Merge branch 'main' into yash/stylus-cli-erc20

Author: kumaryash90

.changeset/clear-books-allow.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Adds `country` to onramp parameters

.changeset/tricky-points-tease.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Remove unnecessary Switch Network button in PayEmbed

apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/components/ProjectSidebarLayout.tsx

@@ -2,7 +2,6 @@
 import { FullWidthSidebarLayout } from "@/components/blocks/SidebarLayout";
 import { Badge } from "@/components/ui/badge";
 import {
-  BellIcon,
   BookTextIcon,
   BoxIcon,
   CoinsIcon,
@@ -95,16 +94,17 @@ export function ProjectSidebarLayout(props: {
           icon: NebulaIcon,
           tracking: tracking("nebula"),
         },
-        {
-          href: `${layoutPath}/webhooks`,
-          label: (
-            <span className="flex items-center gap-2">
-              Webhooks <Badge>New</Badge>
-            </span>
-          ),
-          icon: BellIcon,
-          tracking: tracking("webhooks"),
-        },
+        // Commented until we solve the scrolling issue
+        // {
+        //   href: `${layoutPath}/webhooks`,
+        //   label: (
+        //     <span className="flex items-center gap-2">
+        //       Webhooks <Badge>New</Badge>
+        //     </span>
+        //   ),
+        //   icon: BellIcon,
+        //   tracking: tracking("webhooks"),
+        // },
       ]}
       footerSidebarLinks={[
         {

apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/FilterDetailsStep.tsx

@@ -323,7 +323,7 @@ export function FilterDetailsStep({
                           : null}
                       </SelectValue>
                     </SelectTrigger>
-                    <SelectContent>
+                    <SelectContent className="max-h-60 overflow-y-auto">
                       {eventSignatures.map((event) => {
                         // Truncate the hash for display purposes
                         const truncatedHash = truncateMiddle(
@@ -373,7 +373,7 @@ export function FilterDetailsStep({
                           : null}
                       </SelectValue>
                     </SelectTrigger>
-                    <SelectContent className="max-w-[600px]">
+                    <SelectContent className="max-h-60 max-w-[600px] overflow-y-auto">
                       {functionSignatures.map((func) => (
                         <SelectItem
                           key={func.signature}

apps/playground-web/src/app/insight/insightBlueprints.ts

@@ -59,6 +59,11 @@ export const insightBlueprints: MinimalBlueprintSpec[] = [
     id: "tokens",
     name: "Tokens",
     paths: [
+      {
+        name: "Get token owners by contract",
+        path: "/v1/tokens/owners",
+        deprecated: false,
+      },
       {
         name: "Get token transfers by transaction",
         path: "/v1/tokens/transfers/transaction/{transaction_hash}",
@@ -126,7 +131,7 @@ export const insightBlueprints: MinimalBlueprintSpec[] = [
         deprecated: false,
       },
       {
-        name: "Get NFTs by owner",
+        name: "Get NFTs",
         path: "/v1/nfts",
         deprecated: false,
       },

packages/thirdweb/src/bridge/Onramp.ts

@@ -53,6 +53,7 @@ interface OnrampApiRequestBody {
   maxSteps?: number;
   excludeChainIds?: string;
   paymentLinkId?: string;
+  country?: string;
 }
 
 /**
@@ -107,6 +108,22 @@ interface OnrampApiRequestBody {
  * }
  * ```
  *
+ * ### Global Support
+ *
+ * For the best user experience, specify the user's `country` code in your request. This will return an error if the user's country is not supported by the provider.
+ *
+ * ```typescript
+ * const preparedOnramp = await Bridge.Onramp.prepare({
+ *   client: thirdwebClient,
+ *   onramp: "stripe",
+ *   chainId: ethereum.id,
+ *   tokenAddress: NATIVE_TOKEN_ADDRESS,
+ *   receiver: "0x...", // receiver's address
+ *   amount: toWei("10"), // 10 of the destination token
+ *   country: "AU" // User's country code
+ * });
+ * ```
+ *
  * @param options - The options for preparing the onramp.
  * @param options.client - Your thirdweb client.
  * @param options.onramp - The onramp provider to use (e.g., "stripe", "coinbase", "transak").
@@ -121,6 +138,7 @@ interface OnrampApiRequestBody {
  * @param [options.currency] - The currency for the onramp (e.g., "USD", "GBP"). Defaults to user's preferred or "USD".
  * @param [options.maxSteps] - Maximum number of post-onramp steps.
  * @param [options.excludeChainIds] - Chain IDs to exclude from the route (string or array of strings).
+ * @param [options.country] - The user's country code (e.g. "US", "JP"). Defaults to "US". We highly recommend this be set (based on the user's IP address).
  *
  * @returns A promise that resolves to the prepared onramp details, including the link and quote.
  * @throws Will throw an error if there is an issue preparing the onramp.
@@ -145,6 +163,7 @@ export async function prepare(
     maxSteps,
     excludeChainIds,
     paymentLinkId,
+    country,
   } = options;
 
   const clientFetch = getClientFetch(client);
@@ -186,6 +205,9 @@ export async function prepare(
   if (paymentLinkId !== undefined) {
     apiRequestBody.paymentLinkId = paymentLinkId;
   }
+  if (country !== undefined) {
+    apiRequestBody.country = country;
+  }
 
   const response = await clientFetch(url, {
     method: "POST",
@@ -247,6 +269,7 @@ export declare namespace prepare {
     currency?: string;
     maxSteps?: number;
     excludeChainIds?: string | string[];
+    country?: string;
     /**
      * @hidden
      */

packages/thirdweb/src/bridge/Webhook.ts

@@ -60,11 +60,13 @@ export type WebhookPayload = Exclude<
 >;
 
 /**
- * Parses an incoming webhook from thirdweb.
+ * Parses an incoming Universal Bridge webhook payload.
  *
  * @param payload - The raw text body received from thirdweb.
  * @param headers - The webhook headers received from thirdweb.
  * @param secret - The webhook secret to verify the payload with.
+ * @beta
+ * @bridge Webhook
  */
 export async function parse(
   /**

packages/thirdweb/src/extensions/prebuilts/deploy-published.ts

@@ -308,7 +308,7 @@ export async function deployContractfromDeployMetadata(
         method,
         params: normalizeFunctionParams(method, initializeParams),
       });
-      // asumption here is that the factory address returns the deployed proxy address
+      // assumption here is that the factory address returns the deployed proxy address
       const address = await simulateTransaction({
         transaction: deployTx,
       });

packages/thirdweb/src/extensions/prebuilts/get-required-transactions.ts

@@ -140,7 +140,7 @@ async function getTransactionsForImplementation(options: {
     options;
 
   if (deployMetadata.name === "MarketplaceV3") {
-    return getTransactionsForMaketplaceV3(options);
+    return getTransactionsForMarketplaceV3(options);
   }
 
   if (deployMetadata.routerType === "dynamic") {
@@ -173,7 +173,7 @@ async function getTransactionsForImplementation(options: {
   return result ? [result] : [];
 }
 
-async function getTransactionsForMaketplaceV3(options: {
+async function getTransactionsForMarketplaceV3(options: {
   chain: Chain;
   client: ThirdwebClient;
 }): Promise<DeployTransactionResult[]> {

packages/thirdweb/src/react/web/ui/ConnectWallet/screens/Buy/swap/SwapScreenContent.tsx

@@ -21,7 +21,6 @@ import {
 } from "../../../../components/Drawer.js";
 import { Spacer } from "../../../../components/Spacer.js";
 import { Spinner } from "../../../../components/Spinner.js";
-import { SwitchNetworkButton } from "../../../../components/SwitchNetwork.js";
 import { Container } from "../../../../components/basic.js";
 import { Button } from "../../../../components/buttons.js";
 import { Text } from "../../../../components/text.js";
@@ -171,8 +170,6 @@ export function SwapScreenContent(props: {
     (swapRequired && !quoteQuery.data) ||
     isNotEnoughBalance ||
     allowanceQuery.isLoading;
-  const switchChainRequired =
-    props.payer.wallet.getChain()?.id !== fromChain?.id;
 
   const errorMsg =
     !quoteQuery.isLoading && quoteQuery.error
@@ -319,19 +316,6 @@ export function SwapScreenContent(props: {
         >
           Pay with another token
         </Button>
-      ) : switchChainRequired &&
-        fromChain &&
-        !quoteQuery.isLoading &&
-        !allowanceQuery.isLoading &&
-        !isNotEnoughBalance &&
-        !quoteQuery.error ? (
-        <SwitchNetworkButton
-          variant="accent"
-          fullWidth
-          switchChain={async () => {
-            await props.payer.wallet.switchChain(fromChain);
-          }}
-        />
       ) : (
         <Button
           variant={disableContinue ? "outline" : "accent"}
@@ -340,6 +324,9 @@ export function SwapScreenContent(props: {
           disabled={disableContinue}
           onClick={async () => {
             if (!disableContinue) {
+              if (props.payer.wallet.getChain()?.id !== fromChain?.id) {
+                await props.payer.wallet.switchChain(fromChain);
+              }
               showSwapFlow();
               trackPayEvent({
                 event: "confirm_swap_quote",

packages/thirdweb/src/utils/extensions/drops/process-override-list.ts

@@ -90,7 +90,7 @@ export async function processOverrideList(options: {
     client: options.client,
     files: [stringify(options.overrides)],
   });
-  // 7. assmeble the final sharded merkle tree info
+  // 7. assemble the final sharded merkle tree info
   const shardedMerkleInfo: ShardedMerkleTreeInfo = {
     merkleRoot: tree.getHexRoot(),
     baseUri,