@trustware/sdk-staging 1.1.8-staging.5 → 1.1.8-staging.6

package/dist/widget.cjs

@@ -593,7 +593,7 @@ var init_constants = __esm({
   "src/constants.ts"() {
     "use strict";
     SDK_NAME = "@trustware/sdk";
-    SDK_VERSION = "1.1.8-staging.5";
+    SDK_VERSION = "1.1.8-staging.6";
     API_ROOT = "https://bv-staging-api.trustware.io";
     GTM_ID = "GTM-TZDGNCXB";
     API_PREFIX = "/api";
@@ -4349,6 +4349,134 @@ var init_sdkRpc = __esm({
 });
 
 // src/wallets/solana.ts
+function encodeBase58(bytes) {
+  const digits = [0];
+  for (const byte of bytes) {
+    let carry = byte;
+    for (let i = 0; i < digits.length; i++) {
+      carry += digits[i] << 8;
+      digits[i] = carry % 58;
+      carry = carry / 58 | 0;
+    }
+    while (carry > 0) {
+      digits.push(carry % 58);
+      carry = carry / 58 | 0;
+    }
+  }
+  let result = "";
+  for (let i = 0; i < bytes.length && bytes[i] === 0; i++) {
+    result += "1";
+  }
+  for (let i = digits.length - 1; i >= 0; i--) {
+    result += BASE58_ALPHABET[digits[i]];
+  }
+  return result;
+}
+function collectWalletStandardWallets() {
+  if (typeof window === "undefined") return [];
+  const collected = [];
+  const api = {
+    register(...wallets) {
+      collected.push(...wallets);
+      return () => {
+      };
+    }
+  };
+  try {
+    window.dispatchEvent(
+      Object.assign(
+        new Event("wallet-standard:app-ready", { bubbles: false }),
+        {
+          detail: api
+        }
+      )
+    );
+  } catch {
+  }
+  return collected;
+}
+function walletStandardToSolanaProvider(wallet) {
+  let currentAccount = wallet.accounts[0] ?? null;
+  const provider = {
+    get isConnected() {
+      return !!currentAccount;
+    },
+    get publicKey() {
+      if (!currentAccount) return void 0;
+      const addr = currentAccount.address;
+      return { toString: () => addr };
+    },
+    async connect() {
+      const feature = wallet.features["standard:connect"];
+      if (!feature?.connect)
+        throw new Error("Wallet Standard connect not available");
+      const result = await feature.connect({ silent: false });
+      currentAccount = result.accounts[0] ?? null;
+      if (!currentAccount)
+        throw new Error("No Solana account returned from MetaMask");
+      return { publicKey: { toString: () => currentAccount.address } };
+    },
+    async disconnect() {
+      const feature = wallet.features["standard:disconnect"];
+      await feature?.disconnect?.();
+      currentAccount = null;
+    },
+    async signAndSendTransaction(transaction, options) {
+      const feature = wallet.features["solana:signAndSendTransaction"];
+      if (!feature?.signAndSendTransaction || !currentAccount) {
+        throw new Error("signAndSendTransaction not available");
+      }
+      const txBytes = transaction.serialize();
+      const results = await feature.signAndSendTransaction({
+        account: currentAccount,
+        transaction: txBytes,
+        chain: SOLANA_MAINNET_CHAIN,
+        options
+      });
+      const sig = results[0]?.signature;
+      if (!sig) throw new Error("No signature returned");
+      return typeof sig === "string" ? sig : encodeBase58(sig);
+    },
+    async signTransaction(transaction) {
+      const feature = wallet.features["solana:signTransaction"];
+      if (!feature?.signTransaction || !currentAccount) {
+        throw new Error("signTransaction not available");
+      }
+      const txBytes = transaction.serialize();
+      const results = await feature.signTransaction({
+        account: currentAccount,
+        transaction: txBytes,
+        chain: SOLANA_MAINNET_CHAIN
+      });
+      const signed = results[0]?.signedTransaction;
+      if (!signed) throw new Error("No signed transaction returned");
+      return { serialize: () => signed };
+    },
+    on() {
+    },
+    off() {
+    },
+    removeListener() {
+    }
+  };
+  return provider;
+}
+function detectMetaMaskSolanaWallet(wallets) {
+  const meta = wallets.find((w) => w.id === "metamask-solana");
+  if (!meta) return [];
+  const standardWallets = collectWalletStandardWallets();
+  const mmWallet = standardWallets.find(
+    (w) => w.name.toLowerCase().includes("metamask") && w.chains.some((c) => c.startsWith("solana:"))
+  );
+  if (!mmWallet) return [];
+  return [
+    {
+      meta,
+      provider: walletStandardToSolanaProvider(mmWallet),
+      via: "solana-window"
+    }
+  ];
+}
 function getPublicKeyString(provider) {
   const publicKey = provider?.publicKey;
   if (!publicKey) return null;
@@ -4410,12 +4538,13 @@ function getSolanaProviders() {
 }
 function detectSolanaWallets(wallets) {
   const providers = getSolanaProviders();
-  return SOLANA_WALLET_IDS.flatMap((walletId) => {
+  const windowDetected = SOLANA_WALLET_IDS.flatMap((walletId) => {
     const provider = providers[walletId];
     const meta = wallets.find((item) => item.id === walletId);
     if (!provider || !meta) return [];
     return [{ meta, provider, via: "solana-window" }];
   });
+  return [...windowDetected, ...detectMetaMaskSolanaWallet(wallets)];
 }
 function bindSolanaProviderEvents(provider, handlers) {
   const onConnect = () => handlers.onConnect?.();
@@ -4480,7 +4609,7 @@ function toSolanaWalletInterface(provider) {
     }
   };
 }
-var SOLANA_WALLET_IDS;
+var SOLANA_WALLET_IDS, SOLANA_MAINNET_CHAIN, BASE58_ALPHABET;
 var init_solana = __esm({
   "src/wallets/solana.ts"() {
     "use strict";
@@ -4490,6 +4619,8 @@ var init_solana = __esm({
       "solflare",
       "backpack"
     ];
+    SOLANA_MAINNET_CHAIN = "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp";
+    BASE58_ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
   }
 });
 
@@ -4663,6 +4794,15 @@ var init_metadata = __esm({
         ios: "https://apps.apple.com/app/phantom-crypto-wallet/id1598432977",
         deepLink: (url) => `phantom://browse/${encodeURIComponent(url)}`
       },
+      {
+        id: "metamask-solana",
+        name: "MetaMask (Solana)",
+        category: "injected",
+        ecosystem: "solana",
+        logo: `${ASSETS_BASE_URL}/assets/wallets/metamask.svg`,
+        emoji: "\u{1F98A}",
+        homepage: "https://metamask.io/"
+      },
       {
         id: "solflare",
         name: "Solflare",
@@ -6656,7 +6796,9 @@ function applyWalletTokenState({
   const selectedTokenStillExists = selectedToken && sortedTokens.some(
     (token) => normalizeChainKey2(token.chainId) === normalizeChainKey2(selectedToken.chainId) && token.address === selectedToken.address
   );
-  const nextSelectedToken = selectedTokenStillExists && selectedToken ? selectedToken : sortedTokens.find((token) => Number(token.balance) > 0) ?? null;
+  const nextSelectedToken = selectedTokenStillExists && selectedToken ? sortedTokens.find(
+    (token) => normalizeChainKey2(token.chainId) === normalizeChainKey2(selectedToken.chainId) && token.address === selectedToken.address
+  ) ?? selectedToken : sortedTokens.find((token) => Number(token.balance) > 0) ?? null;
   setSelectedToken(nextSelectedToken);
   if (nextSelectedToken && (!selectedChain || normalizeChainKey2(selectedChain.chainId) !== normalizeChainKey2(
     hasChainData(nextSelectedToken) ? nextSelectedToken.chainData?.chainId ?? null : nextSelectedToken.chainId
@@ -13457,10 +13599,12 @@ function useDepositAmountModel({
   ]);
   const amountWei = amountValidationError ? 0n : amountComputation.fromAmountWei ?? 0n;
   const parsedAmount = parseFloat(fixedFromAmountString ?? amount) || 0;
-  const maxTokenAmount = (0, import_react31.useMemo)(
-    () => Math.min(normalizedTokenBalance, 1e4),
-    [normalizedTokenBalance]
-  );
+  const maxTokenAmount = (0, import_react31.useMemo)(() => {
+    const cap = Math.min(normalizedTokenBalance, 1e4);
+    const token = selectedToken;
+    const isSolNative = token?.category === "native" && typeof token.chain_key === "string" && token.chain_key.toLowerCase().includes("solana");
+    return isSolNative ? Math.max(0, cap - 0.01) : cap;
+  }, [normalizedTokenBalance, selectedToken]);
   const maxUsdAmount = (0, import_react31.useMemo)(() => {
     if (!hasUsdPrice) return void 0;
     return Math.min(maxTokenAmount * tokenPriceUSD, 1e4);
@@ -30429,7 +30573,8 @@ function sleep3(ms) {
 }
 function isUserRejection(err) {
   if (!err) return false;
-  const code = err?.code;
+  const e2 = err;
+  const code = e2?.code ?? e2?.data?.code;
   if (code === 4001) return true;
   const msg = (err instanceof Error ? err.message : String(err)).toLowerCase();
   return msg.includes("user rejected") || msg.includes("user denied") || msg.includes("cancelled");
@@ -30578,6 +30723,26 @@ function useSwapExecution(fromChain) {
       );
       const canUseSA = !!routeResult.sponsorship && Date.now() >= saFailedUntilRef.current && wallet?.ecosystem === "evm" && wallet.type === "eip1193" && !isNative && !!walletAddress && Number.isFinite(numericChainId);
       if (canUseSA) {
+        if (numericChainId && wallet) {
+          try {
+            const currentChainId = await wallet.getChainId();
+            if (currentChainId !== numericChainId) {
+              await wallet.switchChain(numericChainId);
+            }
+          } catch (switchErr) {
+            if (isUserRejection(switchErr)) {
+              const msg = mapTxError(switchErr);
+              setState((p) => ({
+                ...p,
+                isSubmitting: false,
+                txStatus: "error",
+                errorMessage: msg
+              }));
+              onError(msg);
+              return;
+            }
+          }
+        }
         try {
           const mod = await Promise.resolve().then(() => (init_smart_account2(), smart_account_exports));
           const result = await mod.sendRouteAsUserOperation({
@@ -31125,11 +31290,18 @@ function SwapWalletSelector({
   onBack
 }) {
   const { detected } = useWalletDetection();
+  const {
+    isConnected: managerConnected,
+    walletMetaId,
+    connectedVia,
+    disconnect
+  } = useWalletInfo();
+  const walletConnectCfg = TrustwareConfigStore.peek()?.walletConnect;
+  const connectWC = useWalletConnectConnect(walletConnectCfg);
+  const [wcConnecting, setWcConnecting] = (0, import_react45.useState)(false);
   const [connectingId, setConnectingId] = (0, import_react45.useState)(null);
-  const [connectedWalletId, setConnectedWalletId] = (0, import_react45.useState)(
-    null
-  );
   const [timerExpired, setTimerExpired] = (0, import_react45.useState)(false);
+  const [selectedNamespace, setSelectedNamespace] = (0, import_react45.useState)("evm");
   const prevStatusRef = (0, import_react45.useRef)(walletStatus);
   (0, import_react45.useEffect)(() => {
     const t = setTimeout(() => setTimerExpired(true), 450);
@@ -31144,16 +31316,48 @@ function SwapWalletSelector({
       prevStatusRef.current = walletStatus;
     }
   }, [walletStatus]);
+  const filteredWallets = (0, import_react45.useMemo)(
+    () => detected.filter(
+      (w) => (w.meta?.ecosystem ?? "").toLowerCase() === selectedNamespace
+    ),
+    [detected, selectedNamespace]
+  );
+  const isDetecting = detected.length === 0 && !timerExpired;
+  const handleDisconnect = () => {
+    void disconnect();
+  };
+  const handleWalletConnect = async () => {
+    if (wcConnecting) return;
+    if (connectedVia === "walletconnect" && managerConnected) {
+      onBack();
+      return;
+    }
+    setWcConnecting(true);
+    try {
+      const { error } = await connectWC();
+      if (error) {
+        toast.error("WalletConnect Failed", error);
+      }
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : "WalletConnect failed";
+      toast.error("WalletConnect Failed", msg);
+    } finally {
+      setWcConnecting(false);
+    }
+  };
   const handleClick = async (wallet) => {
     if (walletStatus === "connecting") return;
     if (wallet.meta.id === "walletconnect" || wallet.via === "walletconnect") {
       toast.error("Not Available", "WalletConnect is not currently available.");
       return;
     }
+    if (managerConnected && walletMetaId === wallet.meta.id) {
+      onBack();
+      return;
+    }
     setConnectingId(wallet.meta.id);
     try {
       await connectWallet(wallet);
-      setConnectedWalletId(wallet.meta.id);
     } catch (err) {
       setConnectingId(null);
       const msg = err instanceof Error ? err.message : "Failed to connect wallet";
@@ -31167,7 +31371,10 @@ function SwapWalletSelector({
       }
     }
   };
-  const isDetecting = detected.length === 0 && !timerExpired;
+  const tabs = [
+    { id: "evm", label: "EVM" },
+    { id: "solana", label: "Solana" }
+  ];
   return /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)("div", { style: { display: "flex", flexDirection: "column" }, children: [
     /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(
       "div",
@@ -31224,134 +31431,348 @@ function SwapWalletSelector({
                 fontSize: fontSize.lg,
                 fontWeight: fontWeight.semibold,
                 color: colors.foreground,
-                textAlign: "center",
-                marginRight: "1.75rem"
+                textAlign: "center"
               },
               children: "Connect Wallet"
             }
-          )
-        ]
-      }
-    ),
-    /* @__PURE__ */ (0, import_jsx_runtime55.jsx)("div", { style: { padding: spacing[4] }, children: isDetecting ? /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(
-      "div",
-      {
-        style: {
-          display: "flex",
-          flexDirection: "column",
-          gap: spacing[3]
-        },
-        children: [
-          [1, 2].map((i) => /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(
+          ),
+          /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(
             "div",
             {
               style: {
+                position: "relative",
                 display: "flex",
                 alignItems: "center",
-                gap: spacing[4],
-                padding: spacing[4],
-                borderRadius: borderRadius["2xl"],
-                backgroundColor: colors.muted,
-                animation: "tw-pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite"
+                borderRadius: "9999px",
+                background: colors.background,
+                border: `1px solid ${colors.mutedForeground}`,
+                padding: "3px"
               },
               children: [
                 /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
                   "div",
                   {
                     style: {
-                      width: "3rem",
-                      height: "3rem",
-                      borderRadius: borderRadius.xl,
-                      backgroundColor: "rgba(161,161,170,0.2)"
+                      position: "absolute",
+                      top: 3,
+                      bottom: 3,
+                      width: "calc(50% - 3px)",
+                      borderRadius: "9999px",
+                      background: `linear-gradient(to bottom, ${colors.zinc[100]}, ${colors.zinc[200]})`,
+                      border: `1px solid ${colors.mutedForeground}`,
+                      transition: "transform 300ms ease-out",
+                      transform: selectedNamespace === "evm" ? "translateX(0)" : "translateX(100%)"
                     }
                   }
                 ),
-                /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
-                  "div",
+                tabs.map((t) => /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+                  "button",
                   {
+                    onClick: () => setSelectedNamespace(t.id),
                     style: {
-                      height: "1rem",
-                      width: "6rem",
-                      borderRadius: borderRadius.md,
-                      backgroundColor: "rgba(161,161,170,0.2)"
-                    }
-                  }
-                )
+                      position: "relative",
+                      zIndex: 10,
+                      padding: "4px 11px",
+                      fontSize: "10px",
+                      outline: "none",
+                      fontWeight: 600,
+                      borderRadius: "9999px",
+                      background: "transparent",
+                      border: "none",
+                      cursor: "pointer",
+                      transition: "color 200ms",
+                      color: selectedNamespace === t.id ? colors.black : colors.mutedForeground
+                    },
+                    children: t.label
+                  },
+                  t.id
+                ))
               ]
-            },
-            i
-          )),
-          /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
-            "p",
-            {
-              style: {
-                textAlign: "center",
-                fontSize: fontSize.sm,
-                color: colors.mutedForeground,
-                marginTop: spacing[4]
-              },
-              children: "Detecting wallets..."
             }
           )
         ]
       }
-    ) : detected.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)("div", { style: { textAlign: "center", padding: `${spacing[8]} 0` }, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime55.jsx)("div", { style: { fontSize: "2.5rem", marginBottom: spacing[4] }, children: "\u{1F45B}" }),
-      /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
-        "h3",
+    ),
+    /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)("div", { style: { padding: spacing[4] }, children: [
+      isDetecting ? /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(
+        "div",
         {
           style: {
-            fontSize: fontSize.lg,
-            fontWeight: fontWeight.semibold,
-            color: colors.foreground,
-            marginBottom: spacing[2]
+            display: "flex",
+            flexDirection: "column",
+            gap: spacing[3]
           },
-          children: "No Wallets Found"
+          children: [
+            [1, 2].map((i) => /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(
+              "div",
+              {
+                style: {
+                  display: "flex",
+                  alignItems: "center",
+                  gap: spacing[4],
+                  padding: spacing[4],
+                  borderRadius: borderRadius["2xl"],
+                  backgroundColor: colors.muted,
+                  animation: "tw-pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite"
+                },
+                children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+                    "div",
+                    {
+                      style: {
+                        width: "3rem",
+                        height: "3rem",
+                        borderRadius: borderRadius.xl,
+                        backgroundColor: "rgba(161,161,170,0.2)"
+                      }
+                    }
+                  ),
+                  /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+                    "div",
+                    {
+                      style: {
+                        height: "1rem",
+                        width: "6rem",
+                        borderRadius: borderRadius.md,
+                        backgroundColor: "rgba(161,161,170,0.2)"
+                      }
+                    }
+                  )
+                ]
+              },
+              i
+            )),
+            /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+              "p",
+              {
+                style: {
+                  textAlign: "center",
+                  fontSize: fontSize.sm,
+                  color: colors.mutedForeground,
+                  marginTop: spacing[4]
+                },
+                children: "Detecting wallets..."
+              }
+            )
+          ]
         }
-      ),
-      /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
-        "p",
+      ) : filteredWallets.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)("div", { style: { textAlign: "center", padding: `${spacing[8]} 0` }, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime55.jsx)("div", { style: { fontSize: "2.5rem", marginBottom: spacing[4] }, children: "\u{1F45B}" }),
+        /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+          "h3",
+          {
+            style: {
+              fontSize: fontSize.lg,
+              fontWeight: fontWeight.semibold,
+              color: colors.foreground,
+              marginBottom: spacing[2]
+            },
+            children: "No Wallets Found"
+          }
+        ),
+        /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+          "p",
+          {
+            style: {
+              fontSize: fontSize.sm,
+              color: colors.mutedForeground,
+              marginBottom: spacing[4]
+            },
+            children: "Please install a web3 wallet to continue."
+          }
+        ),
+        /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+          "a",
+          {
+            href: "https://metamask.io/download/",
+            target: "_blank",
+            rel: "noopener noreferrer",
+            style: {
+              display: "inline-flex",
+              alignItems: "center",
+              justifyContent: "center",
+              padding: `${spacing[2]} ${spacing[4]}`,
+              borderRadius: borderRadius.lg,
+              backgroundColor: colors.primary,
+              color: colors.primaryForeground,
+              fontSize: fontSize.sm,
+              fontWeight: fontWeight.medium,
+              textDecoration: "none"
+            },
+            children: "Install MetaMask"
+          }
+        )
+      ] }) : /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+        "div",
         {
           style: {
-            fontSize: fontSize.sm,
-            color: colors.mutedForeground,
-            marginBottom: spacing[4]
+            display: "flex",
+            flexDirection: "column",
+            gap: spacing[3]
           },
-          children: "Please install a web3 wallet to continue."
+          children: filteredWallets.map((wallet) => {
+            const isWalletConnected = managerConnected && walletMetaId === wallet.meta.id;
+            const isConnecting = connectingId === wallet.meta.id && walletStatus === "connecting";
+            return /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(
+              "div",
+              {
+                style: mergeStyles(
+                  {
+                    width: "100%",
+                    display: "flex",
+                    alignItems: "center",
+                    gap: spacing[4],
+                    padding: spacing[4],
+                    borderRadius: borderRadius["2xl"],
+                    backgroundColor: colors.card,
+                    border: `1px solid ${colors.border}`
+                  },
+                  isWalletConnected && {
+                    boxShadow: `0 0 0 2px ${colors.primary}`,
+                    border: `1px solid ${colors.primary}`
+                  }
+                ),
+                children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+                    "div",
+                    {
+                      style: {
+                        width: "3rem",
+                        height: "3rem",
+                        borderRadius: borderRadius.xl,
+                        backgroundColor: colors.muted,
+                        display: "flex",
+                        alignItems: "center",
+                        justifyContent: "center",
+                        overflow: "hidden",
+                        flexShrink: 0
+                      },
+                      children: wallet.meta.logo ? /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+                        "img",
+                        {
+                          src: wallet.meta.logo,
+                          alt: wallet.meta.name,
+                          style: {
+                            width: "2rem",
+                            height: "2rem",
+                            objectFit: "contain"
+                          }
+                        }
+                      ) : wallet.detail?.info?.icon ? /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+                        "img",
+                        {
+                          src: wallet.detail.info.icon,
+                          alt: wallet.meta.name,
+                          style: {
+                            width: "2rem",
+                            height: "2rem",
+                            objectFit: "contain"
+                          }
+                        }
+                      ) : /* @__PURE__ */ (0, import_jsx_runtime55.jsx)("span", { style: { fontSize: "1.5rem" }, children: wallet.meta.emoji || "\u{1F45B}" })
+                    }
+                  ),
+                  /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)("div", { style: { flex: 1, minWidth: 0 }, children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+                      "p",
+                      {
+                        style: {
+                          fontWeight: fontWeight.semibold,
+                          color: colors.foreground
+                        },
+                        children: wallet.meta.name
+                      }
+                    ),
+                    isWalletConnected && walletAddress && /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(
+                      "p",
+                      {
+                        style: {
+                          fontSize: fontSize.xs,
+                          color: colors.mutedForeground
+                        },
+                        children: [
+                          walletAddress.slice(0, 6),
+                          "...",
+                          walletAddress.slice(-4)
+                        ]
+                      }
+                    )
+                  ] }),
+                  isConnecting ? /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+                    "div",
+                    {
+                      style: {
+                        width: "1.25rem",
+                        height: "1.25rem",
+                        border: `2px solid ${colors.mutedForeground}`,
+                        borderTopColor: "transparent",
+                        borderRadius: "9999px",
+                        animation: "tw-spin 1s linear infinite",
+                        flexShrink: 0
+                      }
+                    }
+                  ) : isWalletConnected ? /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+                    "button",
+                    {
+                      onClick: handleDisconnect,
+                      style: {
+                        padding: `${spacing[1.5]} ${spacing[3]}`,
+                        borderRadius: "9999px",
+                        backgroundColor: "rgba(239,68,68,0.1)",
+                        color: "#ef4444",
+                        fontSize: fontSize.xs,
+                        fontWeight: fontWeight.medium,
+                        border: 0,
+                        cursor: "pointer",
+                        flexShrink: 0
+                      },
+                      children: "Disconnect"
+                    }
+                  ) : /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+                    "button",
+                    {
+                      onClick: () => void handleClick(wallet),
+                      disabled: walletStatus === "connecting",
+                      style: mergeStyles(
+                        {
+                          padding: `${spacing[1.5]} ${spacing[3]}`,
+                          borderRadius: "9999px",
+                          backgroundColor: "rgba(59,130,246,0.1)",
+                          color: colors.primary,
+                          fontSize: fontSize.xs,
+                          fontWeight: fontWeight.medium,
+                          border: 0,
+                          cursor: "pointer",
+                          flexShrink: 0
+                        },
+                        walletStatus === "connecting" && {
+                          opacity: 0.5,
+                          cursor: "not-allowed"
+                        }
+                      ),
+                      children: "Connect"
+                    }
+                  )
+                ]
+              },
+              wallet.meta.id
+            );
+          })
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
-        "a",
-        {
-          href: "https://metamask.io/download/",
-          target: "_blank",
-          rel: "noopener noreferrer",
-          style: {
-            display: "inline-flex",
-            alignItems: "center",
-            justifyContent: "center",
-            padding: `${spacing[2]} ${spacing[4]}`,
-            borderRadius: borderRadius.lg,
-            backgroundColor: colors.primary,
-            color: colors.primaryForeground,
-            fontSize: fontSize.sm,
-            fontWeight: fontWeight.medium,
-            textDecoration: "none"
-          },
-          children: "Install MetaMask"
-        }
-      )
-    ] }) : /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
-      "div",
-      {
-        style: {
-          display: "flex",
-          flexDirection: "column",
-          gap: spacing[3]
-        },
-        children: detected.map((wallet) => {
-          const isConnecting = connectingId === wallet.meta.id;
-          const isConnected = walletStatus === "connected" && connectingId === null && walletAddress !== null && connectedWalletId === wallet.meta.id;
+      selectedNamespace === "evm" && /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(import_jsx_runtime55.Fragment, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+          "div",
+          {
+            style: {
+              height: 1,
+              backgroundColor: colors.border,
+              margin: `${spacing[3]} 0`
+            }
+          }
+        ),
+        (() => {
+          const wcConnected = managerConnected && connectedVia === "walletconnect";
           return /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(
             "div",
             {
@@ -31364,13 +31785,15 @@ function SwapWalletSelector({
                   padding: spacing[4],
                   borderRadius: borderRadius["2xl"],
                   backgroundColor: colors.card,
-                  border: `1px solid ${colors.border}`
+                  border: `1px solid ${colors.border}`,
+                  cursor: "pointer"
                 },
-                isConnected && {
+                wcConnected && {
                   boxShadow: `0 0 0 2px ${colors.primary}`,
                   border: `1px solid ${colors.primary}`
                 }
               ),
+              onClick: !wcConnected ? () => void handleWalletConnect() : void 0,
               children: [
                 /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
                   "div",
@@ -31383,35 +31806,24 @@ function SwapWalletSelector({
                       display: "flex",
                       alignItems: "center",
                       justifyContent: "center",
-                      overflow: "hidden",
                       flexShrink: 0
                     },
-                    children: wallet.meta.logo ? /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
-                      "img",
-                      {
-                        src: wallet.meta.logo,
-                        alt: wallet.meta.name,
-                        style: {
-                          width: "2rem",
-                          height: "2rem",
-                          objectFit: "contain"
-                        }
-                      }
-                    ) : wallet.detail?.info?.icon ? /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
-                      "img",
+                    children: /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+                      "svg",
                       {
-                        src: wallet.detail.info.icon,
-                        alt: wallet.meta.name,
                         style: {
-                          width: "2rem",
-                          height: "2rem",
-                          objectFit: "contain"
-                        }
+                          width: "1.5rem",
+                          height: "1.5rem",
+                          color: colors.blue[500]
+                        },
+                        viewBox: "0 0 24 24",
+                        fill: "currentColor",
+                        children: /* @__PURE__ */ (0, import_jsx_runtime55.jsx)("path", { d: "M6.09 10.56c3.26-3.2 8.56-3.2 11.82 0l.39.39a.4.4 0 010 .58l-1.34 1.31a.21.21 0 01-.3 0l-.54-.53c-2.28-2.23-5.97-2.23-8.24 0l-.58.56a.21.21 0 01-.3 0L5.66 11.6a.4.4 0 010-.58l.43-.46zm14.6 2.72l1.2 1.17a.4.4 0 010 .58l-5.38 5.27a.43.43 0 01-.6 0l-3.82-3.74a.11.11 0 00-.15 0l-3.82 3.74a.43.43 0 01-.6 0L2.15 15.03a.4.4 0 010-.58l1.2-1.17a.43.43 0 01.6 0l3.82 3.74c.04.04.1.04.15 0l3.82-3.74a.43.43 0 01.6 0l3.82 3.74c.04.04.1.04.15 0l3.82-3.74a.43.43 0 01.6 0z" })
                       }
-                    ) : /* @__PURE__ */ (0, import_jsx_runtime55.jsx)("span", { style: { fontSize: "1.5rem" }, children: wallet.meta.emoji || "\u{1F45B}" })
+                    )
                   }
                 ),
-                /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)("div", { style: { flex: 1 }, children: [
+                /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)("div", { style: { flex: 1, minWidth: 0 }, children: [
                   /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
                     "p",
                     {
@@ -31419,10 +31831,10 @@ function SwapWalletSelector({
                         fontWeight: fontWeight.semibold,
                         color: colors.foreground
                       },
-                      children: wallet.meta.name
+                      children: "WalletConnect"
                     }
                   ),
-                  isConnected && walletAddress && /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(
+                  wcConnected && walletAddress && /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(
                     "p",
                     {
                       style: {
@@ -31437,7 +31849,7 @@ function SwapWalletSelector({
                     }
                   )
                 ] }),
-                isConnecting ? /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+                wcConnecting ? /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
                   "div",
                   {
                     style: {
@@ -31446,40 +31858,58 @@ function SwapWalletSelector({
                       border: `2px solid ${colors.mutedForeground}`,
                       borderTopColor: "transparent",
                       borderRadius: "9999px",
-                      animation: "tw-spin 1s linear infinite"
+                      animation: "tw-spin 1s linear infinite",
+                      flexShrink: 0
                     }
                   }
+                ) : wcConnected ? /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
+                  "button",
+                  {
+                    onClick: (e2) => {
+                      e2.stopPropagation();
+                      handleDisconnect();
+                    },
+                    style: {
+                      padding: `${spacing[1.5]} ${spacing[3]}`,
+                      borderRadius: "9999px",
+                      backgroundColor: "rgba(239,68,68,0.1)",
+                      color: "#ef4444",
+                      fontSize: fontSize.xs,
+                      fontWeight: fontWeight.medium,
+                      border: 0,
+                      cursor: "pointer",
+                      flexShrink: 0
+                    },
+                    children: "Disconnect"
+                  }
                 ) : /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
                   "button",
                   {
-                    onClick: () => handleClick(wallet),
-                    disabled: walletStatus === "connecting",
-                    style: mergeStyles(
-                      {
-                        padding: `${spacing[1.5]} ${spacing[3]}`,
-                        borderRadius: "9999px",
-                        backgroundColor: "rgba(59,130,246,0.1)",
-                        color: colors.primary,
-                        fontSize: fontSize.xs,
-                        fontWeight: fontWeight.medium,
-                        border: 0,
-                        cursor: "pointer"
-                      },
-                      walletStatus === "connecting" && {
-                        opacity: 0.5,
-                        cursor: "not-allowed"
-                      }
-                    ),
+                    onClick: (e2) => {
+                      e2.stopPropagation();
+                      void handleWalletConnect();
+                    },
+                    disabled: wcConnecting,
+                    style: {
+                      padding: `${spacing[1.5]} ${spacing[3]}`,
+                      borderRadius: "9999px",
+                      backgroundColor: "rgba(59,130,246,0.1)",
+                      color: colors.primary,
+                      fontSize: fontSize.xs,
+                      fontWeight: fontWeight.medium,
+                      border: 0,
+                      cursor: "pointer",
+                      flexShrink: 0
+                    },
                     children: "Connect"
                   }
                 )
               ]
-            },
-            wallet.meta.id
+            }
           );
-        })
-      }
-    ) })
+        })()
+      ] })
+    ] })
   ] });
 }
 var import_react45, import_jsx_runtime55;
