@reown/appkit 1.6.3 → 1.6.4-rc.1.0

package/dist/esm/exports/constants.js

@@ -1,2 +1,2 @@
-export const PACKAGE_VERSION = '1.6.3';
+export const PACKAGE_VERSION = '1.6.4-rc.1.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,OAAO,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.3",
+    "version": "1.6.4-rc.1.0",
     "type": "module",
     "main": "./dist/esm/exports/index.js",
     "types": "./dist/types/exports/index.d.ts",

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

@@ -130,6 +130,14 @@ export class AdapterBlueprint {
             listeners.delete(callback);
         }
     }
+    /**
+     * Removes all event listeners.
+     */
+    removeAllEventListeners() {
+        this.eventListeners.forEach(listeners => {
+            listeners.clear();
+        });
+    }
     /**
      * Emits an event with the given name and optional data.
      * @template T

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

@@ -1 +1 @@
-{"version":3,"file":"ChainAdapterBlueprint.js","sourceRoot":"","sources":["../../../../src/adapters/ChainAdapterBlueprint.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,aAAa,IAAI,mBAAmB,EAIrC,MAAM,sBAAsB,CAAA;AAE7B,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,EAQhB,MAAM,oBAAoB,CAAA;AAG3B,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAGjD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAiBzC;;;GAGG;AACH,MAAM,OAAgB,gBAAgB;IAapC;;;OAGG;IACH,YAAY,MAAgC;QAVlC,wBAAmB,GAAgB,EAAE,CAAA;QAIvC,mBAAc,GAAG,IAAI,GAAG,EAA4C,CAAA;QAO1E,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QACxB,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,SAAS,CAAC,MAA+B;QACvC,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAA;QACnC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;QACjC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;IACnC,CAAC;IAED;;;OAGG;IACH,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,mBAAmB,CAAA;IACjC,CAAC;IAED;;;OAGG;IACH,IAAW,QAAQ;QACjB,OAAO,IAAI,CAAC,YAAY,IAAI,EAAE,CAAA;IAChC,CAAC;IAED;;;OAGG;IACI,oBAAoB,CAAC,iBAAoC;QAC9D,IAAI,CAAC,YAAY,CAAC;YAChB,EAAE,EAAE,mBAAmB,CAAC,YAAY,CAAC,cAAc;YACnD,IAAI,EAAE,gBAAgB;YACtB,IAAI,EAAE,WAAW,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,YAAY,CAAC,cAAc,CAAC;YACpF,QAAQ,EAAE,iBAAiB;YAC3B,OAAO,EAAE,WAAW,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,YAAY,CAAC,cAAc,CAAC;YACvF,KAAK,EAAE,IAAI,CAAC,SAAS;YACrB,MAAM,EAAE,EAAE;SACa,CAAC,CAAA;IAC5B,CAAC;IAED;;;OAGG;IACI,eAAe,CAAC,YAA8B;QACnD,IAAI,CAAC,YAAY,CAAC;YAChB,EAAE,EAAE,mBAAmB,CAAC,YAAY,CAAC,IAAI;YACzC,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,YAAY;YACtB,OAAO,EAAE,WAAW,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,YAAY,CAAC,IAAI,CAAC;YAC7E,KAAK,EAAE,IAAI,CAAC,SAAS;YACrB,MAAM,EAAE,EAAE;SACa,CAAC,CAAA;IAC5B,CAAC;IAED;;;OAGG;IACO,YAAY,CAAC,GAAG,UAAuB;QAC/C,IAAI,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,mBAAmB,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;YACzF,MAAM,aAAa,GAAG,UAAU,CAAC,IAAI,CACnC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,mBAAmB,CAAC,YAAY,CAAC,IAAI,CACnD,CAAA;YAElB,MAAM,YAAY,GAAG,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAA;YACtD,MAAM,SAAS,GAAG,eAAe,CAAC,WAAW,EAAE,CAAC,SAAS,CAAA;YACzD,MAAM,cAAc,GAAG,eAAe,CAAC,WAAW,EAAE,CAAC,cAAc,CAAA;YAEnE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC;gBACtC,QAAQ,EAAE,YAAY,CAAC,QAAoB;gBAC3C,UAAU,EAAE,YAAY,CAAC,UAAU;gBACnC,SAAS,EAAE,YAAY,CAAC,SAAS;gBACjC,OAAO,EAAE,YAAY,CAAC,OAAO;aAC9B,CAAC,CAAA;YACF,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAC/B,SAAS;gBACT,cAAc;gBACd,iBAAiB,EAAE,oBAAoB,CAAC,cAAc,EAAE,SAAS,CAAC;aACnE,CAAC,CAAA;QACJ,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,GAAG,EAAU,CAAA;QACzC,IAAI,CAAC,mBAAmB,GAAG,CAAC,GAAG,UAAU,EAAE,GAAG,IAAI,CAAC,mBAAmB,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;YACzF,IAAI,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;gBACtC,OAAO,KAAK,CAAA;YACd,CAAC;YAED,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;YAEjC,OAAO,IAAI,CAAA;QACb,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAA;IACnD,CAAC;IAES,SAAS,CAAC,MAAwC,EAAE,cAA+B;QAC3F,iBAAiB,CAAC,SAAS,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;IACrD,CAAC;IAED;;;;;OAKG;IACI,EAAE,CAAsB,SAAY,EAAE,QAA0B;QACrE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;QAC/C,CAAC;QAED,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,GAAG,CAAC,QAAoC,CAAC,CAAA;IAC/E,CAAC;IAED;;;;;OAKG;IACI,GAAG,CAAsB,SAAY,EAAE,QAA0B;QACtE,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QACpD,IAAI,SAAS,EAAE,CAAC;YACd,SAAS,CAAC,MAAM,CAAC,QAAoC,CAAC,CAAA;QACxD,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACO,IAAI,CAAsB,SAAY,EAAE,IAAmB;QACnE,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QACpD,IAAI,SAAS,EAAE,CAAC;YACd,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAoB,CAAC,CAAC,CAAA;QAC/D,CAAC;IACH,CAAC;CAkKF"}
+{"version":3,"file":"ChainAdapterBlueprint.js","sourceRoot":"","sources":["../../../../src/adapters/ChainAdapterBlueprint.ts"],"names":[],"mappings":"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"}

package/dist/esm/src/client.js

@@ -14,17 +14,6 @@ import { WalletUtil } from '@reown/appkit-scaffold-ui/utils';
 // -- Export Controllers -------------------------------------------------------
 export { AccountController };
 // -- Constants ----------------------------------------- //
-const accountState = {
-    currentTab: 0,
-    tokenBalance: [],
-    smartAccountDeployed: false,
-    addressLabels: new Map(),
-    allAccounts: []
-};
-const networkState = {
-    supportsAllNetworks: true,
-    smartAccountEnabledNetworks: []
-};
 const OPTIONAL_METHODS = [
     'eth_accounts',
     'eth_requestAccounts',
@@ -104,6 +93,9 @@ export class AppKit {
         this.setProfileImage = (profileImage, chain) => {
             AccountController.setProfileImage(profileImage, chain);
         };
+        this.setUser = user => {
+            AccountController.setUser(user);
+        };
         this.resetAccount = (chain) => {
             AccountController.resetAccount(chain);
         };
@@ -183,23 +175,23 @@ export class AppKit {
             }
         };
         this.options = options;
+        this.version = options.sdkVersion;
+        this.caipNetworks = this.extendCaipNetworks(options);
+        this.chainNamespaces = [
+            ...new Set(this.caipNetworks?.map(caipNetwork => caipNetwork.chainNamespace))
+        ];
+        this.defaultCaipNetwork = this.extendDefaultCaipNetwork(options);
+        this.chainAdapters = this.createAdapters(options.adapters);
         this.initialize(options);
     }
     static getInstance() {
         return this.instance;
     }
     async initialize(options) {
-        this.caipNetworks = this.extendCaipNetworks(options);
-        this.defaultCaipNetwork = this.extendDefaultCaipNetwork(options);
         this.initControllers(options);
-        this.createClients();
-        ChainController.initialize(options.adapters ?? [], this.caipNetworks);
-        this.chainAdapters = this.createAdapters(options.adapters);
         await this.initChainAdapters();
-        this.syncRequestedNetworks();
-        await this.initOrContinue();
+        await this.injectModalUi();
         await this.syncExistingConnection();
-        this.version = options.sdkVersion;
         const { ...optionsCopy } = options;
         delete optionsCopy.adapters;
         EventsController.sendEvent({
@@ -217,14 +209,14 @@ export class AppKit {
     }
     // -- Public -------------------------------------------------------------------
     async open(options) {
-        await this.initOrContinue();
+        await this.injectModalUi();
         if (options?.uri && this.universalAdapter) {
             ConnectionController.setUri(options.uri);
         }
         ModalController.open(options);
     }
     async close() {
-        await this.initOrContinue();
+        await this.injectModalUi();
         ModalController.close();
     }
     setLoading(loading) {
@@ -290,7 +282,12 @@ export class AppKit {
                 caipAddress: ChainController.state.activeCaipAddress,
                 address: CoreHelperUtil.getPlainAddress(ChainController.state.activeCaipAddress),
                 isConnected: Boolean(ChainController.state.activeCaipAddress),
-                status: AccountController.state.status
+                status: AccountController.state.status,
+                embeddedWalletInfo: {
+                    user: AccountController.state.user,
+                    accountType: AccountController.state.preferredAccountType,
+                    isSmartAccountDeployed: Boolean(AccountController.state.smartAccountDeployed)
+                }
             });
         }
         ChainController.subscribe(updateVal);
@@ -376,56 +373,80 @@ export class AppKit {
     getConnectMethodsOrder() {
         return WalletUtil.getConnectOrderMethod(OptionsController.state.features, ConnectorController.getConnectors());
     }
+    /**
+     * Removes an adapter from the AppKit.
+     * @param namespace - The namespace of the adapter to remove.
+     */
+    removeAdapter(namespace) {
+        const isConnected = this.getIsConnectedState();
+        const adapter = this.getAdapter(namespace);
+        if (!adapter || !this.chainAdapters || isConnected) {
+            return;
+        }
+        const newCaipNetworks = this.caipNetworks?.filter(network => network.chainNamespace !== namespace);
+        ChainController.removeAdapter(namespace);
+        ConnectorController.removeAdapter(namespace);
+        this.chainNamespaces = this.chainNamespaces.filter(n => n !== namespace);
+        this.caipNetworks = newCaipNetworks;
+        adapter.removeAllEventListeners();
+        Reflect.deleteProperty(this.chainAdapters, namespace);
+    }
+    /**
+     * Adds an adapter to the AppKit.
+     * @param adapter - The adapter instance.
+     * @param networks - The list of networks that this adapter supports / uses.
+     */
+    addAdapter(adapter, networks) {
+        const namespace = adapter.namespace;
+        if (!this.connectionControllerClient || !this.networkControllerClient) {
+            return;
+        }
+        if (!this.chainAdapters || !namespace) {
+            return;
+        }
+        const extendedAdapterNetworks = this.extendCaipNetworks({ ...this.options, networks });
+        this.caipNetworks = [...(this.caipNetworks || []), ...extendedAdapterNetworks];
+        this.createAdapter(adapter);
+        this.initChainAdapter(namespace);
+        ChainController.addAdapter(adapter, {
+            connectionControllerClient: this.connectionControllerClient,
+            networkControllerClient: this.networkControllerClient
+        }, extendedAdapterNetworks);
+    }
     // -- Private ------------------------------------------------------------------
