@unifold/ui-web 0.1.59 → 0.1.60

package/dist/index.js

@@ -44159,6 +44159,56 @@ var cva = (base, config) => (props) => {
   }, []);
   return cx(base, getVariantClassNames, getCompoundVariantClassNames, props === null || props === void 0 ? void 0 : props.class, props === null || props === void 0 ? void 0 : props.className);
 };
+function requestProviders(listener) {
+  if (typeof window === "undefined")
+    return;
+  const handler = (event) => listener(event.detail);
+  window.addEventListener("eip6963:announceProvider", handler);
+  window.dispatchEvent(new CustomEvent("eip6963:requestProvider"));
+  return () => window.removeEventListener("eip6963:announceProvider", handler);
+}
+function createStore() {
+  const listeners = /* @__PURE__ */ new Set();
+  let providerDetails = [];
+  const request = () => requestProviders((providerDetail) => {
+    if (providerDetails.some(({ info }) => info.uuid === providerDetail.info.uuid))
+      return;
+    providerDetails = [...providerDetails, providerDetail];
+    listeners.forEach((listener) => listener(providerDetails, { added: [providerDetail] }));
+  });
+  let unwatch = request();
+  return {
+    _listeners() {
+      return listeners;
+    },
+    clear() {
+      listeners.forEach((listener) => listener([], { removed: [...providerDetails] }));
+      providerDetails = [];
+    },
+    destroy() {
+      this.clear();
+      listeners.clear();
+      unwatch?.();
+    },
+    findProvider({ rdns }) {
+      return providerDetails.find((providerDetail) => providerDetail.info.rdns === rdns);
+    },
+    getProviders() {
+      return providerDetails;
+    },
+    reset() {
+      this.clear();
+      unwatch?.();
+      unwatch = request();
+    },
+    subscribe(listener, { emitImmediately } = {}) {
+      listeners.add(listener);
+      if (emitImmediately)
+        listener(providerDetails, { added: providerDetails });
+      return () => listeners.delete(listener);
+    }
+  };
+}
 function isArray(value) {
   return !Array.isArray ? getTag(value) === "[object Array]" : Array.isArray(value);
 }
@@ -51452,7 +51502,7 @@ function interpolate(template, params) {
 }
 var DEPOSIT_CONFIRM_DELAY_MS = 5e3;
 var POLL_INTERVAL_MS = 2500;