@@ -31490,6 +31920,7 @@ var init_SwapWalletSelector = __esm({
     init_styles();
     init_utils();
     init_wallets();
+    init_config2();
     init_Toast();
     import_jsx_runtime55 = require("react/jsx-runtime");
   }
@@ -31774,7 +32205,7 @@ function SwapMode({
     (c) => setFromChain(c),
     []
   );
-  const { yourWalletTokens } = useWalletTokenState({
+  const { yourWalletTokens, reloadWalletTokens } = useWalletTokenState({
     walletAddress,
     selectedChain: fromChain,
     setSelectedChain: setFromChainStable,
@@ -31964,7 +32395,8 @@ function SwapMode({
     setCompletedAt(null);
     setCopiedHash(null);
     setStage("home");
-  }, [execution, route]);
+    reloadWalletTokens();
+  }, [execution, route, reloadWalletTokens]);
   const handleSwapBack = (0, import_react46.useCallback)(() => {
     const prevFrom = fromToken;
     const prevFromChain = fromChain;
@@ -31979,7 +32411,16 @@ function SwapMode({
     setCompletedAt(null);
     setCopiedHash(null);
     setStage("home");
-  }, [fromToken, fromChain, toToken, toChain, execution, route]);
+    reloadWalletTokens();
+  }, [
+    fromToken,
+    fromChain,
+    toToken,
+    toChain,
+    execution,
+    route,
+    reloadWalletTokens
+  ]);
   const handleCopyHash = (0, import_react46.useCallback)((hash) => {
     if (!navigator?.clipboard?.writeText) return;
     void navigator.clipboard.writeText(hash).then(() => {
@@ -34361,9 +34802,15 @@ function SwapMode({
                                 fromToken.address,
                                 fromChainType ?? ""
                               ) || isZeroAddrLike(fromToken.address, fromChainType));
-                              const effectivePct = isNative && p.value === 1 ? 0.995 : p.value;
+                              const isSolana = normalizeChainType2(fromChain) === "solana";
+                              const effectiveAmount = (() => {
+                                if (!isNative || p.value !== 1)
+                                  return fromBalance * p.value;
+                                if (isSolana) return Math.max(0, fromBalance - 0.01);
+                                return fromBalance * 0.995;
+                              })();
                               if (amountInputMode === "usd" && hasFromUsdPrice) {
-                                const fiatVal = fromBalance * effectivePct * fromTokenPriceUSD * currencyRate;
+                                const fiatVal = effectiveAmount * fromTokenPriceUSD * currencyRate;
                                 const dp = fiatVal > 0 ? Math.min(
                                   8,
                                   Math.max(
@@ -34375,7 +34822,7 @@ function SwapMode({
                               } else {
                                 setAmount(
                                   truncateDecimal(
-                                    fromBalance * effectivePct,
+                                    effectiveAmount,
                                     Math.min(decimals, 6)
                                   )
                                 );