Merge branch 'main' into greg/tool-5091-fix-broken-links-in-portal

Author: gregfromstl

apps/dashboard/src/app/(app)/(dashboard)/explore/data.ts

@@ -90,144 +90,6 @@ const MARKETS = {
   name: "Marketplace",
 } satisfies ExploreCategory;
 
-const MODULAR_CONTRACTS = {
-  contracts: [
-    // erc721 drop
-    [
-      "thirdweb.eth/ERC721CoreInitializable",
-      [
-        "deployer.thirdweb.eth/ClaimableERC721",
-        "deployer.thirdweb.eth/BatchMetadataERC721",
-        "deployer.thirdweb.eth/RoyaltyERC721",
-      ],
-      {
-        description: "ERC721 NFTs that anyone can mint.",
-        title: "Modular NFT Drop",
-      },
-    ],
-    // erc721 token
-    [
-      "thirdweb.eth/ERC721CoreInitializable",
-      [
-        "deployer.thirdweb.eth/MintableERC721",
-        "deployer.thirdweb.eth/BatchMetadataERC721",
-        "deployer.thirdweb.eth/TransferableERC721",
-      ],
-      {
-        description: "ERC721 NFTs that only owners can mint.",
-        title: "Modular NFT Collection",
-      },
-    ],
-    // open edition 721
-    [
-      "thirdweb.eth/ERC721CoreInitializable",
-      [
-        "deployer.thirdweb.eth/ClaimableERC721",
-        "deployer.thirdweb.eth/OpenEditionMetadataERC721",
-        "deployer.thirdweb.eth/RoyaltyERC721",
-      ],
-      {
-        description: "ERC721 NFTs with identical metadata.",
-        title: "Modular Open Edition",
-      },
-    ],
-    // erc1155 drop
-    [
-      "thirdweb.eth/ERC1155CoreInitializable",
-      [
-        "deployer.thirdweb.eth/ClaimableERC1155",
-        "deployer.thirdweb.eth/BatchMetadataERC1155",
-        "deployer.thirdweb.eth/RoyaltyERC1155",
-        "deployer.thirdweb.eth/SequentialTokenIdERC1155",
-      ],
-      {
-        description: "ERC1155 NFTs that others can mint.",
-        title: "Modular Edition Drop",
-      },
-    ],
-    // erc1155 token
-    [
-      "thirdweb.eth/ERC1155CoreInitializable",
-      [
-        "deployer.thirdweb.eth/MintableERC1155",
-        "deployer.thirdweb.eth/BatchMetadataERC1155",
-        "deployer.thirdweb.eth/TransferableERC1155",
-        "deployer.thirdweb.eth/SequentialTokenIdERC1155",
-      ],
-      {
-        description: "ERC1155 NFTs that only owners can mint.",
-        title: "Modular Edition",
-      },
-    ],
-    // erc20 drop
-    [
-      "thirdweb.eth/ERC20CoreInitializable",
-      [
-        "deployer.thirdweb.eth/ClaimableERC20",
-        "deployer.thirdweb.eth/TransferableERC20",
-      ],
-      {
-        description: "ERC20 Tokens that others can mint.",
-        title: "Modular Token Drop",
-      },
-    ],
-    // erc20 token
-    [
-      "thirdweb.eth/ERC20CoreInitializable",
-      [
-        "deployer.thirdweb.eth/MintableERC20",
-        "deployer.thirdweb.eth/TransferableERC20",
-      ],
-      {
-        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 = {
-  contracts: [
-    // erc20 token + superchain
-    [
-      "thirdweb.eth/ERC20CoreInitializable",
-      [
-        "deployer.thirdweb.eth/MintableERC20",
-        "deployer.thirdweb.eth/TransferableERC20",
-        "deployer.thirdweb.eth/SuperChainInterop",
-      ],
-      {
-        description: "ERC20 Tokens that only owners can mint.",
-        title: "Modular Superchain Token",
-      },
-    ],
-    // erc20 drop + superchain
-    [
-      "thirdweb.eth/ERC20CoreInitializable",
-      [
-        "deployer.thirdweb.eth/ClaimableERC20",
-        "deployer.thirdweb.eth/TransferableERC20",
-        "deployer.thirdweb.eth/SuperChainInterop",
-      ],
-      {
-        description: "ERC20 Tokens that others can mint.",
-        title: "Modular Superchain Token Drop",
-      },
-    ],
-  ],
-  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 = {
   contracts: ["thirdweb.eth/Airdrop"],
   description:
@@ -313,12 +175,26 @@ const SMART_WALLET = {
   showInExplore: true,
 } satisfies ExploreCategory;
 
+const STYLUS = {
+  contracts: [
+    "0x6453a486d52e0EB6E79Ec4491038E2522a926936/StylusAirdropERC1155",
+    "0x6453a486d52e0EB6E79Ec4491038E2522a926936/StylusAirdropERC721",
+    "0x6453a486d52e0EB6E79Ec4491038E2522a926936/StylusAirdropERC20",
+  ],
+  description:
+    "Airdrop your NFTs or tokens to a large number of recipients. Built with Arbitrum Stylus.",
+  displayName: "Arbitrum Stylus Contracts",
+  id: "stylus",
+  name: "Stylus",
+  showInExplore: true,
+  isBeta: true,
+} satisfies ExploreCategory;
+
 const CATEGORIES: Record<string, ExploreCategory> = {
   [POPULAR.id]: POPULAR,
-  [MODULAR_CONTRACTS.id]: MODULAR_CONTRACTS,
-  [SUPERCHAIN.id]: SUPERCHAIN,
   [NFTS.id]: NFTS,
   [MARKETS.id]: MARKETS,
+  [STYLUS.id]: STYLUS,
   [DROPS.id]: DROPS,
   [SMART_WALLET.id]: SMART_WALLET,
   [AIRDROP.id]: AIRDROP,

apps/portal/redirects.mjs

@@ -337,6 +337,11 @@ const solidityRedirects = {
   "/solidity/extensions/primarysale":
     "/contracts/build/extensions/general/PrimarySale",
   "/solidity/extensions/royalty": "/contracts/build/extensions/general/Royalty",
+
+  // contracts -> tokens
+  "/contracts/deploy/:path*": "/contracts/deploy",
+  "/contracts/build": "/tokens/build",
+  "/contracts/build/:path*": "/tokens/build/:path*",
 };
 
 const extensionsTable = "/typescript/v4/extensions#all-available-extensions";
@@ -701,6 +706,7 @@ const walletRedirects = {
 
 const paymentRedirects = {
   "/pay": "/payments",
+  "/pay/:path*": "/payments",
   "/checkouts": "/payments",
   "/checkouts/api-reference": "/payments/nft-checkout/api-reference",
   "/checkouts/checkout-link": "/payments/nft-checkout/checkout-link",
@@ -909,7 +915,6 @@ const otherRedirects = {
   "/connect/account-abstraction": "/connect/account-abstraction/overview",
   // connect
   "/connect/connect": "/connect/sign-in",
-  "/connect/ecosystems/:path*": "/connect/wallet/overview",
   "/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":
@@ -1012,6 +1017,9 @@ const otherRedirects = {
   "/connect/wallet/server": "/wallets/server",
   "/connect/account-abstraction/get-started": "/wallets/sponsor-gas",
   "/connect/account-abstraction/:path*": "/wallets/sponsor-gas",
+  "/connect/pay/:path*": "/payments",
+  "/connect/ecosystems/:path*": "/wallets/ecosystem/set-up",
+  "/connect/:path*": "/wallets",
   "/wallets/in-app-wallet/custom-auth/configuration": "/wallets/custom-auth",
   "/connect/wallets/user-management/link-multiple-identity":
     "/wallets/link-profiles",

apps/portal/src/app/account/api-keys/page.mdx

@@ -12,7 +12,7 @@ export const metadata = createMetadata({
 
 # API Keys
 
-Each thirdweb project is equipped with an API key to use thirdweb's infrastructure services including [Storage](/infrastructure/storage/overview), [RPC Edge](/infrastructure/rpc-edge/overview), [Account Abstraction infrastructure](/wallest/sponsor-gas), and [In-App Wallets](/wallets).
+Each thirdweb project is equipped with an API key to use thirdweb's infrastructure services including [Storage](/infrastructure/storage/overview), [RPC Edge](/infrastructure/rpc-edge/overview), [Account Abstraction infrastructure](/bundler), and [In-App Wallets](/wallets).
 
 ## Services
 

apps/portal/src/app/pay/faqs/page.mdx

@@ -44,8 +44,8 @@ Payments will automatically kick off the token route discovery process. Please c
 Yes, Payments is designed to be agnostic to wallet infrastructure. You can use it with any wallet service.
 </Details>
 
-<Details summary="Does Payments support Apple Pay or Google Pay?">
-Apple Pay and Google Pay are supported through the onramp providers depending on region. Coinbase, Stripe, and Transak currently support Apple Pay. Transak supports Google Pay. [Learn more about the supported onramp providers.](/pay/onramp-providers).
+<Details summary="Does Payments support Apple Pay or Google Pay?"> 
+Apple Pay and Google Pay are supported through the onramp providers depending on region. Coinbase, Stripe, and Transak currently support Apple Pay. Transak supports Google Pay.
 </Details>
 
 <Details summary="What are the KYC requirements?">

apps/portal/src/app/react/v5/migrate/installation/page.mdx

@@ -99,7 +99,7 @@ const client = createThirdwebClient({
 <ConnectButton client={client} />
 ```
 
-To learn more about the new `ConnectButton`, head over to the [Playground](https://playground.thirdweb.com/connect/sign-in/button).
+To learn more about the new `ConnectButton`, head over to the [Playground](/connect/sign-in/button).
 
 Notice how you are passing the thirdweb client to the component itself and not to the `ThirdwebProvider` like in v4?
 By not putting every config inside the context wrapper, we were able to make the SDK v5 much more lightweight since you only load what you need!

apps/portal/src/app/wallets/auth/page.mdx

@@ -150,3 +150,24 @@ Quickly get started with one of our templates:
 	description="A working example of a React + Express app using Auth"
 />
 
+## Frameworks
+
+Auth integrates with a variety of server-side and client-side development frameworks. We're always adding support for more frameworks, so if you don't see yours, [let us know](https://thirdweb.com/contact-us).
+
+<Stack>
+
+<ArticleIconCard
+	title="Next.js"
+	href="/wallets/auth/frameworks/next"
+	description="Integrate Auth in Next.js applications."
+	image={next}
+/>
+
+<ArticleIconCard
+	title="React + Express"
+	href="/wallets/auth/frameworks/react-express"
+	description="Integrate Auth in React applications using Vite and Express."
+	image={react}
+/>
+
+</Stack>

apps/portal/src/app/wallets/pregenerate-wallets/page.mdx

@@ -67,7 +67,7 @@ When the user logs in with any method associated with that email (including goog
 ```
 
 {/* TODO: update link when custom auth documentation has been updated */}
-Use this when [bringing your own authentication method](/wallets/users). When the user logs in, if the user ids you provide from the auth endpoint match, they will get access to the same pregenerated wallet.
+Use this when [bringing your own authentication method](/wallets/custom-auth). When the user logs in, if the user ids you provide from the auth endpoint match, they will get access to the same pregenerated wallet.
 
 ## Headers
 
@@ -126,4 +126,4 @@ Pre-generating is independent and doesn't change the user's experience.
 
 Your users can continue to login as per usual. When they do, they will be assigned the pregenerated wallet.
 
-For more information on signing in, see the [Connect Wallets](/wallets) section.
+For more information on signing in, see the [User Wallets](/wallets/users) section.

apps/portal/src/app/wallets/sidebar.tsx

@@ -28,6 +28,10 @@ export const sidebar: SideBar = {
           href: `${walletSlug}/external-wallets`,
           name: "External Wallets",
         },
+        {
+          href: `${walletSlug}/ecosystem/set-up`,
+          name: "Ecosystem Wallets",
+        },
         {
           href: `${walletSlug}/sponsor-gas`,
           name: "Sponsor Gas",
@@ -111,10 +115,6 @@ export const sidebar: SideBar = {
           icon: <ExternalLinkIcon />,
           name: "Templates",
         },
-        {
-          href: `${walletSlug}/ecosystem/set-up`,
-          name: "Ecosystem Wallets",
-        },
         {
           href: `${walletSlug}/security`,
           name: "Security",

apps/portal/src/app/wallets/users/page.mdx

@@ -25,7 +25,7 @@ If you already have an auth system, you can use thirdweb to attach wallets to yo
 
 <Stack>
     <ArticleIconCard
-        href="/wallets/ecosystem/set-up"
+        href="/wallets/custom-auth"
         icon={EcosystemWalletsIcon}
         title="Custom Authentication"
         description="Learn more about custom authentication with your own auth system"

apps/portal/src/components/others/DocSearch.tsx

@@ -31,7 +31,7 @@ const suggestedLinks: { title: string; href: string }[] = [
     title: "Contracts",
   },
   {
-    href: "/engine/v3",
+    href: "/transactions",
     title: "Transactions",
   },
   {
@@ -45,6 +45,7 @@ type Tag =
   | "React Native"
   | "Unity"
   | "TypeScript"
+  | "Wallet SDK"
   | "Wallets"
   | "Reference"
   | "Python"
@@ -55,7 +56,8 @@ type Tag =
   | "Solidity"
   | "Payments"
   | "Glossary"
-  | "Engine";
+  | "Engine"
+  | "Transactions";
 
 function SearchModalContent(props: { closeModal: () => void }) {
   const [input, setInput] = useState("");
@@ -417,6 +419,9 @@ function getTagsFromHref(href: string): Tag[] | undefined {
   if (href.includes("/engine")) {
     return ["Engine"];
   }
+  if (href.includes("/transactions")) {
+    return ["Transactions"];
+  }
   if (href.includes("/infrastructure")) {
     return ["Infra"];
   }