npm - thirdweb - Versions diffs - 5.36.0 → 5.36.1-nightly-af4acc4319fdfb323778694bd8843bd695e52d6b-20240719161043 - Mend

thirdweb 5.36.0 → 5.36.1-nightly-af4acc4319fdfb323778694bd8843bd695e52d6b-20240719161043

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1431) hide show

package/src/extensions/permissions/__generated__/IPermissionsEnumerable/write/grantRole.ts CHANGED Viewed

@@ -141,5 +141,6 @@ export function grantRole(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/permissions/__generated__/IPermissionsEnumerable/write/renounceRole.ts CHANGED Viewed

@@ -141,5 +141,6 @@ export function renounceRole(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/permissions/__generated__/IPermissionsEnumerable/write/revokeRole.ts CHANGED Viewed

@@ -141,5 +141,6 @@ export function revokeRole(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/prebuilts/__generated__/DropERC1155/write/initialize.ts CHANGED Viewed

@@ -251,5 +251,6 @@ export function initialize(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/prebuilts/__generated__/DropERC20/write/initialize.ts CHANGED Viewed

@@ -225,5 +225,6 @@ export function initialize(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/prebuilts/__generated__/DropERC721/write/initialize.ts CHANGED Viewed

@@ -251,5 +251,6 @@ export function initialize(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/prebuilts/__generated__/Marketplace/write/initialize.ts CHANGED Viewed

@@ -192,5 +192,6 @@ export function initialize(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/prebuilts/__generated__/OpenEditionERC721/write/initialize.ts CHANGED Viewed

@@ -225,5 +225,6 @@ export function initialize(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/prebuilts/__generated__/TokenERC1155/write/initialize.ts CHANGED Viewed

@@ -251,5 +251,6 @@ export function initialize(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/prebuilts/__generated__/TokenERC20/write/initialize.ts CHANGED Viewed

@@ -225,5 +225,6 @@ export function initialize(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/prebuilts/__generated__/TokenERC721/write/initialize.ts CHANGED Viewed

@@ -251,5 +251,6 @@ export function initialize(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/thirdweb/__generated__/IAppURI/write/setAppURI.ts CHANGED Viewed

@@ -133,5 +133,6 @@ export function setAppURI(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/thirdweb/__generated__/IContractFactory/write/deployProxyByImplementation.ts CHANGED Viewed

@@ -170,5 +170,6 @@ export function deployProxyByImplementation(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/thirdweb/__generated__/IContractPublisher/write/publishContract.ts CHANGED Viewed

@@ -207,5 +207,6 @@ export function publishContract(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/thirdweb/__generated__/IContractPublisher/write/setPublisherProfileUri.ts CHANGED Viewed

@@ -150,5 +150,6 @@ export function setPublisherProfileUri(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/thirdweb/__generated__/IContractPublisher/write/unpublishContract.ts CHANGED Viewed

@@ -154,5 +154,6 @@ export function unpublishContract(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/thirdweb/__generated__/IRulesEngine/write/createRuleMultiplicative.ts CHANGED Viewed

@@ -171,5 +171,6 @@ export function createRuleMultiplicative(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/thirdweb/__generated__/IRulesEngine/write/createRuleThreshold.ts CHANGED Viewed

@@ -174,5 +174,6 @@ export function createRuleThreshold(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/thirdweb/__generated__/IRulesEngine/write/deleteRule.ts CHANGED Viewed

@@ -133,5 +133,6 @@ export function deleteRule(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/thirdweb/__generated__/IRulesEngine/write/setRulesEngineOverride.ts CHANGED Viewed

@@ -142,5 +142,6 @@ export function setRulesEngineOverride(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/write/add.ts CHANGED Viewed

@@ -171,5 +171,6 @@ export function add(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/thirdweb/__generated__/ITWMultichainRegistry/write/remove.ts CHANGED Viewed

@@ -158,5 +158,6 @@ export function remove(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/thirdweb/__generated__/IThirdwebContract/write/setContractURI.ts CHANGED Viewed

@@ -135,5 +135,6 @@ export function setContractURI(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/uniswap/__generated__/IQuoter/write/quoteExactInput.ts CHANGED Viewed

@@ -148,5 +148,6 @@ export function quoteExactInput(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/uniswap/__generated__/IQuoter/write/quoteExactInputSingle.ts CHANGED Viewed

@@ -191,5 +191,6 @@ export function quoteExactInputSingle(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/uniswap/__generated__/IQuoter/write/quoteExactOutput.ts CHANGED Viewed

@@ -151,5 +151,6 @@ export function quoteExactOutput(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/uniswap/__generated__/IQuoter/write/quoteExactOutputSingle.ts CHANGED Viewed

@@ -194,5 +194,6 @@ export function quoteExactOutputSingle(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/uniswap/__generated__/ISwapRouter/write/exactInput.ts CHANGED Viewed

@@ -170,5 +170,6 @@ export function exactInput(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/uniswap/__generated__/ISwapRouter/write/exactInputSingle.ts CHANGED Viewed

@@ -187,5 +187,6 @@ export function exactInputSingle(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/uniswap/__generated__/ISwapRouter/write/exactOutput.ts CHANGED Viewed

@@ -170,5 +170,6 @@ export function exactOutput(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/uniswap/__generated__/ISwapRouter/write/exactOutputSingle.ts CHANGED Viewed

@@ -189,5 +189,6 @@ export function exactOutputSingle(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/uniswap/__generated__/IUniswapV3Factory/write/createPool.ts CHANGED Viewed

@@ -162,5 +162,6 @@ export function createPool(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/uniswap/__generated__/IUniswapV3Factory/write/enableFeeAmount.ts CHANGED Viewed

@@ -146,5 +146,6 @@ export function enableFeeAmount(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/extensions/uniswap/__generated__/IUniswapV3Factory/write/setOwner.ts CHANGED Viewed

@@ -131,5 +131,6 @@ export function setOwner(
       (await asyncOptions()).overrides?.maxPriorityFeePerGas,
     nonce: async () => (await asyncOptions()).overrides?.nonce,
     extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
   });
 }

package/src/pay/buyWithCrypto/getQuote.ts CHANGED Viewed

@@ -265,13 +265,8 @@ export async function getBuyWithCryptoQuote(
     // Assuming the response directly matches the SwapResponse interface
     if (!response.ok) {
       const errorObj = await response.json();
-      if (
-        errorObj &&
-        "error" in errorObj &&
-        typeof errorObj.error === "object" &&
-        "message" in errorObj.error
-      ) {
-        throw new Error(errorObj.error.message);
+      if (errorObj && "error" in errorObj) {
+        throw errorObj;
       }
       throw new Error(`HTTP error! status: ${response.status}`);
     }
@@ -327,7 +322,7 @@ export async function getBuyWithCryptoQuote(
     return swapRoute;
   } catch (error) {
-    console.error("Fetch error:", error);
-    throw new Error(`Fetch failed: ${error}`);
+    console.error("Error getting buy with crypto quote", error);
+    throw error;
   }
 }

package/src/pay/buyWithFiat/getQuote.ts CHANGED Viewed

@@ -285,7 +285,7 @@ export async function getBuyWithFiatQuote(
     return (await response.json()).result;
   } catch (error) {
-    console.error("Fetch error:", error);
+    console.error("Error getting buy with fiat quote", error);
     throw error;
   }
 }

package/src/react/core/hooks/pay/useBuyWithCryptoQuote.ts CHANGED Viewed

@@ -92,9 +92,13 @@ export function useBuyWithCryptoQuote(
       if (failureCount > 3) {
         return false;
       }
-      if (error.message.includes("Minimum purchase")) {
-        return false;
+      try {
+        // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+        if ((error as any).error.code === "MINIMUM_PURCHASE_AMOUNT") {
+          return false;
+        }
+      } catch {
+        return true;
       }
       return true;

package/src/react/core/hooks/transaction/useSendTransaction.ts CHANGED Viewed

@@ -1,5 +1,8 @@
 import { type UseMutationResult, useMutation } from "@tanstack/react-query";
+import type { Address } from "abitype";
 import type { Chain } from "../../../../chains/types.js";
+import { getContract } from "../../../../contract/contract.js";
+import { getCurrencyMetadata } from "../../../../extensions/erc20/read/getCurrencyMetadata.js";
 import { getGasPrice } from "../../../../gas/get-gas-price.js";
 import { estimateGasCost } from "../../../../transaction/actions/estimate-gas-cost.js";
 import type { GaslessOptions } from "../../../../transaction/actions/gasless/types.js";
@@ -76,6 +79,13 @@ type ShowModalData = {
   sendTx: () => void;
   rejectTx: (reason: Error) => void;
   totalCostWei: bigint;
+  currency?: {
+    address: Address;
+    name: string;
+    symbol: string;
+    decimals: number;
+    icon?: string;
+  };
   walletBalance: GetWalletBalanceResult;
   resolveTx: (data: WaitForReceiptOptions) => void;
 };
@@ -155,7 +165,7 @@ export function useSendTransactionCore(args: {
             }
             //  buy supported, check if there is enough balance - if not show modal to buy tokens
-            const [walletBalance, totalCostWei] = await Promise.all([
+            const [nativeWalletBalance, nativeCostWei] = await Promise.all([
               getWalletBalance({
                 address: account.address,
                 chain: tx.chain,
@@ -164,10 +174,40 @@ export function useSendTransactionCore(args: {
               getTotalTxCostForBuy(tx, account?.address),
             ]);
-            const walletBalanceWei = walletBalance.value;
+            let currency: ShowModalData["currency"] | undefined = undefined;
+            let walletBalance = nativeWalletBalance;
+            let totalCostWei = nativeCostWei;
+            const hasEnoughForGas = nativeWalletBalance.value > nativeCostWei;
+            const erc20Value = await resolvePromisedValue(tx.erc20Value);
+            if (erc20Value && hasEnoughForGas) {
+              const [tokenBalance, tokenMeta] = await Promise.all([
+                getWalletBalance({
+                  address: account.address,
+                  chain: tx.chain,
+                  client: tx.client,
+                  tokenAddress: erc20Value.tokenAddress,
+                }),
+                getCurrencyMetadata({
+                  contract: getContract({
+                    address: erc20Value.tokenAddress,
+                    chain: tx.chain,
+                    client: tx.client,
+                  }),
+                }),
+              ]);
+              totalCostWei = erc20Value.amountWei;
+              walletBalance = tokenBalance;
+              currency = {
+                address: erc20Value.tokenAddress,
+                name: tokenMeta.name,
+                symbol: tokenMeta.symbol,
+                decimals: tokenMeta.decimals,
+              };
+            }
             // if enough balance, send tx
-            if (totalCostWei < walletBalanceWei) {
+            if (totalCostWei < walletBalance.value) {
               sendTx();
               return;
             }
@@ -180,6 +220,7 @@ export function useSendTransactionCore(args: {
               resolveTx: resolve,
               totalCostWei,
               walletBalance,
+              currency,
             });
           } catch (e) {
             console.error("Failed to estimate cost", e);

package/src/react/native/ui/connect/ConnectModal.tsx CHANGED Viewed

@@ -502,7 +502,7 @@ function SignInView({
               color: theme.colors.accentButtonText,
             }}
           >
-            Sign Login Request
+            Sign login request
           </ThemedText>
         </ThemedButton>
         <Spacer size="md" />
@@ -521,7 +521,7 @@ function SignInView({
             theme={theme}
             type="defaultSemiBold"
             style={{
-              color: theme.colors.accentButtonText,
+              color: theme.colors.secondaryButtonText,
             }}
           >
             Disconnect

package/src/react/native/ui/connect/ConnectedModal.tsx CHANGED Viewed

@@ -244,6 +244,8 @@ const WalletMenu = (props: ConnectedModalPropsInner) => {
   return (
     <View style={styles.walletMenuContainer}>
       <ChainSwitcher {...props} />
+      {/* TODO (rn) implement transactions screen */}
+      {/* <Transactions {...props} /> */}
       <ViewFunds {...props} />
       <DisconnectWallet {...props} />
     </View>
@@ -268,6 +270,25 @@ const ChainSwitcher = (props: ConnectedModalPropsInner) => {
   );
 };
+/** TODO (rn) implement transactions screen
+const Transactions = (props: ConnectedModalPropsInner) => {
+  const { client, wallet, theme } = props;
+  return (
+    <TouchableOpacity style={styles.walletMenuRow} onPress={() => {}}>
+      <RNImage
+        theme={theme}
+        size={32}
+        data={TRANSACTIONS_ICON}
+        color={theme.colors.secondaryIconColor}
+      />
+      <ThemedText theme={theme} type="defaultSemiBold">
+        Transactions
+      </ThemedText>
+    </TouchableOpacity>
+  );
+};
+ */
 const ViewFunds = (props: ConnectedModalPropsInner) => {
   const { theme, setModalState } = props;
   return (
@@ -298,7 +319,9 @@ const DisconnectWallet = (props: ConnectedModalProps) => {
       onPress={() => {
         onClose?.();
         disconnect(wallet);
-        siweAuth.doLogout();
+        if (siweAuth.isLoggedIn) {
+          siweAuth.doLogout();
+        }
       }}
     >
       <RNImage

package/src/react/native/ui/icons/svgs.ts CHANGED Viewed

@@ -137,6 +137,8 @@ export const COINS_ICON = `<svg
       />
     </svg>`;
+export const TRANSACTIONS_ICON = `<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-logs"><path d="M13 12h8"/><path d="M13 18h8"/><path d="M13 6h8"/><path d="M3 12h1"/><path d="M3 18h1"/><path d="M3 6h1"/><path d="M8 12h1"/><path d="M8 18h1"/><path d="M8 6h1"/></svg>`;
 export const RIGHT_CHEVRON = `<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M6 4L10 8L6 12" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>

package/src/react/web/hooks/transaction/useSendTransaction.tsx CHANGED Viewed

@@ -1,9 +1,12 @@
 import { CheckCircledIcon } from "@radix-ui/react-icons";
 import { useCallback, useContext, useEffect, useRef, useState } from "react";
 import type { ThirdwebClient } from "../../../../client/client.js";
+import { isNativeTokenAddress } from "../../../../constants/addresses.js";
 import type { WaitForReceiptOptions } from "../../../../transaction/actions/wait-for-tx-receipt.js";
 import type { PreparedTransaction } from "../../../../transaction/prepare-transaction.js";
+import { toTokens } from "../../../../utils/units.js";
 import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
+import type { GetWalletBalanceResult } from "../../../../wallets/utils/getWalletBalance.js";
 import { CustomThemeProvider } from "../../../core/design-system/CustomThemeProvider.js";
 import { type Theme, iconSize } from "../../../core/design-system/index.js";
 import type { PayUIOptions } from "../../../core/hooks/connection/ConnectButtonProps.js";
@@ -56,6 +59,7 @@ export function useSendTransaction(config: SendTransactionConfig = {}) {
     payModalEnabled = false;
   }
+  // TODO handle erc20 pay modal
   // if active wallet is smart wallet with gasless enabled, don't show the pay modal
   if (activeWallet && activeWallet.id === "smart") {
     const options = (activeWallet as Wallet<"smart">).getConfig();
@@ -69,12 +73,35 @@ export function useSendTransaction(config: SendTransactionConfig = {}) {
     }
   }
+  if (activeWallet && activeWallet.id === "inApp") {
+    const options = (activeWallet as Wallet<"inApp">).getConfig();
+    if (options && "smartAccount" in options && options.smartAccount) {
+      const smartOptions = options.smartAccount;
+      if ("sponsorGas" in smartOptions && smartOptions.sponsorGas === true) {
+        payModalEnabled = false;
+      }
+      if ("gasless" in smartOptions && smartOptions.gasless === true) {
+        payModalEnabled = false;
+      }
+    }
+  }
   const setRootEl = useContext(SetRootElementContext);
   return useSendTransactionCore({
     showPayModal:
       !payModalEnabled || payModal === false
         ? undefined
         : (data) => {
+            const prefillBuy: PayUIOptions["prefillBuy"] =
+              data.currency && !isNativeTokenAddress(data.currency.address)
+                ? {
+                    chain: data.tx.chain,
+                    amount: toTokens(data.totalCostWei, data.currency.decimals),
+                    token: data.currency,
+                  }
+                : undefined;
             setRootEl(
               <TxModal
                 title={payModal?.metadata?.title || "Buy"}
@@ -92,12 +119,12 @@ export function useSendTransaction(config: SendTransactionConfig = {}) {
                 supportedTokens={payModal?.supportedTokens}
                 theme={payModal?.theme || "dark"}
                 txCostWei={data.totalCostWei}
-                walletBalanceWei={data.walletBalance.value}
-                nativeTokenSymbol={data.walletBalance.symbol}
+                walletBalance={data.walletBalance}
                 payOptions={{
                   buyWithCrypto: payModal?.buyWithCrypto,
                   buyWithFiat: payModal?.buyWithFiat,
                   purchaseData: payModal?.purchaseData,
+                  prefillBuy,
                 }}
               />,
             );
@@ -117,8 +144,7 @@ type ModalProps = {
   supportedTokens?: SupportedTokens;
   theme: Theme | "light" | "dark";
   txCostWei: bigint;
-  walletBalanceWei: bigint;
-  nativeTokenSymbol: string;
+  walletBalance: GetWalletBalanceResult;
   tx: PreparedTransaction;
   payOptions: PayUIOptions;
   onTxSent: (data: WaitForReceiptOptions) => void;
@@ -165,6 +191,7 @@ function ModalContent(props: ModalProps) {
   if (screen === "tx-history") {
     return (
       <PayTxHistoryScreen
+        title={props.title}
         client={props.client}
         onBack={() => {
           setScreen("buy");
@@ -189,10 +216,11 @@ function ModalContent(props: ModalProps) {
       supportedTokens={props.supportedTokens}
       connectLocale={localeQuery.data}
       buyForTx={{
-        balance: props.walletBalanceWei,
+        balance: props.walletBalance.value,
         cost: props.txCostWei,
         tx: props.tx,
-        tokenSymbol: props.nativeTokenSymbol,
+        tokenSymbol: props.walletBalance.symbol,
+        tokenDecimals: props.walletBalance.decimals,
       }}
       theme={typeof props.theme === "string" ? props.theme : props.theme.type}
       payOptions={props.payOptions}
@@ -267,6 +295,12 @@ function ExecutingTxScreen(props: {
         {status === "failed" && "Transaction failed"}
         {status === "sent" && "Transaction sent"}
       </Text>
+      <Spacer y="sm" />
+      <Text color="danger" center size="sm">
+        {status === "failed" && sendTxCore.error
+          ? sendTxCore.error.message
+          : ""}
+      </Text>
       <Spacer y="xxl" />
       <Spacer y="xxl" />

package/src/react/web/ui/ConnectWallet/Details.tsx CHANGED Viewed

@@ -629,6 +629,7 @@ function DetailsModal(props: {
   if (screen === "transactions") {
     content = (
       <TransactionsScreen
+        title="Buy"
         onBack={() => setScreen("main")}
         closeModal={closeModal}
         locale={locale}

package/src/react/web/ui/ConnectWallet/TransactionsScreen.tsx CHANGED Viewed

@@ -26,6 +26,7 @@ import type { WalletDetailsModalScreen } from "./screens/types.js";
  * @internal
  */
 export function TransactionsScreen(props: {
+  title: string;
   onBack: () => void;
   setScreen: (screen: WalletDetailsModalScreen) => void;
   closeModal: () => void;
@@ -53,6 +54,7 @@ export function TransactionsScreen(props: {
   if (selectedTx) {
     return (
       <TxDetailsScreen
+        title={props.title}
         client={props.client}
         statusInfo={selectedTx}
         onBack={() => setSelectedTx(null)}