0xtrails 0.13.0 → 0.13.2

package/src/wallets.ts

@@ -1,7 +1,16 @@
 import { sequenceWallet } from "@0xsequence/connect"
-import { Wallet as WalletIcon } from "lucide-react"
+import {
+  getWalletIcon,
+  getWalletRegistry,
+  wagmiConnectorToWalletId,
+  type WalletRegistryEntry,
+} from "@0xtrails/wallet-registry"
 import React from "react"
-import { useConnectors as useWagmiConnectors } from "wagmi"
+import {
+  useConnectors as useWagmiConnectors,
+  type Connector as WagmiConnector,
+  type CreateConnectorFn,
+} from "wagmi"
 import type { EIP1193Provider } from "viem"
 import {
   baseAccount,
@@ -15,53 +24,47 @@ import {
   DEFAULT_WALLETCONNECT_PROJECT_ID,
   PROD_TRAILS_API_URL,
 } from "./constants.js"
-import WalletConnectLogo from "./widget/assets/WalletConnect-logo-blue-bg.svg"
-import SequenceLogo from "./widget/assets/sequence-logo.svg"
 import { useTrails } from "./widget/providers/TrailsProvider.js"
 
-type Connector = any
-
-/**
- * EIP-6963 RDNS (Reverse Domain Name System) mapping for reliable wallet identification.
- * Wagmi's multiInjectedProviderDiscovery uses these identifiers to uniquely identify wallets.
- * Reference: https://github.com/wevm/wagmi/pull/4343
- */
-export const WALLET_RDNS_MAP: Record<string, string> = {
-  "io.metamask": "metamask",
-  "io.rabby": "rabby",
-  "app.phantom": "phantom",
-  "com.coinbase.wallet": "coinbase",
-  "me.rainbow": "rainbow",
-  "app.zerion": "zerion",
-  "com.trustwallet.app": "trust",
-  "io.okx.wallet": "okx",
-  "xyz.ambire": "ambire",
-  "io.zerion": "zerion",
-  "world.bitget": "bitget",
-  "io.1inch.wallet": "1inch",
-  "com.brave.wallet": "brave",
+type ConfigConnector = CreateConnectorFn &
+  Partial<
+    Pick<
+      WagmiConnector,
+      | "connect"
+      | "disconnect"
+      | "getAccounts"
+      | "icon"
+      | "id"
+      | "name"
+      | "rdns"
+      | "type"
+      | "uid"
+    >
+  >
+
+export type WalletConnector = WagmiConnector | ConfigConnector
+
+export interface WalletConfig extends WalletRegistryEntry {
+  connector?: ConfigConnector
 }
 
-/**
- * Reverse lookup from wallet ID to RDNS identifier
- */
-export const WALLET_ID_TO_RDNS: Record<string, string> = Object.fromEntries(
-  Object.entries(WALLET_RDNS_MAP).map(([rdns, id]) => [id, rdns]),
-)
-
-export interface WalletConfig {
-  id: string
-  name: string
-  icon: string
-  connector?: Connector
-  getWalletConnectDeepLink?: (uri: string) => string
+export interface WalletOption extends WalletRegistryEntry {
+  connector: WalletConnector
+  source: "config" | "wagmi"
 }
 
-export interface QRCodeWalletOption {
-  id: string
-  label: string
-  usesEip681: boolean
-  icon: string
+interface InternalConnectors {
+  injected: ConfigConnector
+  walletconnect: ConfigConnector
+  safe: ConfigConnector
+  baseAccount: ConfigConnector
+  gemini: ConfigConnector
+  trust: ConfigConnector
+  phantom: ConfigConnector
+  okx: ConfigConnector
+  zerion: ConfigConnector
+  ambire: ConfigConnector
+  sequence: ConfigConnector
 }
 
 // WalletConnect connector singleton to avoid multiple Core initializations.
@@ -69,8 +72,8 @@ export interface QRCodeWalletOption {
 // should NOT create a WalletConnect connector until one is actually needed.
 // This avoids conflicts with apps that bring their own WalletConnect setup
 // (e.g. Reown AppKit) when using hooks-only via TrailsProvider.
-let wcConnectorSingleton: Connector | null = null
-export function getWalletConnectConnector(): Connector {
+let wcConnectorSingleton: ConfigConnector | null = null
+export function getWalletConnectConnector(): ConfigConnector {
   if (!wcConnectorSingleton) {
     wcConnectorSingleton = walletConnect({
       projectId:
@@ -159,11 +162,11 @@ function resolveProvider(
   return candidate as EIP1193Provider
 }
 
-export function windowProviderOrWalletConnect(
+function windowProviderOrWalletConnect(
   walletId: string,
   windowObjectIdentifier: string | string[] | ProviderSelector,
   name: string,
-) {
+): ConfigConnector {
   if (typeof window === "undefined") return getWalletConnectConnector()
 
   const windowRecord = window as unknown as Record<string, unknown>
@@ -183,75 +186,59 @@ export function windowProviderOrWalletConnect(
   })
 }
 
-/**
- * Hook to get all wallet connectors, creating them lazily with the correct configuration
- */
-export function useConnectors(): Connector[] {
-  const { trailsApiKey, trailsApiUrl } = useTrails()
-
-  return React.useMemo(() => {
-    return getConnectorsInternal(trailsApiKey, trailsApiUrl)
-  }, [trailsApiKey, trailsApiUrl])
-}
-
 /**
  * Internal function to get connectors (for use outside React components)
  * Exported for use in widget.tsx where hooks can't be used in useMemo
  */
 
 // Cache connectors to prevent recreation on every call
-const connectorsCache = new Map<string, Connector[]>()
+const connectorsCache = new Map<string, InternalConnectors>()
 
-export function getConnectorsInternal(
+function createInternalConnectors(
   projectAccessKey?: string,
   trailsApiUrl?: string,
-): Connector[] {
-  const cacheKey = `${projectAccessKey || "default"}:${trailsApiUrl || "default"}`
-
-  // Return cached connectors if they exist
-  const cached = connectorsCache.get(cacheKey)
-  if (cached) {
-    return cached
-  }
+): InternalConnectors {
+  const walletConnectConnector = getWalletConnectConnector()
+  const walletRegistry = getWalletRegistry()
 
   // Create base connectors
   const injectedConnector = injected()
-  const baseAccountConnector: Connector = baseAccount()
-  const geminiConnector: Connector = gemini()
-  const safeConnector: Connector = safeProviderOrWalletConnect()
+  const baseAccountConnector: ConfigConnector = baseAccount()
+  const geminiConnector: ConfigConnector = gemini()
+  const safeConnector: ConfigConnector = safeProviderOrWalletConnect()
 
   // Create wallet-specific connectors
   // Note: MetaMask and Rainbow removed - they support EIP-6963 discovery
-  const trustwalletConnector = windowProviderOrWalletConnect(
+  const trustConnector = windowProviderOrWalletConnect(
     "trustwallet",
     "trustwallet",
-    "Trust",
+    walletRegistry.trust.name,
   )
   const phantomConnector = windowProviderOrWalletConnect(
     "phantom",
     ["phantom", "ethereum"],
-    "Phantom",
+    walletRegistry.phantom.name,
   )
-  const okxwalletConnector = windowProviderOrWalletConnect(
-    "okxwallet",
+  const okxConnector = windowProviderOrWalletConnect(
+    "okx",
     "okxwallet",
-    "OKX Wallet",
+    walletRegistry.okx.name,
   )
   const zerionConnector = windowProviderOrWalletConnect(
     "zerion",
     "zerionWallet",
-    "Zerion",
+    walletRegistry.zerion.name,
   )
   const ambireConnector = windowProviderOrWalletConnect(
     "ambire",
     "ambire",
-    "Ambire",
+    walletRegistry.ambire.name,
   )
 
   // Note: Rabby and Coinbase removed - they support EIP-6963 discovery
 
   // Create sequence connector with projectAccessKey
-  const sequenceConnector: any = sequenceWallet({
+  const sequenceConnector: ConfigConnector = sequenceWallet({
     connect: {
       app: "Trails",
       projectAccessKey: projectAccessKey || getConfig("trailsApiKey") || "",
@@ -260,24 +247,62 @@ export function getConnectorsInternal(
     walletAppURL: getSequenceWalletAppUrl(trailsApiUrl),
   })
 
-  const connectors = [
-    injectedConnector,
-    getWalletConnectConnector(),
-    safeConnector,
-    baseAccountConnector,
-    geminiConnector,
-    trustwalletConnector,
-    phantomConnector,
-    okxwalletConnector,
-    zerionConnector,
-    ambireConnector,
-    sequenceConnector,
-  ]
+  return {
+    injected: injectedConnector,
+    walletconnect: walletConnectConnector,
+    safe: safeConnector,
+    baseAccount: baseAccountConnector,
+    gemini: geminiConnector,
+    trust: trustConnector,
+    phantom: phantomConnector,
+    okx: okxConnector,
+    zerion: zerionConnector,
+    ambire: ambireConnector,
+    sequence: sequenceConnector,
+  }
+}
 
-  // Cache the connectors before returning
-  connectorsCache.set(cacheKey, connectors)
+function getCachedInternalConnectors(
+  projectAccessKey?: string,
+  trailsApiUrl?: string,
+): InternalConnectors {
+  const cacheKey = `${projectAccessKey || "default"}:${trailsApiUrl || "default"}`
 
-  return connectors
+  const cachedConnectors = connectorsCache.get(cacheKey)
+  if (cachedConnectors) {
+    return cachedConnectors
+  }
+
+  const internalConnectors = createInternalConnectors(
+    projectAccessKey,
+    trailsApiUrl,
+  )
+  connectorsCache.set(cacheKey, internalConnectors)
+  return internalConnectors
+}
+
+export function getConnectorsInternal(
+  projectAccessKey?: string,
+  trailsApiUrl?: string,
+): ConfigConnector[] {
+  const internalConnectors = getCachedInternalConnectors(
+    projectAccessKey,
+    trailsApiUrl,
+  )
+
+  return [
+    internalConnectors.injected,
+    internalConnectors.walletconnect,
+    internalConnectors.safe,
+    internalConnectors.baseAccount,
+    internalConnectors.gemini,
+    internalConnectors.trust,
+    internalConnectors.phantom,
+    internalConnectors.okx,
+    internalConnectors.zerion,
+    internalConnectors.ambire,
+    internalConnectors.sequence,
+  ]
 }
 
 /**
@@ -298,248 +323,112 @@ function getWalletConfigsInternal(
   projectAccessKey?: string,
   trailsApiUrl?: string,
 ): Record<string, WalletConfig> {
-  // Get connectors
-  const connectors = getConnectorsInternal(projectAccessKey, trailsApiUrl)
-  const [
-    injectedConnector,
-    ,
-    safeConnector,
-    baseAccountConnector,
-    geminiConnector,
-    trustwalletConnector,
-    phantomConnector,
-    okxwalletConnector,
-    zerionConnector,
-    ambireConnector,
-    sequenceConnector,
-  ] = connectors
+  const walletRegistry = getWalletRegistry()
+  const internalConnectors = getCachedInternalConnectors(
+    projectAccessKey,
+    trailsApiUrl,
+  )
 
   // Create wallet-specific connectors with EIP-6963 priority
   // These will check EIP-6963 first (in widget.tsx), then window properties, then WalletConnect
   const metamaskConnector = windowProviderOrWalletConnect(
     "metamask",
     (provider) => provider.isMetaMask === true,
-    "MetaMask",
+    walletRegistry.metamask.name,
   )
   const rabbyConnector = windowProviderOrWalletConnect(
     "rabby",
     (provider) => provider.isRabby === true,
-    "Rabby",
+    walletRegistry.rabby.name,
   )
   const rainbowConnector = windowProviderOrWalletConnect(
     "rainbow",
     "rainbow",
-    "Rainbow",
+    walletRegistry.rainbow.name,
   )
   const coinbaseConnector = windowProviderOrWalletConnect(
     "coinbase",
     "coinbaseWalletExtension",
-    "Coinbase Wallet",
+    walletRegistry.coinbase.name,
   )
 
   return {
     injected: {
-      id: "injected",
-      name: "Browser Wallet",
-      connector: injectedConnector,
-      icon: WalletIcon as unknown as string,
+      ...walletRegistry.injected,
+      connector: internalConnectors.injected,
     },
     walletconnect: {
-      id: "walletconnect",
-      name: "WalletConnect",
-      connector: getWalletConnectConnector(),
-      icon: WalletConnectLogo as string,
+      ...walletRegistry.walletconnect,
+      connector: internalConnectors.walletconnect,
     },
     metamask: {
-      id: "metamask",
-      name: "MetaMask",
-      connector: metamaskConnector, // EIP-6963 > window.ethereum.isMetaMask > WalletConnect
-      icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzAiIGhlaWdodD0iMzAiIHZpZXdCb3g9IjAgMCAzMCAzMCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjIzIiBoZWlnaHQ9IjIzIiB4PSIzLjUiIHk9IjMuNSIgdmlld0JveD0iMCAwIDE0MS41MSAxMzYuNDIiPjxwYXRoIGZpbGw9IiNGRjVDMTYiIGQ9Im0xMzIuMjQgMTMxLjc1LTMwLjQ4LTkuMDctMjIuOTkgMTMuNzQtMTYuMDMtLjAxLTIzLTEzLjc0LTMwLjQ3IDkuMDhMMCAxMDAuNDdsOS4yNy0zNC43M0wwIDM2LjQgOS4yNyAwbDQ3LjYgMjguNDRoMjcuNzZMMTMyLjI0IDBsOS4yNyAzNi4zOC05LjI3IDI5LjM2IDkuMjcgMzQuNzItOS4yNyAzMS4zWiIvPjxwYXRoIGZpbGw9IiNGRjVDMTYiIGQ9Im05LjI3IDAgNDcuNjEgMjguNDZMNTQuOTggNDggOS4yOSAwWm0zMC40NyAxMDAuNDggMjAuOTUgMTUuOTUtMjAuOTUgNi4yNHYtMjIuMlpNNTkuMDEgNzQuMSA1NSA0OCAyOS4yMiA2NS43NWgtLjAybC4wOCAxOC4yNyAxMC40NS05LjkyaDE5LjI5Wk0xMzIuMjUgMGwtNDcuNiAyOC40Nkw4Ni41MSA0OGw0NS43Mi00OFptLTMwLjQ3IDEwMC40OC0yMC45NCAxNS45NSAyMC45NCA2LjI0di0yMi4yWm0xMC41My0zNC43M0w4Ni41MyA0OCA4Mi41IDc0LjFoMTkuMjdsMTAuNDYgOS45LjA3LTE4LjI2WiIvPjxwYXRoIGZpbGw9IiNFMzQ4MDciIGQ9Im0zOS43MyAxMjIuNjctMzAuNDYgOS4wOEwwIDEwMC40OGgzOS43M3YyMi4yWk01OS4wMiA3NC4xbDUuODIgMzcuNzEtOC4wNy0yMC45Ny0yNy40OS02LjgyIDEwLjQ2LTkuOTJINTlabTQyLjc2IDQ4LjU5IDMwLjQ3IDkuMDcgOS4yNy0zMS4yN2gtMzkuNzR6TTgyLjUgNzQuMDlsLTUuODIgMzcuNzEgOC4wNi0yMC45NyAyNy41LTYuODItMTAuNDctOS45MnoiLz48cGF0aCBmaWxsPSIjRkY4RDVEIiBkPSJtMCAxMDAuNDcgOS4yNy0zNC43M0gyOS4ybC4wNyAxOC4yNyAyNy41IDYuODIgOC4wNiAyMC45Ny00LjE1IDQuNjItMjAuOTQtMTUuOTZIMFptMTQxLjUgMC05LjI2LTM0LjczaC0xOS45M2wtLjA3IDE4LjI3LTI3LjUgNi44Mi04LjA2IDIwLjk3IDQuMTUgNC42MiAyMC45NC0xNS45NmgzOS43NFpNODQuNjQgMjguNDRINTYuODhsLTEuODkgMTkuNTQgOS44NCA2My44aDExLjg1bDkuODUtNjMuOC0xLjktMTkuNTRaIi8+PHBhdGggZmlsbD0iIzY2MTgwMCIgZD0iTTkuMjcgMCAwIDM2LjM4bDkuMjcgMjkuMzZIMjkuMkw1NC45OCA0OHptNDMuOTggODEuNjdoLTkuMDNsLTQuOTIgNC44MSAxNy40NyA0LjMzLTMuNTItOS4xNVpNMTMyLjI0IDBsOS4yNyAzNi4zOC05LjI3IDI5LjM2aC0xOS45M0w4Ni41MyA0OHpNODguMjcgODEuNjdoOS4wNGw0LjkyIDQuODItMTcuNDkgNC4zNCAzLjUzLTkuMTdabS05LjUgNDIuMyAyLjA2LTcuNTQtNC4xNS00LjYySDY0LjgybC00LjE0IDQuNjIgMi4wNSA3LjU0Ii8+PHBhdGggZmlsbD0iI0MwQzRDRCIgZD0iTTc4Ljc3IDEyMy45N3YxMi40NUg2Mi43NHYtMTIuNDVoMTYuMDJaIi8+PHBhdGggZmlsbD0iI0U3RUJGNiIgZD0ibTM5Ljc0IDEyMi42NiAyMyAxMy43NnYtMTIuNDZsLTIuMDUtNy41NHptNjIuMDMgMC0yMyAxMy43NnYtMTIuNDZsMi4wNi03LjU0eiIvPjwvc3ZnPjwvc3ZnPg==",
-      getWalletConnectDeepLink: (uri: string) => {
-        return `https://metamask.app.link/wc?uri=${encodeURIComponent(uri)}`
-      },
+      ...walletRegistry.metamask,
+      connector: metamaskConnector,
     },
     baseAccount: {
-      id: "baseAccount",
-      name: "Base",
-      connector: baseAccountConnector,
-      icon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAALZJREFUaEPtmjEOhDAMBNc/O14GvOzys3CAKK6eAlmaVGl2Zc+kTOU685vkc9/bnD2prZK5/TZY24z9P+g4F5hNh7/GdoG37WlAA5CATwgCxHENYISwQAMQII5rACOEBRqAAHFcAxghLNAABIjjGsAIYYEGIEAc1wBGCAs0AAHiuAYwQligAQgQxzWAEcICDUCAOK4BjBAWaAACxHENYISwQAMQII6fBjr+VHkW3+u+tfyxMpJaDgYzYxb/ALZVAAAAAElFTkSuQmCC",
+      ...walletRegistry.baseAccount,
+      connector: internalConnectors.baseAccount,
     },
     safe: {
-      id: "safe",
-      name: "Safe",
-      connector: safeConnector,
-      icon: "https://explorer-api.walletconnect.com/v3/logo/sm/3913df81-63c2-4413-d60b-8ff83cbed500?projectId=34357d3c125c2bcf2ce2bc3309d98715",
-      getWalletConnectDeepLink: (uri: string) => {
-        return `https://gnosis-safe.io/wc?uri=${encodeURIComponent(uri)}`
-      },
+      ...walletRegistry.safe,
+      connector: internalConnectors.safe,
     },
     rainbow: {
-      id: "rainbow",
-      name: "Rainbow",
-      connector: rainbowConnector, // EIP-6963 > window.rainbow > WalletConnect
-      icon: "https://explorer-api.walletconnect.com/v3/logo/sm/7a33d7f1-3d12-4b5c-f3ee-5cd83cb1b500?projectId=34357d3c125c2bcf2ce2bc3309d98715",
-      getWalletConnectDeepLink: (uri: string) => {
-        return `https://rnbwapp.com/wc?uri=${encodeURIComponent(
-          uri,
-        )}&connector=connectkit`
-      },
+      ...walletRegistry.rainbow,
+      connector: rainbowConnector,
     },
     trust: {
-      id: "trust",
-      name: "Trust",
-      connector: trustwalletConnector,
-      icon: "https://explorer-api.walletconnect.com/v3/logo/sm/7677b54f-3486-46e2-4e37-bf8747814f00?projectId=34357d3c125c2bcf2ce2bc3309d98715",
-      getWalletConnectDeepLink: (uri: string) => {
-        return `https://link.trustwallet.com/wc?uri=${encodeURIComponent(uri)}`
-      },
+      ...walletRegistry.trust,
+      connector: internalConnectors.trust,
     },
     ambire: {
-      id: "ambire",
-      name: "Ambire Wallet",
-      connector: ambireConnector,
-      icon: "https://www.ambire.com/favicon.png",
+      ...walletRegistry.ambire,
+      connector: internalConnectors.ambire,
     },
     argent: {
-      id: "argent",
-      name: "Argent",
-      connector: getWalletConnectConnector(),
-      icon: "https://explorer-api.walletconnect.com/v3/logo/sm/215158d2-614b-49c9-410f-77aa661c3900?projectId=34357d3c125c2bcf2ce2bc3309d98715",
+      ...walletRegistry.argent,
+      connector: internalConnectors.walletconnect,
     },
     binance: {
-      id: "binance",
-      name: "Binance Wallet",
-      connector: getWalletConnectConnector(),
-      icon: "https://explorer-api.walletconnect.com/v3/logo/sm/ebac7b39-688c-41e3-7912-a4fefba74600?projectId=34357d3c125c2bcf2ce2bc3309d98715",
+      ...walletRegistry.binance,
+      connector: internalConnectors.walletconnect,
     },
     okx: {
-      id: "okx",
-      name: "OKX Wallet",
-      connector: okxwalletConnector,
-      icon: "https://explorer-api.walletconnect.com/v3/logo/sm/c55df831-3c52-49fc-d1d1-97a926dc0c00?projectId=34357d3c125c2bcf2ce2bc3309d98715",
+      ...walletRegistry.okx,
+      connector: internalConnectors.okx,
     },
     zerion: {
-      id: "zerion",
-      name: "Zerion",
-      connector: zerionConnector,
-      icon: "https://explorer-api.walletconnect.com/v3/logo/sm/73f6f52f-7862-49e7-bb85-ba93ab72cc00?projectId=34357d3c125c2bcf2ce2bc3309d98715",
-      getWalletConnectDeepLink: (uri: string) => {
-        return `https://app.zerion.io/wc?uri=${encodeURIComponent(uri)}`
-      },
+      ...walletRegistry.zerion,
+      connector: internalConnectors.zerion,
     },
     phantom: {
-      id: "phantom",
-      name: "Phantom",
-      connector: phantomConnector,
-      icon: "https://explorer-api.walletconnect.com/v3/logo/sm/b6ec7b81-bb4f-427d-e290-7631e6e50d00?projectId=34357d3c125c2bcf2ce2bc3309d98715",
-      getWalletConnectDeepLink: (_uri: string) => {
-        // TODO: https://phantom.com/learn/blog/the-complete-guide-to-phantom-deeplinks
-        // return `https://phantom.app/ul/v1/connect`
-        // For now, use the browse link to open the Phantom app
-        return `https://phantom.app/ul/browse/${encodeURIComponent(typeof window !== "undefined" ? window.location.href : "")}`
-      },
+      ...walletRegistry.phantom,
+      connector: internalConnectors.phantom,
     },
     coinbase: {
-      id: "coinbase",
-      name: "Coinbase Wallet",
-      connector: coinbaseConnector, // EIP-6963 > window.coinbaseWalletExtension > WalletConnect
-      icon: "data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PScwIDAgMTAyNCAxMDI0JyBmaWxsPSdub25lJyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHN0eWxlPSdoZWlnaHQ6MjhweDt3aWR0aDoyOHB4Jz48cmVjdCB3aWR0aD0nMTAyNCcgaGVpZ2h0PScxMDI0JyBmaWxsPScjMDA1MkZGJyByeD0nMTAwJyByeT0nMTAwJz48L3JlY3Q+PHBhdGggZmlsbC1ydWxlPSdldmVub2RkJyBjbGlwLXJ1bGU9J2V2ZW5vZGQnIGQ9J00xNTIgNTEyQzE1MiA3MTAuODIzIDMxMy4xNzcgODcyIDUxMiA4NzJDNzEwLjgyMyA4NzIgODcyIDcxMC44MjMgODcyIDUxMkM4NzIgMzEzLjE3NyA3MTAuODIzIDE1MiA1MTIgMTUyQzMxMy4xNzcgMTUyIDE1MiAzMTMuMTc3IDE1MiA1MTJaTTQyMCAzOTZDNDA2Ljc0NSAzOTYgMzk2IDQwNi43NDUgMzk2IDQyMFY2MDRDMzk2IDYxNy4yNTUgNDA2Ljc0NSA2MjggNDIwIDYyOEg2MDRDNjE3LjI1NSA2MjggNjI4IDYxNy4yNTUgNjI4IDYwNFY0MjBDNjI4IDQwNi43NDUgNjE3LjI1NSAzOTYgNjA0IDM5Nkg0MjBaJyBmaWxsPSd3aGl0ZSc+PC9wYXRoPjwvc3ZnPg==",
-      getWalletConnectDeepLink: (uri: string) => {
-        return `https://go.cb-w.com/wc?uri=${encodeURIComponent(uri)}`
-      },
+      ...walletRegistry.coinbase,
+      connector: coinbaseConnector,
     },
     rabby: {
-      id: "rabby",
-      name: "Rabby",
-      connector: rabbyConnector, // EIP-6963 > window.ethereum.isRabby > WalletConnect,
-      icon: "https://explorer-api.walletconnect.com/v3/logo/sm/255e6ba2-8dfd-43ad-e88e-57cbb98f6800?projectId=34357d3c125c2bcf2ce2bc3309d98715",
-    },
-    privy: {
-      id: "privy",
-      name: "Privy",
-      icon: "https://avatars.githubusercontent.com/u/81824329?s=200&v=4",
+      ...walletRegistry.rabby,
+      connector: rabbyConnector,
     },
+    privy: walletRegistry.privy,
     gemini: {
-      id: "gemini",
-      name: "Gemini",
-      connector: geminiConnector,
-      icon: "https://explorer-api.walletconnect.com/v3/logo/sm/56a3fd87-2627-4903-fddd-205224dac500?projectId=34357d3c125c2bcf2ce2bc3309d98715",
+      ...walletRegistry.gemini,
+      connector: internalConnectors.gemini,
     },
     sequence: {
-      id: "sequence",
-      name: "Sequence",
-      connector: sequenceConnector,
-      icon: SequenceLogo as string,
+      ...walletRegistry.sequence,
+      connector: internalConnectors.sequence,
     },
     "sequence-waas": {
-      id: "sequence-waas",
-      name: "Sequence WaaS",
-      connector: sequenceConnector,
-      icon: SequenceLogo as string,
+      ...walletRegistry["sequence-waas"],
+      connector: internalConnectors.sequence,
     },
   }
 }
 
-/**
- * Hook to get QR code wallet options
- */
-export function useQRCodeWallets(): QRCodeWalletOption[] {
-  const { trailsApiKey, trailsApiUrl } = useTrails()
-
-  return React.useMemo(() => {
-    return getQRCodeWalletsInternal(trailsApiKey, trailsApiUrl)
-  }, [trailsApiKey, trailsApiUrl])
-}
-
-/**
- * Internal function to get QR code wallets (for use outside React components)
- */
-function getQRCodeWalletsInternal(
-  projectAccessKey?: string,
-  trailsApiUrl?: string,
-): QRCodeWalletOption[] {
-  const walletConfigs = getWalletConfigsInternal(projectAccessKey, trailsApiUrl)
-
-  return [
-    {
-      id: "metamask",
-      label: "MetaMask",
-      usesEip681: true,
-      icon: walletConfigs.metamask?.icon || "",
-    },
-    {
-      id: "coinbase",
-      label: "CB Wallet",
-      usesEip681: false,
-      icon: walletConfigs.coinbase?.icon || "",
-    },
-    {
-      id: "trust",
-      label: "Trust Wallet",
-      usesEip681: false,
-      icon: walletConfigs.trust?.icon || "",
-    },
-    {
-      id: "rabby",
-      label: "Rabby",
-      usesEip681: false,
-      icon: walletConfigs.rabby?.icon || "",
-    },
-    {
-      id: "rainbow",
-      label: "Rainbow",
-      usesEip681: false,
-      icon: walletConfigs.rainbow?.icon || "",
-    },
-    {
-      id: "phantom",
-      label: "Phantom",
-      usesEip681: false,
-      icon: walletConfigs.phantom?.icon || "",
-    },
-  ] satisfies QRCodeWalletOption[]
-}
-
 const PROD_SEQUENCE_WALLET_APP_URL = "https://sequence.app"
 const DEV_SEQUENCE_WALLET_APP_URL = "https://dev.sequence.app"
 
@@ -557,94 +446,9 @@ function getSequenceWalletAppUrl(trailsApiUrl?: string): string {
     : PROD_SEQUENCE_WALLET_APP_URL
 }
 
-export const topShownWallets = [
-  "metamask",
-  "walletconnect",
-  "baseAccount",
-  "rainbow",
-  "phantom",
-]
-
-/**
- * Hook to get wallet icon
- */
-export function useWalletIcon(walletId?: string): string {
-  const walletConfigs = useWalletConfigs()
-
-  return React.useMemo(() => {
-    if (!walletId) return ""
-    return (walletConfigs[walletId]?.icon || "") as string
-  }, [walletId, walletConfigs])
-}
-
-/**
- * Hook to get wallet name
- */
-export function useWalletName(walletId?: string): string {
-  const walletConfigs = useWalletConfigs()
-
-  return React.useMemo(() => {
-    if (!walletId) return ""
-    return (walletConfigs[walletId]?.name || "") as string
-  }, [walletId, walletConfigs])
-}
-
-// Legacy functions for backward compatibility (use hooks instead)
-export const getWalletIcon = (
-  walletId?: string,
-  projectAccessKey?: string,
-): string => {
-  if (!walletId) return ""
-  const walletConfigs = getWalletConfigsInternal(projectAccessKey)
-  return (walletConfigs[walletId]?.icon || "") as string
-}
-
-export const getWalletName = (
-  walletId?: string,
-  projectAccessKey?: string,
-): string => {
-  if (!walletId) return ""
-  const walletConfigs = getWalletConfigsInternal(projectAccessKey)
-  return (walletConfigs[walletId]?.name || "") as string
-}
-
-/**
- * Convert a wagmi connector to a wallet ID using EIP-6963 RDNS (preferred) or name fallback.
- * RDNS-based identification is more reliable as it uses the wallet's unique identifier
- * announced via EIP-6963, avoiding conflicts when multiple wallets override window.ethereum.
- */
-export const wagmiConnectorToWalletId = (wagmiConnector: any): string => {
-  // 1. First try RDNS from EIP-6963 info (most reliable)
-  // Wagmi's multiInjectedProviderDiscovery populates this from EIP-6963 announcements
-  const rdns = wagmiConnector?.info?.rdns
-  if (rdns && WALLET_RDNS_MAP[rdns]) {
-    return WALLET_RDNS_MAP[rdns]
-  }
-
-  // 2. Fallback to name-based matching for non-EIP-6963 connectors
-  const wagmiConnectorName = (
-    wagmiConnector?.name ||
-    wagmiConnector?.id ||
-    ""
-  ).toLowerCase()
-  if (wagmiConnectorName.includes("rabby")) return "rabby"
-  if (wagmiConnectorName.includes("metamask")) return "metamask"
-  if (wagmiConnectorName.includes("walletconnect")) return "walletconnect"
-  if (wagmiConnectorName.includes("coinbase")) return "coinbase"
-  if (wagmiConnectorName.includes("base")) return "baseAccount"
-  if (wagmiConnectorName.includes("rainbow")) return "rainbow"
-  if (wagmiConnectorName.includes("trust")) return "trust"
-  if (wagmiConnectorName.includes("ambire")) return "ambire"
-  if (wagmiConnectorName.includes("argent")) return "argent"
-  if (wagmiConnectorName.includes("okx")) return "okxwallet"
-  if (wagmiConnectorName.includes("privy")) return "privy"
-  if (wagmiConnectorName.includes("gemini")) return "gemini"
-  if (wagmiConnectorName.includes("waas")) return "sequence-waas"
-  if (wagmiConnectorName.includes("sequence")) return "sequence"
-  return wagmiConnector.id || "injected"
-}
-
-export const isEmbeddedConnector = (connector?: any): boolean => {
+export const isEmbeddedConnector = (
+  connector?: Pick<WalletConnector, "name"> | null,
+): boolean => {
   if (!connector) return false
   if (
     connector.name?.toLowerCase()?.includes("privy") ||
@@ -660,15 +464,21 @@ export const useWallets = () => {
   const walletConfigs = useWalletConfigs()
 
   const allWallets = React.useMemo(() => {
+    const hasConnector = (
+      walletConfig: WalletConfig,
+    ): walletConfig is WalletConfig & { connector: ConfigConnector } => {
+      return Boolean(walletConfig.connector)
+    }
+
     // Get config wallets that have connectors
     const configWallets = Object.values(walletConfigs)
-      .filter((config) => config.connector)
+      .filter(hasConnector)
       .map((config) => ({
         id: config.id,
         name: config.name,
         icon: config.icon,
         connector: config.connector,
-        source: "config" as const,
+        source: "config",
       }))
 
     // Get wagmi wallets
@@ -680,14 +490,14 @@ export const useWallets = () => {
         connector.icon ||
         "",
       connector: connector,
-      source: "wagmi" as const,
+      source: "wagmi",
     }))
 
     // Combine and deduplicate, prioritizing wagmi connector over config connector.
     // We keep config metadata (name, icon) but always prefer the connector instance
     // from the active Wagmi config so that consumer-provided connectors (e.g. WaaS)
     // are used instead of the SDK's own connector instances.
-    const allWallets: any[] = []
+    const allWallets: WalletOption[] = []
 
     for (const wallet of configWallets) {
       // Always check if the active Wagmi config has a matching connector
@@ -703,16 +513,16 @@ export const useWallets = () => {
         name: wallet.name,
         icon: wallet.icon,
         connector: resolvedConnector,
-        source: wagmiConnector ? ("wagmi" as const) : ("config" as const),
+        source: wagmiConnector ? "wagmi" : "config",
       })
     }
 
     for (const wallet of wagmiWallets) {
       if (
-        !allWallets.find((w: any) => w.id === wagmiConnectorToWalletId(wallet))
+        !allWallets.find((existingWallet) => existingWallet.id === wallet.id)
       ) {
         const configWallet = configWallets.find(
-          (config: any) => config.id === wallet.id,
+          (config) => config.id === wallet.id,
         )
 
         allWallets.push({
@@ -720,7 +530,7 @@ export const useWallets = () => {
           name: configWallet?.name || wallet.name,
           icon: configWallet?.icon || wallet.icon,
           connector: wallet.connector,
-          source: "wagmi" as const,
+          source: "wagmi",
         })
       }
     }
@@ -732,9 +542,3 @@ export const useWallets = () => {
     wallets: allWallets,
   }
 }
-
-// Helper method to find wallet by ID using the hook (for use in components)
-export const useFindWalletById = (walletId: string) => {
-  const { wallets } = useWallets()
-  return wallets.find((wallet: any) => wallet.id === walletId) || null
-}