thirdweb 5.87.3 → 5.87.4

package/src/react/web/ui/ConnectWallet/screens/Buy/BuyScreen.tsx

@@ -1006,34 +1006,6 @@ function SwapScreenContent(props: {
   const switchChainRequired =
     props.payer.wallet.getChain()?.id !== fromChain.id;
 
-  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-  function getErrorMessage(err: any) {
-    type AmountTooLowError = {
-      code: "MINIMUM_PURCHASE_AMOUNT";
-      data: {
-        minimumAmountUSDCents: number;
-        requestedAmountUSDCents: number;
-        minimumAmountWei: string;
-        minimumAmountEth: string;
-      };
-    };
-
-    const defaultMessage = "Unable to get price quote";
-    try {
-      if (err.error.code === "MINIMUM_PURCHASE_AMOUNT") {
-        const obj = err.error as AmountTooLowError;
-        const minAmountToken = obj.data.minimumAmountEth;
-        return {
-          minAmount: formatNumber(Number(minAmountToken), 6),
-        };
-      }
-    } catch {}
-
-    return {
-      msg: [defaultMessage],
-    };
-  }
-
   const errorMsg =
     !quoteQuery.isLoading && quoteQuery.error
       ? getErrorMessage(quoteQuery.error)
@@ -1133,9 +1105,10 @@ function SwapScreenContent(props: {
       {/* Error message */}
       {errorMsg && (
         <div>
-          {errorMsg.minAmount && (
+          {errorMsg.data?.minimumAmountEth ? (
             <Text color="danger" size="sm" center multiline>
-              Minimum amount is {errorMsg.minAmount}{" "}
+              Minimum amount is{" "}
+              {formatNumber(Number(errorMsg.data.minimumAmountEth), 6)}{" "}
               <TokenSymbol
                 token={toToken}
                 chain={toChain}
@@ -1144,13 +1117,11 @@ function SwapScreenContent(props: {
                 color="danger"
               />
             </Text>
-          )}
-
-          {errorMsg.msg?.map((msg) => (
-            <Text color="danger" size="sm" center multiline key={msg}>
-              {msg}
+          ) : (
+            <Text color="danger" size="sm" center multiline>
+              {errorMsg.message || defaultMessage}
             </Text>
-          ))}
+          )}
         </div>
       )}
 
@@ -1166,12 +1137,17 @@ function SwapScreenContent(props: {
       )}
 
       {/* Button */}
-      {errorMsg?.minAmount ? (
+      {errorMsg?.data?.minimumAmountEth ? (
         <Button
           variant="accent"
           fullWidth
           onClick={() => {
-            props.setTokenAmount(String(errorMsg.minAmount));
+            props.setTokenAmount(
+              formatNumber(
+                Number(errorMsg.data?.minimumAmountEth),
+                6,
+              ).toString(),
+            );
             props.setHasEditedAmount(true);
           }}
         >
@@ -1306,34 +1282,6 @@ function FiatScreenContent(props: {
     setIsOpen(true);
   }
 
-  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-  function getErrorMessage(err: any) {
-    type AmountTooLowError = {
-      code: "MINIMUM_PURCHASE_AMOUNT";
-      data: {
-        minimumAmountUSDCents: number;
-        requestedAmountUSDCents: number;
-        minimumAmountWei: string;
-        minimumAmountEth: string;
-      };
-    };
-
-    const defaultMessage = "Unable to get price quote";
-    try {
-      if (err.error.code === "MINIMUM_PURCHASE_AMOUNT") {
-        const obj = err.error as AmountTooLowError;
-        const minAmountToken = obj.data.minimumAmountEth;
-        return {
-          minAmount: formatNumber(Number(minAmountToken), 6),
-        };
-      }
-    } catch {}
-
-    return {
-      msg: [defaultMessage],
-    };
-  }
-
   const disableSubmit = !fiatQuoteQuery.data;
 
   const errorMsg =
@@ -1381,9 +1329,10 @@ function FiatScreenContent(props: {
       {/* Error message */}
       {errorMsg && (
         <div>
-          {errorMsg.minAmount && (
+          {errorMsg.data?.minimumAmountEth ? (
             <Text color="danger" size="sm" center multiline>
-              Minimum amount is {errorMsg.minAmount}{" "}
+              Minimum amount is{" "}
+              {formatNumber(Number(errorMsg.data.minimumAmountEth), 6)}{" "}
               <TokenSymbol
                 token={toToken}
                 chain={toChain}
@@ -1392,22 +1341,25 @@ function FiatScreenContent(props: {
                 color="danger"
               />
             </Text>
-          )}
-
-          {errorMsg.msg?.map((msg) => (
-            <Text color="danger" size="sm" center multiline key={msg}>
-              {msg}
+          ) : (
+            <Text color="danger" size="sm" center multiline>
+              {errorMsg.message || defaultMessage}
             </Text>
-          ))}
+          )}
         </div>
       )}
 
-      {errorMsg?.minAmount ? (
+      {errorMsg?.data?.minimumAmountEth ? (
         <Button
           variant="accent"
           fullWidth
           onClick={() => {
-            props.setTokenAmount(String(errorMsg.minAmount));
+            props.setTokenAmount(
+              formatNumber(
+                Number(errorMsg.data?.minimumAmountEth),
+                6,
+              ).toString(),
+            );
             props.setHasEditedAmount(true);
           }}
         >
@@ -1526,3 +1478,26 @@ function ChainSelectionScreen(props: {
     />
   );
 }
+
+type ApiError = {
+  code: string;
+  message?: string;
+  data?: {
+    minimumAmountUSDCents?: string;
+    requestedAmountUSDCents?: string;
+    minimumAmountWei?: string;
+    minimumAmountEth?: string;
+  };
+};
+
+const defaultMessage = "Unable to get price quote";
+// biome-ignore lint/suspicious/noExplicitAny: <explanation>
+function getErrorMessage(err: any): ApiError {
+  if (typeof err.error === "object") {
+    return err.error;
+  }
+  return {
+    code: "UNABLE_TO_GET_PRICE_QUOTE",
+    message: defaultMessage,
+  };
+}

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

@@ -248,11 +248,9 @@ function OnrampStatusScreenUI(props: {
             </>
           )}
 
-          {!props.isEmbed && (
-            <Button variant="accent" fullWidth onClick={props.onDone}>
-              {props.transactionMode ? "Continue Transaction" : "Done"}
-            </Button>
-          )}
+          <Button variant="accent" fullWidth onClick={props.onDone}>
+            {props.transactionMode ? "Continue Transaction" : "Done"}
+          </Button>
         </>
       )}
     </Container>

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

@@ -236,19 +236,7 @@ export function SwapConfirmationScreen(props: {
             if (step === "swap") {
               setStatus("pending");
               try {
-                let tx = props.quote.transactionRequest;
-
-                // Fix for inApp wallet
-                // Ideally - the pay server sends a non-legacy transaction to avoid this issue
-                if (
-                  props.payer.wallet.id === "inApp" ||
-                  props.payer.wallet.id === "embedded"
-                ) {
-                  tx = {
-                    ...props.quote.transactionRequest,
-                    gasPrice: undefined,
-                  };
-                }
+                const tx = props.quote.transactionRequest;
 
                 trackPayEvent({
                   event: "prompt_swap_execution",

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

@@ -113,11 +113,9 @@ export function SwapStatusScreen(props: {
             <Spacer y="xl" />
             {swapDetails}
             <Spacer y="sm" />
-            {!props.isEmbed && (
-              <Button variant="accent" fullWidth onClick={props.onDone}>
-                {props.transactionMode ? "Continue Transaction" : "Done"}
-              </Button>
-            )}
+            <Button variant="accent" fullWidth onClick={props.onDone}>
+              {props.transactionMode ? "Continue Transaction" : "Done"}
+            </Button>
           </>
         )}
 

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.87.3";
+export const version = "5.87.4";