-    initControllers(options) {
+    initializeOptionsController(options) {
         OptionsController.setDebug(options.debug !== false);
-        OptionsController.setProjectId(options.projectId);
-        OptionsController.setSdkVersion(options.sdkVersion);
-        OptionsController.setEnableEmbedded(options.enableEmbedded);
-        if (options.allowUnsupportedChain) {
-            OptionsController.setAllowUnsupportedChain(options.allowUnsupportedChain);
-        }
         if (!options.projectId) {
             AlertController.open(ErrorUtil.ALERT_ERRORS.PROJECT_ID_NOT_CONFIGURED, 'error');
             return;
         }
-        const defaultMetaData = this.getDefaultMetaData();
-        if (!options.metadata && defaultMetaData) {
-            options.metadata = defaultMetaData;
-        }
-        this.setDefaultNetwork();
+        // On by default
+        OptionsController.setEnableWalletConnect(options.enableWalletConnect !== false);
+        OptionsController.setEnableWalletGuide(options.enableWalletGuide !== false);
+        OptionsController.setEnableWallets(options.enableWallets !== false);
+        OptionsController.setEIP6963Enabled(options.enableEIP6963 !== false);
+        OptionsController.setEnableAuthLogger(options.enableAuthLogger !== false);
+        OptionsController.setSdkVersion(options.sdkVersion);
+        OptionsController.setProjectId(options.projectId);
+        OptionsController.setEnableEmbedded(options.enableEmbedded);
         OptionsController.setAllWallets(options.allWallets);
         OptionsController.setIncludeWalletIds(options.includeWalletIds);
         OptionsController.setExcludeWalletIds(options.excludeWalletIds);
-        if (options.excludeWalletIds) {
-            ApiController.searchWalletByIds({ ids: options.excludeWalletIds });
-        }
         OptionsController.setFeaturedWalletIds(options.featuredWalletIds);
         OptionsController.setTokens(options.tokens);
         OptionsController.setTermsConditionsUrl(options.termsConditionsUrl);
         OptionsController.setPrivacyPolicyUrl(options.privacyPolicyUrl);
         OptionsController.setCustomWallets(options.customWallets);
         OptionsController.setFeatures(options.features);
-        OptionsController.setEnableWalletConnect(options.enableWalletConnect !== false);
-        OptionsController.setEnableWalletGuide(options.enableWalletGuide !== false);
-        OptionsController.setEnableWallets(options.enableWallets !== false);
-        OptionsController.setEIP6963Enabled(options.enableEIP6963 !== false);
-        OptionsController.setEnableAuthLogger(options.enableAuthLogger !== false);
-        if (options.metadata) {
-            OptionsController.setMetadata(options.metadata);
-        }
-        if (options.themeMode) {
-            ThemeController.setThemeMode(options.themeMode);
-        }
-        if (options.themeVariables) {
-            ThemeController.setThemeVariables(options.themeVariables);
-        }
-        if (options.disableAppend) {
-            OptionsController.setDisableAppend(Boolean(options.disableAppend));
-        }
-        if (options.siwx) {
-            OptionsController.setSIWX(options.siwx);
+        OptionsController.setAllowUnsupportedChain(options.allowUnsupportedChain);
+        const defaultMetaData = this.getDefaultMetaData();
+        if (!options.metadata && defaultMetaData) {
+            options.metadata = defaultMetaData;
         }
+        OptionsController.setMetadata(options.metadata);
+        OptionsController.setDisableAppend(options.disableAppend);
+        OptionsController.setEnableEmbedded(options.enableEmbedded);
+        OptionsController.setSIWX(options.siwx);
         const evmAdapter = options.adapters?.find(adapter => adapter.namespace === ConstantsUtil.CHAIN.EVM);
         // Set the SIWE client for EVM chains
         if (evmAdapter) {
@@ -437,6 +458,35 @@ export class AppKit {
             }
         }
     }
+    initializeThemeController(options) {
+        if (options.themeMode) {
+            ThemeController.setThemeMode(options.themeMode);
+        }
+        if (options.themeVariables) {
+            ThemeController.setThemeVariables(options.themeVariables);
+        }
+    }
+    initializeChainController(options) {
+        if (!this.connectionControllerClient || !this.networkControllerClient) {
+            throw new Error('ConnectionControllerClient and NetworkControllerClient must be set');
+        }
+        ChainController.initialize(options.adapters ?? [], this.caipNetworks, {
+            connectionControllerClient: this.connectionControllerClient,
+            networkControllerClient: this.networkControllerClient
+        });
+        const network = this.getDefaultNetwork();
+        if (network) {
+            ChainController.setActiveCaipNetwork(network);
+        }
+    }
+    initControllers(options) {
+        this.initializeOptionsController(options);
+        this.initializeChainController(options);
+        this.initializeThemeController(options);
+        if (options.excludeWalletIds) {
+            ApiController.initializeExcludedWalletRdns({ ids: options.excludeWalletIds });
+        }
+    }
     getDefaultMetaData() {
         if (typeof window !== 'undefined' && typeof document !== 'undefined') {
             return {
@@ -567,6 +617,7 @@ export class AppKit {
                 await adapter?.disconnect({ provider, providerType });
                 StorageUtil.removeConnectedNamespace(namespace);
                 ProviderUtil.resetChain(namespace);
+                this.setUser(undefined);
                 this.setStatus('disconnected', namespace);
             },
             checkInstalled: (ids) => {
@@ -679,7 +730,7 @@ export class AppKit {
                     this.setCaipNetwork(caipNetwork);
                     await this.syncAccount({
                         address: AccountController.state.address,
-                        chainId: ChainController.state.activeCaipNetwork?.id,
+                        chainId: caipNetwork.id,
                         chainNamespace: caipNetwork.chainNamespace
                     });
                 }
@@ -744,9 +795,7 @@ export class AppKit {
                 return { supportsAllNetworks: true, approvedCaipNetworkIds: [] };
             }
         };
-        if (this.networkControllerClient && this.connectionControllerClient) {
-            ConnectionController.setClient(this.connectionControllerClient);
-        }
+        ConnectionController.setClient(this.connectionControllerClient);
     }
     setupAuthConnectorListeners(provider) {
         provider.onRpcRequest((request) => {
@@ -830,6 +879,7 @@ export class AppKit {
                 });
             }
             this.setCaipAddress(caipAddress, namespace);
+            this.setUser({ ...(AccountController.state.user || {}), email: user.email });
             const preferredAccountType = (user.preferredAccountType || 'eoa');
             this.setPreferredAccountType(preferredAccountType, namespace);
             const userAccounts = user.accounts?.map(account => CoreHelperUtil.createAccount(namespace, account.address, namespace === ConstantsUtil.CHAIN.EVM ? account.type : 'eoa'));
@@ -839,6 +889,9 @@ export class AppKit {
             await provider.getSmartAccountEnabledNetworks();
             this.setLoading(false);
         });
+        provider.onSocialConnected(({ userName }) => {
+            this.setUser({ ...(AccountController.state.user || {}), username: userName });
+        });
         provider.onGetSmartAccountEnabledNetworks(networks => {
             this.setSmartAccountEnabledNetworks(networks, ChainController.state.activeChain);
         });
@@ -856,6 +909,9 @@ export class AppKit {
         if (isLoginEmailUsed) {
             this.setStatus('connecting', ChainController.state.activeChain);
         }
+        const email = provider.getEmail();
+        const username = provider.getUsername();
+        this.setUser({ ...(AccountController.state?.user || {}), username, email });
         this.setupAuthConnectorListeners(provider);
         const { isConnected } = await provider.isConnected();
         const namespace = StorageUtil.getActiveNamespace();
@@ -1094,7 +1150,6 @@ export class AppKit {
         }
     }
     async syncBalance(params) {
-        const adapter = this.getAdapter(params.chainNamespace);
         const caipNetwork = NetworkUtil.getNetworksByNamespace(this.caipNetworks, params.chainNamespace).find(n => n.id.toString() === params.chainId.toString());
         if (!caipNetwork) {
             return;
@@ -1103,15 +1158,9 @@ export class AppKit {
             this.setBalance('0.00', caipNetwork.nativeCurrency.symbol, caipNetwork.chainNamespace);
             return;
         }
-        const balance = await adapter?.getBalance({
-            address: params.address,
-            chainId: params.chainId,
-            caipNetwork,
-            tokens: this.options.tokens
-        });
-        if (balance) {
-            this.setBalance(balance.balance, balance.symbol, params.chainNamespace);
-        }
+        const balances = await AccountController.fetchTokenBalance(() => this.setBalance('0.00', caipNetwork.nativeCurrency.symbol, caipNetwork.chainNamespace));
+        const balance = balances.find(b => b.chainId === params.chainId);
+        this.setBalance(balance?.quantity?.numeric || '0.00', caipNetwork.nativeCurrency.symbol, params.chainNamespace);
     }
     syncConnectedWalletInfo(chainNamespace) {
         const connectorId = StorageUtil.getConnectedConnectorId(chainNamespace);
@@ -1200,14 +1249,6 @@ export class AppKit {
             this.setProfileName(null, chainNamespace);
         }
     }
-    syncRequestedNetworks() {
-        const uniqueChainNamespaces = [
-            ...new Set(this.caipNetworks?.map(caipNetwork => caipNetwork.chainNamespace))
-        ];
-        this.chainNamespaces = uniqueChainNamespaces;
-        uniqueChainNamespaces.forEach(chainNamespace => this.setRequestedCaipNetworks(this.caipNetworks?.filter(caipNetwork => caipNetwork.chainNamespace === chainNamespace) ??
-            [], chainNamespace));
-    }
     async syncAdapterConnection(namespace) {
         const adapter = this.getAdapter(namespace);
         const connectorId = StorageUtil.getConnectedConnectorId(namespace);
@@ -1242,7 +1283,6 @@ export class AppKit {
             }
         }
         catch (e) {
-            console.warn(`Error syncing connection for namespace ${namespace}`, e);
             StorageUtil.deleteConnectedConnectorId(namespace);
             this.setStatus('disconnected', namespace);
         }
@@ -1273,10 +1313,7 @@ export class AppKit {
         }
     }
     async syncExistingConnection() {
-        const connectedNamespaces = StorageUtil.getConnectedNamespaces();
-        if (connectedNamespaces?.length > 0) {
-            await Promise.allSettled(connectedNamespaces.map(namespace => this.syncNamespaceConnection(namespace)));
-        }
+        await Promise.allSettled(this.chainNamespaces.map(namespace => this.syncNamespaceConnection(namespace)));
     }
     getAdapter(namespace) {
         return this.chainAdapters?.[namespace];
@@ -1351,6 +1388,11 @@ export class AppKit {
                     AlertController.open(ErrorUtil.ALERT_ERRORS.SOCIALS_TIMEOUT, 'error');
                 }
             });
+            this.subscribeState(val => {
+                if (!val.open) {
+                    this.authProvider?.rejectRpcRequests();
+                }
+            });
             this.syncAuthConnector(this.authProvider);
         }
     }
@@ -1366,8 +1408,31 @@ export class AppKit {
             this.chainAdapters?.[chainNamespace]?.setAuthProvider?.(this.authProvider);
         }
     }
