@wheelx-widget/widget 0.1.16 → 0.1.18

package/dist/index.mjs

@@ -17,7 +17,7 @@ import { Fraction, RoundingMode } from 'bi-fraction';
 import { base, soneium, ink as ink$1, bsc as bsc$1 } from 'viem/chains';
 import { PublicKey, VersionedTransaction, VersionedMessage, Transaction } from '@solana/web3.js';
 import { parseAccount, getAddress } from 'viem/utils';
-import { writeContract as writeContract$1, waitForTransactionReceipt as waitForTransactionReceipt$1, getTransaction, call, readContract as readContract$1 } from 'viem/actions';
+import { readContract as readContract$1, writeContract as writeContract$1, waitForTransactionReceipt as waitForTransactionReceipt$1, getTransaction, call } from 'viem/actions';
 import { MdOutlineStarOutline, MdOutlineStarPurple500, MdFavoriteBorder, MdFavorite, MdLocalGasStation } from 'react-icons/md';
 import { WalletIcon as WalletIcon$1 } from '@dynamic-labs/wallet-book';
 import { FiEdit } from 'react-icons/fi';
@@ -47986,14 +47986,107 @@ var OptimizedImage = forwardRef(
   }
 );
 OptimizedImage.displayName = "OptimizedImage";
-
-// src/core/utils/twoApprove.ts
-var useUSDTHandler = () => {
-  return {
-    needsTwoApproval: false,
-    isProcessingSecondApproval: false
+var usdtAbi = [
+  {
+    name: "approve",
+    type: "function",
+    stateMutability: "nonpayable",
+    inputs: [
+      { name: "_spender", type: "address" },
+      { name: "_value", type: "uint256" }
+    ],
+    outputs: [{ name: "", type: "bool" }]
+  },
+  {
+    name: "allowance",
+    type: "function",
+    stateMutability: "view",
+    inputs: [
+      { name: "_owner", type: "address" },
+      { name: "_spender", type: "address" }
+    ],
+    outputs: [{ name: "", type: "uint256" }]
+  }
+];
+function useUSDTHandler(chainId) {
+  const config = useConfig();
+  const { address: owner } = useAccount();
+  const [error, setError] = useState(null);
+  const [isLoading, setIsLoading] = useState(false);
+  const handleApprove = async (tokenAddress, spender, amount) => {
+    setError(null);
+    setIsLoading(true);
+    try {
+      if (!owner) {
+        const errorMsg = "No account available. Please connect your wallet and try again.";
+        setError(errorMsg);
+        throw new Error(errorMsg);
+      }
+      const targetChainId = chainId ?? 1;
+      console.log("[USDT Approve] Reading allowance:", {
+        chainId: targetChainId,
+        tokenAddress,
+        owner,
+        spender
+      });
+      const currentAllowance = await readContract(config, {
+        abi: usdtAbi,
+        address: tokenAddress,
+        functionName: "allowance",
+        chainId: targetChainId,
+        args: [owner, spender]
+      });
+      console.log("[USDT Approve] Current allowance:", currentAllowance.toString());
+      if (currentAllowance >= amount) {
+        console.log(
+          "[USDT Approve] Allowance is sufficient, no additional approval needed"
+        );
+        return;
+      }
+      if (currentAllowance > 0n) {
+        console.log("[USDT Approve] Performing allowance reset to zero");
+        const zeroApproveHash = await writeContract(config, {
+          abi: usdtAbi,
+          address: tokenAddress,
+          functionName: "approve",
+          chainId: targetChainId,
+          args: [spender, 0n]
+        });
+        console.log(
+          "[USDT Approve] Waiting for zero-approval transaction confirmation..."
+        );
+        await waitForTransactionReceipt(config, {
+          hash: zeroApproveHash,
+          chainId: targetChainId
+        });
+        console.log("[USDT Approve] Zero-approval completed");
+      }
+      console.log("[USDT Approve] Performing target amount approval");
+      const approveHash = await writeContract(config, {
+        abi: usdtAbi,
+        address: tokenAddress,
+        functionName: "approve",
+        chainId: targetChainId,
+        args: [spender, amount]
+      });
+      console.log(
+        "[USDT Approve] Waiting for target amount approval transaction confirmation..."
+      );
+      await waitForTransactionReceipt(config, {
+        hash: approveHash,
+        chainId: targetChainId
+      });
+      console.log("[USDT Approve] Double approval process completed");
+    } catch (err) {
+      const errorMessage = err instanceof Error ? err.message : "Authorization operation failed";
+      setError(errorMessage);
+      throw err;
+    } finally {
+      setIsLoading(false);
+    }
   };
-};
+  return { handleApprove, error, isLoading };
+}
 var buttonStyles = {
   w: "100%",
   h: {
@@ -48167,7 +48260,7 @@ var FormButton = ({
       startLoading();
       const vCode = extractVPathSegment();
       const fromAddress = fromTokenInfo.isSolana ? solanaWalletAddress || "" : effectiveEvmAddress || "";
-      const toAddress = toTokenInfo.isSolana ? solanaWalletAddress || "" : differentAddress || effectiveEvmAddress || "";
+      const toAddress = toTokenInfo.isSolana ? config?.solanaDifferentAddress || solanaWalletAddress || "" : config?.evmDifferentAddress || differentAddress || effectiveEvmAddress || "";
       if (fromAddress && fromAmount) {
         console.log(
           "[Transaction] Refetching quote after transaction rejection..."
@@ -48202,7 +48295,9 @@ var FormButton = ({
       effectiveEvmAddress,
       solanaWalletAddress,
       differentAddress,
-      slippage
+      slippage,
+      config?.evmDifferentAddress,
+      config?.solanaDifferentAddress
     ]
   );
   const { sendTransaction, isPending } = useSendTransaction({
@@ -48492,7 +48587,7 @@ var FormButton = ({
       /* @__PURE__ */ jsx(Icon, { w: "24px", h: "24px", as: WalletIcon }),
       /* @__PURE__ */ jsxs(Heading, { variant: buttonHeadingVariant, children: [
         "Connect ",
-        name ? name : "",
+        name ,
         " Wallet"
       ] })
     ] });
@@ -48567,7 +48662,7 @@ var FormButton = ({
           startLoading();
           const vCode = extractVPathSegment();
           const fromAddress = solanaWalletAddress || "";
-          const toAddress = toTokenInfo.isSolana ? solanaWalletAddress || "" : differentAddress || effectiveEvmAddress || "";
+          const toAddress = toTokenInfo.isSolana ? config?.solanaDifferentAddress || solanaWalletAddress || "" : config?.evmDifferentAddress || differentAddress || effectiveEvmAddress || "";
           if (fromAddress && fromAmount) {
             console.log(
               "[Solana Transaction] Refetching quote after transaction rejection..."
@@ -48608,28 +48703,17 @@ var FormButton = ({
         }
       ) });
     }
-    if ((fromTokenInfo.isSolana || toTokenInfo.isSolana) && !solanaWalletAddress && !(skipSolanaWalletConnect && !fromTokenInfo.isSolana)) {
+    if (!fromTokenInfo.isSolana && !hasEvmUiWallet) {
+      return renderEvmWalletConnectButton("EVM");
+    }
+    if (fromTokenInfo.isSolana && !solanaWalletAddress) {
       return renderSolanaWalletConnectButton();
     }
-    if (!fromTokenInfo.isSolana && !hasEvmUiWallet) {
+    if (fromTokenInfo.isSolana && !toTokenInfo.isSolana && !skipEvmWalletConnect && !hasEvmUiWallet) {
       return renderEvmWalletConnectButton("EVM");
     }
-    if (!hasEvmUiWallet && !solanaWalletAddress) {
-      if (fromTokenInfo.isSolana && toTokenInfo.isSolana || fromTokenInfo.isSolana && !toTokenInfo.isSolana) {
-        return renderSolanaWalletConnectButton();
-      }
-      return renderEvmWalletConnectButton();
-    } else if (!hasEvmUiWallet && solanaWalletAddress) {
-      if (!fromTokenInfo.isSolana && !toTokenInfo.isSolana || !fromTokenInfo.isSolana && toTokenInfo.isSolana || fromTokenInfo.isSolana && !toTokenInfo.isSolana && !skipEvmWalletConnect) {
-        return renderEvmWalletConnectButton("EVM");
-      }
-    } else if (hasEvmUiWallet && !solanaWalletAddress) {
-      if (fromTokenInfo.isSolana || toTokenInfo.isSolana && !skipSolanaWalletConnect) {
-        return renderSolanaWalletConnectButton();
-      }
-      if (fromTokenInfo.isSolana && toTokenInfo.isSolana || !fromTokenInfo.isSolana && toTokenInfo.isSolana && !skipSolanaWalletConnect || fromTokenInfo.isSolana && !toTokenInfo.isSolana) {
-        return renderSolanaWalletConnectButton();
-      }
+    if (!fromTokenInfo.isSolana && toTokenInfo.isSolana && !skipSolanaWalletConnect && !solanaWalletAddress) {
+      return renderSolanaWalletConnectButton();
     }
     if (isFetching || fromAmount && !toAmount) {
       return /* @__PURE__ */ jsx(
@@ -55837,6 +55921,8 @@ var MainForm = ({ config }) => {
   const prevAddressRef = useRef(address);
   const prevSolanaAddressRef = useRef(solanaWalletAddress);
   const isWalletChangingRef = useRef(false);
+  const affiliationRef = useRef(config?.affiliation);
+  affiliationRef.current = config?.affiliation;
   const fromAddress = useMemo(() => {
     if (fromTokenInfo.isSolana) {
       return solanaWalletAddress || "";
@@ -55909,6 +55995,7 @@ var MainForm = ({ config }) => {
         }
       }
       const p = params;
+      p.affiliation = affiliationRef.current || p.affiliation;
       const isAutoRefetchRequest = Boolean(isAutoRefetch);
       const traceId = createTraceId();
       const requestStartedAt = Date.now();