Merge branch 'main' into joe-UB-Route-Discovery

Author: gregfromstl

.changeset/blue-comics-doubt.md

@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/engine": patch
+---
+
+client id optional

.changeset/blue-mice-prove.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+default the spinner stroke color to currentColor and make the color prop optional

.changeset/breezy-dodos-hunt.md

@@ -0,0 +1,5 @@
+---
+"@thirdweb-dev/insight": patch
+---
+
+client id optional

.changeset/fast-onions-obey.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Handle large NFT colletions when updating metadata

.changeset/five-sheep-crash.md

@@ -27,10 +27,7 @@ module.exports = [
   // -- engine
   "/engine",
   // -- solutions pages --
-  "/solutions/gaming",
-  "/solutions/consumer-apps",
-  "/solutions/defi",
-  "/solutions/ecosystem",
+  "/solutions/:solution_slug",
   // -- campaigns --
   // "/unlimited-wallets", -- OFF for now
   // -- TPP --

.changeset/green-olives-unite.md

@@ -40,8 +40,8 @@
     "@radix-ui/react-popover": "^1.1.10",
     "@radix-ui/react-progress": "^1.1.4",
     "@radix-ui/react-radio-group": "^1.3.3",
-    "@radix-ui/react-select": "^2.2.2",
-    "@radix-ui/react-separator": "^1.1.4",
+    "@radix-ui/react-select": "^2.2.5",
+    "@radix-ui/react-separator": "^1.1.7",
     "@radix-ui/react-slot": "^1.2.0",
     "@radix-ui/react-switch": "^1.2.2",
     "@radix-ui/react-tooltip": "1.2.3",
@@ -77,7 +77,7 @@
     "nextjs-toploader": "^1.6.12",
     "nuqs": "^2.4.3",
     "p-limit": "^6.2.0",
-    "papaparse": "^5.5.2",
+    "papaparse": "^5.5.3",
     "pluralize": "^8.0.0",
     "posthog-js": "1.67.1",
     "prettier": "3.5.3",
@@ -89,7 +89,7 @@
     "react-dropzone": "^14.3.8",
     "react-error-boundary": "^5.0.0",
     "react-hook-form": "7.55.0",
-    "react-markdown": "^9.0.1",
+    "react-markdown": "10.1.0",
     "react-table": "^7.8.0",
     "recharts": "2.15.3",
     "remark-gfm": "4.0.1",
@@ -105,7 +105,7 @@
     "thirdweb": "workspace:*",
     "tiny-invariant": "^1.3.3",
     "use-debounce": "^10.0.4",
-    "zod": "3.24.3"
+    "zod": "3.25.24"
   },
   "devDependencies": {
     "@chakra-ui/cli": "^2.4.1",

.changeset/limited-country-dropdown.md

@@ -11,8 +11,8 @@ import type { EngineBackendWalletType } from "lib/engine";
 import { useState } from "react";
 import { useActiveAccount } from "thirdweb/react";
 import invariant from "tiny-invariant";
-import type { ResultItem } from "../../../app/(app)/team/[team_slug]/[project_slug]/engine/dedicated/(instance)/[engineId]/metrics/components/StatusCodes";
-import type { EngineStatus } from "../../../app/(app)/team/[team_slug]/[project_slug]/engine/dedicated/(instance)/[engineId]/overview/components/transactions-table";
+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";
 
 // Engine instances

.changeset/shy-pigs-drive.md

@@ -77,17 +77,11 @@ export async function RoutesData(props: {
 
   const totalPages = Math.ceil(filteredCount / DEFAULT_PAGE_SIZE);
 
-  const activePage = Number(props.searchParams.page || 1);
-  const pageSize = DEFAULT_PAGE_SIZE;
-  const startIndex = (activePage - 1) * pageSize;
-  const endIndex = startIndex + pageSize;
-  const paginatedRoutes = routesToRender.slice(startIndex, endIndex);
-
   return (
     <>
       <main>
         {/* empty state */}
-        {paginatedRoutes.length === 0 ? (
+        {routesToRender.length === 0 ? (
           <div className="flex h-[300px] items-center justify-center rounded-lg border p-8 lg:h-[500px]">
             <p className="text-2xl">No Results found</p>
           </div>
@@ -111,7 +105,7 @@ export async function RoutesData(props: {
                 </TableRow>
               </TableHeader>
               <TableBody>
-                {paginatedRoutes.map((route) => (
+                {routesToRender.map((route) => (
                   <RouteListRow
                     key={`${route.originToken.chainId}:${route.originToken.address}-${route.destinationToken.chainId}:${route.destinationToken.address}`}
                     originChainId={route.originToken.chainId}
@@ -131,7 +125,7 @@ export async function RoutesData(props: {
           </TableContainer>
         ) : (
           <ul className="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3">
-            {paginatedRoutes.map((route) => (
+            {routesToRender.map((route) => (
               <li
                 key={`${route.originToken.chainId}:${route.originToken.address}-${route.destinationToken.chainId}:${route.destinationToken.address}`}
                 className="h-full"
@@ -155,12 +149,15 @@ export async function RoutesData(props: {
       </main>
       <div className="h-10" />
       {totalPages > 1 && (
-        <ChainlistPagination totalPages={totalPages} activePage={activePage} />
+        <ChainlistPagination
+          totalPages={totalPages}
+          activePage={Number(props.searchParams.page) || 1}
+        />
       )}
       <div className="h-4" />
       <p className="text-balance text-center text-muted-foreground text-sm">
         Showing{" "}
-        <span className="text-accent-foreground">{paginatedRoutes.length}</span>{" "}
+        <span className="text-accent-foreground">{routesToRender.length}</span>{" "}
         out of{" "}
         {filteredCount !== totalCount ? (
           <>

.changeset/slick-apes-do.md

@@ -10,7 +10,7 @@ import {
   type SearchParams,
 } from "./components/server/routes-table";
 
-const title = "Routes: Swap, Bridge, and On-Ramp";
+const title = "Universal Bridge Routes: Swap, Bridge, and Onramp";
 const description =
   "A list of token routes for swapping, bridging, and on-ramping between EVM chains with thirdweb.";
 

.changeset/tired-rice-kiss.md

@@ -1,6 +1,7 @@
 "use client";
 
 import type { ThirdwebContract } from "thirdweb";
+import type { ProjectMeta } from "../../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/types";
 import { ErrorPage, LoadingPage } from "../../_components/page-skeletons";
 import { RedirectToContractOverview } from "../../_components/redirect-contract-overview.client";
 import { useContractPageMetadata } from "../../_hooks/useContractPageMetadata";
@@ -9,6 +10,7 @@ import { ContractDirectListingsPage } from "./ContractDirectListingsPage";
 export function ContractDirectListingsPageClient(props: {
   contract: ThirdwebContract;
   isLoggedIn: boolean;
+  projectMeta: ProjectMeta | undefined;
 }) {
   const metadataQuery = useContractPageMetadata(props.contract);
 
@@ -21,7 +23,12 @@ export function ContractDirectListingsPageClient(props: {
   }
 
   if (!metadataQuery.data.isDirectListingSupported) {
-    return <RedirectToContractOverview contract={props.contract} />;
+    return (
+      <RedirectToContractOverview
+        contract={props.contract}
+        projectMeta={props.projectMeta}
+      />
+    );
   }
 
   return (

apps/dashboard/framer-rewrites.js

@@ -1,45 +1,18 @@
-import { notFound, redirect } from "next/navigation";
 import { getRawAccount } from "../../../../../../account/settings/getAccount";
-import { getContractPageParamsInfo } from "../../_utils/getContractFromParams";
-import { getContractPageMetadata } from "../../_utils/getContractPageMetadata";
-import { ContractDirectListingsPage } from "./ContractDirectListingsPage";
-import { ContractDirectListingsPageClient } from "./ContractDirectListingsPage.client";
+import type { PublicContractPageParams } from "../../types";
+import { SharedDirectListingsPage } from "./shared-direct-listings-page";
 
 export default async function Page(props: {
-  params: Promise<{
-    contractAddress: string;
-    chain_id: string;
-  }>;
+  params: Promise<PublicContractPageParams>;
 }) {
-  const params = await props.params;
-  const account = await getRawAccount();
-  const info = await getContractPageParamsInfo(params);
-
-  if (!info) {
-    notFound();
-  }
-
-  if (info.isLocalhostChain) {
-    return (
-      <ContractDirectListingsPageClient
-        contract={info.clientContract}
-        isLoggedIn={!!account}
-      />
-    );
-  }
-
-  const { isDirectListingSupported, isInsightSupported } =
-    await getContractPageMetadata(info.serverContract);
-
-  if (!isDirectListingSupported) {
-    redirect(`/${params.chain_id}/${params.contractAddress}`);
-  }
+  const [params, account] = await Promise.all([props.params, getRawAccount()]);
 
   return (
-    <ContractDirectListingsPage
-      contract={info.clientContract}
+    <SharedDirectListingsPage
+      contractAddress={params.contractAddress}
+      chainIdOrSlug={params.chain_id}
+      projectMeta={undefined}
       isLoggedIn={!!account}
-      isInsightSupported={isInsightSupported}
     />
   );
 }

apps/dashboard/package.json

@@ -0,0 +1,53 @@
+import { notFound } from "next/navigation";
+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";
+import { getContractPageParamsInfo } from "../../_utils/getContractFromParams";
+import { getContractPageMetadata } from "../../_utils/getContractPageMetadata";
+import { ContractDirectListingsPage } from "./ContractDirectListingsPage";
+import { ContractDirectListingsPageClient } from "./ContractDirectListingsPage.client";
+
+export async function SharedDirectListingsPage(props: {
+  contractAddress: string;
+  chainIdOrSlug: string;
+  projectMeta: ProjectMeta | undefined;
+  isLoggedIn: boolean;
+}) {
+  const info = await getContractPageParamsInfo({
+    contractAddress: props.contractAddress,
+    chainIdOrSlug: props.chainIdOrSlug,
+    teamId: props.projectMeta?.teamId,
+  });
+
+  if (!info) {
+    notFound();
+  }
+
+  if (info.isLocalhostChain) {
+    return (
+      <ContractDirectListingsPageClient
+        contract={info.clientContract}
+        isLoggedIn={props.isLoggedIn}
+        projectMeta={props.projectMeta}
+      />
+    );
+  }
+
+  const { isDirectListingSupported, isInsightSupported } =
+    await getContractPageMetadata(info.serverContract);
+
+  if (!isDirectListingSupported) {
+    redirectToContractLandingPage({
+      chainIdOrSlug: props.chainIdOrSlug,
+      contractAddress: props.contractAddress,
+      projectMeta: props.projectMeta,
+    });
+  }
+
+  return (
+    <ContractDirectListingsPage
+      contract={info.clientContract}
+      isLoggedIn={props.isLoggedIn}
+      isInsightSupported={isInsightSupported}
+    />
+  );
+}

apps/dashboard/src/@3rdweb-sdk/react/hooks/useEngine.ts

@@ -1,6 +1,7 @@
 "use client";
 
 import type { ThirdwebContract } from "thirdweb";
+import type { ProjectMeta } from "../../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/types";
 import { ErrorPage, LoadingPage } from "../../_components/page-skeletons";
 import { RedirectToContractOverview } from "../../_components/redirect-contract-overview.client";
 import { useContractPageMetadata } from "../../_hooks/useContractPageMetadata";
@@ -9,6 +10,7 @@ import { ContractEnglishAuctionsPage } from "./ContractEnglishAuctionsPage";
 export function ContractEnglishAuctionsPageClient(props: {
   contract: ThirdwebContract;
   isLoggedIn: boolean;
+  projectMeta: ProjectMeta | undefined;
 }) {
   const metadataQuery = useContractPageMetadata(props.contract);
 
@@ -21,7 +23,12 @@ export function ContractEnglishAuctionsPageClient(props: {
   }
 
   if (!metadataQuery.data.isEnglishAuctionSupported) {
-    return <RedirectToContractOverview contract={props.contract} />;
+    return (
+      <RedirectToContractOverview
+        contract={props.contract}
+        projectMeta={props.projectMeta}
+      />
+    );
   }
 
   return (