@reown/appkit 1.6.1-rc.0 → 1.6.1-rc.2.0

package/dist/esm/exports/constants.js

@@ -1,2 +1,2 @@
-export const PACKAGE_VERSION = '1.6.1-rc.0';
+export const PACKAGE_VERSION = '1.6.1-rc.2.0';
 //# sourceMappingURL=constants.js.map

package/dist/esm/exports/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../exports/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG,YAAY,CAAA"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../exports/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG,cAAc,CAAA"}

package/dist/esm/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@reown/appkit",
-    "version": "1.6.1-rc.0",
+    "version": "1.6.1-rc.2.0",
     "type": "module",
     "main": "./dist/esm/exports/index.js",
     "types": "./dist/types/exports/index.d.ts",

package/dist/esm/src/adapters/ChainAdapterBlueprint.js

@@ -1,6 +1,6 @@
-import { getW3mThemeVariables } from '@reown/appkit-common';
+import { getW3mThemeVariables, ConstantsUtil as CommonConstantsUtil } from '@reown/appkit-common';
 import { AccountController, OptionsController, ThemeController } from '@reown/appkit-core';
-import { ConstantsUtil, PresetsUtil } from '@reown/appkit-utils';
+import { PresetsUtil } from '@reown/appkit-utils';
 import { snapshot } from 'valtio/vanilla';
 /**
  * Abstract class representing a chain adapter blueprint.
@@ -47,11 +47,11 @@ export class AdapterBlueprint {
      */
     setUniversalProvider(universalProvider) {
         this.addConnector({
-            id: ConstantsUtil.WALLET_CONNECT_CONNECTOR_ID,
+            id: CommonConstantsUtil.CONNECTOR_ID.WALLET_CONNECT,
             type: 'WALLET_CONNECT',
-            name: PresetsUtil.ConnectorNamesMap[ConstantsUtil.WALLET_CONNECT_CONNECTOR_ID],
+            name: PresetsUtil.ConnectorNamesMap[CommonConstantsUtil.CONNECTOR_ID.WALLET_CONNECT],
             provider: universalProvider,
-            imageId: PresetsUtil.ConnectorImageIds[ConstantsUtil.WALLET_CONNECT_CONNECTOR_ID],
+            imageId: PresetsUtil.ConnectorImageIds[CommonConstantsUtil.CONNECTOR_ID.WALLET_CONNECT],
             chain: this.namespace,
             chains: []
         });
@@ -62,11 +62,11 @@ export class AdapterBlueprint {
      */
     setAuthProvider(authProvider) {
         this.addConnector({
-            id: ConstantsUtil.AUTH_CONNECTOR_ID,
+            id: CommonConstantsUtil.CONNECTOR_ID.AUTH,
             type: 'AUTH',
             name: 'Auth',
             provider: authProvider,
-            imageId: PresetsUtil.ConnectorImageIds[ConstantsUtil.AUTH_CONNECTOR_ID],
+            imageId: PresetsUtil.ConnectorImageIds[CommonConstantsUtil.CONNECTOR_ID.AUTH],
             chain: this.namespace,
             chains: []
         });
@@ -76,8 +76,8 @@ export class AdapterBlueprint {
      * @param {...Connector} connectors - The connectors to add
      */
     addConnector(...connectors) {
-        if (connectors.some(connector => connector.id === 'ID_AUTH')) {
-            const authConnector = connectors.find(connector => connector.id === 'ID_AUTH');
+        if (connectors.some(connector => connector.id === CommonConstantsUtil.CONNECTOR_ID.AUTH)) {
+            const authConnector = connectors.find(connector => connector.id === CommonConstantsUtil.CONNECTOR_ID.AUTH);
             const optionsState = snapshot(OptionsController.state);
             const themeMode = ThemeController.getSnapshot().themeMode;
             const themeVariables = ThemeController.getSnapshot().themeVariables;
@@ -101,6 +101,7 @@ export class AdapterBlueprint {
             connectorsAdded.add(connector.id);
             return true;
         });
+        this.emit('connectors', this.availableConnectors);
     }
     setStatus(status, chainNamespace) {
         AccountController.setStatus(status, chainNamespace);

package/dist/esm/src/adapters/ChainAdapterBlueprint.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChainAdapterBlueprint.js","sourceRoot":"","sources":["../../../../src/adapters/ChainAdapterBlueprint.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ChainAdapterBlueprint.js","sourceRoot":"","sources":["../../../../src/adapters/ChainAdapterBlueprint.ts"],"names":[],"mappings":"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"}

package/dist/esm/src/client.js

@@ -2,7 +2,7 @@
 import { ConstantsUtil as CoreConstantsUtil, SIWXUtil } from '@reown/appkit-core';
 import { AccountController, BlockchainApiController, ConnectionController, ConnectorController, CoreHelperUtil, EventsController, ModalController, ChainController, PublicStateController, ThemeController, SnackController, RouterController, EnsController, OptionsController, AssetUtil, ApiController, AlertController, StorageUtil } from '@reown/appkit-core';
 import { setColorTheme, setThemeVariables } from '@reown/appkit-ui';
-import { ConstantsUtil, NetworkUtil, ParseUtil } from '@reown/appkit-common';
+import { NetworkUtil, ConstantsUtil, ParseUtil } from '@reown/appkit-common';
 import { UniversalAdapter, UniversalAdapter as UniversalAdapterClient } from './universal-adapter/client.js';
 import { CaipNetworksUtil, ErrorUtil, LoggerUtil, ConstantsUtil as UtilConstantsUtil } from '@reown/appkit-utils';
 import { W3mFrameHelpers, W3mFrameRpcConstants } from '@reown/appkit-wallet';
@@ -10,6 +10,7 @@ import { ProviderUtil } from './store/ProviderUtil.js';
 import UniversalProvider from '@walletconnect/universal-provider';
 import { W3mFrameProviderSingleton } from './auth-provider/W3MFrameProviderSingleton.js';
 import { WcHelpersUtil } from './utils/HelpersUtil.js';
+import { WalletUtil } from '@reown/appkit-scaffold-ui/utils';
 // -- Export Controllers -------------------------------------------------------
 export { AccountController };
 // -- Constants ----------------------------------------- //
@@ -190,12 +191,10 @@ export class AppKit {
     async initialize(options) {
         this.caipNetworks = this.extendCaipNetworks(options);
         this.defaultCaipNetwork = this.extendDefaultCaipNetwork(options);
-        await this.initControllers(options);
-        this.createAuthProvider();
-        await this.createUniversalProvider();
+        this.initControllers(options);
         this.createClients();
         ChainController.initialize(options.adapters ?? [], this.caipNetworks);
-        this.chainAdapters = await this.createAdapters(options.adapters);
+        this.chainAdapters = this.createAdapters(options.adapters);
         await this.initChainAdapters();
         this.syncRequestedNetworks();
         await this.initOrContinue();
@@ -214,10 +213,14 @@ export class AppKit {
                 }
             }
         });
+        PublicStateController.set({ initialized: true });
     }
     // -- Public -------------------------------------------------------------------
     async open(options) {
         await this.initOrContinue();
+        if (options?.uri && this.universalAdapter) {
+            ConnectionController.setUri(options.uri);
+        }
         ModalController.open(options);
     }
     async close() {
@@ -368,10 +371,13 @@ export class AppKit {
         OptionsController.setSocialsOrder(socialsOrder);
     }
     async disconnect() {
-        await this.connectionControllerClient?.disconnect();
+        await ChainController.disconnect();
+    }
+    getConnectMethodsOrder() {
+        return WalletUtil.getConnectOrderMethod(OptionsController.state.features, ConnectorController.getConnectors());
     }
     // -- Private ------------------------------------------------------------------
-    async initControllers(options) {
+    initControllers(options) {
         OptionsController.setDebug(options.debug !== false);
         OptionsController.setProjectId(options.projectId);
         OptionsController.setSdkVersion(options.sdkVersion);
@@ -383,7 +389,6 @@ export class AppKit {
             AlertController.open(ErrorUtil.ALERT_ERRORS.PROJECT_ID_NOT_CONFIGURED, 'error');
             return;
         }
-        this.adapters = options.adapters;
         const defaultMetaData = this.getDefaultMetaData();
         if (!options.metadata && defaultMetaData) {
             options.metadata = defaultMetaData;
@@ -427,18 +432,14 @@ export class AppKit {
                 if (options.siwx) {
                     throw new Error('Cannot set both `siweConfig` and `siwx` options');
                 }
-                const siwe = await import('@reown/appkit-siwe');
-                if (typeof siwe.mapToSIWX !== 'function') {
-                    throw new Error('Please update the `@reown/appkit-siwe` package to the latest version');
-                }
-                OptionsController.setSIWX(siwe.mapToSIWX(options.siweConfig));
+                OptionsController.setSIWX(options.siweConfig.mapToSIWX());
             }
         }
     }
     getDefaultMetaData() {
         if (typeof window !== 'undefined' && typeof document !== 'undefined') {
             return {
-                name: document.getElementsByTagName('title')[0]?.textContent || '',
+                name: document.getElementsByTagName('title')?.[0]?.textContent || '',
                 description: document.querySelector('meta[property="og:description"]')?.content || '',
                 url: window.location.origin,
                 icons: [document.querySelector('link[rel~="icon"]')?.href || '']
@@ -488,9 +489,7 @@ export class AppKit {
         this.connectionControllerClient = {
             connectWalletConnect: async (onUri) => {
                 const adapter = this.getAdapter(ChainController.state.activeChain);
-                this.universalProvider?.on('display_uri', (uri) => {
-                    onUri(uri);
-                });
+                this.universalProvider?.on('display_uri', onUri);
                 this.setClientId((await this.universalProvider?.client?.core?.crypto?.getClientId()) || null);
                 let isAuthenticated = false;
                 if (this.universalProvider) {
@@ -522,37 +521,15 @@ export class AppKit {
                 if (!adapter) {
                     throw new Error('Adapter not found');
                 }
-                let res = undefined;
-                try {
-                    res = await adapter.connect({
-                        id,
-                        info,
-                        type,
-                        provider,
-                        chainId: caipNetwork?.id || this.getCaipNetwork()?.id,
-                        rpcUrl: caipNetwork?.rpcUrls?.default?.http?.[0] ||
-                            this.getCaipNetwork()?.rpcUrls?.default?.http?.[0]
-                    });
-                    /**
-                     * In some cases with wagmi connectors, the connector is already connected
-                     * which throws an `Is already connected`error. In such cases, we need to reconnect
-                     * to restore the session.
-                     * We check if the reconnect method exists (which it does for wagmi connectors) and if so
-                     * we attempt to reconnect and restore the session state.
-                     */
-                }
-                catch (error) {
-                    if (!adapter?.reconnect) {
-                        throw new Error('Adapter is not able to connect');
-                    }
-                    await adapter.reconnect({
-                        id,
-                        info,
-                        type,
-                        provider,
-                        chainId: this.getCaipNetwork()?.id
-                    });
-                }
+                const res = await adapter.connect({
+                    id,
+                    info,
+                    type,
+                    provider,
+                    chainId: caipNetwork?.id || this.getCaipNetwork()?.id,
+                    rpcUrl: caipNetwork?.rpcUrls?.default?.http?.[0] ||
+                        this.getCaipNetwork()?.rpcUrls?.default?.http?.[0]
+                });
                 if (res) {
                     this.syncProvider({
                         ...res,
@@ -582,6 +559,7 @@ export class AppKit {
                 const provider = ProviderUtil.getProvider(ChainController.state.activeChain);
                 const providerType = ProviderUtil.state.providerIds[ChainController.state.activeChain];
                 await adapter?.disconnect({ provider, providerType });
+                ProviderUtil.resetChain(ChainController.state.activeChain);
                 this.setStatus('disconnected', ChainController.state.activeChain);
             },
             checkInstalled: (ids) => {
@@ -704,7 +682,7 @@ export class AppKit {
                         try {
                             ChainController.state.activeChain = caipNetwork.chainNamespace;
                             await this.connectionControllerClient?.connectExternal?.({
-                                id: UtilConstantsUtil.AUTH_CONNECTOR_ID,
+                                id: ConstantsUtil.CONNECTOR_ID.AUTH,
                                 provider: this.authProvider,
                                 chain: caipNetwork.chainNamespace,
                                 chainId: caipNetwork.id,
@@ -763,9 +741,6 @@ export class AppKit {
             ConnectionController.setClient(this.connectionControllerClient);
         }
     }
-    async handleDisconnect() {
-        await this.connectionControllerClient?.disconnect();
-    }
     async listenAuthConnector(provider) {
         this.setLoading(true);
         const isLoginEmailUsed = provider.getLoginEmailUsed();
@@ -822,8 +797,8 @@ export class AppKit {
             }
         });
         provider.onNotConnected(() => {
-            const connectedConnector = StorageUtil.getConnectedConnector();
-            const isConnectedWithAuth = connectedConnector === UtilConstantsUtil.AUTH_CONNECTOR_ID;
+            const connectorId = StorageUtil.getConnectedConnectorId();
+            const isConnectedWithAuth = connectorId === ConstantsUtil.CONNECTOR_ID.AUTH;
             if (!isConnected && isConnectedWithAuth) {
                 this.setCaipAddress(undefined, ChainController.state.activeChain);
                 this.setLoading(false);
@@ -837,7 +812,7 @@ export class AppKit {
             this.syncProvider({
                 type: UtilConstantsUtil.CONNECTOR_TYPE_AUTH,
                 provider,
-                id: UtilConstantsUtil.AUTH_CONNECTOR_ID,
+                id: ConstantsUtil.CONNECTOR_ID.AUTH,
                 chainNamespace: namespace
             });
             // To keep backwards compatibility, eip155 chainIds are numbers and not actual caipChainIds
@@ -866,8 +841,8 @@ export class AppKit {
         });
         if (isConnected && this.connectionControllerClient?.connectExternal) {
             await this.connectionControllerClient?.connectExternal({
-                id: UtilConstantsUtil.AUTH_CONNECTOR_ID,
-                info: { name: UtilConstantsUtil.AUTH_CONNECTOR_ID },
+                id: ConstantsUtil.CONNECTOR_ID.AUTH,
+                info: { name: ConstantsUtil.CONNECTOR_ID.AUTH },
                 type: UtilConstantsUtil.CONNECTOR_TYPE_AUTH,
                 provider,
                 chainId: ChainController.state.activeCaipNetwork?.id
@@ -943,11 +918,7 @@ export class AppKit {
                 this.setUnsupportedNetwork(chainId);
             }
         });
-        adapter.on('disconnect', () => {
-            if (ChainController.state.activeChain === chainNamespace) {
-                this.handleDisconnect();
-            }
-        });
+        adapter.on('disconnect', this.disconnect.bind(this));
         adapter.on('pendingTransactions', () => {
             const address = AccountController.state.address;
             const activeCaipNetwork = ChainController.state.activeCaipNetwork;
@@ -1015,7 +986,7 @@ export class AppKit {
                 else {
                     ProviderUtil.setProvider(chainNamespace, this.universalProvider);
                 }
-                StorageUtil.setConnectedConnector(UtilConstantsUtil.CONNECTOR_TYPE_WALLET_CONNECT);
+                StorageUtil.setConnectedConnectorId(ConstantsUtil.CONNECTOR_ID.WALLET_CONNECT);
                 let address = '';
                 if (caipAddress.split(':').length === 3) {
                     address = caipAddress.split(':')[2];
@@ -1070,13 +1041,13 @@ export class AppKit {
     syncProvider({ type, provider, id, chainNamespace }) {
         ProviderUtil.setProviderId(chainNamespace, type);
         ProviderUtil.setProvider(chainNamespace, provider);
-        StorageUtil.setConnectedConnector(id);
+        StorageUtil.setConnectedConnectorId(id);
     }
     async syncAccount({ address, chainId, chainNamespace }) {
         const { namespace: activeNamespace, chainId: activeChainId } = StorageUtil.getActiveNetworkProps();
         const chainIdToUse = chainId || activeChainId;
         // Only update state when needed
-        if (address.toLowerCase() !== AccountController.state.address?.toLowerCase()) {
+        if (address?.toLowerCase() !== AccountController.state.address?.toLowerCase()) {
             this.setCaipAddress(`${chainNamespace}:${chainId}:${address}`, chainNamespace);
             await this.syncIdentity({ address, chainId, chainNamespace });
         }
@@ -1106,12 +1077,12 @@ export class AppKit {
         }
     }
     syncConnectedWalletInfo(chainNamespace) {
-        const currentActiveWallet = StorageUtil.getConnectedConnector();
+        const connectorId = StorageUtil.getConnectedConnectorId();
         const providerType = ProviderUtil.state.providerIds[chainNamespace];
         if (providerType === UtilConstantsUtil.CONNECTOR_TYPE_ANNOUNCED ||
             providerType === UtilConstantsUtil.CONNECTOR_TYPE_INJECTED) {
-            if (currentActiveWallet) {
-                const connector = this.getConnectors().find(c => c.id === currentActiveWallet);
+            if (connectorId) {
+                const connector = this.getConnectors().find(c => c.id === connectorId);
                 if (connector?.info) {
                     this.setConnectedWalletInfo({ ...connector.info }, chainNamespace);
                 }
@@ -1127,12 +1098,12 @@ export class AppKit {
                 }, chainNamespace);
             }
         }
-        else if (providerType === UtilConstantsUtil.COINBASE_CONNECTOR_ID) {
-            const connector = this.getConnectors().find(c => c.id === UtilConstantsUtil.COINBASE_CONNECTOR_ID);
-            this.setConnectedWalletInfo({ name: 'Coinbase Wallet', icon: this.getConnectorImage(connector) }, chainNamespace);
-        }
-        else if (currentActiveWallet) {
-            this.setConnectedWalletInfo({ name: currentActiveWallet }, chainNamespace);
+        else if (connectorId) {
+            if (connectorId === ConstantsUtil.CONNECTOR_ID.COINBASE) {
+                const connector = this.getConnectors().find(c => c.id === ConstantsUtil.CONNECTOR_ID.COINBASE);
+                this.setConnectedWalletInfo({ name: 'Coinbase Wallet', icon: this.getConnectorImage(connector) }, chainNamespace);
+            }
+            this.setConnectedWalletInfo({ name: connectorId }, chainNamespace);
         }
     }
     async syncIdentity({ address, chainId, chainNamespace }) {
@@ -1198,43 +1169,56 @@ export class AppKit {
             [], chainNamespace));
     }
     async syncExistingConnection() {
-        const connectedConnector = StorageUtil.getConnectedConnector();
-        const activeNamespace = StorageUtil.getActiveNamespace();
-        if (connectedConnector === UtilConstantsUtil.CONNECTOR_TYPE_WALLET_CONNECT && activeNamespace) {
-            this.syncWalletConnectAccount();
-        }
-        else if (connectedConnector &&
-            connectedConnector !== UtilConstantsUtil.CONNECTOR_TYPE_W3M_AUTH &&
-            activeNamespace) {
-            this.setStatus('connecting', activeNamespace);
-            const adapter = this.getAdapter(activeNamespace);
-            const res = await adapter?.syncConnection({
-                id: connectedConnector,
-                chainId: this.getCaipNetwork()?.id,
-                namespace: activeNamespace,
-                rpcUrl: this.getCaipNetwork()?.rpcUrls?.default?.http?.[0]
-            });
-            if (res) {
-                const accounts = await adapter?.getAccounts({
+        try {
+            const connectorId = StorageUtil.getConnectedConnectorId();
+            const activeNamespace = StorageUtil.getActiveNamespace();
+            if (connectorId === ConstantsUtil.CONNECTOR_ID.WALLET_CONNECT && activeNamespace) {
+                this.syncWalletConnectAccount();
+            }
+            else if (connectorId &&
+                connectorId !== ConstantsUtil.CONNECTOR_ID.AUTH &&
+                activeNamespace) {
+                this.setStatus('connecting', activeNamespace);
+                const adapter = this.getAdapter(activeNamespace);
+                const res = await adapter?.syncConnection({
+                    id: connectorId,
+                    chainId: this.getCaipNetwork()?.id,
                     namespace: activeNamespace,
-                    id: connectedConnector
+                    rpcUrl: this.getCaipNetwork()?.rpcUrls?.default?.http?.[0]
                 });
-                this.syncProvider({ ...res, chainNamespace: activeNamespace });
-                await this.syncAccount({ ...res, chainNamespace: activeNamespace });
-                this.setAllAccounts(accounts?.accounts || [], activeNamespace);
-                this.setStatus('connected', activeNamespace);
-            }
-            else {
-                this.setStatus('disconnected', activeNamespace);
-            }
-            if (!this.caipNetworks?.some(network => network.id === res?.chainId)) {
-                if (res?.chainId) {
-                    this.setUnsupportedNetwork(res.chainId);
+                if (res) {
+                    const accounts = await adapter?.getAccounts({
+                        namespace: activeNamespace,
+                        id: connectorId
+                    });
+                    if (!accounts || accounts.accounts.length === 0) {
+                        throw new Error('No accounts found');
+                    }
+                    this.syncProvider({ ...res, chainNamespace: activeNamespace });
+                    await this.syncAccount({ ...res, chainNamespace: activeNamespace });
+                    this.setAllAccounts(accounts.accounts, activeNamespace);
+                    this.setStatus('connected', activeNamespace);
+                }
+                else {
+                    this.setStatus('disconnected', activeNamespace);
                 }
+                if (!this.caipNetworks?.some(network => network.id === res?.chainId)) {
+                    if (res?.chainId) {
+                        this.setUnsupportedNetwork(res.chainId);
+                    }
+                }
+            }
+            else if (connectorId !== ConstantsUtil.CONNECTOR_ID.AUTH) {
+                this.setStatus('disconnected', ChainController.state.activeChain);
             }
         }
-        else if (connectedConnector !== UtilConstantsUtil.CONNECTOR_TYPE_W3M_AUTH) {
-            this.setStatus('disconnected', ChainController.state.activeChain);
+        catch (err) {
+            // eslint-disable-next-line no-console
+            console.log("AppKit:syncExistingConnection - couldn't sync existing connection", err);
+            this.disconnect().finally(() => {
+                StorageUtil.deleteConnectedConnectorId();
+                this.setStatus('disconnected', ChainController.state.activeChain);
+            });
         }
     }
     getAdapter(namespace) {
@@ -1242,7 +1226,7 @@ export class AppKit {
     }
     createUniversalProvider() {
         if (!this.universalProviderInitPromise &&
-            typeof window !== 'undefined' &&
+            CoreHelperUtil.isClient() &&
             this.options?.projectId) {
             this.universalProviderInitPromise = this.initializeUniversalAdapter();
         }
@@ -1278,7 +1262,10 @@ export class AppKit {
             },
             logger
         };
-        this.universalProvider = await UniversalProvider.init(universalProviderOptions);
+        OptionsController.setUsingInjectedUniversalProvider(Boolean(this.options?.universalProvider));
+        this.universalProvider =
+            this.options.universalProvider ?? (await UniversalProvider.init(universalProviderOptions));
+        this.listenWalletConnect();
     }
     async getUniversalProvider() {
         if (!this.universalProvider) {
@@ -1292,13 +1279,13 @@ export class AppKit {
         return this.universalProvider;
     }
     createAuthProvider() {
-        const emailEnabled = this.options?.features?.email === undefined
+        const isEmailEnabled = this.options?.features?.email === undefined
             ? CoreConstantsUtil.DEFAULT_FEATURES.email
             : this.options?.features?.email;
-        const socialsEnabled = this.options?.features?.socials
+        const isSocialsEnabled = this.options?.features?.socials
             ? this.options?.features?.socials?.length > 0
             : CoreConstantsUtil.DEFAULT_FEATURES.socials;
-        if (this.options?.projectId && (emailEnabled || socialsEnabled)) {
+        if (!this.authProvider && this.options?.projectId && (isEmailEnabled || isSocialsEnabled)) {
             this.authProvider = W3mFrameProviderSingleton.getInstance({
                 projectId: this.options.projectId,
                 onTimeout: () => {
@@ -1308,10 +1295,19 @@ export class AppKit {
             this.listenAuthConnector(this.authProvider);
         }
     }
-    async createAdapters(blueprints) {
-        if (!this.universalProvider) {
-            this.universalProvider = await this.getUniversalProvider();
+    async createUniversalProviderForAdapter(chainNamespace) {
+        await this.getUniversalProvider();
+        if (this.universalProvider) {
+            this.chainAdapters?.[chainNamespace]?.setUniversalProvider?.(this.universalProvider);
         }
+    }
+    createAuthProviderForAdapter(chainNamespace) {
+        this.createAuthProvider();
+        if (this.authProvider) {
+            this.chainAdapters?.[chainNamespace]?.setAuthProvider?.(this.authProvider);
+        }
+    }
+    createAdapters(blueprints) {
         this.syncRequestedNetworks();
         return this.chainNamespaces.reduce((adapters, namespace) => {
             const blueprint = blueprints?.find(b => b.namespace === namespace);
@@ -1323,25 +1319,12 @@ export class AppKit {
                     projectId: this.options?.projectId,
                     networks: this.caipNetworks
                 });
-                if (this.universalProvider) {
-                    adapters[namespace].setUniversalProvider(this.universalProvider);
-                }
-                if (this.authProvider) {
-                    adapters[namespace].setAuthProvider(this.authProvider);
-                }
-                adapters[namespace].syncConnectors(this.options, this);
             }
             else {
                 adapters[namespace] = new UniversalAdapter({
                     namespace,
                     networks: this.caipNetworks
                 });
-                if (this.universalProvider) {
-                    adapters[namespace].setUniversalProvider(this.universalProvider);
-                }
-                if (this.authProvider) {
-                    adapters[namespace].setAuthProvider(this.authProvider);
-                }
             }
             ChainController.state.chains.set(namespace, {
                 namespace,
@@ -1355,16 +1338,21 @@ export class AppKit {
             // eslint-disable-next-line @typescript-eslint/prefer-reduce-type-parameter
         }, {});
     }
+    async createConnectorsForAdapter(namespace) {
+        await this.createUniversalProviderForAdapter(namespace);
+        this.createAuthProviderForAdapter(namespace);
+    }
+    onConnectors(chainNamespace) {
+        const adapter = this.getAdapter(chainNamespace);
+        adapter?.on('connectors', this.setConnectors.bind(this));
+    }
     async initChainAdapters() {
-        await Promise.all(
-        // eslint-disable-next-line @typescript-eslint/require-await
-        this.chainNamespaces.map(async (namespace) => {
-            if (this.options) {
-                this.listenAdapter(namespace);
-                this.setConnectors(this.chainAdapters?.[namespace]?.connectors || []);
-            }
+        await Promise.all(this.chainNamespaces.map(async (namespace) => {
+            this.onConnectors(namespace);
+            this.listenAdapter(namespace);
+            this.chainAdapters?.[namespace].syncConnectors(this.options, this);
+            await this.createConnectorsForAdapter(namespace);
         }));
-        this.listenWalletConnect();
     }
     setDefaultNetwork() {
         const previousNetwork = StorageUtil.getActiveCaipNetworkId();