thirdweb 5.93.2 → 5.93.4

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.2";
+export const version = "5.93.4";

package/src/wallets/coinbase/coinbase-mobile.ts

@@ -17,11 +17,6 @@ export async function getCoinbaseMobileProvider(
       mobileProvider = (await initSmartWalletProvider(
         options,
       )) as unknown as ProviderInterface;
-      const ExpoLinking = await import("expo-linking");
-      const { handleResponse } = await import("@mobile-wallet-protocol/client");
-      ExpoLinking.addEventListener("url", ({ url }) => {
-        handleResponse(url);
-      });
     } else {
       // otherwise, use the coinbase app provider
       // TODO: remove this path once the new @mobile-wallet-protocol/client supports it
@@ -55,10 +50,10 @@ async function initSmartWalletProvider(
   }
   const sdk = new EIP1193Provider({
     metadata: {
-      appName: options?.appMetadata?.name || "thirdweb powered app",
-      appChainIds: options?.chains?.map((c) => c.id),
-      appDeeplinkUrl,
-      appLogoUrl: options?.appMetadata?.logoUrl,
+      name: options?.appMetadata?.name || "thirdweb powered app",
+      chainIds: options?.chains?.map((c) => c.id),
+      customScheme: appDeeplinkUrl,
+      logoUrl: options?.appMetadata?.logoUrl,
     },
     wallet: Wallets.CoinbaseSmartWallet, // TODO support both smart and EOA once the SDK supports it
   });

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",