-var POLL_ENDPOINT_INTERVAL_MS = 3e3;
+var POLL_ENDPOINT_INTERVAL_MS = 5e3;
 var CUTOFF_BUFFER_MS = 6e4;
 function useDepositPolling({
   userId,
@@ -55094,6 +55144,53 @@ function CashAppButton({
     }
   );
 }
+var _store = null;
+function getEip6963Store() {
+  if (typeof window === "undefined") return null;
+  if (!_store) {
+    _store = createStore();
+  }
+  return _store;
+}
+var RDNS_TO_WALLET_ID = {
+  "io.metamask": "metamask",
+  "io.metamask.flask": "metamask",
+  "io.metamask.mmi": "metamask",
+  "app.phantom": "phantom",
+  "com.coinbase.wallet": "coinbase",
+  "com.okex.wallet": "okx",
+  "io.rabby": "rabby",
+  "com.trustwallet.app": "trust",
+  "me.rainbow": "rainbow"
+};
+function rdnsToWalletId(rdns) {
+  if (RDNS_TO_WALLET_ID[rdns]) return RDNS_TO_WALLET_ID[rdns];
+  if (rdns.includes("metamask")) return "metamask";
+  if (rdns.includes("phantom")) return "phantom";
+  if (rdns.includes("coinbase")) return "coinbase";
+  if (rdns.includes("okx") || rdns.includes("okex")) return "okx";
+  if (rdns.includes("rabby")) return "rabby";
+  if (rdns.includes("trust")) return "trust";
+  if (rdns.includes("rainbow")) return "rainbow";
+  return "unknown";
+}
+function getEip6963Providers() {
+  const store = getEip6963Store();
+  if (!store) return [];
+  return store.getProviders().map((detail) => ({
+    walletId: rdnsToWalletId(detail.info.rdns),
+    provider: detail.provider,
+    info: detail.info
+  }));
+}
+function findProviderByWalletId(walletId) {
+  return getEip6963Providers().find((p) => p.walletId === walletId);
+}
+function collectAllEip6963EthProviders() {
+  const store = getEip6963Store();
+  if (!store) return [];
+  return store.getProviders().map((d) => d.provider);
+}
 var SOLANA_DISCONNECT_TYPES = [
   "phantom-solana",
   "solflare",
@@ -55133,8 +55230,9 @@ function collectEthereumProvidersForDisconnect(win) {
       out.push(p);
     }
   };
-  const list = anyWin.__eip6963Providers || [];
-  for (const d of list) add(d.provider);
+  for (const p of collectAllEip6963EthProviders()) {
+    add(p);
+  }
   add(win.ethereum);
   add(
     win.phantom?.ethereum
@@ -57140,30 +57238,13 @@ function BrowserWalletButton({
   }, []);
   const [eip6963ProviderCount, setEip6963ProviderCount] = React242.useState(0);
   React242.useEffect(() => {
-    if (typeof window === "undefined") return;
-    const anyWin = window;
-    if (!anyWin.__eip6963Providers) {
-      anyWin.__eip6963Providers = [];
-    }
-    const handleAnnouncement = (event) => {
-      const { detail } = event;
-      if (!detail?.info || !detail?.provider) return;
-      const exists = anyWin.__eip6963Providers.some(
-        (p) => p.info.uuid === detail.info.uuid
-      );
-      if (!exists) {
-        anyWin.__eip6963Providers.push(detail);
-        setEip6963ProviderCount(anyWin.__eip6963Providers.length);
-      }
-    };
-    window.addEventListener("eip6963:announceProvider", handleAnnouncement);
-    window.dispatchEvent(new Event("eip6963:requestProvider"));
-    return () => {
-      window.removeEventListener(
-        "eip6963:announceProvider",
-        handleAnnouncement
-      );
-    };
+    const store = getEip6963Store();
+    if (!store) return;
+    setEip6963ProviderCount(store.getProviders().length);
+    const unsubscribe = store.subscribe((providers) => {
+      setEip6963ProviderCount(providers.length);
+    });
+    return unsubscribe;
   }, []);
   React242.useEffect(() => {
     if (!wallet || !publishableKey) {
@@ -57222,7 +57303,7 @@ function BrowserWalletButton({
           return;
         }
         if (!chainType || chainType === "solana") {
-          const anyWin2 = win;
+          const anyWin = win;
           const trySilentSolana = async (provider, type, name, icon) => {
             if (!provider) return false;
             if (provider.isConnected && provider.publicKey) {
@@ -57261,21 +57342,21 @@ function BrowserWalletButton({
           ))
             return;
           if (await trySilentSolana(
-            anyWin2.solflare,
+            anyWin.solflare,
             "solflare",
             "Solflare",
             "solflare"
           ))
             return;
           if (await trySilentSolana(
-            anyWin2.backpack,
+            anyWin.backpack,
             "backpack",
             "Backpack",
             "backpack"
           ))
             return;
           if (await trySilentSolana(
-            anyWin2.glow,
+            anyWin.glow,
             "glow",
             "Glow",
             "glow"
@@ -57283,19 +57364,14 @@ function BrowserWalletButton({
             return;
         }
         if (!chainType || chainType === "ethereum") {
-          const anyWin2 = win;
+          const anyWin = win;
           const allProviders = [];
-          const eip6963Providers = anyWin2.__eip6963Providers || [];
-          for (const { info, provider } of eip6963Providers) {
-            let walletId = "default";
-            if (info.rdns.includes("metamask")) walletId = "metamask";
-            else if (info.rdns.includes("phantom")) walletId = "phantom";
-            else if (info.rdns.includes("coinbase")) walletId = "coinbase";
-            else if (info.rdns.includes("okx")) walletId = "okx";
-            else if (info.rdns.includes("rabby")) walletId = "rabby";
-            else if (info.rdns.includes("trust")) walletId = "trust";
-            else if (info.rdns.includes("rainbow")) walletId = "rainbow";
-            allProviders.push({ provider, walletId });
+          const eip6963 = getEip6963Providers();
+          for (const { provider, walletId } of eip6963) {
+            allProviders.push({
+              provider,
+              walletId: walletId === "unknown" ? "default" : walletId
+            });
           }
           if (allProviders.length === 0) {
             if (win.phantom?.ethereum) {
@@ -57304,15 +57380,15 @@ function BrowserWalletButton({
                 walletId: "phantom"
               });
             }
-            if (anyWin2.okxwallet) {
+            if (anyWin.okxwallet) {
               allProviders.push({
-                provider: anyWin2.okxwallet,
+                provider: anyWin.okxwallet,
                 walletId: "okx"
               });
             }
-            if (anyWin2.coinbaseWalletExtension) {
+            if (anyWin.coinbaseWalletExtension) {
               allProviders.push({
-                provider: anyWin2.coinbaseWalletExtension,
+                provider: anyWin.coinbaseWalletExtension,
                 walletId: "coinbase"
               });
             }
@@ -57336,7 +57412,7 @@ function BrowserWalletButton({
               });
               if (!accounts || accounts.length === 0) continue;
               const address = accounts[0];
-              const resolved = identifyEthWallet(provider, anyWin2, walletId);
+              const resolved = identifyEthWallet(provider, anyWin, walletId);
               if (mounted) {
                 setWallet({ ...resolved, address });
                 setIsLoading(false);
@@ -57378,15 +57454,11 @@ function BrowserWalletButton({
       solanaProvider.on("disconnect", handleDisconnect);
       solanaProvider.on("accountChanged", handleAccountsChanged);
     }
-    const anyWin = window;
     const ethProviders = [];
-    if (anyWin.__eip6963Providers) {
-      for (const {
-        provider
-      } of anyWin.__eip6963Providers) {
-        if (provider && !ethProviders.includes(provider)) {
-          ethProviders.push(provider);
-        }
+    for (const { provider } of getEip6963Providers()) {
+      const p = provider;
+      if (p && !ethProviders.includes(p)) {
+        ethProviders.push(p);
       }
     }
     if (window.ethereum && !ethProviders.includes(window.ethereum)) {
@@ -57488,7 +57560,7 @@ function BrowserWalletButton({
   if (isLoading) {
     return null;
   }
-  const hasWalletExtension = (!chainType || chainType === "solana") && (window.phantom?.solana?.isPhantom || window.solana?.isPhantom) ? true : (!chainType || chainType === "ethereum") && (window.phantom?.ethereum || window.ethereum) ? true : false;
+  const hasWalletExtension = (!chainType || chainType === "ethereum") && getEip6963Providers().length > 0 || (!chainType || chainType === "solana") && (window.phantom?.solana?.isPhantom || window.solana?.isPhantom) || (!chainType || chainType === "ethereum") && (window.phantom?.ethereum || window.ethereum);
   if (!onConnectClick && !wallet && !hasWalletExtension) {
     return null;
   }
@@ -62996,15 +63068,10 @@ var WALLET_DEFINITIONS = [
   { id: "backpack", name: "Backpack", networks: ["solana"], installUrl: "https://backpack.app/" },
   { id: "glow", name: "Glow", networks: ["solana"], installUrl: "https://glow.app/" }
 ];
-function getWalletProviders() {
+function getSolanaProviders() {
   if (typeof window === "undefined") return {};
   const win = window;
   return {
-    ethereum: win.ethereum,
-    phantomEthereum: win.phantom?.ethereum,
-    coinbaseEthereum: win.coinbaseWalletExtension,
-    trustEthereum: win.trustwallet?.ethereum,
-    okxEthereum: win.okxwallet,
     phantomSolana: win.phantom?.solana,
     solflare: win.solflare,
     backpack: win.backpack,
@@ -63012,37 +63079,71 @@ function getWalletProviders() {
     coinbaseSolana: win.coinbaseSolana || win.coinbaseWalletExtension?.solana
   };
 }
+function getLegacyEvmProviders() {
+  if (typeof window === "undefined") return {};
+  const win = window;
+  return {
+    ethereum: win.ethereum,
+    phantomEthereum: win.phantom?.ethereum,
+    coinbaseEthereum: win.coinbaseWalletExtension,
+    trustEthereum: win.trustwallet?.ethereum,
+    okxEthereum: win.okxwallet
+  };
+}
 function detectAvailableWallets(filterChainType) {
-  const providers = getWalletProviders();
+  const solProviders = getSolanaProviders();
+  const legacyEvm = getLegacyEvmProviders();
+  const eip6963List = getEip6963Providers();
   const win = typeof window !== "undefined" ? window : null;
+  const hasEip6963 = (walletId) => eip6963List.some((d) => {
+    const rdns = d.info?.rdns || "";
+    switch (walletId) {
+      case "metamask":
+        return rdns.includes("metamask");
+      case "phantom":
+        return rdns.includes("phantom");
+      case "coinbase":
+        return rdns.includes("coinbase");
+      case "trust":
+        return rdns.includes("trust");
+      case "rainbow":
+        return rdns.includes("rainbow");
+      case "rabby":
+        return rdns.includes("rabby");
+      case "okx":
+        return rdns.includes("okx") || rdns.includes("okex");
+      default:
+        return false;
+    }
+  });
   return WALLET_DEFINITIONS.filter((w) => !filterChainType || w.networks.includes(filterChainType)).map((wallet) => {
     let isInstalled = false;
     const detectedNetworks = [];
     switch (wallet.id) {
       case "metamask":
-        isInstalled = !!(providers.ethereum?.isMetaMask && !providers.ethereum?.isPhantom && !providers.ethereum?.isRabby && !providers.ethereum?.isOkxWallet);
+        isInstalled = hasEip6963("metamask") || !!(legacyEvm.ethereum?.isMetaMask && !legacyEvm.ethereum?.isPhantom && !legacyEvm.ethereum?.isRabby && !legacyEvm.ethereum?.isOkxWallet);
         if (isInstalled) detectedNetworks.push("ethereum");
         break;
       case "phantom":
-        if (providers.phantomSolana?.isPhantom) {
+        if (solProviders.phantomSolana?.isPhantom) {
           isInstalled = true;
           detectedNetworks.push("solana");
         }
-        if (providers.phantomEthereum?.isPhantom) {
+        if (hasEip6963("phantom") || legacyEvm.phantomEthereum?.isPhantom) {
           isInstalled = true;
           detectedNetworks.push("ethereum");
         }
         break;
       case "coinbase":
-        if (providers.coinbaseEthereum || providers.ethereum?.isCoinbaseWallet) {
+        if (hasEip6963("coinbase") || legacyEvm.coinbaseEthereum || legacyEvm.ethereum?.isCoinbaseWallet) {
           isInstalled = true;
           detectedNetworks.push("ethereum");
         }
-        if (providers.coinbaseSolana || win?.coinbaseWalletExtension?.solana) detectedNetworks.push("solana");
+        if (solProviders.coinbaseSolana || win?.coinbaseWalletExtension?.solana) detectedNetworks.push("solana");
         if (isInstalled && wallet.networks.includes("solana") && !detectedNetworks.includes("solana")) detectedNetworks.push("solana");
         break;
       case "trust":
-        if (providers.trustEthereum || providers.ethereum?.isTrust || win?.trustwallet) {
+        if (hasEip6963("trust") || legacyEvm.trustEthereum || legacyEvm.ethereum?.isTrust || win?.trustwallet) {
           isInstalled = true;
           detectedNetworks.push("ethereum");
         }
@@ -63050,27 +63151,27 @@ function detectAvailableWallets(filterChainType) {
         if (isInstalled && wallet.networks.includes("solana") && !detectedNetworks.includes("solana")) detectedNetworks.push("solana");
         break;
       case "rainbow":
-        isInstalled = !!providers.ethereum?.isRainbow;
+        isInstalled = hasEip6963("rainbow") || !!legacyEvm.ethereum?.isRainbow;
         if (isInstalled) detectedNetworks.push("ethereum");
         break;
       case "rabby":
-        isInstalled = !!providers.ethereum?.isRabby;
+        isInstalled = hasEip6963("rabby") || !!legacyEvm.ethereum?.isRabby;
         if (isInstalled) detectedNetworks.push("ethereum");
         break;
       case "okx":
-        isInstalled = !!(providers.okxEthereum || providers.ethereum?.isOkxWallet);
+        isInstalled = hasEip6963("okx") || !!(legacyEvm.okxEthereum || legacyEvm.ethereum?.isOkxWallet);
         if (isInstalled) detectedNetworks.push("ethereum");
         break;
       case "solflare":
-        isInstalled = !!providers.solflare?.isSolflare;
+        isInstalled = !!solProviders.solflare?.isSolflare;
         if (isInstalled) detectedNetworks.push("solana");
         break;
       case "backpack":
-        isInstalled = !!(providers.backpack?.isBackpack || win?.backpack);
+        isInstalled = !!(solProviders.backpack?.isBackpack || win?.backpack);
         if (isInstalled) detectedNetworks.push("solana");
         break;
       case "glow":
-        isInstalled = !!(providers.glow?.isGlow || win?.glow);
+        isInstalled = !!(solProviders.glow?.isGlow || win?.glow);
         if (isInstalled) detectedNetworks.push("solana");
         break;
     }
@@ -63125,7 +63226,16 @@ function WalletConnect({
   const [connectingNetwork, setConnectingNetwork] = React292.useState(null);
   const [walletError, setWalletError] = React292.useState(null);
   const [isWalletConnecting, setIsWalletConnecting] = React292.useState(false);
-  const availableWallets = React292.useMemo(() => detectAvailableWallets(), []);
+  const [eip6963ProviderCount, setEip6963ProviderCount] = React292.useState(0);
+  React292.useEffect(() => {
+    const store = getEip6963Store();
+    if (!store) return;
+    setEip6963ProviderCount(store.getProviders().length);
+    return store.subscribe((providers) => {
+      setEip6963ProviderCount(providers.length);
+    });
+  }, []);
+  const availableWallets = React292.useMemo(() => detectAvailableWallets(), [eip6963ProviderCount]);
   const [balances, setBalances] = React292.useState([]);
   const [isLoading, setIsLoading] = React292.useState(false);
   const [selectedBalance, setSelectedBalance] = React292.useState(null);
@@ -63184,59 +63294,72 @@ function WalletConnect({
     setWalletError(null);
     setIsWalletConnecting(true);
     try {
-      const providers = getWalletProviders();
       const win = typeof window !== "undefined" ? window : null;
       let connectedInfo;
       if (network === "ethereum") {
-        let provider;
-        switch (wallet.id) {
-          case "metamask":
-            if (providers.ethereum?.isMetaMask && !providers.ethereum?.isPhantom) provider = providers.ethereum;
-            break;
-          case "phantom":
-            provider = providers.phantomEthereum;
-            break;
-          case "coinbase":
-            provider = providers.coinbaseEthereum || (providers.ethereum?.isCoinbaseWallet ? providers.ethereum : void 0);
-            break;
-          case "trust":
-            provider = providers.trustEthereum || (providers.ethereum?.isTrust ? providers.ethereum : void 0);
-            break;
-          case "rainbow":
-            if (providers.ethereum?.isRainbow) provider = providers.ethereum;
-            break;
-          case "rabby":
-            if (providers.ethereum?.isRabby) provider = providers.ethereum;
-            break;
-          case "okx":
-            provider = providers.okxEthereum || (providers.ethereum?.isOkxWallet ? providers.ethereum : void 0);
-            break;
-          default:
-            provider = providers.ethereum;
+        const eip6963Match = findProviderByWalletId(wallet.id);
+        let provider = eip6963Match?.provider;
+        if (!provider) {
+          const legacyEvm = getLegacyEvmProviders();
+          switch (wallet.id) {
+            case "metamask":
+              if (legacyEvm.ethereum?.isMetaMask && !legacyEvm.ethereum?.isPhantom) provider = legacyEvm.ethereum;
+              break;
+            case "phantom":
+              provider = legacyEvm.phantomEthereum;
+              break;
+            case "coinbase":
+              provider = legacyEvm.coinbaseEthereum || (legacyEvm.ethereum?.isCoinbaseWallet ? legacyEvm.ethereum : void 0);
+              break;
+            case "trust":
+              provider = legacyEvm.trustEthereum || (legacyEvm.ethereum?.isTrust ? legacyEvm.ethereum : void 0);
+              break;
+            case "rainbow":
+              if (legacyEvm.ethereum?.isRainbow) provider = legacyEvm.ethereum;
+              break;
+            case "rabby":
+              if (legacyEvm.ethereum?.isRabby) provider = legacyEvm.ethereum;
+              break;
+            case "okx":
+              provider = legacyEvm.okxEthereum || (legacyEvm.ethereum?.isOkxWallet ? legacyEvm.ethereum : void 0);
+              break;
+            default:
+              provider = legacyEvm.ethereum;
+          }
         }
         if (!provider) throw new Error(`${wallet.name} wallet not found. Please install it.`);
         const accounts = await provider.request({ method: "eth_requestAccounts" });
         if (!accounts?.length) throw new Error("No accounts returned from wallet");
         setUserDisconnectedWallet(false);
-        const walletType = wallet.id === "phantom" ? "phantom-ethereum" : wallet.id === "coinbase" ? "coinbase" : "metamask";
+        const walletIdToType = {
+          phantom: "phantom-ethereum",
+          coinbase: "coinbase",
+          trust: "trust",
+          rainbow: "rainbow",
+          rabby: "rabby",
+          okx: "okx",
+          metamask: "metamask"
+        };
+        const walletType = walletIdToType[wallet.id] || "metamask";
         connectedInfo = { type: walletType, name: wallet.name, address: accounts[0], icon: wallet.id };
       } else {
+        const solProviders = getSolanaProviders();
         let provider;
         switch (wallet.id) {
           case "phantom":
-            provider = providers.phantomSolana;
+            provider = solProviders.phantomSolana;
             break;
           case "solflare":
-            provider = providers.solflare;
+            provider = solProviders.solflare;
             break;
           case "backpack":
-            provider = providers.backpack || win?.backpack;
+            provider = solProviders.backpack || win?.backpack;
             break;
           case "glow":
-            provider = providers.glow || win?.glow;
+            provider = solProviders.glow || win?.glow;
             break;
           case "coinbase":
-            provider = providers.coinbaseSolana || win?.coinbaseWalletExtension?.solana;
+            provider = solProviders.coinbaseSolana || win?.coinbaseWalletExtension?.solana;
             break;
           case "trust":
             provider = win?.trustwallet?.solana;
@@ -63482,10 +63605,15 @@ function WalletConnect({
   };
   const sendEthereumTransaction = async (token, amountStr) => {
     if (!recipientAddress || !/^0x[a-fA-F0-9]{40}$/.test(recipientAddress)) throw new Error(`Invalid recipient address.`);
-    let provider;
-    if (walletInfo.type === "phantom-ethereum") provider = window.phantom?.ethereum;
-    else if (walletInfo.type === "coinbase") provider = window.coinbaseWalletExtension || window.ethereum;
-    else provider = window.ethereum;
+    const walletIdMap = { "phantom-ethereum": "phantom", coinbase: "coinbase", trust: "trust", okx: "okx", rainbow: "rainbow", rabby: "rabby", metamask: "metamask" };
+    const lookupId = walletIdMap[walletInfo.type] || walletInfo.type;
+    const eip6963Match = findProviderByWalletId(lookupId);
+    let provider = eip6963Match?.provider;
+    if (!provider) {
+      if (walletInfo.type === "phantom-ethereum") provider = window.phantom?.ethereum;
+      else if (walletInfo.type === "coinbase") provider = window.coinbaseWalletExtension || window.ethereum;
+      else provider = window.ethereum;
+    }
     if (!provider) throw new Error("Ethereum wallet not found");
     const currentChainIdHex = await provider.request({ method: "eth_chainId", params: [] });
     if (parseInt(currentChainIdHex, 16).toString() !== token.chain_id) {
@@ -65319,7 +65447,7 @@ function useExecutions(userId, publishableKey, options2) {
   });
 }
 var POLL_INTERVAL_MS3 = 2500;
-var POLL_ENDPOINT_INTERVAL_MS2 = 3e3;
+var POLL_ENDPOINT_INTERVAL_MS2 = 5e3;
 var CUTOFF_BUFFER_MS2 = 6e4;
 function useWithdrawPolling({
   userId,

package/dist/index.mjs

@@ -44146,6 +44146,56 @@ var cva = (base, config) => (props) => {
   }, []);
   return cx(base, getVariantClassNames, getCompoundVariantClassNames, props === null || props === void 0 ? void 0 : props.class, props === null || props === void 0 ? void 0 : props.className);
 };
+function requestProviders(listener) {
+  if (typeof window === "undefined")
+    return;
+  const handler = (event) => listener(event.detail);
+  window.addEventListener("eip6963:announceProvider", handler);
+  window.dispatchEvent(new CustomEvent("eip6963:requestProvider"));
+  return () => window.removeEventListener("eip6963:announceProvider", handler);
+}
+function createStore() {
+  const listeners = /* @__PURE__ */ new Set();
+  let providerDetails = [];
+  const request = () => requestProviders((providerDetail) => {
+    if (providerDetails.some(({ info }) => info.uuid === providerDetail.info.uuid))
+      return;
+    providerDetails = [...providerDetails, providerDetail];
+    listeners.forEach((listener) => listener(providerDetails, { added: [providerDetail] }));
+  });
+  let unwatch = request();
+  return {
+    _listeners() {
+      return listeners;
+    },
+    clear() {
+      listeners.forEach((listener) => listener([], { removed: [...providerDetails] }));
+      providerDetails = [];
+    },
+    destroy() {
+      this.clear();
+      listeners.clear();
+      unwatch?.();
+    },
+    findProvider({ rdns }) {
+      return providerDetails.find((providerDetail) => providerDetail.info.rdns === rdns);
+    },
+    getProviders() {
+      return providerDetails;
+    },
+    reset() {
+      this.clear();
+      unwatch?.();
+      unwatch = request();
+    },
+    subscribe(listener, { emitImmediately } = {}) {
+      listeners.add(listener);
+      if (emitImmediately)
+        listener(providerDetails, { added: providerDetails });
+      return () => listeners.delete(listener);
+    }
+  };
+}
 function isArray(value) {
   return !Array.isArray ? getTag(value) === "[object Array]" : Array.isArray(value);
 }
@@ -51439,7 +51489,7 @@ function interpolate(template, params) {
 }
 var DEPOSIT_CONFIRM_DELAY_MS = 5e3;
 var POLL_INTERVAL_MS = 2500;
-var POLL_ENDPOINT_INTERVAL_MS = 3e3;
+var POLL_ENDPOINT_INTERVAL_MS = 5e3;
 var CUTOFF_BUFFER_MS = 6e4;
 function useDepositPolling({
   userId,
@@ -55081,6 +55131,53 @@ function CashAppButton({
     }
   );
 }
+var _store = null;
+function getEip6963Store() {
+  if (typeof window === "undefined") return null;
+  if (!_store) {
+    _store = createStore();
+  }
+  return _store;
+}
+var RDNS_TO_WALLET_ID = {
+  "io.metamask": "metamask",
+  "io.metamask.flask": "metamask",
+  "io.metamask.mmi": "metamask",
+  "app.phantom": "phantom",
+  "com.coinbase.wallet": "coinbase",
+  "com.okex.wallet": "okx",
+  "io.rabby": "rabby",
+  "com.trustwallet.app": "trust",
+  "me.rainbow": "rainbow"
+};
+function rdnsToWalletId(rdns) {
+  if (RDNS_TO_WALLET_ID[rdns]) return RDNS_TO_WALLET_ID[rdns];
+  if (rdns.includes("metamask")) return "metamask";
+  if (rdns.includes("phantom")) return "phantom";
+  if (rdns.includes("coinbase")) return "coinbase";
+  if (rdns.includes("okx") || rdns.includes("okex")) return "okx";
+  if (rdns.includes("rabby")) return "rabby";
+  if (rdns.includes("trust")) return "trust";
+  if (rdns.includes("rainbow")) return "rainbow";
+  return "unknown";
+}
+function getEip6963Providers() {
+  const store = getEip6963Store();
+  if (!store) return [];
+  return store.getProviders().map((detail) => ({
+    walletId: rdnsToWalletId(detail.info.rdns),
+    provider: detail.provider,
+    info: detail.info
+  }));
+}
+function findProviderByWalletId(walletId) {
+  return getEip6963Providers().find((p) => p.walletId === walletId);
+}
+function collectAllEip6963EthProviders() {
+  const store = getEip6963Store();
+  if (!store) return [];
+  return store.getProviders().map((d) => d.provider);
+}
 var SOLANA_DISCONNECT_TYPES = [
   "phantom-solana",
   "solflare",
@@ -55120,8 +55217,9 @@ function collectEthereumProvidersForDisconnect(win) {
       out.push(p);
     }
   };
-  const list = anyWin.__eip6963Providers || [];
-  for (const d of list) add(d.provider);
+  for (const p of collectAllEip6963EthProviders()) {
+    add(p);
+  }
   add(win.ethereum);
   add(
     win.phantom?.ethereum
@@ -57127,30 +57225,13 @@ function BrowserWalletButton({
   }, []);
   const [eip6963ProviderCount, setEip6963ProviderCount] = React242.useState(0);
   React242.useEffect(() => {
-    if (typeof window === "undefined") return;
-    const anyWin = window;
-    if (!anyWin.__eip6963Providers) {
-      anyWin.__eip6963Providers = [];
-    }
-    const handleAnnouncement = (event) => {
-      const { detail } = event;
-      if (!detail?.info || !detail?.provider) return;
-      const exists = anyWin.__eip6963Providers.some(
-        (p) => p.info.uuid === detail.info.uuid
-      );
-      if (!exists) {
-        anyWin.__eip6963Providers.push(detail);
-        setEip6963ProviderCount(anyWin.__eip6963Providers.length);
-      }
-    };
-    window.addEventListener("eip6963:announceProvider", handleAnnouncement);
-    window.dispatchEvent(new Event("eip6963:requestProvider"));
-    return () => {
-      window.removeEventListener(
-        "eip6963:announceProvider",
-        handleAnnouncement
-      );
-    };
+    const store = getEip6963Store();
+    if (!store) return;
+    setEip6963ProviderCount(store.getProviders().length);
+    const unsubscribe = store.subscribe((providers) => {
+      setEip6963ProviderCount(providers.length);
+    });
+    return unsubscribe;
   }, []);
   React242.useEffect(() => {
     if (!wallet || !publishableKey) {
@@ -57209,7 +57290,7 @@ function BrowserWalletButton({
           return;
         }
         if (!chainType || chainType === "solana") {
-          const anyWin2 = win;
+          const anyWin = win;
           const trySilentSolana = async (provider, type, name, icon) => {
             if (!provider) return false;
             if (provider.isConnected && provider.publicKey) {
@@ -57248,21 +57329,21 @@ function BrowserWalletButton({
           ))
             return;
           if (await trySilentSolana(
-            anyWin2.solflare,
+            anyWin.solflare,
             "solflare",
             "Solflare",
             "solflare"
           ))
             return;
           if (await trySilentSolana(
-            anyWin2.backpack,
+            anyWin.backpack,
             "backpack",
             "Backpack",
             "backpack"
           ))
             return;
           if (await trySilentSolana(
-            anyWin2.glow,
+            anyWin.glow,
             "glow",
             "Glow",
             "glow"
@@ -57270,19 +57351,14 @@ function BrowserWalletButton({
             return;
         }
         if (!chainType || chainType === "ethereum") {
-          const anyWin2 = win;
+          const anyWin = win;
           const allProviders = [];
-          const eip6963Providers = anyWin2.__eip6963Providers || [];
-          for (const { info, provider } of eip6963Providers) {
-            let walletId = "default";
-            if (info.rdns.includes("metamask")) walletId = "metamask";
-            else if (info.rdns.includes("phantom")) walletId = "phantom";
-            else if (info.rdns.includes("coinbase")) walletId = "coinbase";
-            else if (info.rdns.includes("okx")) walletId = "okx";
-            else if (info.rdns.includes("rabby")) walletId = "rabby";
-            else if (info.rdns.includes("trust")) walletId = "trust";
-            else if (info.rdns.includes("rainbow")) walletId = "rainbow";
-            allProviders.push({ provider, walletId });
+          const eip6963 = getEip6963Providers();
+          for (const { provider, walletId } of eip6963) {
+            allProviders.push({
+              provider,
+              walletId: walletId === "unknown" ? "default" : walletId
+            });
           }
           if (allProviders.length === 0) {
             if (win.phantom?.ethereum) {
@@ -57291,15 +57367,15 @@ function BrowserWalletButton({
                 walletId: "phantom"
               });
             }
-            if (anyWin2.okxwallet) {
+            if (anyWin.okxwallet) {
               allProviders.push({
-                provider: anyWin2.okxwallet,
+                provider: anyWin.okxwallet,
                 walletId: "okx"
               });
             }
-            if (anyWin2.coinbaseWalletExtension) {
+            if (anyWin.coinbaseWalletExtension) {
               allProviders.push({
-                provider: anyWin2.coinbaseWalletExtension,
+                provider: anyWin.coinbaseWalletExtension,
                 walletId: "coinbase"
               });
             }
@@ -57323,7 +57399,7 @@ function BrowserWalletButton({
               });
               if (!accounts || accounts.length === 0) continue;
               const address = accounts[0];
-              const resolved = identifyEthWallet(provider, anyWin2, walletId);
+              const resolved = identifyEthWallet(provider, anyWin, walletId);
               if (mounted) {
                 setWallet({ ...resolved, address });
                 setIsLoading(false);
@@ -57365,15 +57441,11 @@ function BrowserWalletButton({
       solanaProvider.on("disconnect", handleDisconnect);
       solanaProvider.on("accountChanged", handleAccountsChanged);
     }
-    const anyWin = window;
     const ethProviders = [];
-    if (anyWin.__eip6963Providers) {
-      for (const {
-        provider
-      } of anyWin.__eip6963Providers) {
-        if (provider && !ethProviders.includes(provider)) {
-          ethProviders.push(provider);
-        }
+    for (const { provider } of getEip6963Providers()) {
+      const p = provider;
+      if (p && !ethProviders.includes(p)) {
+        ethProviders.push(p);
       }
     }
     if (window.ethereum && !ethProviders.includes(window.ethereum)) {
@@ -57475,7 +57547,7 @@ function BrowserWalletButton({
   if (isLoading) {
     return null;
   }
-  const hasWalletExtension = (!chainType || chainType === "solana") && (window.phantom?.solana?.isPhantom || window.solana?.isPhantom) ? true : (!chainType || chainType === "ethereum") && (window.phantom?.ethereum || window.ethereum) ? true : false;
+  const hasWalletExtension = (!chainType || chainType === "ethereum") && getEip6963Providers().length > 0 || (!chainType || chainType === "solana") && (window.phantom?.solana?.isPhantom || window.solana?.isPhantom) || (!chainType || chainType === "ethereum") && (window.phantom?.ethereum || window.ethereum);
   if (!onConnectClick && !wallet && !hasWalletExtension) {
     return null;
   }
@@ -62983,15 +63055,10 @@ var WALLET_DEFINITIONS = [
   { id: "backpack", name: "Backpack", networks: ["solana"], installUrl: "https://backpack.app/" },
   { id: "glow", name: "Glow", networks: ["solana"], installUrl: "https://glow.app/" }
 ];
-function getWalletProviders() {
+function getSolanaProviders() {
   if (typeof window === "undefined") return {};
   const win = window;
   return {
-    ethereum: win.ethereum,
-    phantomEthereum: win.phantom?.ethereum,
-    coinbaseEthereum: win.coinbaseWalletExtension,
-    trustEthereum: win.trustwallet?.ethereum,
-    okxEthereum: win.okxwallet,
     phantomSolana: win.phantom?.solana,
     solflare: win.solflare,
     backpack: win.backpack,
@@ -62999,37 +63066,71 @@ function getWalletProviders() {
     coinbaseSolana: win.coinbaseSolana || win.coinbaseWalletExtension?.solana
   };
 }
+function getLegacyEvmProviders() {
+  if (typeof window === "undefined") return {};
+  const win = window;
+  return {
+    ethereum: win.ethereum,
+    phantomEthereum: win.phantom?.ethereum,
+    coinbaseEthereum: win.coinbaseWalletExtension,
+    trustEthereum: win.trustwallet?.ethereum,
+    okxEthereum: win.okxwallet
+  };
+}
 function detectAvailableWallets(filterChainType) {
-  const providers = getWalletProviders();
+  const solProviders = getSolanaProviders();
+  const legacyEvm = getLegacyEvmProviders();
+  const eip6963List = getEip6963Providers();
   const win = typeof window !== "undefined" ? window : null;
+  const hasEip6963 = (walletId) => eip6963List.some((d) => {
+    const rdns = d.info?.rdns || "";
+    switch (walletId) {
+      case "metamask":
+        return rdns.includes("metamask");
+      case "phantom":
+        return rdns.includes("phantom");
+      case "coinbase":
+        return rdns.includes("coinbase");
+      case "trust":
+        return rdns.includes("trust");
+      case "rainbow":
+        return rdns.includes("rainbow");
+      case "rabby":
+        return rdns.includes("rabby");
+      case "okx":
+        return rdns.includes("okx") || rdns.includes("okex");
+      default:
+        return false;
+    }
+  });
   return WALLET_DEFINITIONS.filter((w) => !filterChainType || w.networks.includes(filterChainType)).map((wallet) => {
     let isInstalled = false;
     const detectedNetworks = [];
     switch (wallet.id) {
       case "metamask":
-        isInstalled = !!(providers.ethereum?.isMetaMask && !providers.ethereum?.isPhantom && !providers.ethereum?.isRabby && !providers.ethereum?.isOkxWallet);
+        isInstalled = hasEip6963("metamask") || !!(legacyEvm.ethereum?.isMetaMask && !legacyEvm.ethereum?.isPhantom && !legacyEvm.ethereum?.isRabby && !legacyEvm.ethereum?.isOkxWallet);
         if (isInstalled) detectedNetworks.push("ethereum");
         break;
       case "phantom":
-        if (providers.phantomSolana?.isPhantom) {
+        if (solProviders.phantomSolana?.isPhantom) {
           isInstalled = true;
           detectedNetworks.push("solana");
         }
-        if (providers.phantomEthereum?.isPhantom) {
+        if (hasEip6963("phantom") || legacyEvm.phantomEthereum?.isPhantom) {
           isInstalled = true;
           detectedNetworks.push("ethereum");
         }
         break;
       case "coinbase":
-        if (providers.coinbaseEthereum || providers.ethereum?.isCoinbaseWallet) {
+        if (hasEip6963("coinbase") || legacyEvm.coinbaseEthereum || legacyEvm.ethereum?.isCoinbaseWallet) {
           isInstalled = true;
           detectedNetworks.push("ethereum");
         }
-        if (providers.coinbaseSolana || win?.coinbaseWalletExtension?.solana) detectedNetworks.push("solana");
+        if (solProviders.coinbaseSolana || win?.coinbaseWalletExtension?.solana) detectedNetworks.push("solana");
         if (isInstalled && wallet.networks.includes("solana") && !detectedNetworks.includes("solana")) detectedNetworks.push("solana");
         break;
       case "trust":
-        if (providers.trustEthereum || providers.ethereum?.isTrust || win?.trustwallet) {
+        if (hasEip6963("trust") || legacyEvm.trustEthereum || legacyEvm.ethereum?.isTrust || win?.trustwallet) {
           isInstalled = true;
           detectedNetworks.push("ethereum");
         }
@@ -63037,27 +63138,27 @@ function detectAvailableWallets(filterChainType) {
         if (isInstalled && wallet.networks.includes("solana") && !detectedNetworks.includes("solana")) detectedNetworks.push("solana");
         break;
       case "rainbow":
-        isInstalled = !!providers.ethereum?.isRainbow;
+        isInstalled = hasEip6963("rainbow") || !!legacyEvm.ethereum?.isRainbow;
         if (isInstalled) detectedNetworks.push("ethereum");
         break;
       case "rabby":
-        isInstalled = !!providers.ethereum?.isRabby;
+        isInstalled = hasEip6963("rabby") || !!legacyEvm.ethereum?.isRabby;
         if (isInstalled) detectedNetworks.push("ethereum");
         break;
       case "okx":
-        isInstalled = !!(providers.okxEthereum || providers.ethereum?.isOkxWallet);
+        isInstalled = hasEip6963("okx") || !!(legacyEvm.okxEthereum || legacyEvm.ethereum?.isOkxWallet);
         if (isInstalled) detectedNetworks.push("ethereum");
         break;
       case "solflare":
-        isInstalled = !!providers.solflare?.isSolflare;
+        isInstalled = !!solProviders.solflare?.isSolflare;
         if (isInstalled) detectedNetworks.push("solana");
         break;
       case "backpack":
-        isInstalled = !!(providers.backpack?.isBackpack || win?.backpack);
+        isInstalled = !!(solProviders.backpack?.isBackpack || win?.backpack);
         if (isInstalled) detectedNetworks.push("solana");
         break;
       case "glow":
-        isInstalled = !!(providers.glow?.isGlow || win?.glow);
+        isInstalled = !!(solProviders.glow?.isGlow || win?.glow);
         if (isInstalled) detectedNetworks.push("solana");
         break;
     }
@@ -63112,7 +63213,16 @@ function WalletConnect({
   const [connectingNetwork, setConnectingNetwork] = React292.useState(null);
   const [walletError, setWalletError] = React292.useState(null);
   const [isWalletConnecting, setIsWalletConnecting] = React292.useState(false);
-  const availableWallets = React292.useMemo(() => detectAvailableWallets(), []);
+  const [eip6963ProviderCount, setEip6963ProviderCount] = React292.useState(0);
+  React292.useEffect(() => {
+    const store = getEip6963Store();
+    if (!store) return;
+    setEip6963ProviderCount(store.getProviders().length);
+    return store.subscribe((providers) => {
+      setEip6963ProviderCount(providers.length);
+    });
+  }, []);
+  const availableWallets = React292.useMemo(() => detectAvailableWallets(), [eip6963ProviderCount]);
   const [balances, setBalances] = React292.useState([]);
   const [isLoading, setIsLoading] = React292.useState(false);
   const [selectedBalance, setSelectedBalance] = React292.useState(null);
@@ -63171,59 +63281,72 @@ function WalletConnect({
     setWalletError(null);
     setIsWalletConnecting(true);
     try {
-      const providers = getWalletProviders();
       const win = typeof window !== "undefined" ? window : null;
       let connectedInfo;
       if (network === "ethereum") {
-        let provider;
-        switch (wallet.id) {
-          case "metamask":
-            if (providers.ethereum?.isMetaMask && !providers.ethereum?.isPhantom) provider = providers.ethereum;
-            break;
-          case "phantom":
-            provider = providers.phantomEthereum;
-            break;
-          case "coinbase":
-            provider = providers.coinbaseEthereum || (providers.ethereum?.isCoinbaseWallet ? providers.ethereum : void 0);
-            break;
-          case "trust":
-            provider = providers.trustEthereum || (providers.ethereum?.isTrust ? providers.ethereum : void 0);
-            break;
-          case "rainbow":
-            if (providers.ethereum?.isRainbow) provider = providers.ethereum;
-            break;
-          case "rabby":
-            if (providers.ethereum?.isRabby) provider = providers.ethereum;
-            break;
-          case "okx":
-            provider = providers.okxEthereum || (providers.ethereum?.isOkxWallet ? providers.ethereum : void 0);
-            break;
-          default:
-            provider = providers.ethereum;
+        const eip6963Match = findProviderByWalletId(wallet.id);
+        let provider = eip6963Match?.provider;
+        if (!provider) {
+          const legacyEvm = getLegacyEvmProviders();
+          switch (wallet.id) {
+            case "metamask":
+              if (legacyEvm.ethereum?.isMetaMask && !legacyEvm.ethereum?.isPhantom) provider = legacyEvm.ethereum;
+              break;
+            case "phantom":
+              provider = legacyEvm.phantomEthereum;
+              break;
+            case "coinbase":
+              provider = legacyEvm.coinbaseEthereum || (legacyEvm.ethereum?.isCoinbaseWallet ? legacyEvm.ethereum : void 0);
+              break;
+            case "trust":
+              provider = legacyEvm.trustEthereum || (legacyEvm.ethereum?.isTrust ? legacyEvm.ethereum : void 0);
+              break;
+            case "rainbow":
+              if (legacyEvm.ethereum?.isRainbow) provider = legacyEvm.ethereum;
+              break;
+            case "rabby":
+              if (legacyEvm.ethereum?.isRabby) provider = legacyEvm.ethereum;
+              break;
+            case "okx":
+              provider = legacyEvm.okxEthereum || (legacyEvm.ethereum?.isOkxWallet ? legacyEvm.ethereum : void 0);
+              break;
+            default:
+              provider = legacyEvm.ethereum;
+          }
         }
         if (!provider) throw new Error(`${wallet.name} wallet not found. Please install it.`);
         const accounts = await provider.request({ method: "eth_requestAccounts" });
         if (!accounts?.length) throw new Error("No accounts returned from wallet");
         setUserDisconnectedWallet(false);
-        const walletType = wallet.id === "phantom" ? "phantom-ethereum" : wallet.id === "coinbase" ? "coinbase" : "metamask";
+        const walletIdToType = {
+          phantom: "phantom-ethereum",
+          coinbase: "coinbase",
+          trust: "trust",
+          rainbow: "rainbow",
+          rabby: "rabby",
+          okx: "okx",
+          metamask: "metamask"
+        };
+        const walletType = walletIdToType[wallet.id] || "metamask";
         connectedInfo = { type: walletType, name: wallet.name, address: accounts[0], icon: wallet.id };
       } else {
+        const solProviders = getSolanaProviders();
         let provider;
         switch (wallet.id) {
           case "phantom":
-            provider = providers.phantomSolana;
+            provider = solProviders.phantomSolana;
             break;
           case "solflare":
-            provider = providers.solflare;
+            provider = solProviders.solflare;
             break;
           case "backpack":
-            provider = providers.backpack || win?.backpack;
+            provider = solProviders.backpack || win?.backpack;
             break;
           case "glow":
-            provider = providers.glow || win?.glow;
+            provider = solProviders.glow || win?.glow;
             break;
           case "coinbase":
-            provider = providers.coinbaseSolana || win?.coinbaseWalletExtension?.solana;
+            provider = solProviders.coinbaseSolana || win?.coinbaseWalletExtension?.solana;
             break;
           case "trust":
             provider = win?.trustwallet?.solana;
@@ -63469,10 +63592,15 @@ function WalletConnect({
   };
   const sendEthereumTransaction = async (token, amountStr) => {
     if (!recipientAddress || !/^0x[a-fA-F0-9]{40}$/.test(recipientAddress)) throw new Error(`Invalid recipient address.`);
-    let provider;
-    if (walletInfo.type === "phantom-ethereum") provider = window.phantom?.ethereum;
-    else if (walletInfo.type === "coinbase") provider = window.coinbaseWalletExtension || window.ethereum;
-    else provider = window.ethereum;
+    const walletIdMap = { "phantom-ethereum": "phantom", coinbase: "coinbase", trust: "trust", okx: "okx", rainbow: "rainbow", rabby: "rabby", metamask: "metamask" };
+    const lookupId = walletIdMap[walletInfo.type] || walletInfo.type;
+    const eip6963Match = findProviderByWalletId(lookupId);
+    let provider = eip6963Match?.provider;
+    if (!provider) {
+      if (walletInfo.type === "phantom-ethereum") provider = window.phantom?.ethereum;
+      else if (walletInfo.type === "coinbase") provider = window.coinbaseWalletExtension || window.ethereum;
+      else provider = window.ethereum;
+    }
     if (!provider) throw new Error("Ethereum wallet not found");
     const currentChainIdHex = await provider.request({ method: "eth_chainId", params: [] });
     if (parseInt(currentChainIdHex, 16).toString() !== token.chain_id) {
@@ -65306,7 +65434,7 @@ function useExecutions(userId, publishableKey, options2) {
   });
 }
 var POLL_INTERVAL_MS3 = 2500;
-var POLL_ENDPOINT_INTERVAL_MS2 = 3e3;
+var POLL_ENDPOINT_INTERVAL_MS2 = 5e3;
 var CUTOFF_BUFFER_MS2 = 6e4;
 function useWithdrawPolling({
   userId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unifold/ui-web",
-  "version": "0.1.59",
+  "version": "0.1.60",
   "description": "Unifold UI Web - Framework-agnostic deposit widget",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -30,10 +30,10 @@
     "@types/react-dom": "^19.0.0",
     "tsup": "^8.0.0",
     "typescript": "^5.0.0",
-    "@unifold/connect-react": "0.1.59",
-    "@unifold/ui-react": "0.1.59",
-    "@unifold/react-provider": "0.1.59",
-    "@unifold/core": "0.1.59"
+    "@unifold/core": "0.1.60",
+    "@unifold/react-provider": "0.1.60",
+    "@unifold/ui-react": "0.1.60",
+    "@unifold/connect-react": "0.1.60"
   },
   "keywords": [
     "unifold",