coinley-checkout 1.3.1 → 1.3.2

package/dist/coinley-checkout.es.js

@@ -22003,104 +22003,97 @@ const connectMetamaskWallet = async () => {
 const connectTrustWallet = async (targetNetwork = null) => {
   console.log("=== TRUST WALLET CONNECTION DEBUG ===");
   console.log("Connecting to Trust Wallet for network:", targetNetwork);
-  let trustProvider = null;
   let networkType = targetNetwork || NETWORK_TYPES.ETHEREUM;
-  if (window.ethereum) {
-    console.log("Available ethereum providers:", {
-      main: {
-        isMetaMask: window.ethereum.isMetaMask,
-        isTrust: window.ethereum.isTrust,
-        isTrustWallet: window.ethereum.isTrustWallet,
-        providers: window.ethereum.providers?.length || 0
-      }
-    });
-    if (window.ethereum.providers) {
-      window.ethereum.providers.forEach((provider, index) => {
-        console.log(`Provider ${index}:`, {
-          isMetaMask: provider.isMetaMask,
-          isTrust: provider.isTrust,
-          isTrustWallet: provider.isTrustWallet
-        });
-      });
-    }
-  }
   try {
     if (networkType === NETWORK_TYPES.ETHEREUM || networkType === NETWORK_TYPES.BSC) {
       if (!window.ethereum) {
         throw new Error("No Ethereum provider found. Please install Trust Wallet browser extension.");
       }
-      if (window.ethereum.isTrust === true || window.ethereum.isTrustWallet === true) {
-        trustProvider = window.ethereum;
-        console.log("✅ Found Trust Wallet via direct detection");
-      } else if (window.ethereum.providers && window.ethereum.providers.length > 0) {
-        trustProvider = window.ethereum.providers.find((p2) => p2.isTrust === true || p2.isTrustWallet === true);
-        if (trustProvider) {
-          console.log("✅ Found Trust Wallet in providers array");
-        } else {
-          const nonMetaMaskProvider = window.ethereum.providers.find((p2) => !p2.isMetaMask);
-          if (nonMetaMaskProvider) {
-            trustProvider = nonMetaMaskProvider;
-            console.log("✅ Found non-MetaMask provider, assuming it's Trust Wallet");
-          }
-        }
-      } else if (window.trustwallet && window.trustwallet.ethereum) {
-        trustProvider = window.trustwallet.ethereum;
-        console.log("✅ Found Trust Wallet via global trustwallet object");
-      } else if (window.ethereum && !window.ethereum.isMetaMask && !window.ethereum.isPhantom) {
-        console.log("🔍 Single provider detected, not MetaMask or Phantom - assuming Trust Wallet");
-        trustProvider = window.ethereum;
-      } else if (window.ethereum) {
-        console.log("🔍 Fallback strategy - testing main ethereum provider as Trust Wallet");
-        trustProvider = window.ethereum;
-      }
-      if (!trustProvider) {
-        throw new Error(`Trust Wallet provider not found. Available providers: ${window.ethereum.providers?.length || 1}. Please ensure Trust Wallet is properly installed and enabled.`);
-      }
-      console.log("🚀 Attempting to connect with Trust Wallet provider...");
-      let accounts;
-      try {
-        accounts = await trustProvider.request({
-          method: "eth_requestAccounts"
+      console.log("Available ethereum details:", {
+        isMetaMask: window.ethereum.isMetaMask,
+        isTrust: window.ethereum.isTrust,
+        isTrustWallet: window.ethereum.isTrustWallet,
+        providers: window.ethereum.providers?.length || 0,
+        selectedAddress: window.ethereum.selectedAddress
+      });
+      const providersToTry = [];
+      if (window.ethereum.providers && window.ethereum.providers.length > 0) {
+        providersToTry.push(...window.ethereum.providers);
+        console.log(`Found ${window.ethereum.providers.length} providers in array`);
+      } else {
+        providersToTry.push(window.ethereum);
+        console.log("Using main ethereum provider");
+      }
+      if (window.trustwallet?.ethereum) {
+        providersToTry.push(window.trustwallet.ethereum);
+        console.log("Added trustwallet.ethereum provider");
+      }
+      console.log(`Total providers to try: ${providersToTry.length}`);
+      let successfulProvider = null;
+      let accounts = null;
+      let lastError = null;
+      for (let i = 0; i < providersToTry.length; i++) {
+        const provider = providersToTry[i];
+        console.log(`
+🔍 Trying provider ${i + 1}/${providersToTry.length}:`, {
+          isMetaMask: provider.isMetaMask,
+          isTrust: provider.isTrust,
+          isTrustWallet: provider.isTrustWallet,
+          selectedAddress: provider.selectedAddress
         });
-      } catch (requestError) {
-        console.log("❌ Connection attempt failed:", requestError);
-        if (window.ethereum.providers && window.ethereum.providers.length > 1) {
-          console.log("🔄 Trying alternative providers...");
-          for (let i = 0; i < window.ethereum.providers.length; i++) {
-            const altProvider = window.ethereum.providers[i];
-            if (altProvider !== trustProvider) {
-              try {
-                console.log(`🔍 Testing provider ${i}...`);
-                const altAccounts = await altProvider.request({ method: "eth_requestAccounts" });
-                if (altAccounts && altAccounts.length > 0) {
-                  trustProvider = altProvider;
-                  accounts = altAccounts;
-                  console.log(`✅ Alternative provider ${i} worked!`);
-                  break;
-                }
-              } catch (altError) {
-                console.log(`❌ Alternative provider ${i} failed:`, altError.message);
-                continue;
-              }
+        try {
+          console.log(`📞 Requesting accounts from provider ${i + 1}...`);
+          const testAccounts = await provider.request({
+            method: "eth_requestAccounts"
+          });
+          if (testAccounts && testAccounts.length > 0) {
+            console.log(`✅ Provider ${i + 1} worked! Got ${testAccounts.length} accounts`);
+            console.log(`📝 First account: ${testAccounts[0]}`);
+            successfulProvider = provider;
+            accounts = testAccounts;
+            if (!provider.isMetaMask) {
+              console.log(`🎯 Provider ${i + 1} is not MetaMask - using this one!`);
+              break;
+            } else {
+              console.log(`⚠️ Provider ${i + 1} is MetaMask - will use it if no other works`);
             }
+          } else {
+            console.log(`❌ Provider ${i + 1} returned no accounts`);
+          }
+        } catch (providerError) {
+          console.log(`❌ Provider ${i + 1} failed:`, providerError.message);
+          lastError = providerError;
+          if (providerError.code === 4001) {
+            console.log("🛑 User rejected connection - stopping attempts");
+            throw new Error("Connection rejected by user. Please approve the connection in your wallet.");
           }
+          continue;
         }
-        if (!accounts) {
-          if (requestError.code === 4001) {
-            throw new Error("Connection rejected by user. Please approve the connection in Trust Wallet.");
+      }
+      if (!successfulProvider || !accounts || accounts.length === 0) {
+        console.error("❌ All providers failed");
+        if (lastError) {
+          if (lastError.code === 4001) {
+            throw new Error("Connection rejected by user. Please approve the connection in your wallet.");
           } else {
-            throw new Error(`Failed to connect to Trust Wallet: ${requestError.message}. Please make sure Trust Wallet is unlocked and try again.`);
+            throw new Error(`Connection failed: ${lastError.message}. Please make sure your wallet is unlocked and try again.`);
           }
+        } else {
+          throw new Error("No wallet accounts found. Please make sure Trust Wallet is unlocked and has at least one account.");
         }
       }
-      if (!accounts || accounts.length === 0) {
-        throw new Error("No accounts found in Trust Wallet. Please create an account or unlock your wallet.");
-      }
+      console.log("\n🎉 Successfully connected!");
+      console.log("Using provider:", {
+        isMetaMask: successfulProvider.isMetaMask,
+        isTrust: successfulProvider.isTrust,
+        isTrustWallet: successfulProvider.isTrustWallet
+      });
       const address = accounts[0];
       let chainIdHex, chainId;
       try {
-        chainIdHex = await trustProvider.request({ method: "eth_chainId" });
+        chainIdHex = await successfulProvider.request({ method: "eth_chainId" });
         chainId = parseInt(chainIdHex, 16);
+        console.log("Chain ID:", chainId);
       } catch (chainError) {
         console.warn("Could not get chain ID:", chainError);
         chainId = 1;
@@ -22115,7 +22108,7 @@ const connectTrustWallet = async (targetNetwork = null) => {
         default:
           networkType = `unknown-${chainId}`;
       }
-      const web3Provider = new BrowserProvider(trustProvider);
+      const web3Provider = new BrowserProvider(successfulProvider);
       console.log("✅ Trust Wallet connected successfully:", {
         address,
         network: networkType,
@@ -22129,15 +22122,12 @@ const connectTrustWallet = async (targetNetwork = null) => {
         network: networkType,
         isConnected: true,
         chainId,
-        nativeProvider: trustProvider
+        nativeProvider: successfulProvider
       };
     } else if (networkType === NETWORK_TYPES.TRON) {
       if (!window.tronWeb) {
         throw new Error("TronWeb not found. Please install Trust Wallet with TRON support or use Trust Wallet mobile app.");
       }
-      if (window.tronWeb.isTrust !== true && !window.trustwallet) {
-        console.warn("TronWeb detected but may not be from Trust Wallet");
-      }
       const waitForTronWeb = async (maxAttempts = 10, interval = 500) => {
         for (let attempt = 0; attempt < maxAttempts; attempt++) {
           if (window.tronWeb && window.tronWeb.ready) {
@@ -22202,14 +22192,12 @@ const connectTrustWallet = async (targetNetwork = null) => {
     console.error("=== TRUST WALLET CONNECTION ERROR ===");
     console.error("Error details:", error);
     console.log("=== END TRUST WALLET CONNECTION DEBUG ===");
-    if (error.code === 4001 || error.message.includes("rejected")) {
-      throw new Error("Connection rejected by user. Please approve the connection in Trust Wallet.");
+    if (error.code === 4001 || error.message.includes("rejected by user")) {
+      throw error;
     } else if (error.message.includes("locked")) {
       throw new Error("Trust Wallet is locked. Please unlock your wallet and try again.");
-    } else if (error.message.includes("install") || error.message.includes("not detected") || error.message.includes("not found")) {
-      throw error;
     } else {
-      throw new Error(`Failed to connect to Trust Wallet: ${error.message}`);
+      throw error;
     }
   }
 };