@reown/appkit-react-native 2.0.0-alpha.3 → 2.0.0-alpha.5

package/lib/typescript/views/w3m-upgrade-email-wallet-view/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-upgrade-email-wallet-view/index.tsx"],"names":[],"mappings":"AAIA,wBAAgB,sBAAsB,4CAuBrC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-upgrade-email-wallet-view/index.tsx"],"names":[],"mappings":"AAKA,wBAAgB,sBAAsB,4CAoBrC"}

package/lib/typescript/views/w3m-wallet-compatible-networks-view/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-wallet-compatible-networks-view/index.tsx"],"names":[],"mappings":"AAYA,wBAAgB,wBAAwB,4CAuCvC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-wallet-compatible-networks-view/index.tsx"],"names":[],"mappings":"AAiBA,wBAAgB,wBAAwB,4CAuCvC"}

package/lib/typescript/views/w3m-wallet-send-preview-view/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-wallet-send-preview-view/index.tsx"],"names":[],"mappings":"AAcA,wBAAgB,qBAAqB,4CAgHpC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-wallet-send-preview-view/index.tsx"],"names":[],"mappings":"AAsBA,wBAAgB,qBAAqB,4CAgHpC"}

package/lib/typescript/views/w3m-wallet-send-select-token-view/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-wallet-send-select-token-view/index.tsx"],"names":[],"mappings":"AAiBA,wBAAgB,yBAAyB,4CA+DxC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-wallet-send-select-token-view/index.tsx"],"names":[],"mappings":"AAsBA,wBAAgB,yBAAyB,4CA+DxC"}

package/lib/typescript/views/w3m-wallet-send-view/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-wallet-send-view/index.tsx"],"names":[],"mappings":"AAgBA,wBAAgB,cAAc,4CAwG7B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-wallet-send-view/index.tsx"],"names":[],"mappings":"AAeA,wBAAgB,cAAc,4CAyG7B"}

package/lib/typescript/views/w3m-wallet-send-view/styles.d.ts

@@ -15,9 +15,6 @@ declare const _default: {
     addressContainer: {
         width: "100%";
     };
-    withKeyboard: {
-        height: "100%";
-    };
 };
 export default _default;
 //# sourceMappingURL=styles.d.ts.map

