@unifold/ui-react 0.1.58 → 0.1.60

package/dist/index.js

@@ -1580,7 +1580,7 @@ var import_react3 = require("react");
 var import_core6 = require("@unifold/core");
 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,
@@ -5324,6 +5324,56 @@ var React24 = __toESM(require("react"));
 var import_lucide_react17 = require("lucide-react");
 var import_core14 = require("@unifold/core");
 
+// src/lib/eip6963-store.ts
+var import_mipd = require("mipd");
+var _store = null;
+function getEip6963Store() {
+  if (typeof window === "undefined") return null;
+  if (!_store) {
+    _store = (0, import_mipd.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);
+}
+
 // src/components/deposits/browser-wallets/disconnectInjectedBrowserWallet.ts
 var SOLANA_DISCONNECT_TYPES = [
   "phantom-solana",
@@ -5364,8 +5414,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
@@ -7425,30 +7476,13 @@ function BrowserWalletButton({
   }, []);
   const [eip6963ProviderCount, setEip6963ProviderCount] = React24.useState(0);
   React24.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;
   }, []);
   React24.useEffect(() => {
     if (!wallet || !publishableKey) {
@@ -7507,7 +7541,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) {
@@ -7546,21 +7580,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"
@@ -7568,19 +7602,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) {
@@ -7589,15 +7618,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"
               });
             }
@@ -7621,7 +7650,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);
@@ -7663,15 +7692,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)) {
@@ -7773,7 +7798,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;
   }
@@ -10307,6 +10332,7 @@ function DepositsModal({
 // src/components/deposits/TokenSelectorSheet.tsx
 var import_react14 = require("react");
 var import_lucide_react19 = require("lucide-react");
+var import_fuse = __toESM(require("fuse.js"));
 var import_jsx_runtime41 = require("react/jsx-runtime");
 var STORAGE_KEY = "unifold_recent_tokens";
 var MAX_RECENT_TOKENS = 5;
@@ -10412,13 +10438,25 @@ function TokenSelectorSheet({
     });
     setRecentTokens(updated);
   };
+  const fuse = (0, import_react14.useMemo)(
+    () => new import_fuse.default(allOptions, {
+      keys: [
+        { name: "token.symbol", weight: 2 },
+        { name: "token.name", weight: 1 },
+        { name: "chain.chain_name", weight: 0.5 }
+      ],
+      threshold: 0.2,
+      ignoreLocation: true,
+      minMatchCharLength: 2
+    }),
+    [allOptions]
+  );
   const filteredOptions = (0, import_react14.useMemo)(() => {
     if (!searchQuery.trim()) return allOptions;
-    const query = searchQuery.toLowerCase();
-    return allOptions.filter(
-      ({ token, chain }) => token.symbol.toLowerCase().includes(query) || token.name.toLowerCase().includes(query) || chain.chain_name.toLowerCase().includes(query)
-    );
-  }, [allOptions, searchQuery]);
+    const query = searchQuery.trim();
+    const results = fuse.search(query);
+    return results.map((r) => r.item);
+  }, [fuse, allOptions, searchQuery]);
   const isCommonToken = (symbol, chainType, chainId) => {
     return COMMON_TOKENS.some(
       (ct) => ct.symbol === symbol && ct.chainType === chainType && ct.chainId === chainId
@@ -13443,15 +13481,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,
@@ -13459,37 +13492,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");
         }
@@ -13497,27 +13564,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;
     }
