@aurum-sdk/core 0.1.5 → 0.2.0

package/dist/index.mjs

@@ -1,9 +1,11 @@
 import {
+  AppKitAdapter,
   ConnectPages,
   ConnectUIProviders,
   DEFAULT_THEME,
   Modal,
   ThemeContainer,
+  WalletConnectAdapter,
   createConfigError,
   generateCompleteStyles,
   getDefaultThemeConfig,
@@ -14,7 +16,7 @@ import {
   useAurumStore,
   useNavigation,
   waitForStoreHydration
-} from "./chunk-5NXCRO5Q.mjs";
+} from "./chunk-NRC534B3.mjs";
 
 // src/AurumCore.ts
 import { checksumAddress } from "viem";
@@ -110,7 +112,7 @@ function renderConnectModal({
 }) {
   return new Promise((resolve, reject) => {
     let sortedWallets = sortWallets(displayedWallets, { filterHidden: false });
-    const hasAppKit = sortedWallets.some((w) => w.id === WalletId.AppKit);
+    const hasAppKit = sortedWallets.some((w) => w instanceof AppKitAdapter);
     if (isMobile() && !hasAppKit) {
       sortedWallets = sortedWallets.filter((w) => w.id !== WalletId.WalletConnect);
     }
@@ -129,276 +131,15 @@ function renderConnectModal({
   });
 }
 
-// src/wallet-adapters/AppKitAdapter.ts
+// src/wallet-adapters/RabbyAdapter.ts
 import { getLogoDataUri } from "@aurum-sdk/logos";
 import { WalletId as WalletId2, WalletName } from "@aurum-sdk/types";
-var AppKitAdapter = class {
-  constructor(config) {
-    this.id = WalletId2.AppKit;
-    this.name = WalletName.AppKit;
-    this.icon = getLogoDataUri(WalletId2.AppKit, "brand") ?? "";
-    this.hide = true;
-    this.downloadUrl = null;
-    this.wcDeepLinkUrl = null;
-    this.modal = null;
-    this.wagmiAdapter = null;
-    this.provider = null;
-    this.address = null;
-    this.accountsChangedCallback = null;
-    this.unsubscribeFunctions = [];
-    this.initPromise = null;
-    this.config = {
-      projectId: config.projectId,
-      appName: config.appName,
-      modalZIndex: config.modalZIndex,
-      theme: config.theme
-    };
-  }
-  async ensureInitialized() {
-    if (this.modal) return;
-    if (!this.initPromise) {
-      this.initPromise = this.initializeAppKit();
-    }
-    await this.initPromise;
-  }
-  async initializeAppKit() {
-    if (typeof window === "undefined") return;
-    const [{ createAppKit }, { WagmiAdapter }, { mainnet: mainnet2 }] = await Promise.all([
-      import("@reown/appkit"),
-      import("@reown/appkit-adapter-wagmi"),
-      import("@reown/appkit/networks")
-    ]);
-    const networks = [mainnet2];
-    this.wagmiAdapter = new WagmiAdapter({
-      projectId: this.config.projectId,
-      networks,
-      ssr: true
-    });
-    this.modal = createAppKit({
-      adapters: [this.wagmiAdapter],
-      networks,
-      projectId: this.config.projectId,
-      metadata: {
-        name: this.config.appName,
-        description: this.config.appName,
-        url: window.location.origin,
-        icons: []
-      },
-      allowUnsupportedChain: true,
-      themeMode: this.config.theme,
-      themeVariables: {
-        "--apkt-z-index": this.config.modalZIndex + 1
-      }
-    });
-    this.setupEventListeners();
-  }
-  setupEventListeners() {
-    if (!this.modal) return;
-    const unsubscribeProviders = this.modal.subscribeProviders((state) => {
-      const eip155Provider = state["eip155"];
-      this.provider = eip155Provider || null;
-      if (!eip155Provider) {
-        this.address = null;
-      }
-    });
-    this.unsubscribeFunctions.push(unsubscribeProviders);
-  }
-  syncAddressFromWagmi() {
-    if (!this.wagmiAdapter?.wagmiConfig) return;
-    const { state } = this.wagmiAdapter.wagmiConfig;
-    if (state.current && state.connections) {
-      const connection = state.connections.get(state.current);
-      if (connection?.accounts?.[0]) {
-        this.address = connection.accounts[0];
-      }
-    }
-  }
-  async syncProviderFromModal() {
-    if (!this.modal) return;
-    try {
-      const getProvidersFn = this.modal.getProviders;
-      if (typeof getProvidersFn === "function") {
-        const providers = getProvidersFn.call(this.modal);
-        const eip155Provider = providers?.["eip155"];
-        if (eip155Provider) {
-          this.provider = eip155Provider;
-          return;
-        }
-      }
-      if (this.wagmiAdapter?.wagmiConfig) {
-        const { state } = this.wagmiAdapter.wagmiConfig;
-        if (state.current && state.connections) {
-          const connection = state.connections.get(state.current);
-          const connector = connection?.connector;
-          if (connector && typeof connector.getProvider === "function") {
-            try {
-              const provider = await connector.getProvider();
-              if (provider) {
-                this.provider = provider;
-              }
-            } catch (error) {
-              sentryLogger.warn("Failed to get provider from wagmi connector", { error });
-            }
-          }
-        }
-      }
-    } catch (error) {
-      sentryLogger.warn("Failed to get provider from AppKit", { error });
-    }
-  }
-  isInstalled() {
-    return true;
-  }
-  async connect() {
-    if (!this.config.projectId) {
-      throw createConfigError("AppKit");
-    }
-    await this.ensureInitialized();
-    if (!this.modal) {
-      sentryLogger.error("AppKit is not available");
-      throw new Error("AppKit is not available");
-    }
-    const existingAddress = this.modal.getAddress();
-    if (this.modal.getIsConnectedState() && existingAddress) {
-      await this.syncProviderFromModal();
-      if (this.provider) {
-        this.address = existingAddress;
-        return {
-          address: existingAddress,
-          provider: this.provider,
-          walletId: this.id
-        };
-      }
-      await this.disconnect();
-    }
-    this.modal.open({ view: "AllWallets" });
-    return await this.waitForConnection();
-  }
-  waitForConnection(timeout = 6e4) {
-    return new Promise((resolve, reject) => {
-      const startTime = Date.now();
-      let unsubscribeState = null;
-      let isResolved = false;
-      const cleanup = () => {
-        unsubscribeState?.();
-      };
-      const checkConnection = async () => {
-        if (isResolved) return true;
-        this.syncAddressFromWagmi();
-        if (this.address && !this.provider) {
-          await this.syncProviderFromModal();
-        }
-        if (this.provider && this.address) {
-          try {
-            const accounts = await this.provider.request({ method: "eth_accounts" });
-            if (accounts && accounts.length > 0) {
-              isResolved = true;
-              cleanup();
-              this.modal?.close();
-              resolve({
-                address: this.address,
-                provider: this.provider,
-                walletId: this.id
-              });
-              return true;
-            }
-            return false;
-          } catch {
-            return false;
-          }
-        }
-        return false;
-      };
-      unsubscribeState = this.modal.subscribeState(async (state) => {
-        if (await checkConnection()) return;
-        if (state.open === false && !this.address && !isResolved) {
-          cleanup();
-          reject(new Error("Connection rejected by user"));
-        }
-      });
-      const pollTimeout = async () => {
-        if (await checkConnection()) return;
-        if (Date.now() - startTime > timeout) {
-          cleanup();
-          reject(new Error("Connection timeout"));
-          return;
-        }
-        setTimeout(pollTimeout, 500);
-      };
-      pollTimeout();
-    });
-  }
-  async tryRestoreConnection() {
-    await this.ensureInitialized();
-    if (!this.modal || !this.wagmiAdapter) return null;
-    try {
-      await new Promise((resolve) => setTimeout(resolve, 1e3));
-      const wagmiConfig = this.wagmiAdapter.wagmiConfig;
-      if (wagmiConfig?.state?.current && wagmiConfig.state.connections) {
-        const connection = wagmiConfig.state.connections.get(wagmiConfig.state.current);
-        if (connection?.accounts?.[0]) {
-          this.address = connection.accounts[0];
-          if (this.provider && this.address) {
-            return {
-              address: this.address,
-              provider: this.provider,
-              walletId: this.id
-            };
-          }
-        }
-      }
-      return null;
-    } catch {
-      return null;
-    }
-  }
-  async disconnect() {
-    if (!this.modal) {
-      this.address = null;
-      this.provider = null;
-      return;
-    }
-    await this.modal.disconnect("eip155");
-    const timeout = Date.now() + 2e3;
-    while (Date.now() < timeout && (this.modal.getIsConnectedState() || this.modal.getAddress())) {
-      await new Promise((r) => setTimeout(r, 100));
-    }
-    this.address = null;
-    this.provider = null;
-  }
-  getProvider() {
-    return this.provider;
-  }
-  onAccountsChanged(callback) {
-    if (!this.provider?.on) return;
-    if (this.accountsChangedCallback) {
-      this.provider.removeListener?.("accountsChanged", this.accountsChangedCallback);
-    }
-    this.accountsChangedCallback = (accounts) => {
-      this.address = accounts[0] || null;
-      callback(accounts);
-    };
-    this.provider.on("accountsChanged", this.accountsChangedCallback);
-  }
-  removeListeners() {
-    if (this.provider?.removeListener && this.accountsChangedCallback) {
-      this.provider.removeListener("accountsChanged", this.accountsChangedCallback);
-      this.accountsChangedCallback = null;
-    }
-    this.unsubscribeFunctions.forEach((unsub) => unsub());
-    this.unsubscribeFunctions = [];
-  }
-};
-
-// src/wallet-adapters/RabbyAdapter.ts
-import { getLogoDataUri as getLogoDataUri2 } from "@aurum-sdk/logos";
-import { WalletId as WalletId3, WalletName as WalletName2 } from "@aurum-sdk/types";
 var RABBY_RDNS = "io.rabby";
 var RabbyAdapter = class {
   constructor() {
-    this.id = WalletId3.Rabby;
-    this.name = WalletName2.Rabby;
-    this.icon = getLogoDataUri2(WalletId3.Rabby, "brand") ?? "";
+    this.id = WalletId2.Rabby;
+    this.name = WalletName.Rabby;
+    this.icon = getLogoDataUri(WalletId2.Rabby, "brand") ?? "";
     this.hide = false;
     this.downloadUrl = "https://rabby.io";
     this.wcDeepLinkUrl = null;
@@ -529,8 +270,8 @@ var RabbyAdapter = class {
 };
 
 // src/wallet-adapters/BraveAdapter.ts
-import { getLogoDataUri as getLogoDataUri3 } from "@aurum-sdk/logos";
-import { WalletId as WalletId4, WalletName as WalletName3 } from "@aurum-sdk/types";
+import { getLogoDataUri as getLogoDataUri2 } from "@aurum-sdk/logos";
+import { WalletId as WalletId3, WalletName as WalletName2 } from "@aurum-sdk/types";
 
 // src/utils/platform/isBraveBrowser.ts
 function isBraveBrowser() {
@@ -542,9 +283,9 @@ function isBraveBrowser() {
 var BRAVE_RDNS = "com.brave.wallet";
 var BraveAdapter = class {
   constructor() {
-    this.id = WalletId4.Brave;
-    this.name = WalletName3.Brave;
-    this.icon = getLogoDataUri3(WalletId4.Brave, "brand") ?? "";
+    this.id = WalletId3.Brave;
+    this.name = WalletName2.Brave;
+    this.icon = getLogoDataUri2(WalletId3.Brave, "brand") ?? "";
     this.downloadUrl = "https://brave.com/download";
     this.wcDeepLinkUrl = null;
     this.provider = null;
@@ -679,15 +420,15 @@ var BraveAdapter = class {
 };
 
 // src/wallet-adapters/LedgerAdapter.ts
-import { getLogoDataUri as getLogoDataUri4 } from "@aurum-sdk/logos";
-import { WalletId as WalletId5, WalletName as WalletName4 } from "@aurum-sdk/types";
+import { getLogoDataUri as getLogoDataUri3 } from "@aurum-sdk/logos";
+import { WalletId as WalletId4, WalletName as WalletName3 } from "@aurum-sdk/types";
 import { SupportedProviders } from "@ledgerhq/connect-kit-loader";
 import { mainnet } from "viem/chains";
 var LedgerAdapter = class {
   constructor(config) {
-    this.id = WalletId5.Ledger;
-    this.name = WalletName4.Ledger;
-    this.icon = getLogoDataUri4(WalletId5.Ledger, "brand") ?? "";
+    this.id = WalletId4.Ledger;
+    this.name = WalletName3.Ledger;
+    this.icon = getLogoDataUri3(WalletId4.Ledger, "brand") ?? "";
     this.hide = false;
     this.downloadUrl = "https://www.ledger.com/ledger-live";
     this.wcDeepLinkUrl = "ledgerlive://wc?uri=";
@@ -796,14 +537,14 @@ var LedgerAdapter = class {
 };
 
 // src/wallet-adapters/PhantomAdapter.ts
-import { getLogoDataUri as getLogoDataUri5 } from "@aurum-sdk/logos";
-import { WalletId as WalletId6, WalletName as WalletName5 } from "@aurum-sdk/types";
+import { getLogoDataUri as getLogoDataUri4 } from "@aurum-sdk/logos";
+import { WalletId as WalletId5, WalletName as WalletName4 } from "@aurum-sdk/types";
 var PHANTOM_RDNS = "app.phantom";
 var PhantomAdapter = class {
   constructor() {
-    this.id = WalletId6.Phantom;
-    this.name = WalletName5.Phantom;
-    this.icon = getLogoDataUri5(WalletId6.Phantom, "brand") ?? "";
+    this.id = WalletId5.Phantom;
+    this.name = WalletName4.Phantom;
+    this.icon = getLogoDataUri4(WalletId5.Phantom, "brand") ?? "";
     this.hide = false;
     this.downloadUrl = "https://phantom.com/download";
     this.wcDeepLinkUrl = "phantom://wc?uri=";
@@ -940,13 +681,13 @@ var PhantomAdapter = class {
 
 // src/wallet-adapters/CoinbaseWalletAdapter.ts
 import { createCoinbaseWalletSDK } from "@coinbase/wallet-sdk";
-import { getLogoDataUri as getLogoDataUri6 } from "@aurum-sdk/logos";
-import { WalletId as WalletId7, WalletName as WalletName6 } from "@aurum-sdk/types";
+import { getLogoDataUri as getLogoDataUri5 } from "@aurum-sdk/logos";
+import { WalletId as WalletId6, WalletName as WalletName5 } from "@aurum-sdk/types";
 var CoinbaseWalletAdapter = class {
   constructor({ appName, appLogoUrl }) {
-    this.id = WalletId7.CoinbaseWallet;
-    this.name = WalletName6.CoinbaseWallet;
-    this.icon = getLogoDataUri6(WalletId7.CoinbaseWallet, "brand") ?? "";
+    this.id = WalletId6.CoinbaseWallet;
+    this.name = WalletName5.CoinbaseWallet;
+    this.icon = getLogoDataUri5(WalletId6.CoinbaseWallet, "brand") ?? "";
     this.hide = false;
     this.downloadUrl = "https://www.coinbase.com/wallet/downloads";
     this.wcDeepLinkUrl = "cbwallet://wc?uri=";
@@ -1061,14 +802,14 @@ var CoinbaseWalletAdapter = class {
 };
 
 // src/wallet-adapters/MetaMaskAdapter.ts
-import { getLogoDataUri as getLogoDataUri7 } from "@aurum-sdk/logos";
-import { WalletId as WalletId8, WalletName as WalletName7 } from "@aurum-sdk/types";
+import { getLogoDataUri as getLogoDataUri6 } from "@aurum-sdk/logos";
+import { WalletId as WalletId7, WalletName as WalletName6 } from "@aurum-sdk/types";
 var METAMASK_RDNS = "io.metamask";
 var MetaMaskAdapter = class {
   constructor() {
-    this.id = WalletId8.MetaMask;
-    this.name = WalletName7.MetaMask;
-    this.icon = getLogoDataUri7(WalletId8.MetaMask, "brand") ?? "";
+    this.id = WalletId7.MetaMask;
+    this.name = WalletName6.MetaMask;
+    this.icon = getLogoDataUri6(WalletId7.MetaMask, "brand") ?? "";
     this.hide = false;
     this.downloadUrl = "https://metamask.io/download";
     this.wcDeepLinkUrl = "metamask://wc?uri=";
@@ -1204,205 +945,14 @@ var MetaMaskAdapter = class {
   }
 };
 
-// src/wallet-adapters/WalletConnectAdapter.ts
-import { getLogoDataUri as getLogoDataUri8 } from "@aurum-sdk/logos";
-import { WalletId as WalletId9, WalletName as WalletName8 } from "@aurum-sdk/types";
-var WalletConnectAdapter = class {
-  constructor(config) {
-    this.id = WalletId9.WalletConnect;
-    this.name = WalletName8.WalletConnect;
-    this.icon = getLogoDataUri8(WalletId9.WalletConnect, "brand") ?? "";
-    this.hide = false;
-    this.downloadUrl = null;
-    this.wcDeepLinkUrl = null;
-    this.provider = null;
-    this.connectionUri = null;
-    this.accountsChangedCallback = null;
-    this.initPromise = null;
-    this.config = {
-      projectId: config.projectId,
-      appName: config.appName
-    };
-  }
-  async ensureInitialized() {
-    if (this.provider) return;
-    if (!this.initPromise) {
-      this.initPromise = this.initializeProvider();
-    }
-    await this.initPromise;
-  }
-  async initializeProvider() {
-    if (typeof window === "undefined") return;
-    const { EthereumProvider } = await import("@walletconnect/ethereum-provider");
-    this.provider = await EthereumProvider.init({
-      projectId: this.config.projectId ?? "",
-      optionalChains: [1],
-      showQrModal: false,
-      metadata: {
-        name: this.config.appName,
-        description: this.config.appName,
-        url: window.location.origin,
-        icons: []
-      }
-    });
-    this.provider.on("display_uri", (uri) => {
-      this.connectionUri = uri;
-      if (typeof window !== "undefined") {
-        window.dispatchEvent(new CustomEvent("walletconnect:uri", { detail: { uri } }));
-      }
-    });
-    this.provider.on("connect", (session) => {
-      if (typeof window !== "undefined") {
-        window.dispatchEvent(new CustomEvent("walletconnect:connect", { detail: { session } }));
-      }
-    });
-    this.provider.on("disconnect", () => {
-      this.connectionUri = null;
-    });
-    this.provider.on("session_delete", () => {
-      if (typeof window !== "undefined") {
-        window.dispatchEvent(new CustomEvent("walletconnect:disconnect"));
-      }
-    });
-  }
-  isInstalled() {
-    return true;
-  }
-  async connect() {
-    if (!this.config.projectId) {
-      throw createConfigError("WalletConnect");
-    }
-    try {
-      await this.ensureInitialized();
-      if (!this.provider) {
-        sentryLogger.error("connect: WalletConnect is not available");
-        throw new Error("WalletConnect is not available");
-      }
-      const accounts = await this.provider.enable();
-      if (!accounts || accounts.length === 0 || !accounts[0]) {
-        sentryLogger.error("connect: No accounts returned from WalletConnect");
-        throw new Error("No accounts returned from WalletConnect");
-      }
-      return {
-        address: accounts[0],
-        provider: this.provider,
-        walletId: this.id
-      };
-    } catch {
-      this.connectionUri = null;
-      throw new Error("Failed to connect to WalletConnect");
-    }
-  }
-  getConnectionUri() {
-    return this.connectionUri;
-  }
-  /**
-   * Starts a WalletConnect session for headless/custom QR code flows.
-   * Returns the URI immediately and a function to wait for the connection.
-   */
-  async startSession(timeout = 1e4) {
-    if (!this.config.projectId) {
-      throw new Error("WalletConnect projectId is required");
-    }
-    await this.ensureInitialized();
-    if (!this.provider) {
-      sentryLogger.error("startSession: WalletConnect is not available");
-      throw new Error("WalletConnect is not available");
-    }
-    this.connectionUri = null;
-    const uriPromise = new Promise((resolve, reject) => {
-      const timeoutId = setTimeout(() => {
-        reject(new Error("Timeout waiting for WalletConnect URI"));
-      }, timeout);
-      this.provider.once("display_uri", (uri2) => {
-        clearTimeout(timeoutId);
-        this.connectionUri = uri2;
-        resolve(uri2);
-      });
-    });
-    const connectionPromise = (async () => {
-      const accounts = await this.provider.enable();
-      if (!accounts || accounts.length === 0 || !accounts[0]) {
-        sentryLogger.error("startSession: No accounts returned from WalletConnect");
-        throw new Error("No accounts returned from WalletConnect");
-      }
-      return {
-        address: accounts[0],
-        provider: this.provider,
-        walletId: this.id
-      };
-    })();
-    const uri = await uriPromise;
-    return {
-      uri,
-      waitForConnection: async () => {
-        try {
-          return await connectionPromise;
-        } catch {
-          this.connectionUri = null;
-          throw new Error("Failed to connect via WalletConnect");
-        }
-      }
-    };
-  }
-  async tryRestoreConnection() {
-    try {
-      await this.ensureInitialized();
-      if (!this.provider) {
-        return null;
-      }
-      const accounts = this.provider.accounts;
-      if (!accounts || accounts.length === 0 || !accounts[0]) {
-        return null;
-      }
-      return {
-        address: accounts[0],
-        provider: this.provider,
-        walletId: this.id
-      };
-    } catch {
-      return null;
-    }
-  }
-  async disconnect() {
-    try {
-      if (this.provider) {
-        await this.provider.disconnect();
-      }
-    } finally {
-      this.connectionUri = null;
-      this.provider = null;
-      this.initPromise = null;
-    }
-  }
-  getProvider() {
-    return this.provider;
-  }
-  // Called by Aurum when user connects wallet
-  // Passes Aurum.ts --> syncStateFromAccountsChanged() to handle the provider accounts changed event
-  onAccountsChanged(callback) {
-    if (!this.provider?.on) return;
-    if (this.accountsChangedCallback) {
-      this.provider.removeListener?.("accountsChanged", this.accountsChangedCallback);
-    }
-    this.accountsChangedCallback = callback;
-    this.provider.on("accountsChanged", this.accountsChangedCallback);
-  }
-  removeListeners() {
-    if (!this.provider?.removeListener || !this.accountsChangedCallback) return;
-    this.provider.removeListener("accountsChanged", this.accountsChangedCallback);
-    this.accountsChangedCallback = null;
-  }
-};
-
 // src/wallet-adapters/EmailAdapter.ts
-import { WalletId as WalletId10, WalletName as WalletName9 } from "@aurum-sdk/types";
-import { getLogoDataUri as getLogoDataUri9 } from "@aurum-sdk/logos";
+import { WalletId as WalletId8, WalletName as WalletName7 } from "@aurum-sdk/types";
+import { getLogoDataUri as getLogoDataUri7 } from "@aurum-sdk/logos";
 var _EmailAdapter = class _EmailAdapter {
   constructor(config) {
-    this.id = WalletId10.Email;
-    this.name = WalletName9.Email;
-    this.icon = getLogoDataUri9(WalletId10.Email, "brand") ?? "";
+    this.id = WalletId8.Email;
+    this.name = WalletName7.Email;
+    this.icon = getLogoDataUri7(WalletId8.Email, "brand") ?? "";
     this.hide = true;
     this.downloadUrl = null;
     this.wcDeepLinkUrl = null;
@@ -1617,7 +1167,7 @@ function createWalletAdapters({
 }
 
 // src/AurumCore.ts
-import { WalletId as WalletId11 } from "@aurum-sdk/types";
+import { WalletId as WalletId9 } from "@aurum-sdk/types";
 
 // src/providers/RpcProvider.ts
 var RpcProvider = class {
@@ -1717,9 +1267,6 @@ var _AurumCore = class _AurumCore {
     if (walletId === "email") {
       throw new Error("Use emailAuthStart() and emailAuthVerify() for email wallet connections");
     }
-    if (walletId === "walletconnect") {
-      throw new Error("Use getWalletConnectSession() for WalletConnect connections");
-    }
     if (this.userInfo?.publicAddress && this.connectedWalletAdapter?.getProvider()) {
       if (!walletId || this.userInfo.walletId === walletId) {
         return this.userInfo.publicAddress;
@@ -1728,13 +1275,22 @@ var _AurumCore = class _AurumCore {
     }
     let adapter = null;
     let result;
-    if (walletId) {
+    if (walletId === WalletId9.WalletConnect) {
+      if (this.excludedWallets.has(walletId)) {
+        throw new Error(`${walletId} is excluded from wallet options`);
+      }
+      adapter = this.wallets.find((w) => w instanceof AppKitAdapter) || null;
+      if (!adapter) {
+        throw new Error("WalletConnect is not enabled");
+      }
+      result = await adapter.connect();
+    } else if (walletId) {
       if (this.excludedWallets.has(walletId)) {
         throw new Error(`${walletId} is excluded from wallet options`);
       }
       adapter = this.wallets.find((w) => w.id === walletId) || null;
       if (!adapter) {
-        throw new Error(`${walletId} is not configured`);
+        throw new Error(`${walletId} is not enabled`);
       }
       if (!adapter.isInstalled()) {
         throw new Error(`${adapter.name} is not installed`);
@@ -1820,6 +1376,7 @@ var _AurumCore = class _AurumCore {
     this.emitConnect(chainId);
     this.emitAccountsChanged([checksumAdr]);
     sentryLogger.info(`Wallet connected: ${adapter.id} (widget)`);
+    return this.userInfo;
   }
   async getChainId() {
     await this.whenReady();
@@ -1862,9 +1419,9 @@ var _AurumCore = class _AurumCore {
    */
   async emailAuthStart(email) {
     await this.whenReady();
-    const emailAdapter = this.wallets.find((w) => w.id === WalletId11.Email);
+    const emailAdapter = this.wallets.find((w) => w.id === WalletId9.Email);
     if (!emailAdapter || !emailAdapter.emailAuthStart) {
-      throw new Error("Email wallet is not configured");
+      throw new Error("Email wallet is not enabled");
     }
     const result = await emailAdapter.emailAuthStart(email);
     return { flowId: result.flowId };
@@ -1877,9 +1434,9 @@ var _AurumCore = class _AurumCore {
    */
   async emailAuthVerify(flowId, otp) {
     await this.whenReady();
-    const emailAdapter = this.wallets.find((w) => w.id === WalletId11.Email);
+    const emailAdapter = this.wallets.find((w) => w.id === WalletId9.Email);
     if (!emailAdapter || !emailAdapter.emailAuthVerify) {
-      throw new Error("Email wallet is not configured");
+      throw new Error("Email wallet is not enabled");
     }
     const verifyResult = await emailAdapter.emailAuthVerify(flowId, otp);
     const provider = emailAdapter.getProvider();
@@ -1916,7 +1473,10 @@ var _AurumCore = class _AurumCore {
    */
   async getWalletConnectSession() {
     await this.whenReady();
-    const wcAdapter = this.wallets.find((w) => w.id === WalletId11.WalletConnect);
+    if (this.excludedWallets.has(WalletId9.WalletConnect)) {
+      throw new Error("WalletConnect is excluded from wallet options");
+    }
+    const wcAdapter = this.wallets.find((w) => w instanceof WalletConnectAdapter);
     if (!wcAdapter) {
       throw new Error("WalletConnect is not enabled");
     }
@@ -1936,7 +1496,8 @@ var _AurumCore = class _AurumCore {
         this.userInfo = {
           publicAddress: checksumAdr,
           walletName: wcAdapter.name,
-          walletId: wcAdapter.id
+          walletId: wcAdapter.id,
+          email: void 0
         };
         this.persistConnectionState(wcAdapter, checksumAdr);
         this.setInternalAccountChangeListener(wcAdapter);
@@ -2239,7 +1800,8 @@ var Aurum = class {
    * Opens the wallet connection modal or connects directly to a specific wallet.
    *
    * @param walletId - Optional wallet ID for direct connection (bypasses modal).
-   *                   Cannot be 'email' or 'walletconnect' (use their dedicated methods).
+   *                   Cannot be 'email' (use emailAuthStart/emailAuthVerify).
+   *                   For 'walletconnect', opens the WalletConnect modal directly.
    * @returns The connected wallet address
    * @throws Error if user closes the modal without connecting a wallet
    *
@@ -2251,6 +1813,9 @@ var Aurum = class {
    * // Or connect directly to a specific wallet
    * import { WalletId } from '@aurum-sdk/types';
    * const address = await aurum.connect(WalletId.MetaMask);
+   *
+   * // Open WalletConnect modal directly
+   * const address = await aurum.connect(WalletId.WalletConnect);
    * ```
    */
   async connect(walletId) {
@@ -2358,7 +1923,7 @@ var Aurum = class {
    * import { WalletId } from '@aurum-sdk/types';
    *
    * aurum.updateWalletsConfig({
-   *   exclude: [WalletId.Email, WalletId.AppKit],
+   *   exclude: [WalletId.Email, WalletId.WalletConnect],
    * });
    * ```
    */
@@ -2380,7 +1945,7 @@ var Aurum = class {
    *
    * @param email - The email address to send the OTP to
    * @returns Object containing flowId to use with emailAuthVerify
-   * @throws Error if email wallet is not configured
+   * @throws Error if email wallet is not enabled
    *
    * @example
    * ```typescript
@@ -2416,7 +1981,7 @@ var Aurum = class {
    * Use this for building custom QR code UIs instead of using the built-in modal.
    *
    * @returns Object containing the URI and a function to wait for the connection
-   * @throws Error if WalletConnect is not configured
+   * @throws Error if WalletConnect is not enabled
    *
    * @example
    * ```typescript