Merge branch 'main' into ru-locale

denpiligrim · web-flow · commit 43e5cce6b70c · 2025-04-01T13:44:41.000+03:00
diff --git a/.changeset/cyan-kids-hide.md b/.changeset/cyan-kids-hide.md
@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Only onramp for the amount required for transaction flows in PayEmbed
diff --git a/.changeset/fruity-cooks-know.md b/.changeset/fruity-cooks-know.md
@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Show past transactions in transactions modal screen
diff --git a/.changeset/neat-wasps-count.md b/.changeset/neat-wasps-count.md
diff --git a/.changeset/wicked-kings-joke.md b/.changeset/wicked-kings-joke.md
diff --git a/apps/playground-web/src/app/connect/pay/backend/page.tsx b/apps/playground-web/src/app/connect/pay/backend/page.tsx
@@ -1,3 +1,4 @@
+import { Button } from "@/components/ui/button";
 import { Table, TableBody, TableCell, TableRow } from "@/components/ui/table";
 import Link from "next/link";
 import { getBridgePaths } from "./utils";
@@ -7,27 +8,39 @@ export default async function Page() {
     const paths = await getBridgePaths();
     return (
       <div className="pb-20">
-        <h2 className="mb-2 font-semibold text-2xl tracking-tight">
-          Universal Bridge REST API
-        </h2>
-        <p className="mb-5 text-muted-foreground">
-          Directly interact with the Universal Bridge API from your backend,
-          using standard REST api.
-        </p>
+        <div className="flex flex-col justify-between py-6 md:flex-row md:gap-8">
+          <div>
+            <h2 className="mb-2 font-semibold text-2xl tracking-tight">
+              Universal Bridge REST API
+            </h2>
+            <p className="mb-5 text-muted-foreground">
+              Directly interact with the Universal Bridge API from your backend,
+              using standard REST APIs.
+            </p>
+          </div>
+
+          <Link href="https://bridge.thirdweb.com/reference" target="_blank">
+            <Button className="max-md:w-full">View all endpoints</Button>
+          </Link>
+        </div>
 
         <div className="flex flex-col gap-8">
           <BlueprintSection
-            title="Available endpoints"
-            blueprints={paths.map(([pathName, pathObj]) => {
-              if (!pathObj) {
-                throw new Error(`Path not found: ${pathName}`);
-              }
-              return {
-                name: pathName,
-                description: pathObj.get?.description || "",
-                link: `/connect/pay/backend/reference?route=${pathName}`,
-              };
-            })}
+            title="Available GET endpoints"
+            blueprints={paths
+              .filter(
+                ([_pathName, pathObj]) => typeof pathObj?.get !== "undefined",
+              )
+              .map(([pathName, pathObj]) => {
+                if (!pathObj) {
+                  throw new Error(`Path not found: ${pathName}`);
+                }
+                return {
+                  name: pathName,
+                  description: pathObj.get?.description || "",
+                  link: `/connect/pay/backend/reference?route=${pathName}`,
+                };
+              })}
           />
         </div>
       </div>
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
@@ -160,6 +160,10 @@ export function BlueprintPlaygroundUI(props: {
     for (const param of parameters) {
       if (param.schema && "type" in param.schema && param.schema.default) {
         values[param.name] = param.schema.default;
+      } else if (param.name === "filter_block_timestamp_gte") {
+        values[param.name] = Math.floor(
+          (Date.now() - 3 * 30 * 24 * 60 * 60 * 1000) / 1000,
+        );
       } else {
         values[param.name] = "";
       }
diff --git a/packages/thirdweb/CHANGELOG.md b/packages/thirdweb/CHANGELOG.md
@@ -1,5 +1,13 @@
 # thirdweb
 
+## 5.93.9
+
+### Patch Changes
+
+- [#6593](https://github.com/thirdweb-dev/js/pull/6593) [`0dcde07`](https://github.com/thirdweb-dev/js/commit/0dcde077f5cf9b514b66c6768e26f42be9f904b4) Thanks [@kumaryash90](https://github.com/kumaryash90)! - Fix bytecode caching
+
+- [#6588](https://github.com/thirdweb-dev/js/pull/6588) [`cd9ea69`](https://github.com/thirdweb-dev/js/commit/cd9ea69c13c51525c71e274e05a09ad69d054b8c) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Add erc20Value for makeOffer extension function
+
 ## 5.93.8
 
 ### Patch Changes
diff --git a/packages/thirdweb/package.json b/packages/thirdweb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "thirdweb",
-  "version": "5.93.8",
+  "version": "5.93.9",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/thirdweb-dev/js.git#main"
diff --git a/packages/thirdweb/src/bridge/Buy.test.ts b/packages/thirdweb/src/bridge/Buy.test.ts
@@ -35,7 +35,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("Bridge.Buy.quote", () => {
   });
 });
 
-describe("Bridge.Buy.prepare", () => {
+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,
diff --git a/packages/thirdweb/src/bridge/Sell.test.ts b/packages/thirdweb/src/bridge/Sell.test.ts
@@ -35,7 +35,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("Bridge.Sell.quote", () => {
   });
 });
 
-describe("Bridge.Sell.prepare", () => {
+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,
diff --git a/packages/thirdweb/src/pay/buyWithCrypto/getQuote.ts b/packages/thirdweb/src/pay/buyWithCrypto/getQuote.ts
@@ -259,8 +259,6 @@ export async function getBuyWithCryptoQuote(
         data: data.transactionRequest.data as Hash,
         to: data.transactionRequest.to,
         value: BigInt(data.transactionRequest.value),
-        gas: BigInt(data.transactionRequest.gasLimit),
-        gasPrice: undefined, // ignore gas price returned by the quote, we handle it ourselves
       },
       approvalData,
       swapDetails: {
diff --git a/packages/thirdweb/src/pay/buyWithCrypto/getTransfer.ts b/packages/thirdweb/src/pay/buyWithCrypto/getTransfer.ts
@@ -155,7 +155,6 @@ export async function getBuyWithCryptoTransfer(
         data: data.transactionRequest.data as Hash,
         to: data.transactionRequest.to as Address,
         value: BigInt(data.transactionRequest.value),
-        gas: BigInt(data.transactionRequest.gasLimit),
       },
       approvalData: data.approval,
       fromAddress: data.fromAddress,
diff --git a/packages/thirdweb/src/react/core/hooks/contract/useWaitForReceipt.ts b/packages/thirdweb/src/react/core/hooks/contract/useWaitForReceipt.ts
@@ -17,7 +17,9 @@ import {
  * @transaction
  */
 export function useWaitForReceipt(
-  options: WaitForReceiptOptions | undefined,
+  options:
+    | (WaitForReceiptOptions & { queryOptions?: { enabled?: boolean } })
+    | undefined,
 ): UseQueryResult<TransactionReceipt> {
   return useQuery({
     queryKey: [
@@ -32,7 +34,8 @@ export function useWaitForReceipt(
       }
       return waitForReceipt(options);
     },
-    enabled: !!options?.transactionHash,
+    enabled:
+      !!options?.transactionHash && (options?.queryOptions?.enabled ?? true),
     retry: false,
   });
 }
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
@@ -625,7 +625,7 @@ function SelectedTokenInfo(props: {
   disabled?: boolean;
 }) {
   const getWidth = () => {
-    const amount = formatNumber(Number(props.tokenAmount), 5).toString();
+    const amount = formatNumber(Number(props.tokenAmount), 6).toString();
     let chars = amount.replace(".", "").length;
     const hasDot = amount.includes(".");
     if (hasDot) {
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
@@ -334,7 +334,10 @@ export function TransactionModeScreen(props: {
           variant="accent"
           fullWidth
           onClick={() => {
-            let totalCostWei = transactionCostAndData.transactionValueWei;
+            let totalCostWei = insufficientFunds
+              ? transactionCostAndData.transactionValueWei -
+                (balanceQuery.data?.value || 0n)
+              : transactionCostAndData.transactionValueWei;
             if (
               transactionCostAndData.token.address === NATIVE_TOKEN_ADDRESS &&
               !sponsoredTransactionsEnabled
diff --git a/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/WalletTransactionHistory.tsx b/packages/thirdweb/src/react/web/ui/ConnectWallet/screens/WalletTransactionHistory.tsx
@@ -1,12 +1,17 @@
 "use client";
 import styled from "@emotion/styled";
 import { CheckIcon, CrossCircledIcon } from "@radix-ui/react-icons";
+import { useQuery } from "@tanstack/react-query";
 import { useSyncExternalStore } from "react";
+import { ethereum } from "../../../../../chains/chain-definitions/ethereum.js";
 import { getCachedChain } from "../../../../../chains/utils.js";
 import type { ThirdwebClient } from "../../../../../client/client.js";
-import { getTransactionStore } from "../../../../../transaction/transaction-store.js";
+import {
+  type StoredTransaction,
+  getPastTransactions,
+  getTransactionStore,
+} from "../../../../../transaction/transaction-store.js";
 import { shortenHex } from "../../../../../utils/address.js";
-import type { Hex } from "../../../../../utils/encoding/hex.js";
 import { formatExplorerTxUrl } from "../../../../../utils/url.js";
 import { useCustomTheme } from "../../../../core/design-system/CustomThemeProvider.js";
 import { iconSize, spacing } from "../../../../core/design-system/index.js";
@@ -38,8 +43,20 @@ export function WalletTransactionHistory(props: {
     transactionStore.subscribe,
     transactionStore.getValue,
   );
-  const transactions = [...reverseChronologicalTransactions].reverse();
-
+  const historicalTxQuery = useQuery({
+    queryKey: ["transactions", props.address, activeChain],
+    queryFn: () =>
+      getPastTransactions({
+        walletAddress: props.address,
+        chain: activeChain || ethereum,
+        client: props.client,
+      }),
+    enabled: !!activeChain,
+  });
+  const transactions = [
+    ...[...reverseChronologicalTransactions].reverse(),
+    ...(historicalTxQuery.data || []),
+  ];
   return (
     <Container
       scrollY
@@ -52,7 +69,22 @@ export function WalletTransactionHistory(props: {
       }}
     >
       <Container flex="column" gap="xs" expand>
-        {transactions.length === 0 ? (
+        {historicalTxQuery.isLoading && (
+          <Container
+            flex="column"
+            gap="md"
+            center="both"
+            color="secondaryText"
+            style={{
+              flex: "1",
+              minHeight: "250px",
+            }}
+          >
+            <Spinner color={"secondaryText"} size={"md"} />
+            <Text>Loading recent transactions...</Text>
+          </Container>
+        )}
+        {!historicalTxQuery.isLoading && transactions.length === 0 ? (
           <Container
             flex="column"
             gap="md"
@@ -79,8 +111,7 @@ export function WalletTransactionHistory(props: {
                   key={tx.transactionHash}
                   explorerUrl={chainExplorers.explorers[0]?.url}
                   client={props.client}
-                  hash={tx.transactionHash}
-                  chainId={tx.chainId}
+                  tx={tx}
                 />
               );
             })}
@@ -92,21 +123,24 @@ export function WalletTransactionHistory(props: {
 }
 
 function TransactionButton(props: {
-  hash: string;
+  tx: StoredTransaction;
   client: ThirdwebClient;
-  chainId: number;
   explorerUrl?: string;
 }) {
   const {
-    data: receipt,
+    data: fetchedReceipt,
     isLoading,
     error,
   } = useWaitForReceipt({
-    transactionHash: props.hash as Hex,
-    chain: getCachedChain(props.chainId),
+    transactionHash: props.tx.transactionHash,
+    chain: getCachedChain(props.tx.chainId),
     client: props.client,
+    queryOptions: {
+      enabled: props.tx.receipt === undefined,
+    },
   });
-  const chainIconQuery = useChainIconUrl(getCachedChain(props.chainId));
+  const chainIconQuery = useChainIconUrl(getCachedChain(props.tx.chainId));
+  const receipt = props.tx.receipt ?? fetchedReceipt;
 
   const content = (
     <TxButton
@@ -148,8 +182,8 @@ function TransactionButton(props: {
           >
             <Text size="sm" color="primaryText">
               {receipt?.to
-                ? `Interacted with ${shortenHex(receipt.to, 4)}`
-                : `Hash: ${shortenHex(props.hash, 4)}`}
+                ? `Interacted with ${shortenHex(receipt?.to, 4)}`
+                : `Hash: ${shortenHex(props.tx.transactionHash, 4)}`}
             </Text>
           </Container>
 
@@ -165,7 +199,7 @@ function TransactionButton(props: {
             }}
           >
             <ChainName
-              chain={getCachedChain(props.chainId)}
+              chain={getCachedChain(props.tx.chainId)}
               size="xs"
               client={props.client}
             />
@@ -193,7 +227,7 @@ function TransactionButton(props: {
   if (props.explorerUrl) {
     return (
       <a
-        href={formatExplorerTxUrl(props.explorerUrl, props.hash)}
+        href={formatExplorerTxUrl(props.explorerUrl, props.tx.transactionHash)}
         target="_blank"
         rel="noreferrer"
       >
diff --git a/packages/thirdweb/src/transaction/transaction-store.ts b/packages/thirdweb/src/transaction/transaction-store.ts
diff --git a/packages/thirdweb/src/utils/domain.test.ts b/packages/thirdweb/src/utils/domain.test.ts
diff --git a/packages/thirdweb/src/utils/domains.ts b/packages/thirdweb/src/utils/domains.ts
diff --git a/packages/wagmi-adapter/CHANGELOG.md b/packages/wagmi-adapter/CHANGELOG.md
diff --git a/packages/wagmi-adapter/package.json b/packages/wagmi-adapter/package.json

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"thirdweb": patch
 +---
++
 +Only onramp for the amount required for transaction flows in PayEmbed
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "thirdweb",`
`3`		`- "version": "5.93.8",`
	`3`	`+ "version": "5.93.9",`
`4`	`4`	`"repository": {`
`5`	`5`	`"type": "git",`
`6`	`6`	`"url": "git+https://github.com/thirdweb-dev/js.git#main"`