coinley-checkout 0.4.4 → 0.4.6

package/dist/coinley-checkout.es.js

@@ -2236,7 +2236,7 @@ const names = [
   "finney",
   "ether"
 ];
-function parseUnits$1(value, unit) {
+function parseUnits$2(value, unit) {
   assertArgument(typeof value === "string", "value must be a string", "value", value);
   let decimals = 18;
   if (typeof unit === "string") {
@@ -2248,8 +2248,8 @@ function parseUnits$1(value, unit) {
   }
   return FixedNumber.fromString(value, { decimals, width: 512 }).value;
 }
-function parseEther(ether) {
-  return parseUnits$1(ether, 18);
+function parseEther$1(ether) {
+  return parseUnits$2(ether, 18);
 }
 const WordSize = 32;
 const Padding = new Uint8Array(WordSize);
@@ -15107,7 +15107,7 @@ _name = new WeakMap();
 _chainId2 = new WeakMap();
 _plugins = new WeakMap();
 let Network = _Network;
-function parseUnits(_value2, decimals) {
+function parseUnits$1(_value2, decimals) {
   const value = String(_value2);
   if (!value.match(/^[0-9.]+$/)) {
     throw new Error(`invalid gwei value: ${_value2}`);
@@ -15144,8 +15144,8 @@ function getGasStationPlugin(url) {
       const payload = response.bodyJson.standard;
       const feeData = {
         gasPrice: _feeData.gasPrice,
-        maxFeePerGas: parseUnits(payload.maxFee, 9),
-        maxPriorityFeePerGas: parseUnits(payload.maxPriorityFee, 9)
+        maxFeePerGas: parseUnits$1(payload.maxFee, 9),
+        maxPriorityFeePerGas: parseUnits$1(payload.maxPriorityFee, 9)
       };
       return feeData;
     } catch (error) {
@@ -18385,7 +18385,6 @@ const TOKEN_CONFIG = {
     ethereum: {
       contractAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
       decimals: 6,
-      // USDC has 6 decimals on Ethereum!
       symbol: "USDC"
     },
     bsc: {
@@ -18406,7 +18405,6 @@ const TOKEN_CONFIG = {
   },
   BNB: {
     bsc: {
-      // BNB is native to BSC
       decimals: 18,
       symbol: "BNB",
       isNative: true
@@ -18414,7 +18412,6 @@ const TOKEN_CONFIG = {
   },
   ETH: {
     ethereum: {
-      // ETH is native to Ethereum
       decimals: 18,
       symbol: "ETH",
       isNative: true
@@ -18422,7 +18419,6 @@ const TOKEN_CONFIG = {
   },
   TRX: {
     tron: {
-      // TRX is native to TRON
       decimals: 6,
       symbol: "TRX",
       isNative: true
@@ -18430,7 +18426,6 @@ const TOKEN_CONFIG = {
   },
   ALGO: {
     algorand: {
-      // ALGO is native to Algorand
       decimals: 6,
       symbol: "ALGO",
       isNative: true
@@ -18496,6 +18491,42 @@ const debugWalletEnvironment = () => {
   const wallets = detectWallets();
   console.log("Detected wallets:", wallets);
 };
+const parseEther = (value) => {
+  try {
+    if (parseEther$1) {
+      return parseEther$1(value);
+    }
+    if (void 0)
+      ;
+    const amount = parseFloat(value) * Math.pow(10, 18);
+    return {
+      toString: () => amount.toLocaleString("fullwide", { useGrouping: false })
+    };
+  } catch (error) {
+    const amount = parseFloat(value) * Math.pow(10, 18);
+    return {
+      toString: () => amount.toLocaleString("fullwide", { useGrouping: false })
+    };
+  }
+};
+const parseUnits = (value, decimals) => {
+  try {
+    if (parseUnits$2) {
+      return parseUnits$2(value, decimals);
+    }
+    if (void 0)
+      ;
+    const amount = parseFloat(value) * Math.pow(10, decimals);
+    return {
+      toString: () => amount.toLocaleString("fullwide", { useGrouping: false })
+    };
+  } catch (error) {
+    const amount = parseFloat(value) * Math.pow(10, decimals);
+    return {
+      toString: () => amount.toLocaleString("fullwide", { useGrouping: false })
+    };
+  }
+};
 const connectMetamaskWallet = () => __async(void 0, null, function* () {
   console.log("Connecting to MetaMask wallet...");
   if (!window.ethereum || !window.ethereum.isMetaMask) {
@@ -18789,19 +18820,7 @@ const sendNativeTransaction = (walletConnection, toAddress, amount) => __async(v
         const provider = walletConnection.provider;
         const signer = provider.getSigner();
         const amountInEther = amount.toString();
-        let amountWei;
-        try {
-          amountWei = parseEther(amountInEther);
-        } catch (err) {
-          try {
-            amountWei = (void 0).parseEther(amountInEther);
-          } catch (error) {
-            const value = parseFloat(amountInEther) * Math.pow(10, 18);
-            amountWei = {
-              toString: () => value.toLocaleString("fullwide", { useGrouping: false })
-            };
-          }
-        }
+        const amountWei = parseEther(amountInEther);
         console.log("Sending ETH/BNB:", {
           to: toAddress,
           value: amountWei.toString()
@@ -18852,32 +18871,14 @@ const sendNativeTransaction = (walletConnection, toAddress, amount) => __async(v
         throw new Error(`Unsupported wallet type: ${walletConnection.walletType}`);
     }
     console.log("Transaction sent:", transaction);
-    if (transaction) {
-      const hash2 = transaction.hash || transaction.txID || transaction.txId || transaction;
-      console.log("Transaction hash:", hash2);
-      return hash2;
-    } else {
-      throw new Error("No transaction hash returned");
-    }
+    const hash2 = transaction.hash || transaction.txID || transaction.txId || transaction;
+    console.log("Transaction hash:", hash2);
+    return hash2;
   } catch (error) {
     console.error("Native transaction error:", error);
     throw error;
   }
 });
-const sendTransaction = (walletConnection, tokenConfig, toAddress, amount) => __async(void 0, null, function* () {
-  console.log("Sending transaction with:", { tokenConfig, toAddress, amount });
-  if (!walletConnection) {
-    throw new Error("Wallet not connected");
-  }
-  if (!toAddress) {
-    throw new Error("Recipient address not provided");
-  }
-  if (tokenConfig && tokenConfig.isNative) {
-    return sendNativeTransaction(walletConnection, toAddress, amount);
-  } else {
-    return sendTokenTransaction(walletConnection, tokenConfig, toAddress, amount);
-  }
-});
 const sendTokenTransaction = (walletConnection, tokenConfig, toAddress, amount) => __async(void 0, null, function* () {
   console.log("Sending token transaction with:", { tokenConfig, toAddress, amount });
   if (!walletConnection || !walletConnection.provider) {
@@ -18913,19 +18914,7 @@ const sendERC20Transaction = (walletConnection, tokenConfig, toAddress, amount)
   const { contractAddress, decimals, symbol } = tokenConfig;
   const tokenAmount = parseFloat(amount);
   const tokenDecimals = parseInt(decimals);
-  let tokenUnits;
-  try {
-    tokenUnits = parseUnits$1(tokenAmount.toString(), tokenDecimals);
-  } catch (err) {
-    try {
-      tokenUnits = (void 0).parseUnits(tokenAmount.toString(), tokenDecimals);
-    } catch (error) {
-      const value = tokenAmount * Math.pow(10, tokenDecimals);
-      tokenUnits = {
-        toString: () => value.toLocaleString("fullwide", { useGrouping: false })
-      };
-    }
-  }
+  const tokenUnits = parseUnits(tokenAmount.toString(), tokenDecimals);
   console.log(`Sending ${tokenAmount} ${symbol} (${tokenUnits.toString()} base units) to ${toAddress}`);
   try {
     const tokenContract = new Contract(
@@ -18949,7 +18938,6 @@ const sendERC20Transaction = (walletConnection, tokenConfig, toAddress, amount)
         console.log("Trying USDC transaction with fixed gas limit");
         const transaction = yield tokenContract.transfer(toAddress, tokenUnits, {
           gasLimit: 15e4
-          // Higher fixed gas limit for USDC
         });
         console.log("Transaction sent with fixed gas limit:", transaction);
         return transaction.hash;
@@ -18993,13 +18981,10 @@ const sendTRC20Transaction = (walletConnection, tokenConfig, toAddress, amount)
     const transaction = yield contract.transfer(
       toAddress,
       amountString
-      // Use the raw amount string
     ).send({
       feeLimit: 1e8,
-      // 100 TRX fee limit
       callValue: 0,
       shouldPollResponse: false
-      // Set to false for better handling
     });
     console.log("TRC20 transaction sent:", transaction);
     return transaction;
@@ -19049,12 +19034,38 @@ const sendAlgorandAssetTransaction = (walletConnection, tokenConfig, toAddress,
     }
   }
 });
+const sendTransaction = (walletConnection, transactionParams) => __async(void 0, null, function* () {
+  console.log("sendTransaction called with:", transactionParams);
+  if (!walletConnection) {
+    throw new Error("Wallet not connected");
+  }
+  const { to, toAddress, amount, tokenAddress, tokenConfig, currency, network } = transactionParams;
+  const recipientAddress = to || toAddress;
+  if (!recipientAddress) {
+    throw new Error("Recipient address not provided");
+  }
+  if (!tokenAddress && !tokenConfig) {
+    return sendNativeTransaction(walletConnection, recipientAddress, amount);
+  }
+  let tokenConfiguration = tokenConfig;
+  if (!tokenConfiguration && tokenAddress) {
+    tokenConfiguration = {
+      contractAddress: tokenAddress,
+      decimals: 18,
+      symbol: currency || "TOKEN"
+    };
+  }
+  if (!tokenConfiguration) {
+    throw new Error("Token configuration not provided");
+  }
+  return sendTokenTransaction(walletConnection, tokenConfiguration, recipientAddress, amount);
+});
 let apiConfig = {
   apiKey: null,
   apiSecret: null,
   apiUrl: "https://coinleyserver-production.up.railway.app",
   merchantWalletAddresses: {}
-  // Object for multi-network support
+  // This will be populated dynamically
 };
 const initializeApi = (config) => {
   apiConfig = __spreadValues(__spreadValues({}, apiConfig), config);
@@ -19064,6 +19075,10 @@ const initializeApi = (config) => {
     hasWalletAddresses: Object.keys(apiConfig.merchantWalletAddresses || {}).length > 0
   });
 };
+const setMerchantWalletAddresses = (walletAddresses) => {
+  apiConfig.merchantWalletAddresses = __spreadValues({}, walletAddresses);
+  console.log("Updated merchant wallet addresses:", apiConfig.merchantWalletAddresses);
+};
 const getHeaders = () => {
   return {
     "Content-Type": "application/json",
@@ -19072,6 +19087,7 @@ const getHeaders = () => {
   };
 };
 const createPayment = (paymentData) => __async(void 0, null, function* () {
+  var _a2;
   try {
     console.log("Creating payment with data:", paymentData);
     console.log("API URL:", `${apiConfig.apiUrl}/api/payments/create`);
@@ -19079,7 +19095,24 @@ const createPayment = (paymentData) => __async(void 0, null, function* () {
       throw new Error("Payment amount is required");
     }
     const enhancedPaymentData = __spreadProps(__spreadValues({}, paymentData), {
-      merchantWalletAddresses: __spreadValues(__spreadValues({}, apiConfig.merchantWalletAddresses), paymentData.merchantWalletAddresses)
+      // Primary recipient address (highest priority)
+      recipientAddress: paymentData.recipientAddress || paymentData.toAddress || paymentData.walletAddress,
+      // Merchant wallet addresses (for network switching)
+      merchantWalletAddresses: __spreadValues(__spreadValues({}, apiConfig.merchantWalletAddresses), paymentData.merchantWalletAddresses),
+      // Legacy support
+      walletAddress: paymentData.walletAddress || paymentData.recipientAddress || paymentData.toAddress,
+      // Alternative naming
+      toAddress: paymentData.toAddress || paymentData.recipientAddress || paymentData.walletAddress
+    });
+    const network = enhancedPaymentData.network || "ethereum";
+    const recipientAddress = enhancedPaymentData.recipientAddress || ((_a2 = enhancedPaymentData.merchantWalletAddresses) == null ? void 0 : _a2[network]);
+    if (!recipientAddress) {
+      throw new Error(`No recipient address provided for network: ${network}. Please configure a wallet address.`);
+    }
+    console.log("Enhanced payment data:", {
+      network,
+      recipientAddress,
+      merchantWalletAddresses: enhancedPaymentData.merchantWalletAddresses
     });
     const response = yield fetch(`${apiConfig.apiUrl}/api/payments/create`, {
       method: "POST",
@@ -19099,6 +19132,9 @@ const createPayment = (paymentData) => __async(void 0, null, function* () {
     }
     const data = yield response.json();
     console.log("Create payment response data:", data);
+    if (data.merchantConfig && data.merchantConfig.walletAddresses) {
+      setMerchantWalletAddresses(data.merchantConfig.walletAddresses);
+    }
     return data;
   } catch (error) {
     console.error("Create payment error:", error);
@@ -19142,11 +19178,17 @@ const processPayment = (processData) => __async(void 0, null, function* () {
     if (!processData.transactionHash) {
       throw new Error("Transaction hash is required");
     }
+    const enhancedProcessData = __spreadProps(__spreadValues({}, processData), {
+      // Include timestamp
+      processedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      // Include source information
+      source: "coinley_checkout"
+    });
     console.log("API URL:", `${apiConfig.apiUrl}/api/payments/process`);
     const response = yield fetch(`${apiConfig.apiUrl}/api/payments/process`, {
       method: "POST",
       headers: getHeaders(),
-      body: JSON.stringify(processData)
+      body: JSON.stringify(enhancedProcessData)
     });
     console.log("Process payment response status:", response.status);
     if (!response.ok) {
@@ -19167,31 +19209,37 @@ const processPayment = (processData) => __async(void 0, null, function* () {
     throw error;
   }
 });
-const getSupportedNetworks = () => __async(void 0, null, function* () {
+const getMerchantWallets = (merchantToken) => __async(void 0, null, function* () {
   try {
-    const response = yield fetch(`${apiConfig.apiUrl}/api/networks`, {
+    const response = yield fetch(`${apiConfig.apiUrl}/api/merchants/wallets`, {
       method: "GET",
-      headers: getHeaders()
+      headers: {
+        "Content-Type": "application/json",
+        "Authorization": `Bearer ${merchantToken}`
+      }
     });
     if (!response.ok) {
       let errorData;
       try {
         errorData = yield response.json();
       } catch (e) {
-        throw new Error(`Failed to get networks: ${response.status} ${response.statusText}`);
+        throw new Error(`Failed to get merchant wallets: ${response.status} ${response.statusText}`);
       }
-      throw new Error(errorData.error || `Failed to get networks: ${response.status}`);
+      throw new Error(errorData.error || `Failed to get merchant wallets: ${response.status}`);
     }
     const data = yield response.json();
+    if (data.merchantWallets) {
+      setMerchantWalletAddresses(data.merchantWallets);
+    }
     return data;
   } catch (error) {
-    console.error("Get supported networks error:", error);
+    console.error("Get merchant wallets error:", error);
     throw error;
   }
 });
-const getMerchantProfile = () => __async(void 0, null, function* () {
+const getSupportedNetworks = () => __async(void 0, null, function* () {
   try {
-    const response = yield fetch(`${apiConfig.apiUrl}/api/merchants/profile`, {
+    const response = yield fetch(`${apiConfig.apiUrl}/api/networks`, {
       method: "GET",
       headers: getHeaders()
     });
@@ -19200,53 +19248,75 @@ const getMerchantProfile = () => __async(void 0, null, function* () {
       try {
         errorData = yield response.json();
       } catch (e) {
-        throw new Error(`Failed to get merchant profile: ${response.status} ${response.statusText}`);
+        throw new Error(`Failed to get networks: ${response.status} ${response.statusText}`);
       }
-      throw new Error(errorData.error || `Failed to get merchant profile: ${response.status}`);
+      throw new Error(errorData.error || `Failed to get networks: ${response.status}`);
     }
     const data = yield response.json();
-    if (data.merchant && data.merchant.walletAddresses) {
-      apiConfig.merchantWalletAddresses = __spreadValues(__spreadValues({}, apiConfig.merchantWalletAddresses), data.merchant.walletAddresses);
-    }
     return data;
   } catch (error) {
-    console.error("Get merchant profile error:", error);
+    console.error("Get supported networks error:", error);
     throw error;
   }
 });
-const validateWalletAddress = (address, network) => __async(void 0, null, function* () {
+const validateWalletAddress = (address, network) => {
+  if (!address || typeof address !== "string")
+    return false;
+  switch (network.toLowerCase()) {
+    case "ethereum":
+    case "bsc":
+      return /^0x[a-fA-F0-9]{40}$/.test(address);
+    case "tron":
+      return /^T[a-zA-Z0-9]{33}$/.test(address);
+    case "algorand":
+      return /^[A-Z2-7]{58}$/.test(address);
+    case "solana":
+      return /^[1-9A-HJ-NP-Za-km-z]{32,44}$/.test(address);
+    default:
+      return address.length > 10;
+  }
+};
+const generateMockTransactionHash = (network = "ethereum") => {
+  const prefixes = {
+    ethereum: "0x",
+    bsc: "0x",
+    tron: "",
+    algorand: ""
+  };
+  const prefix = prefixes[network] || "0x";
+  const hash2 = Array.from({ length: 64 }, () => Math.floor(Math.random() * 16).toString(16)).join("");
+  return `${prefix}${hash2}`;
+};
+const getMerchantProfile = () => __async(void 0, null, function* () {
   try {
-    const response = yield fetch(`${apiConfig.apiUrl}/api/wallets/validate`, {
-      method: "POST",
-      headers: getHeaders(),
-      body: JSON.stringify({ address, network })
+    const response = yield fetch(`${apiConfig.apiUrl}/api/merchants/profile`, {
+      method: "GET",
+      headers: getHeaders()
     });
     if (!response.ok) {
       let errorData;
       try {
         errorData = yield response.json();
       } catch (e) {
-        throw new Error(`Failed to validate address: ${response.status} ${response.statusText}`);
+        throw new Error(`Failed to get merchant profile: ${response.status} ${response.statusText}`);
       }
-      throw new Error(errorData.error || `Failed to validate address: ${response.status}`);
+      throw new Error(errorData.error || `Failed to get merchant profile: ${response.status}`);
     }
     const data = yield response.json();
+    if (data.merchant && data.merchant.walletAddresses) {
+      apiConfig.merchantWalletAddresses = __spreadValues(__spreadValues({}, apiConfig.merchantWalletAddresses), data.merchant.walletAddresses);
+    }
     return data;
   } catch (error) {
-    console.error("Validate wallet address error:", error);
+    console.error("Get merchant profile error:", error);
     throw error;
   }
 });
-const generateMockTransactionHash = (network = "ethereum") => {
-  const prefixes = {
-    ethereum: "0x",
-    bsc: "0x",
-    tron: "",
-    algorand: ""
-  };
-  const prefix = prefixes[network] || "0x";
-  const hash2 = Array.from({ length: 64 }, () => Math.floor(Math.random() * 16).toString(16)).join("");
-  return `${prefix}${hash2}`;
+const fetchMerchantWalletAddresses = (merchantToken) => __async(void 0, null, function* () {
+  return getMerchantWallets(merchantToken);
+});
+const getApiConfig = () => {
+  return __spreadValues({}, apiConfig);
 };
 var jsxRuntime = { exports: {} };
 var reactJsxRuntime_production_min = {};
@@ -21394,7 +21464,6 @@ const CoinleyCheckout = forwardRef(({
   customerEmail,
   merchantName = "Merchant",
   merchantWalletAddresses = {},
-  // Object with network-specific addresses
   onSuccess,
   onError,
   onClose,
@@ -21403,7 +21472,6 @@ const CoinleyCheckout = forwardRef(({
   debug = false,
   testMode = false,
   supportedNetworks = [],
-  // Array of supported networks
   preferredNetwork = NETWORK_TYPES.ETHEREUM,
   preferredWallet = WALLET_TYPES.METAMASK
 }, ref) => {
@@ -21418,8 +21486,10 @@ const CoinleyCheckout = forwardRef(({
   const [walletConnection, setWalletConnection] = useState(null);
   const [availableWallets, setAvailableWallets] = useState({});
   const [step, setStep] = useState("select-currency");
-  apiKey || (coinleyContext == null ? void 0 : coinleyContext.apiKey);
-  apiSecret || (coinleyContext == null ? void 0 : coinleyContext.apiSecret);
+  const [merchantWallets, setMerchantWallets] = useState({});
+  const [isLoadingWallets, setIsLoadingWallets] = useState(false);
+  const effectiveApiKey = apiKey || (coinleyContext == null ? void 0 : coinleyContext.apiKey);
+  const effectiveApiSecret = apiSecret || (coinleyContext == null ? void 0 : coinleyContext.apiSecret);
   apiUrl || (coinleyContext == null ? void 0 : coinleyContext.apiUrl);
   const effectiveTheme = theme || contextTheme;
   const effectiveDebug = debug || (coinleyContext == null ? void 0 : coinleyContext.debug);
@@ -21433,6 +21503,7 @@ const CoinleyCheckout = forwardRef(({
     },
     getPayment: () => payment,
     getWalletConnection: () => walletConnection,
+    getMerchantWallets: () => merchantWallets,
     debugWallets: () => debugWalletEnvironment()
   }));
   const log = (message, data) => {
@@ -21450,6 +21521,44 @@ const CoinleyCheckout = forwardRef(({
       detectWalletsAsync();
     }
   }, [effectiveDebug]);
+  useEffect(() => {
+    const loadMerchantWallets = () => __async(void 0, null, function* () {
+      if (!effectiveApiKey || !effectiveApiSecret) {
+        log("No API credentials available for wallet address fetching");
+        return;
+      }
+      setIsLoadingWallets(true);
+      try {
+        const apiConfig2 = getApiConfig();
+        if (apiConfig2.merchantWalletAddresses && Object.keys(apiConfig2.merchantWalletAddresses).length > 0) {
+          setMerchantWallets(apiConfig2.merchantWalletAddresses);
+          log("Loaded wallet addresses from API config:", apiConfig2.merchantWalletAddresses);
+        } else {
+          const walletAddresses = yield fetchMerchantWalletAddresses();
+          if (walletAddresses && Object.keys(walletAddresses).length > 0) {
+            setMerchantWallets(walletAddresses);
+            log("Fetched wallet addresses from API:", walletAddresses);
+          } else {
+            log("No wallet addresses found in API response");
+          }
+        }
+        if (merchantWalletAddresses && Object.keys(merchantWalletAddresses).length > 0) {
+          setMerchantWallets((prev) => __spreadValues(__spreadValues({}, prev), merchantWalletAddresses));
+          log("Added manual wallet addresses:", merchantWalletAddresses);
+        }
+      } catch (error2) {
+        log("Error loading merchant wallet addresses:", error2);
+        console.warn("Could not load merchant wallet addresses:", error2.message);
+        if (merchantWalletAddresses && Object.keys(merchantWalletAddresses).length > 0) {
+          setMerchantWallets(merchantWalletAddresses);
+          log("Using fallback manual wallet addresses:", merchantWalletAddresses);
+        }
+      } finally {
+        setIsLoadingWallets(false);
+      }
+    });
+    loadMerchantWallets();
+  }, [effectiveApiKey, effectiveApiSecret, merchantWalletAddresses, effectiveDebug]);
   const handleOpen = (paymentDetails) => __async(void 0, null, function* () {
     if (!paymentDetails || !paymentDetails.amount) {
       setError("Payment amount is required");
@@ -21462,20 +21571,51 @@ const CoinleyCheckout = forwardRef(({
     setStep("select-currency");
     try {
       log("Creating payment with details:", paymentDetails);
+      let finalWalletAddresses = __spreadValues({}, merchantWallets);
+      if (Object.keys(finalWalletAddresses).length === 0) {
+        log("No wallet addresses available, attempting to fetch...");
+        try {
+          const fetchedWallets = yield fetchMerchantWalletAddresses();
+          if (fetchedWallets) {
+            finalWalletAddresses = fetchedWallets;
+            setMerchantWallets(fetchedWallets);
+          }
+        } catch (fetchError) {
+          log("Failed to fetch wallet addresses:", fetchError);
+        }
+      }
+      if (paymentDetails.merchantWalletAddresses) {
+        finalWalletAddresses = __spreadValues(__spreadValues({}, finalWalletAddresses), paymentDetails.merchantWalletAddresses);
+      }
+      if (merchantWalletAddresses) {
+        finalWalletAddresses = __spreadValues(__spreadValues({}, finalWalletAddresses), merchantWalletAddresses);
+      }
+      log("Final wallet addresses for payment:", finalWalletAddresses);
       const paymentResponse = yield createPayment({
         amount: paymentDetails.amount,
         currency: paymentDetails.currency || "USDT",
         network: paymentDetails.network || preferredNetwork,
         customerEmail: paymentDetails.customerEmail || customerEmail,
         callbackUrl: paymentDetails.callbackUrl,
-        metadata: paymentDetails.metadata || {},
-        merchantWalletAddresses: __spreadValues(__spreadValues({}, merchantWalletAddresses), paymentDetails.merchantWalletAddresses)
+        metadata: __spreadProps(__spreadValues({}, paymentDetails.metadata), {
+          sdkVersion: "1.0.0",
+          merchantWallets: finalWalletAddresses
+        }),
+        merchantWalletAddresses: finalWalletAddresses
       });
       log("Payment created:", paymentResponse);
-      setPayment(paymentResponse.payment);
-      setPaymentStatus("idle");
-      setError(null);
-      log("Payment created and state updated");
+      if (paymentResponse.payment) {
+        setPayment(paymentResponse.payment);
+        if (paymentResponse.merchantConfig && paymentResponse.merchantConfig.walletAddresses) {
+          setMerchantWallets((prev) => __spreadValues(__spreadValues({}, prev), paymentResponse.merchantConfig.walletAddresses));
+          log("Updated wallet addresses from payment response:", paymentResponse.merchantConfig.walletAddresses);
+        }
+        setPaymentStatus("idle");
+        setError(null);
+      } else {
+        throw new Error("Invalid payment response structure");
+      }
+      log("Payment created and state updated successfully");
     } catch (err) {
       log("Error creating payment:", err);
       setError(err.message || "Failed to create payment");
@@ -21490,60 +21630,67 @@ const CoinleyCheckout = forwardRef(({
     setWalletConnection(null);
     setSelectedPaymentMethod(null);
     setStep("select-currency");
+    setError(null);
     if (onClose)
       onClose();
   };
   const handlePaymentMethodSelect = (paymentMethod) => {
-    console.log("=== PAYMENT METHOD SELECTION DEBUG ===");
-    console.log("1. Payment method selected:", paymentMethod);
-    console.log("2. Current step before:", step);
     log("Payment method selected:", paymentMethod);
     setSelectedPaymentMethod(paymentMethod);
     setStep("confirm");
-    console.log("3. Step should now be: confirm");
-    console.log("=== END PAYMENT METHOD SELECTION DEBUG ===");
   };
   const handleBack = () => {
     if (step === "confirm") {
       setStep("select-currency");
       setWalletConnection(null);
+      setError(null);
     } else if (step === "error") {
       setStep("confirm");
+      setError(null);
     }
   };
   const handleConnectWallet = (walletType) => __async(void 0, null, function* () {
-    console.log("=== WALLET CONNECTION DEBUG ===");
-    console.log("1. Wallet type requested:", walletType);
-    console.log("2. Selected payment method:", selectedPaymentMethod);
-    console.log("3. Available wallets:", availableWallets);
-    console.log("4. Current step:", step);
     if (!selectedPaymentMethod) {
-      console.error("No payment method selected");
       setError("Please select a payment method first");
       return;
     }
     try {
-      console.log("5. Attempting to connect wallet...");
       setError(null);
       log("Connecting wallet:", { walletType, network: selectedPaymentMethod.network });
       const connection = yield connectWallet(walletType, selectedPaymentMethod.network, 2);
       setWalletConnection(connection);
       setError(null);
-      console.log("6. Connection successful:", connection);
       log("Wallet connected successfully:", connection);
     } catch (err) {
-      console.error("7. Connection failed:", err);
       log("Wallet connection error:", err);
       setError(err.message || "Failed to connect wallet");
     }
-    console.log("=== END WALLET CONNECTION DEBUG ===");
   });
+  const getRecipientAddress = () => {
+    if (!selectedPaymentMethod)
+      return null;
+    const network = selectedPaymentMethod.network;
+    if (payment && payment.recipientWallet) {
+      return payment.recipientWallet;
+    }
+    if (merchantWallets[network]) {
+      return merchantWallets[network];
+    }
+    if (merchantWalletAddresses[network]) {
+      return merchantWalletAddresses[network];
+    }
+    return null;
+  };
   const handlePayment = () => __async(void 0, null, function* () {
-    var _a2, _b;
     if (!payment || !selectedPaymentMethod) {
       setError("Missing payment information");
       return;
     }
+    const recipientAddress = getRecipientAddress();
+    if (!recipientAddress && !testMode) {
+      setError(`No recipient wallet address configured for ${selectedPaymentMethod.network} network`);
+      return;
+    }
     if (!walletConnection && !testMode) {
       setError("Please connect your wallet first");
       return;
@@ -21558,18 +21705,20 @@ const CoinleyCheckout = forwardRef(({
         log("Test mode: Generating mock transaction...");
         txHash = `test_${Date.now().toString(16)}_${Math.random().toString(16).substring(2, 10)}`;
       } else {
-        const merchantAddress = merchantWalletAddresses[selectedPaymentMethod.network];
-        if (!merchantAddress) {
-          throw new Error(`No merchant wallet address configured for ${selectedPaymentMethod.network}`);
-        }
-        log("Sending transaction through wallet...");
+        log("Sending transaction through wallet...", {
+          recipientAddress,
+          amount: payment.totalAmount || payment.amount,
+          network: selectedPaymentMethod.network
+        });
+        const tokenConfig = payment.token || selectedPaymentMethod.tokenConfig;
         txHash = yield sendTransaction(walletConnection, {
-          to: merchantAddress,
-          amount: payment.amount,
-          tokenAddress: (_a2 = selectedPaymentMethod.tokenConfig) == null ? void 0 : _a2.address,
-          tokenDecimals: (_b = selectedPaymentMethod.tokenConfig) == null ? void 0 : _b.decimals,
+          to: recipientAddress,
+          amount: payment.totalAmount || payment.amount,
+          tokenAddress: tokenConfig == null ? void 0 : tokenConfig.contractAddress,
+          tokenDecimals: tokenConfig == null ? void 0 : tokenConfig.decimals,
           currency: selectedPaymentMethod.currency,
-          network: selectedPaymentMethod.network
+          network: selectedPaymentMethod.network,
+          tokenConfig
         });
       }
       log("Transaction hash:", txHash);
@@ -21590,16 +21739,27 @@ const CoinleyCheckout = forwardRef(({
         onSuccess(payment.id, txHash, {
           network: selectedPaymentMethod.network,
           currency: selectedPaymentMethod.currency,
-          amount: payment.amount
+          amount: payment.totalAmount || payment.amount,
+          recipientAddress
         });
       }
     } catch (err) {
       log("Payment error:", err);
-      setError(err.message || "Failed to process payment");
+      let errorMessage = err.message || "Failed to process payment";
+      if (errorMessage.includes("User rejected") || errorMessage.includes("user rejected")) {
+        errorMessage = "Transaction was rejected by user";
+      } else if (errorMessage.includes("insufficient funds")) {
+        errorMessage = "Insufficient funds in wallet";
+      } else if (errorMessage.includes("network")) {
+        errorMessage = "Network error. Please check your connection and try again";
+      } else if (errorMessage.includes("recipient") || errorMessage.includes("address")) {
+        errorMessage = "Invalid recipient address. Please contact support";
+      }
+      setError(errorMessage);
       setPaymentStatus("error");
       setStep("error");
       if (onError)
-        onError(err);
+        onError(new Error(errorMessage));
     }
   });
   const getSupportedWallets = () => {
@@ -21607,6 +21767,12 @@ const CoinleyCheckout = forwardRef(({
       return [];
     return getSupportedWalletsForNetwork(selectedPaymentMethod.network);
   };
+  if (isLoadingWallets) {
+    return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "fixed inset-0 z-50 flex items-center justify-center bg-black/50", children: /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "bg-white p-6 rounded-lg shadow-xl", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex items-center space-x-3", children: [
+      /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "animate-spin rounded-full h-6 w-6 border-2 border-blue-500 border-t-transparent" }),
+      /* @__PURE__ */ jsxRuntimeExports.jsx("span", { className: "text-gray-700", children: "Loading payment gateway..." })
+    ] }) }) });
+  }
   return /* @__PURE__ */ jsxRuntimeExports.jsx(jsxRuntimeExports.Fragment, { children: isOpen && /* @__PURE__ */ jsxRuntimeExports.jsx(
     CoinleyModal,
     {
@@ -21629,7 +21795,8 @@ const CoinleyCheckout = forwardRef(({
       availableWallets,
       supportedWallets: getSupportedWallets(),
       step,
-      merchantWalletAddresses,
+      merchantWalletAddresses: merchantWallets,
+      recipientAddress: getRecipientAddress(),
       debug: effectiveDebug
     }
   ) });