thirdweb 5.93.1 → 5.93.3

package/src/react/web/ui/ConnectWallet/screens/Buy/fiat/OnRampScreen.tsx

@@ -6,7 +6,7 @@ import type { ThirdwebClient } from "../../../../../../../client/client.js";
 import { getContract } from "../../../../../../../contract/contract.js";
 import { allowance } from "../../../../../../../extensions/erc20/__generated__/IERC20/read/allowance.js";
 import { approve } from "../../../../../../../extensions/erc20/write/approve.js";
-import type { BuyWithCryptoQuote } from "../../../../../../../pay/buyWithCrypto/getQuote.js";
+import { getBuyWithCryptoQuote } from "../../../../../../../pay/buyWithCrypto/getQuote.js";
 import type { BuyWithCryptoStatus } from "../../../../../../../pay/buyWithCrypto/getStatus.js";
 import type { BuyWithFiatQuote } from "../../../../../../../pay/buyWithFiat/getQuote.js";
 import {
@@ -17,6 +17,7 @@ import {
   type OnRampStep,
   getOnRampSteps,
 } from "../../../../../../../pay/buyWithFiat/isSwapRequiredPostOnramp.js";
+import type { PayTokenInfo } from "../../../../../../../pay/utils/commonTypes.js";
 import { sendBatchTransaction } from "../../../../../../../transaction/actions/send-batch-transaction.js";
 import { sendTransaction } from "../../../../../../../transaction/actions/send-transaction.js";
 import type { WaitForReceiptOptions } from "../../../../../../../transaction/actions/wait-for-tx-receipt.js";
@@ -28,7 +29,6 @@ import type { Wallet } from "../../../../../../../wallets/interfaces/wallet.js";
 import { isSmartWallet } from "../../../../../../../wallets/smart/is-smart-wallet.js";
 import { spacing } from "../../../../../../core/design-system/index.js";
 import { useChainName } from "../../../../../../core/hooks/others/useChainQuery.js";
-import { useBuyWithCryptoQuote } from "../../../../../../core/hooks/pay/useBuyWithCryptoQuote.js";
 import { useBuyWithCryptoStatus } from "../../../../../../core/hooks/pay/useBuyWithCryptoStatus.js";
 import { useBuyWithFiatStatus } from "../../../../../../core/hooks/pay/useBuyWithFiatStatus.js";
 import { useConnectedWallets } from "../../../../../../core/hooks/wallets/useConnectedWallets.js";
@@ -319,20 +319,6 @@ function useOnRampScreenState(props: {
   // Get quote for current swap/bridge step if needed
   const previousStep = onRampSteps[currentStepIndex - 1];
   const currentStep = onRampSteps[currentStepIndex];
-  const swapQuoteQuery = useBuyWithCryptoQuote(
-    previousStep && currentStep
-      ? {
-          fromChainId: previousStep.token.chainId,
-          fromTokenAddress: previousStep.token.tokenAddress,
-          toAmount: currentStep.amount,
-          toChainId: currentStep.token.chainId,
-          toTokenAddress: currentStep.token.tokenAddress,
-          fromAddress: props.payer.account.address,
-          toAddress: props.payer.account.address,
-          client: props.client,
-        }
-      : undefined,
-  );
 
   // Handle swap execution
   const swapMutation = useSwapMutation({
@@ -375,9 +361,9 @@ function useOnRampScreenState(props: {
       status = "completed";
     } else if (index === currentStepIndex) {
       // Current step - could be swap or bridge
-      if (swapQuoteQuery.isLoading || swapMutation.isPending) {
+      if (swapMutation.isPending) {
         status = "pending";
-      } else if (swapQuoteQuery.error || swapMutation.error) {
+      } else if (swapMutation.error) {
         status = "failed";
       } else if (swapTxHash) {
         status = swapStatus;
@@ -418,11 +404,13 @@ function useOnRampScreenState(props: {
         type: "fiat",
         intentId: props.quote.intentId,
       });
-    } else if (swapQuoteQuery.data && !swapTxHash) {
+    } else if (previousStep && currentStep && !swapTxHash) {
       // Execute swap/bridge
       try {
         const result = await swapMutation.mutateAsync({
-          quote: swapQuoteQuery.data,
+          fromToken: previousStep.token,
+          toToken: currentStep.token,
+          amount: currentStep.amount,
         });
         setSwapTxHash({
           hash: result.transactionHash,
@@ -435,23 +423,22 @@ function useOnRampScreenState(props: {
       // retry the quote step
       setSwapTxHash(undefined);
       swapMutation.reset();
-      await swapQuoteQuery.refetch();
     }
   }, [
     isDone,
     currentStepIndex,
-    swapQuoteQuery.data,
     swapTxHash,
     props.quote,
     props.onDone,
     swapMutation,
     props.theme,
     isFailed,
-    swapQuoteQuery.refetch,
     swapMutation.reset,
     props.client,
     props.payer.account.address,
     props.payer.wallet.id,
+    currentStep,
+    previousStep,
   ]);
 
   // Auto-progress effect
@@ -467,7 +454,6 @@ function useOnRampScreenState(props: {
       !isFailed &&
       currentStepIndex > 0 &&
       currentStepIndex < onRampSteps.length &&
-      swapQuoteQuery.data &&
       !swapTxHash
     ) {
       handleContinue();
@@ -475,7 +461,6 @@ function useOnRampScreenState(props: {
   }, [
     props.isAutoMode,
     currentStepIndex,
-    swapQuoteQuery.data,
     swapTxHash,
     onRampSteps.length,
     handleContinue,
@@ -643,9 +628,38 @@ function useSwapMutation(props: {
 }) {
   const queryClient = useQueryClient();
   return useMutation({
-    mutationFn: async (input: { quote: BuyWithCryptoQuote }) => {
-      const { quote } = input;
-      const canBatch = props.payer.account.sendBatchTransaction;
+    mutationFn: async (input: {
+      fromToken: PayTokenInfo;
+      toToken: PayTokenInfo;
+      amount: string;
+    }) => {
+      const { fromToken, toToken, amount } = input;
+      const wallet = props.payer.wallet;
+
+      // in case the wallet is not on the same chain as the fromToken, switch to it
+      if (wallet.getChain()?.id !== fromToken.chainId) {
+        await wallet.switchChain(getCachedChain(fromToken.chainId));
+      }
+
+      const account = wallet.getAccount();
+
+      if (!account) {
+        throw new Error("Payer wallet has no account");
+      }
+
+      // always get a fresh quote before executing
+      const quote = await getBuyWithCryptoQuote({
+        fromChainId: fromToken.chainId,
+        fromTokenAddress: fromToken.tokenAddress,
+        toAmount: amount,
+        toChainId: toToken.chainId,
+        toTokenAddress: toToken.tokenAddress,
+        fromAddress: account.address,
+        toAddress: account.address,
+        client: props.client,
+      });
+
+      const canBatch = account.sendBatchTransaction;
       const tokenContract = getContract({
         client: props.client,
         address: quote.swapDetails.fromToken.tokenAddress,
@@ -655,14 +669,14 @@ function useSwapMutation(props: {
         quote.approvalData &&
         (await allowance({
           contract: tokenContract,
-          owner: props.payer.account.address,
+          owner: account.address,
           spender: quote.approvalData.spenderAddress,
         })) < BigInt(quote.approvalData.amountWei);
       if (approveTxRequired && quote.approvalData && !canBatch) {
         trackPayEvent({
           event: "prompt_swap_approval",
           client: props.client,
-          walletAddress: props.payer.account.address,
+          walletAddress: account.address,
           walletType: props.payer.wallet.id,
           fromToken: quote.swapDetails.fromToken.tokenAddress,
           fromAmount: quote.swapDetails.fromAmountWei,
@@ -679,7 +693,7 @@ function useSwapMutation(props: {
         });
 
         const tx = await sendTransaction({
-          account: props.payer.account,
+          account,
           transaction,
         });
 
@@ -688,7 +702,7 @@ function useSwapMutation(props: {
         trackPayEvent({
           event: "swap_approval_success",
           client: props.client,
-          walletAddress: props.payer.account.address,
+          walletAddress: account.address,
           walletType: props.payer.wallet.id,
           fromToken: quote.swapDetails.fromToken.tokenAddress,
           fromAmount: quote.swapDetails.fromAmountWei,
@@ -702,7 +716,7 @@ function useSwapMutation(props: {
       trackPayEvent({
         event: "prompt_swap_execution",
         client: props.client,
-        walletAddress: props.payer.account.address,
+        walletAddress: account.address,
         walletType: props.payer.wallet.id,
         fromToken: quote.swapDetails.fromToken.tokenAddress,
         fromAmount: quote.swapDetails.fromAmountWei,
@@ -722,12 +736,12 @@ function useSwapMutation(props: {
         });
 
         _swapTx = await sendBatchTransaction({
-          account: props.payer.account,
+          account,
           transactions: [approveTx, tx],
         });
       } else {
         _swapTx = await sendTransaction({
-          account: props.payer.account,
+          account,
           transaction: tx,
         });
       }
@@ -737,7 +751,7 @@ function useSwapMutation(props: {
       trackPayEvent({
         event: "swap_execution_success",
         client: props.client,
-        walletAddress: props.payer.account.address,
+        walletAddress: account.address,
         walletType: props.payer.wallet.id,
         fromToken: quote.swapDetails.fromToken.tokenAddress,
         fromAmount: quote.swapDetails.fromAmountWei,

package/src/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.tsx

@@ -160,6 +160,19 @@ export function SwapConfirmationScreen(props: {
             fullWidth
             disabled={status === "pending"}
             onClick={async () => {
+              const wallet = props.payer.wallet;
+
+              // in case the wallet is not on the same chain as the fromToken, switch to it
+              if (wallet.getChain()?.id !== props.fromChain.id) {
+                await wallet.switchChain(props.fromChain);
+              }
+
+              const account = wallet.getAccount();
+
+              if (!account) {
+                throw new Error("Payer wallet has no account");
+              }
+
               if (step === "approval" && props.quote.approvalData) {
                 try {
                   setStatus("pending");
@@ -167,8 +180,8 @@ export function SwapConfirmationScreen(props: {
                   trackPayEvent({
                     event: "prompt_swap_approval",
                     client: props.client,
-                    walletAddress: props.payer.account.address,
-                    walletType: props.payer.wallet.id,
+                    walletAddress: account.address,
+                    walletType: wallet.id,
                     fromToken: props.quote.swapDetails.fromToken.tokenAddress,
                     fromAmount: props.quote.swapDetails.fromAmountWei,
                     toToken: props.quote.swapDetails.toToken.tokenAddress,
@@ -188,7 +201,7 @@ export function SwapConfirmationScreen(props: {
                   });
 
                   const tx = await sendTransaction({
-                    account: props.payer.account,
+                    account: account,
                     transaction,
                   });
 
@@ -197,8 +210,8 @@ export function SwapConfirmationScreen(props: {
                   trackPayEvent({
                     event: "swap_approval_success",
                     client: props.client,
-                    walletAddress: props.payer.account.address,
-                    walletType: props.payer.wallet.id,
+                    walletAddress: account.address,
+                    walletType: wallet.id,
                     fromToken: props.quote.swapDetails.fromToken.tokenAddress,
                     fromAmount: props.quote.swapDetails.fromAmountWei,
                     toToken: props.quote.swapDetails.toToken.tokenAddress,
@@ -221,8 +234,8 @@ export function SwapConfirmationScreen(props: {
                   trackPayEvent({
                     event: "prompt_swap_execution",
                     client: props.client,
-                    walletAddress: props.payer.account.address,
-                    walletType: props.payer.wallet.id,
+                    walletAddress: account.address,
+                    walletType: wallet.id,
                     fromToken: props.quote.swapDetails.fromToken.tokenAddress,
                     fromAmount: props.quote.swapDetails.fromAmountWei,
                     toToken: props.quote.swapDetails.toToken.tokenAddress,
@@ -233,7 +246,7 @@ export function SwapConfirmationScreen(props: {
                   const tx = props.quote.transactionRequest;
                   let _swapTx: WaitForReceiptOptions;
                   // check if we can batch approval and swap
-                  const canBatch = props.payer.account.sendBatchTransaction;
+                  const canBatch = account.sendBatchTransaction;
                   if (
                     canBatch &&
                     props.quote.approvalData &&
@@ -250,12 +263,12 @@ export function SwapConfirmationScreen(props: {
                     });
 
                     _swapTx = await sendBatchTransaction({
-                      account: props.payer.account,
+                      account: account,
                       transactions: [approveTx, tx],
                     });
                   } else {
                     _swapTx = await sendTransaction({
-                      account: props.payer.account,
+                      account: account,
                       transaction: tx,
                     });
                   }
@@ -263,8 +276,8 @@ export function SwapConfirmationScreen(props: {
                   trackPayEvent({
                     event: "swap_execution_success",
                     client: props.client,
-                    walletAddress: props.payer.account.address,
-                    walletType: props.payer.wallet.id,
+                    walletAddress: account.address,
+                    walletType: wallet.id,
                     fromToken: props.quote.swapDetails.fromToken.tokenAddress,
                     fromAmount: props.quote.swapDetails.fromAmountWei,
                     toToken: props.quote.swapDetails.toToken.tokenAddress,

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.93.1";
+export const version = "5.93.3";

package/src/wallets/smart/index.ts

@@ -264,11 +264,12 @@ async function createSmartAccount(
         executeOverride: options.overrides?.execute,
       });
 
+      const chain = getCachedChain(transaction.chainId);
       const result = await _sendUserOp({
         executeTx,
         options: {
           ...options,
-          chain: getCachedChain(transaction.chainId),
+          chain,
           accountContract,
           overrides: {
             ...options.overrides,
@@ -278,7 +279,7 @@ async function createSmartAccount(
       });
       trackTransaction({
         client: options.client,
-        chainId: options.chain.id,
+        chainId: chain.id,
         transactionHash: result.transactionHash,
         walletAddress: options.accountContract.address,
         walletType: "smart",
@@ -292,17 +293,25 @@ async function createSmartAccount(
         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: getCachedChain(transactions[0]?.chainId ?? options.chain.id),
+          chain,
           accountContract,
         },
       });
       trackTransaction({
         client: options.client,
-        chainId: options.chain.id,
+        chainId: chain.id,
         transactionHash: result.transactionHash,
         walletAddress: options.accountContract.address,
         walletType: "smart",