@@ -13572,7 +13639,16 @@ function WalletConnect({
   const [connectingNetwork, setConnectingNetwork] = React29.useState(null);
   const [walletError, setWalletError] = React29.useState(null);
   const [isWalletConnecting, setIsWalletConnecting] = React29.useState(false);
-  const availableWallets = React29.useMemo(() => detectAvailableWallets(), []);
+  const [eip6963ProviderCount, setEip6963ProviderCount] = React29.useState(0);
+  React29.useEffect(() => {
+    const store = getEip6963Store();
+    if (!store) return;
+    setEip6963ProviderCount(store.getProviders().length);
+    return store.subscribe((providers) => {
+      setEip6963ProviderCount(providers.length);
+    });
+  }, []);
+  const availableWallets = React29.useMemo(() => detectAvailableWallets(), [eip6963ProviderCount]);
   const [balances, setBalances] = React29.useState([]);
   const [isLoading, setIsLoading] = React29.useState(false);
   const [selectedBalance, setSelectedBalance] = React29.useState(null);
@@ -13631,59 +13707,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;
@@ -13929,10 +14018,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) {
@@ -14174,6 +14268,7 @@ function DepositModal({
   enableConnectWallet = false,
   browserWalletAmountQuickSelect = "percentage",
   enablePayWithExchange,
+  enableFiatOnramp,
   enableConnectExchange = false,
   enableCashApp = false,
   hideDepositFlowInfo = false,
@@ -14195,8 +14290,9 @@ function DepositModal({
     const s = initialScreen ?? "main";
     if (s === "tracker" && hideDepositTracker) return "main";
     if (s === "cashapp" && !enableCashApp) return "main";
+    if (s === "card" && enableFiatOnramp === false) return "main";
     return s;
-  }, [initialScreen, hideDepositTracker, enableCashApp]);
+  }, [initialScreen, hideDepositTracker, enableCashApp, enableFiatOnramp]);
   const [containerEl, setContainerEl] = (0, import_react20.useState)(null);
   const containerCallbackRef = (0, import_react20.useCallback)((el) => {
     setContainerEl(el);
@@ -14312,6 +14408,13 @@ function DepositModal({
     enabled: open
   });
   const showPayWithExchange = enablePayWithExchange ?? projectConfig?.pay_with_exchange?.enabled ?? true;
+  const showFiatOnramp = enableFiatOnramp ?? projectConfig?.fiat_onramp?.enabled ?? true;
+  (0, import_react20.useEffect)(() => {
+    if (view === "card" && !showFiatOnramp) {
+      setView("main");
+      setCardView("amount");
+    }
+  }, [view, showFiatOnramp]);
   const { exchanges, isLoading: exchangesLoading } = useExchanges({
     publishableKey,
     enabled: open && showPayWithExchange
@@ -14621,7 +14724,7 @@ function DepositModal({
                     featuredWallets: projectConfig?.connect_wallet?.wallets
                   }
                 ),
-                /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+                showFiatOnramp && /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
                   DepositWithCardButton,
                   {
                     onClick: () => setView("card"),
@@ -15797,7 +15900,7 @@ function useExecutions(userId, publishableKey, options) {
 var import_react22 = require("react");
 var import_core35 = require("@unifold/core");
 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,
@@ -16302,29 +16405,18 @@ async function detectBrowserWallet(chainType, senderAddress) {
         evmProviders.push({ provider: p, name });
       }
     };
-    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);
+    const eip6963 = getEip6963Providers();
+    const walletIdToName = {
+      metamask: "MetaMask",
+      phantom: "Phantom",
+      coinbase: "Coinbase",
+      rabby: "Rabby",
+      rainbow: "Rainbow",
+      okx: "OKX Wallet",
+      trust: "Trust Wallet"
     };
-    win.addEventListener("eip6963:announceProvider", handleAnnouncement);
-    win.dispatchEvent(new Event("eip6963:requestProvider"));
-    win.removeEventListener("eip6963:announceProvider", handleAnnouncement);
-    for (const detail of anyWin.__eip6963Providers) {
-      const rdns = detail.info?.rdns || "";
-      let name = detail.info?.name || "Wallet";
-      if (rdns.includes("metamask")) name = "MetaMask";
-      else if (rdns.includes("phantom")) name = "Phantom";
-      else if (rdns.includes("coinbase")) name = "Coinbase";
-      else if (rdns.includes("rabby")) name = "Rabby";
-      else if (rdns.includes("rainbow")) name = "Rainbow";
-      else if (rdns.includes("okx")) name = "OKX Wallet";
-      else if (rdns.includes("trust")) name = "Trust Wallet";
-      add(detail.provider, name);
+    for (const { provider, walletId, info } of eip6963) {
+      add(provider, walletIdToName[walletId] || info.name || "Wallet");
     }
     if (evmProviders.length === 0) {
       add(anyWin.phantom?.ethereum, "Phantom");
@@ -17606,6 +17698,7 @@ function WithdrawModal({
 // src/components/withdrawals/WithdrawTokenSelector.tsx
 var import_react27 = require("react");
 var import_lucide_react34 = require("lucide-react");
+var import_fuse2 = __toESM(require("fuse.js"));
 var import_jsx_runtime62 = require("react/jsx-runtime");
 var t11 = i18n.withdrawModal;
 function WithdrawTokenSelector({
@@ -17625,13 +17718,25 @@ function WithdrawTokenSelector({
     });
     return options;
   }, [tokens]);
+  const fuse = (0, import_react27.useMemo)(
+    () => new import_fuse2.default(allOptions, {
+      keys: [
+        { name: "token.symbol", weight: 2 },
+        { name: "token.name", weight: 1 },
+        { name: "chain.chain_name", weight: 0.5 }
+      ],
+      threshold: 0.2,
+      ignoreLocation: true,
+      minMatchCharLength: 2
+    }),
+    [allOptions]
+  );
   const filteredOptions = (0, import_react27.useMemo)(() => {
     if (!searchQuery.trim()) return allOptions;
-    const query = searchQuery.toLowerCase();
-    return allOptions.filter(
-      ({ token, chain }) => token.symbol.toLowerCase().includes(query) || token.name.toLowerCase().includes(query) || chain.chain_name.toLowerCase().includes(query)
-    );
-  }, [allOptions, searchQuery]);
+    const query = searchQuery.trim();
+    const results = fuse.search(query);
+    return results.map((r) => r.item);
+  }, [fuse, allOptions, searchQuery]);
   return /* @__PURE__ */ (0, import_jsx_runtime62.jsxs)(
     "div",
     {