package/lib/typescript/views/w3m-wallet-send-view/styles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-wallet-send-view/styles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAGA,wBAoBG"}
+{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-wallet-send-view/styles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAGA,wBAiBG"}

package/lib/typescript/views/w3m-what-is-a-network-view/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-what-is-a-network-view/index.tsx"],"names":[],"mappings":"AAKA,wBAAgB,kBAAkB,4CA2CjC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-what-is-a-network-view/index.tsx"],"names":[],"mappings":"AAIA,wBAAgB,kBAAkB,4CA2CjC"}

package/lib/typescript/views/w3m-what-is-a-wallet-view/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-what-is-a-wallet-view/index.tsx"],"names":[],"mappings":"AAMA,wBAAgB,iBAAiB,4CA6DhC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/views/w3m-what-is-a-wallet-view/index.tsx"],"names":[],"mappings":"AAKA,wBAAgB,iBAAiB,4CA6DhC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reown/appkit-react-native",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.5",
   "main": "lib/commonjs/index.js",
   "types": "lib/typescript/index.d.ts",
   "module": "lib/module/index.js",
@@ -29,20 +29,21 @@
   "repository": "https://github.com/reown-com/appkit-react-native",
   "author": "Reown (https://discord.gg/reown)",
   "homepage": "https://reown.com/appkit",
-  "license": "Apache-2.0",
+  "license": "SEE LICENSE IN LICENSE.md",
   "bugs": {
     "url": "https://github.com/reown-com/appkit-react-native/issues"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
   "dependencies": {
-    "@reown/appkit-common-react-native": "2.0.0-alpha.3",
-    "@reown/appkit-core-react-native": "2.0.0-alpha.3",
-    "@reown/appkit-siwe-react-native": "2.0.0-alpha.3",
-    "@reown/appkit-ui-react-native": "2.0.0-alpha.3",
-    "@walletconnect/universal-provider": "2.21.5",
+    "@reown/appkit-common-react-native": "2.0.0-alpha.5",
+    "@reown/appkit-core-react-native": "2.0.0-alpha.5",
+    "@reown/appkit-siwe-react-native": "2.0.0-alpha.5",
+    "@reown/appkit-ui-react-native": "2.0.0-alpha.5",
+    "@walletconnect/universal-provider": "2.21.8",
     "valtio": "2.1.5"
   },
   "peerDependencies": {
@@ -50,6 +51,7 @@
     "@walletconnect/utils": ">=2.16.1",
     "react": ">=18",
     "react-native": ">=0.72",
+    "react-native-safe-area-context": ">=4.4.0",
     "react-native-svg": ">=13.10"
   },
   "eslintIgnore": [

package/src/AppKit.ts

@@ -1,3 +1,4 @@
+import { subscribeKey } from 'valtio/utils';
 import {
   EventsController,
   ModalController,
@@ -12,7 +13,9 @@ import {
   OnRampController,
   CoreHelperUtil,
   SendController,
-  BlockchainApiController
+  BlockchainApiController,
+  WalletUtil,
+  type RouterControllerState
 } from '@reown/appkit-core-react-native';
 
 import {
@@ -31,7 +34,8 @@ import {
   type AccountType,
   type AppKitOpenOptions,
   ConstantsUtil,
-  type Connection
+  type Connection,
+  type WcWallet
 } from '@reown/appkit-common-react-native';
 import { SIWEController } from '@reown/appkit-siwe-react-native';
 
@@ -49,6 +53,7 @@ export class AppKit {
   private config: AppKitConfig;
   private extraConnectors: WalletConnector[];
   private walletConnectConnector?: WalletConnector;
+  private balanceIntervalId?: ReturnType<typeof setInterval>;
 
   constructor(config: AppKitConfig) {
     this.projectId = config.projectId;
@@ -94,6 +99,7 @@ export class AppKit {
 
     this.initControllers(config);
     this.initConnectors();
+    this.watchBalance();
   }
 
   /**
@@ -101,19 +107,31 @@ export class AppKit {
    * @param type - The type of connector to use.
    * @param options - Optional connection options.
    */
-  async connect(type: ConnectorType, options?: AppKitConnectOptions): Promise<void> {
+  async connect(options?: AppKitConnectOptions): Promise<void> {
     try {
-      const { namespaces, defaultChain, universalLink } = options ?? {};
-      const connector = await this.createConnector(type);
+      const { wallet, walletId } = options ?? {};
 
-      const chain =
-        defaultChain ??
-        NetworkUtil.getDefaultChainId(this.namespaces, OptionsController.state.defaultNetwork);
+      let targetWallet: WcWallet | undefined;
+
+      if (walletId) {
+        targetWallet = WalletUtil.getWallet(walletId);
+      } else if (wallet) {
+        targetWallet = wallet;
+      }
+
+      const connectorType = WcHelpersUtil.getConnectorTypeByWallet(targetWallet);
+
+      const connector = await this.createConnector(connectorType);
+
+      const chain = NetworkUtil.getDefaultNetwork(
+        this.namespaces,
+        OptionsController.state.defaultNetwork
+      );
 
       const approvedNamespaces = await connector.connect({
-        namespaces: namespaces ?? this.namespaces,
-        defaultChain: chain,
-        universalLink,
+        namespaces: this.namespaces,
+        defaultNetwork: chain,
+        universalLink: targetWallet?.link_mode ?? undefined,
         siweConfig: this.config?.siweConfig
       });
 
@@ -132,7 +150,7 @@ export class AppKit {
     }
   }
 
-  private processConnection(
+  private async processConnection(
     connector: WalletConnector,
     namespaces?: Namespaces,
     shouldCloseModal: boolean = true
@@ -156,7 +174,7 @@ export class AppKit {
     this.setConnection(initializedAdapters, namespaces, walletInfo, properties);
 
     // Sync accounts
-    this.syncAccounts(initializedAdapters);
+    await this.syncAccounts(initializedAdapters);
 
     // Handle SIWE if enabled
     this.handleSiweConnectionIfEnabled(shouldCloseModal);
@@ -272,10 +290,6 @@ export class AppKit {
     });
 
     ConnectionsController.setActiveNetwork(network.chainNamespace, network.caipNetworkId);
-
-    if (ConnectionsController.state.activeNamespace !== network.chainNamespace) {
-      ConnectionsController.setActiveNamespace(network.chainNamespace);
-    }
   }
 
   open(options?: AppKitOpenOptions) {
@@ -293,10 +307,14 @@ export class AppKit {
         ConnectionsController.state.activeNamespace === 'eip155' &&
         !!ConnectionsController.state.activeAddress
       ) {
-        await this.disconnect();
+        return await this.disconnect();
       }
     }
 
+    if (RouterController.state.view === 'UnsupportedChain') {
+      return await this.disconnect();
+    }
+
     RouterUtil.checkOnRampBack();
     RouterUtil.checkSocialLoginBack();
   }
@@ -315,13 +333,18 @@ export class AppKit {
     const adapter = this.getAdapterByNamespace(namespace);
     if (!adapter) throw new Error('No active adapter');
 
-    ConnectionsController.setAccountType(namespace, type);
+    const address = ConnectionsController.setAccountType(namespace, type);
 
     // Get balances from API
     ConnectionsController.fetchBalance();
 
+    // Fetch transactions for the new account
+    if (address) {
+      TransactionsController.fetchTransactions(address, true);
+    }
+
     // Sync balances from adapter
-    this.syncBalances(adapter, network);
+    this.syncNativeBalance(adapter, network);
 
     EventsController.sendEvent({
       type: 'track',
@@ -383,7 +406,7 @@ export class AppKit {
 
           const namespaces = connector.getNamespaces();
 
-          this.processConnection(connector, namespaces, false);
+          await this.processConnection(connector, namespaces, false);
         } catch (error) {
           // Use console.warn for non-critical initialization failures
           console.warn(`Failed to initialize connector type ${connected.type}:`, error);
@@ -434,12 +457,12 @@ export class AppKit {
         n => n.id?.toString() === connection?.caipNetwork?.split(':')[1]
       );
 
-      this.syncBalances(adapter, network);
+      this.syncNativeBalance(adapter, network);
       this.syncIdentity(namespace, connection);
     });
   }
 
-  private syncBalances(adapter: BlockchainAdapter, network?: AppKitNetwork) {
+  private syncNativeBalance(adapter: BlockchainAdapter, network?: AppKitNetwork) {
     if (adapter && network) {
       const accounts = adapter.getAccounts();
       if (accounts && accounts.length > 0) {
@@ -488,6 +511,55 @@ export class AppKit {
     }
   }
 
+  private refreshBalance(fetchAllBalances: boolean = false) {
+    try {
+      if (fetchAllBalances) {
+        ConnectionsController.fetchBalance();
+      }
+      const ns = ConnectionsController.state.activeNamespace;
+      const network = ConnectionsController.state.activeNetwork;
+      if (ns && network) {
+        const adapter = this.getAdapterByNamespace(ns);
+        if (adapter) {
+          this.syncNativeBalance(adapter, network);
+        }
+      }
+    } catch {
+      // ignore
+    }
+  }
+
+  private startBalancePolling(fetchAllBalances: boolean = false) {
+    if (this.balanceIntervalId) return;
+    // immediate fetch
+    this.refreshBalance(fetchAllBalances);
+    this.balanceIntervalId = setInterval(() => this.refreshBalance(fetchAllBalances), 10000);
+  }
+
+  private stopBalancePolling() {
+    if (this.balanceIntervalId) {
+      clearInterval(this.balanceIntervalId);
+      this.balanceIntervalId = undefined;
+    }
+  }
+
+  private watchBalance() {
+    // watch balance when user is on account or account default view
+    const recomputePolling = () => {
+      const open = ModalController.state.open;
+      const view = RouterController.state.view;
+      if (open && (view === 'Account' || view === 'AccountDefault')) {
+        // fetch all balances when user is using embedded wallet
+        this.startBalancePolling(view === 'Account');
+      } else {
+        this.stopBalancePolling();
+      }
+    };
+    recomputePolling();
+    subscribeKey(RouterController.state, 'view', () => recomputePolling());
+    subscribeKey(ModalController.state, 'open', () => recomputePolling());
+  }
+
   private setConnection(
     adapters: BlockchainAdapter[],
     approvedNamespaces: Namespaces,
@@ -504,7 +576,8 @@ export class AppKit {
       const caipNetwork = adapter?.connector?.getChainId(namespace);
       const namespaceProperties = {
         ...properties,
-        smartAccounts: properties?.smartAccounts?.filter(account => account.startsWith(namespace))
+        smartAccounts: properties?.smartAccounts?.filter(account => account.startsWith(namespace)),
+        canAddEvmChain: wallet?.name === 'MetaMask Wallet' // MetaMask allows adding EVM chains after connecting
       };
 
       ConnectionsController.setConnection({
@@ -530,30 +603,43 @@ export class AppKit {
   private subscribeToAdapterEvents(adapter: BlockchainAdapter): void {
     adapter.on('accountsChanged', ({ accounts }) => {
       const namespace = adapter.getSupportedNamespace();
-      ConnectionsController.updateAccounts(namespace, accounts);
+      const hasChanged = ConnectionsController.updateAccounts(namespace, accounts);
 
-      if (namespace === 'eip155') {
+      if (hasChanged && namespace === 'eip155') {
         this.handleSiweChange({ isAccountChange: true });
       }
     });
 
-    adapter.on('chainChanged', ({ chainId }) => {
-      //eslint-disable-next-line no-console
-      console.log('chainChanged', chainId);
+    adapter.on('chainChanged', async ({ chainId }) => {
+      const isSupported = this.networks.some(network => network.id?.toString() === chainId);
+      if (!isSupported) {
+        return this.navigate('UnsupportedChain');
+      }
+
       const namespace = adapter.getSupportedNamespace();
       const chain = `${namespace}:${chainId}` as CaipNetworkId;
       ConnectionsController.setActiveNetwork(namespace, chain);
+
       const connection = ConnectionsController.state.connections.get(namespace);
       const isAuth = !!connection?.properties?.provider;
 
       const network = this.networks.find(n => n.id?.toString() === chainId);
-      this.syncBalances(adapter, network);
+      this.syncNativeBalance(adapter, network);
       SendController.resetState();
 
+      // Refresh balance for embedded wallets
       if (isAuth) {
         ConnectionsController.fetchBalance();
       }
 
+      const address = connection?.accounts?.find(account =>
+        account.startsWith(`${namespace}:${chainId}`)
+      );
+      if (address) {
+        TransactionsController.fetchTransactions(address, true);
+      }
+
+      // Check if user needs to sign in again
       if (namespace === 'eip155') {
         this.handleSiweChange({ isNetworkChange: true });
       }
@@ -565,8 +651,6 @@ export class AppKit {
     });
 
     adapter.on('balanceChanged', ({ address, balance }) => {
-      //eslint-disable-next-line no-console
-      console.log('balanceChanged', address, balance);
       const namespace = adapter.getSupportedNamespace();
       ConnectionsController.updateBalance(namespace, address, balance);
     });
@@ -584,13 +668,14 @@ export class AppKit {
     OptionsController.setEnableAnalytics(options.enableAnalytics);
     OptionsController.setDebug(options.debug);
     OptionsController.setFeatures(options.features);
+    OptionsController.setRequestedNetworks(this.networks);
 
     if (options.defaultNetwork) {
       const network = NetworkUtil.formatNetwork(options.defaultNetwork, this.projectId);
       OptionsController.setDefaultNetwork(network);
     }
 
-    ThemeController.setThemeMode(options.themeMode);
+    ThemeController.setDefaultThemeMode(options.themeMode);
     ThemeController.setThemeVariables(options.themeVariables);
 
     OptionsController.setSdkVersion(
@@ -605,6 +690,7 @@ export class AppKit {
 
     if (options.siweConfig) {
       SIWEController.setSIWEClient(options.siweConfig);
+      OptionsController.setIsSiweEnabled(options.siweConfig.options.enabled);
     }
 
     if (
@@ -630,14 +716,17 @@ export class AppKit {
     const wallets = await StorageUtil.getRecentWallets();
     const filteredWallets = wallets.filter(wallet => {
       const { includeWalletIds, excludeWalletIds } = options;
-      if (includeWalletIds) {
+
+      if (includeWalletIds?.length) {
         return includeWalletIds.includes(wallet.id);
       }
-      if (excludeWalletIds) {
+      if (excludeWalletIds?.length) {
         return !excludeWalletIds.includes(wallet.id);
       }
 
-      return true;
+      return this.networks.some(
+        network => wallet.chains?.some(chain => network.caipNetworkId === chain)
+      );
     });
 
     WcController.setRecentWallets(filteredWallets);
@@ -661,8 +750,12 @@ export class AppKit {
 
     const customList = [...(customWallets ?? [])];
 
-    const addPhantom =
+    const isSolanaEnabled =
       adapters.some(adapter => adapter.getSupportedNamespace() === 'solana') &&
+      this.networks.some(network => network.chainNamespace === 'solana');
+
+    const addPhantom =
+      isSolanaEnabled &&
       extraConnectors?.some(connector => connector.type.toLowerCase() === 'phantom') &&
       !customList.some(wallet => wallet.id === ConstantsUtil.PHANTOM_CUSTOM_WALLET.id);
 
@@ -670,6 +763,15 @@ export class AppKit {
       customList.push(ConstantsUtil.PHANTOM_CUSTOM_WALLET);
     }
 
+    const addSolflare =
+      isSolanaEnabled &&
+      extraConnectors?.some(connector => connector.type.toLowerCase() === 'solflare') &&
+      !customList.some(wallet => wallet.id === ConstantsUtil.SOLFLARE_CUSTOM_WALLET.id);
+
+    if (addSolflare) {
+      customList.push(ConstantsUtil.SOLFLARE_CUSTOM_WALLET);
+    }
+
     OptionsController.setCustomWallets(customList);
   }
 
@@ -683,11 +785,15 @@ export class AppKit {
     await this.initRecentWallets(options);
   }
 
-  private onSiweNavigation = () => {
+  private navigate = (routeName: RouterControllerState['view']) => {
+    if (RouterController.state.view === routeName) {
+      return;
+    }
+
     if (ModalController.state.open) {
-      RouterController.push('ConnectingSiwe');
+      RouterController.push(routeName);
     } else {
-      ModalController.open({ view: 'ConnectingSiwe' });
+      ModalController.open({ view: routeName });
     }
   };
 
@@ -700,29 +806,33 @@ export class AppKit {
     const { enabled, signOutOnAccountChange, signOutOnNetworkChange } =
       SIWEController.state._client?.options ?? {};
 
-    if (enabled) {
-      const session = await SIWEController.getSession();
-      if (session && isAccountChange) {
-        if (signOutOnAccountChange) {
-          // If the address has changed and signOnAccountChange is enabled, sign out
-          await SIWEController.signOut();
+    if (!enabled || RouterController.state.view === 'ConnectingSiwe') {
+      // Do nothing if view is connecting siwe or siwe is not enabled
+      return;
+    }
 
-          return this.onSiweNavigation();
-        }
-      } else if (isNetworkChange) {
-        if (signOutOnNetworkChange) {
-          // If the network has changed and signOnNetworkChange is enabled, sign out
-          await SIWEController.signOut();
+    const session = await SIWEController.getSession();
+    if (session && isAccountChange) {
+      if (signOutOnAccountChange) {
+        // If the address has changed and signOnAccountChange is enabled, sign out
+        await SIWEController.signOut();
 
-          return this.onSiweNavigation();
-        }
-      } else if (!session) {
-        // If it's connected but there's no session, show sign view
-        return this.onSiweNavigation();
-      } else if (isConnection) {
-        // Connected with 1CA
-        ModalController.close();
+        return this.navigate('ConnectingSiwe');
       }
+    } else if (session && isNetworkChange) {
+      if (signOutOnNetworkChange) {
+        // If the network has changed and signOnNetworkChange is enabled, sign out
+        await SIWEController.signOut();
+
+        return this.navigate('ConnectingSiwe');
+      }
+    } else if (!session) {
+      // If it's connected but there's no session, show sign view
+
+      return this.navigate('ConnectingSiwe');
+    } else if (isConnection) {
+      // Already connected with 1CA
+      ModalController.close();
     }
   }
 }

package/src/AppKitContext.tsx

@@ -1,4 +1,4 @@
-import React, { createContext, useContext, type ReactNode } from 'react';
+import React, { createContext, useContext, useMemo, type ReactNode } from 'react';
 import { AppKit } from './AppKit';
 
 interface AppKitContextType {
@@ -26,14 +26,22 @@ export const useInternalAppKit = () => {
     throw new Error('AppKit instance is not yet available in context.');
   }
 
-  return {
-    connect: context.appKit.connect.bind(context.appKit),
-    disconnect: context.appKit.disconnect.bind(context.appKit),
-    open: context.appKit.open.bind(context.appKit),
-    close: context.appKit.close.bind(context.appKit),
-    back: context.appKit.back.bind(context.appKit),
-    switchNetwork: context.appKit.switchNetwork.bind(context.appKit),
-    getProvider: context.appKit.getProvider.bind(context.appKit),
-    switchAccountType: context.appKit.switchAccountType.bind(context.appKit)
-  };
+  const stableFunctions = useMemo(() => {
+    if (!context.appKit) {
+      throw new Error('AppKit instance is not available');
+    }
+
+    return {
+      connect: context.appKit.connect.bind(context.appKit),
+      disconnect: context.appKit.disconnect.bind(context.appKit),
+      open: context.appKit.open.bind(context.appKit),
+      close: context.appKit.close.bind(context.appKit),
+      back: context.appKit.back.bind(context.appKit),
+      switchNetwork: context.appKit.switchNetwork.bind(context.appKit),
+      getProvider: context.appKit.getProvider.bind(context.appKit),
+      switchAccountType: context.appKit.switchAccountType.bind(context.appKit)
+    };
+  }, [context.appKit]);
+
+  return stableFunctions;
 };

package/src/connectors/WalletConnectConnector.ts

@@ -94,7 +94,7 @@ export class WalletConnectConnector extends WalletConnector {
   }
 
   override async connect(opts: ConnectOptions) {
-    const { siweConfig, namespaces, defaultChain, universalLink } = opts;
+    const { siweConfig, namespaces, defaultNetwork, universalLink } = opts;
     function onUri(uri: string) {
       WcController.setWcUri(uri);
     }
@@ -181,8 +181,8 @@ export class WalletConnectConnector extends WalletConnector {
       this.wallet = undefined;
     }
 
-    if (defaultChain) {
-      (this.provider as IUniversalProvider).setDefaultChain(defaultChain);
+    if (defaultNetwork?.caipNetworkId) {
+      (this.provider as IUniversalProvider).setDefaultChain(defaultNetwork.caipNetworkId);
     }
 
     if (session?.sessionProperties) {
@@ -199,7 +199,7 @@ export class WalletConnectConnector extends WalletConnector {
 
     provider.off('display_uri', onUri);
 
-    return this.namespaces;
+    return (session?.namespaces as Namespaces) ?? {};
   }
 
   override getProvider(namespace?: ChainNamespace): Provider {
@@ -207,15 +207,18 @@ export class WalletConnectConnector extends WalletConnector {
       throw new Error('WalletConnectConnector: Provider not initialized. Call init() first.');
     }
 
-    const provider = this.provider as IUniversalProvider;
+    const provider = this.provider;
 
     if (namespace) {
-      const _chainId = this.getChainId(namespace);
-
-      // @ts-ignore
       return {
-        ...provider,
-        request: (args: RequestArguments, chainId?: CaipNetworkId) => {
+        ...this.provider,
+        connect: async (params?: any) => provider.connect(params) as Promise<any>,
+        disconnect: provider.disconnect.bind(provider),
+        on: provider.on.bind(provider),
+        off: provider.off.bind(provider),
+        request: async (args: RequestArguments, chainId?: CaipNetworkId) => {
+          const _chainId = this.getChainId(namespace);
+
           return provider.request(args, chainId || _chainId);
         }
       };
@@ -225,7 +228,11 @@ export class WalletConnectConnector extends WalletConnector {
   }
 
   override getNamespaces(): Namespaces {
-    return this.namespaces ?? {};
+    const namespaces =
+      ((this.provider as IUniversalProvider)?.session?.namespaces as Namespaces) ?? {};
+    this.namespaces = namespaces;
+
+    return namespaces;
   }
 
   override getProperties(): ConnectionProperties | undefined {
@@ -247,7 +254,8 @@ export class WalletConnectConnector extends WalletConnector {
   }
 
   override getChainId(namespace: ChainNamespace): CaipNetworkId | undefined {
-    if (!this.namespaces || !this.namespaces[namespace]) {
+    const namespaces = this.getNamespaces();
+    if (!namespaces || !namespaces[namespace]) {
       return undefined;
     }