+    createAdapter(blueprint) {
+        if (!blueprint) {
+            return;
+        }
+        const namespace = blueprint.namespace;
+        if (!namespace) {
+            return;
+        }
+        this.createClients();
+        const adapterBlueprint = blueprint;
+        adapterBlueprint.namespace = namespace;
+        adapterBlueprint.construct({
+            namespace,
+            projectId: this.options?.projectId,
+            networks: this.caipNetworks
+        });
+        if (!this.chainNamespaces.includes(namespace)) {
+            this.chainNamespaces.push(namespace);
+        }
+        if (this.chainAdapters) {
+            this.chainAdapters[namespace] = adapterBlueprint;
+        }
+    }
     createAdapters(blueprints) {
-        this.syncRequestedNetworks();
+        this.createClients();
         return this.chainNamespaces.reduce((adapters, namespace) => {
             const blueprint = blueprints?.find(b => b.namespace === namespace);
             if (blueprint) {
@@ -1385,45 +1450,35 @@ export class AppKit {
                     networks: this.caipNetworks
                 });
             }
-            ChainController.state.chains.set(namespace, {
-                namespace,
-                connectionControllerClient: this.connectionControllerClient,
-                networkControllerClient: this.networkControllerClient,
-                networkState,
-                accountState,
-                caipNetworks: this.caipNetworks ?? []
-            });
             return adapters;
             // 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 initChainAdapter(namespace) {
+        this.onConnectors(namespace);
+        this.listenAdapter(namespace);
+        this.chainAdapters?.[namespace].syncConnectors(this.options, this);
+        await this.createUniversalProviderForAdapter(namespace);
+        this.createAuthProviderForAdapter(namespace);
+    }
     async initChainAdapters() {
         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);
+            await this.initChainAdapter(namespace);
         }));
     }
-    setDefaultNetwork() {
+    getDefaultNetwork() {
         const previousNetwork = StorageUtil.getActiveCaipNetworkId();
         const caipNetwork = previousNetwork && this.caipNetworks?.length
             ? this.caipNetworks.find(n => n.caipNetworkId === previousNetwork)
             : undefined;
         const network = caipNetwork || this.defaultCaipNetwork || this.caipNetworks?.[0];
-        if (network) {
-            ChainController.setActiveCaipNetwork(network);
-        }
+        return network;
     }
-    async initOrContinue() {
+    async injectModalUi() {
         if (!this.initPromise && !isInitialized && CoreHelperUtil.isClient()) {
             isInitialized = true;
             this.initPromise = new Promise(async (resolve) => {
@@ -1432,7 +1487,7 @@ export class AppKit {
                     import('@reown/appkit-scaffold-ui/w3m-modal')
                 ]);
                 const modal = document.createElement('w3m-modal');
-                if (!OptionsController.state.disableAppend) {
+                if (!OptionsController.state.disableAppend && !OptionsController.state.enableEmbedded) {
                     document.body.insertAdjacentElement('beforeend', modal);
                 }
                 resolve();