@reown/appkit 1.6.4 → 1.6.5-rc.0.0

package/dist/esm/exports/connectors.js

@@ -0,0 +1,2 @@
+export * from '../src/connectors/index.js';
+//# sourceMappingURL=connectors.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"connectors.js","sourceRoot":"","sources":["../../../exports/connectors.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAA"}

package/dist/esm/exports/constants.js

@@ -1,2 +1,2 @@
-export const PACKAGE_VERSION = '1.6.4';
+export const PACKAGE_VERSION = '1.6.5-rc.0.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/exports/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../exports/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAEzC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAEhD,wEAAwE;AACxE,cAAc,2BAA2B,CAAA;AAEzC,yEAAyE;AACzE,cAAc,uBAAuB,CAAA;AAGrC,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAItE,MAAM,UAAU,YAAY,CAAC,OAAqB;IAChD,OAAO,IAAI,MAAM,CAAC;QAChB,GAAG,OAAO;QACV,UAAU,EAAE,cAAc,CAAC,kBAAkB,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC;KAC/F,CAAC,CAAA;AACJ,CAAC;AAED,OAAO,EAAE,MAAM,EAAE,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../exports/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAEnD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAEzC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAEhD,wEAAwE;AACxE,cAAc,2BAA2B,CAAA;AAEzC,yEAAyE;AACzE,cAAc,uBAAuB,CAAA;AAGrC,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAItE,MAAM,UAAU,YAAY,CAAC,OAAqB;IAChD,OAAO,IAAI,MAAM,CAAC;QAChB,GAAG,OAAO;QACV,UAAU,EAAE,cAAc,CAAC,kBAAkB,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC;KAC/F,CAAC,CAAA;AACJ,CAAC;AAED,OAAO,EAAE,MAAM,EAAE,CAAA"}

package/dist/esm/exports/react.js

@@ -1,8 +1,8 @@
+import { CoreHelperUtil } from '@reown/appkit-core';
+import { useAppKitNetworkCore } from '@reown/appkit-core/react';
 import { AppKit } from '../src/client.js';
 import { getAppKit } from '../src/library/react/index.js';
-import { CoreHelperUtil } from '@reown/appkit-core';
 import { PACKAGE_VERSION } from './constants.js';
-import { useAppKitNetworkCore } from '@reown/appkit-core/react';
 // -- Views ------------------------------------------------------------
 export * from '@reown/appkit-scaffold-ui';
 // -- Hooks ------------------------------------------------------------

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

@@ -1 +1 @@
-{"version":3,"file":"react.js","sourceRoot":"","sources":["../../../exports/react.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AACzD,OAAO,EAAE,cAAc,EAA+B,MAAM,oBAAoB,CAAA;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAA;AAG/D,wEAAwE;AACxE,cAAc,2BAA2B,CAAA;AAEzC,wEAAwE;AACxE,cAAc,+BAA+B,CAAA;AAE7C,yEAAyE;AACzE,cAAc,uBAAuB,CAAA;AAGrC,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAEtE,MAAM,CAAC,IAAI,KAAK,GAAuB,SAAS,CAAA;AAIhD,MAAM,UAAU,YAAY,CAAC,OAAqB;IAChD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,KAAK,GAAG,IAAI,MAAM,CAAC;YACjB,GAAG,OAAO;YACV,UAAU,EAAE,cAAc,CAAC,kBAAkB,CAC3C,OAAO,CAAC,QAAQ,IAAI,EAAE,EACtB,OAAO,EACP,eAAe,CAChB;SACF,CAAC,CAAA;QACF,SAAS,CAAC,KAAK,CAAC,CAAA;IAClB,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC;AAED,OAAO,EAAE,MAAM,EAAE,CAAA;AAGjB,wEAAwE;AACxE,cAAc,+BAA+B,CAAA;AAE7C,MAAM,UAAU,gBAAgB;IAC9B,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,oBAAoB,EAAE,CAAA;IAEtE,SAAS,aAAa,CAAC,OAAsB;QAC3C,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,CAAA;IAC/B,CAAC;IAED,OAAO;QACL,WAAW;QACX,aAAa;QACb,OAAO;QACP,aAAa;KACd,CAAA;AACH,CAAC;AAED,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA"}
+{"version":3,"file":"react.js","sourceRoot":"","sources":["../../../exports/react.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAA+B,MAAM,oBAAoB,CAAA;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAA;AAG/D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAEzD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAEhD,wEAAwE;AACxE,cAAc,2BAA2B,CAAA;AAEzC,wEAAwE;AACxE,cAAc,+BAA+B,CAAA;AAE7C,yEAAyE;AACzE,cAAc,uBAAuB,CAAA;AAGrC,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAEtE,MAAM,CAAC,IAAI,KAAK,GAAuB,SAAS,CAAA;AAIhD,MAAM,UAAU,YAAY,CAAC,OAAqB;IAChD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,KAAK,GAAG,IAAI,MAAM,CAAC;YACjB,GAAG,OAAO;YACV,UAAU,EAAE,cAAc,CAAC,kBAAkB,CAC3C,OAAO,CAAC,QAAQ,IAAI,EAAE,EACtB,OAAO,EACP,eAAe,CAChB;SACF,CAAC,CAAA;QACF,SAAS,CAAC,KAAK,CAAC,CAAA;IAClB,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC;AAED,OAAO,EAAE,MAAM,EAAE,CAAA;AAGjB,wEAAwE;AACxE,cAAc,+BAA+B,CAAA;AAE7C,MAAM,UAAU,gBAAgB;IAC9B,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,oBAAoB,EAAE,CAAA;IAEtE,SAAS,aAAa,CAAC,OAAsB;QAC3C,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,CAAA;IAC/B,CAAC;IAED,OAAO;QACL,WAAW;QACX,aAAa;QACb,OAAO;QACP,aAAa;KACd,CAAA;AACH,CAAC;AAED,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAA"}

package/dist/esm/exports/vue.js

@@ -1,8 +1,8 @@
+import { onUnmounted, ref } from 'vue';
+import { ChainController, CoreHelperUtil } from '@reown/appkit-core';
 import { AppKit } from '../src/client.js';
 import { getAppKit } from '../src/library/vue/index.js';
-import { ChainController, CoreHelperUtil } from '@reown/appkit-core';
 import { PACKAGE_VERSION } from './constants.js';
-import { onUnmounted, ref } from 'vue';
 // -- Views ------------------------------------------------------------
 export * from '@reown/appkit-scaffold-ui';
 // -- Hooks ------------------------------------------------------------

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

@@ -1 +1 @@
-{"version":3,"file":"vue.js","sourceRoot":"","sources":["../../../exports/vue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,cAAc,EAA+B,MAAM,oBAAoB,CAAA;AACjG,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAEhD,OAAO,EAAE,WAAW,EAAE,GAAG,EAAY,MAAM,KAAK,CAAA;AAEhD,wEAAwE;AACxE,cAAc,2BAA2B,CAAA;AAEzC,wEAAwE;AACxE,cAAc,6BAA6B,CAAA;AAE3C,yEAAyE;AACzE,cAAc,uBAAuB,CAAA;AAGrC,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAEtE,IAAI,KAAK,GAAuB,SAAS,CAAA;AAIzC,MAAM,UAAU,YAAY,CAAC,OAAqB;IAChD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,KAAK,GAAG,IAAI,MAAM,CAAC;YACjB,GAAG,OAAO;YACV,UAAU,EAAE,cAAc,CAAC,kBAAkB,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC;SAC/F,CAAC,CAAA;QACF,SAAS,CAAC,KAAK,CAAC,CAAA;IAClB,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC;AAED,OAAO,EAAE,MAAM,EAAE,CAAA;AAGjB,wEAAwE;AACxE,MAAM,UAAU,gBAAgB;IAC9B,MAAM,KAAK,GAAG,GAAG,CAAC;QAChB,WAAW,EAAE,eAAe,CAAC,KAAK,CAAC,iBAAiB;QACpD,OAAO,EAAE,eAAe,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE;QACpD,aAAa,EAAE,eAAe,CAAC,KAAK,CAAC,iBAAiB,EAAE,aAAa;QACrE,aAAa,EAAE,CAAC,OAAsB,EAAE,EAAE;YACxC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,CAAA;QAC/B,CAAC;KACF,CAAC,CAAA;IAEF,MAAM,WAAW,GAAG,eAAe,CAAC,YAAY,CAAC,mBAAmB,EAAE,GAAG,CAAC,EAAE;QAC1E,KAAK,CAAC,KAAK,CAAC,WAAW,GAAG,GAAG,CAAA;QAC7B,KAAK,CAAC,KAAK,CAAC,OAAO,GAAG,GAAG,EAAE,EAAE,CAAA;QAC7B,KAAK,CAAC,KAAK,CAAC,aAAa,GAAG,GAAG,EAAE,aAAa,CAAA;IAChD,CAAC,CAAC,CAAA;IAEF,WAAW,CAAC,GAAG,EAAE;QACf,WAAW,EAAE,CAAA;IACf,CAAC,CAAC,CAAA;IAEF,OAAO,KAAK,CAAA;AACd,CAAC;AAED,cAAc,6BAA6B,CAAA"}
+{"version":3,"file":"vue.js","sourceRoot":"","sources":["../../../exports/vue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,WAAW,EAAE,GAAG,EAAE,MAAM,KAAK,CAAA;AAEhD,OAAO,EAAE,eAAe,EAAE,cAAc,EAA+B,MAAM,oBAAoB,CAAA;AAGjG,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAEhD,wEAAwE;AACxE,cAAc,2BAA2B,CAAA;AAEzC,wEAAwE;AACxE,cAAc,6BAA6B,CAAA;AAE3C,yEAAyE;AACzE,cAAc,uBAAuB,CAAA;AAGrC,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAEtE,IAAI,KAAK,GAAuB,SAAS,CAAA;AAIzC,MAAM,UAAU,YAAY,CAAC,OAAqB;IAChD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,KAAK,GAAG,IAAI,MAAM,CAAC;YACjB,GAAG,OAAO;YACV,UAAU,EAAE,cAAc,CAAC,kBAAkB,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,EAAE,MAAM,EAAE,eAAe,CAAC;SAC/F,CAAC,CAAA;QACF,SAAS,CAAC,KAAK,CAAC,CAAA;IAClB,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC;AAED,OAAO,EAAE,MAAM,EAAE,CAAA;AAGjB,wEAAwE;AACxE,MAAM,UAAU,gBAAgB;IAC9B,MAAM,KAAK,GAAG,GAAG,CAAC;QAChB,WAAW,EAAE,eAAe,CAAC,KAAK,CAAC,iBAAiB;QACpD,OAAO,EAAE,eAAe,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE;QACpD,aAAa,EAAE,eAAe,CAAC,KAAK,CAAC,iBAAiB,EAAE,aAAa;QACrE,aAAa,EAAE,CAAC,OAAsB,EAAE,EAAE;YACxC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,CAAA;QAC/B,CAAC;KACF,CAAC,CAAA;IAEF,MAAM,WAAW,GAAG,eAAe,CAAC,YAAY,CAAC,mBAAmB,EAAE,GAAG,CAAC,EAAE;QAC1E,KAAK,CAAC,KAAK,CAAC,WAAW,GAAG,GAAG,CAAA;QAC7B,KAAK,CAAC,KAAK,CAAC,OAAO,GAAG,GAAG,EAAE,EAAE,CAAA;QAC7B,KAAK,CAAC,KAAK,CAAC,aAAa,GAAG,GAAG,EAAE,aAAa,CAAA;IAChD,CAAC,CAAC,CAAA;IAEF,WAAW,CAAC,GAAG,EAAE;QACf,WAAW,EAAE,CAAA;IACf,CAAC,CAAC,CAAA;IAEF,OAAO,KAAK,CAAA;AACd,CAAC;AAED,cAAc,6BAA6B,CAAA"}

package/dist/esm/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@reown/appkit",
-    "version": "1.6.4",
+    "version": "1.6.5-rc.0.0",
     "type": "module",
     "main": "./dist/esm/exports/index.js",
     "types": "./dist/types/exports/index.d.ts",
@@ -66,6 +66,11 @@
             "types": "./dist/types/exports/adapters.d.ts",
             "import": "./dist/esm/exports/adapters.js",
             "default": "./dist/esm/exports/adapters.js"
+        },
+        "./connectors": {
+            "types": "./dist/types/exports/connectors.d.ts",
+            "import": "./dist/esm/exports/connectors.js",
+            "default": "./dist/esm/exports/connectors.js"
         }
     },
     "typesVersions": {

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

@@ -1,7 +1,9 @@
-import { getW3mThemeVariables, ConstantsUtil as CommonConstantsUtil } from '@reown/appkit-common';
-import { AccountController, OptionsController, ThemeController } from '@reown/appkit-core';
+import UniversalProvider from '@walletconnect/universal-provider';
+import { ConstantsUtil as CommonConstantsUtil } from '@reown/appkit-common';
+import { AccountController, OptionsController } from '@reown/appkit-core';
 import { PresetsUtil } from '@reown/appkit-utils';
-import { snapshot } from 'valtio/vanilla';
+import { W3mFrameProvider } from '@reown/appkit-wallet';
+import { WalletConnectConnector } from '../connectors/WalletConnectConnector.js';
 /**
  * Abstract class representing a chain adapter blueprint.
  * @template Connector - The type of connector extending ChainAdapterConnector
@@ -41,21 +43,6 @@ export class AdapterBlueprint {
     get networks() {
         return this.caipNetworks || [];
     }
-    /**
-     * Sets the universal provider for WalletConnect.
-     * @param {UniversalProvider} universalProvider - The universal provider instance
-     */
-    setUniversalProvider(universalProvider) {
-        this.addConnector({
-            id: CommonConstantsUtil.CONNECTOR_ID.WALLET_CONNECT,
-            type: 'WALLET_CONNECT',
-            name: PresetsUtil.ConnectorNamesMap[CommonConstantsUtil.CONNECTOR_ID.WALLET_CONNECT],
-            provider: universalProvider,
-            imageId: PresetsUtil.ConnectorImageIds[CommonConstantsUtil.CONNECTOR_ID.WALLET_CONNECT],
-            chain: this.namespace,
-            chains: []
-        });
-    }
     /**
      * Sets the auth provider.
      * @param {W3mFrameProvider} authProvider - The auth provider instance
@@ -76,23 +63,6 @@ export class AdapterBlueprint {
      * @param {...Connector} connectors - The connectors to add
      */
     addConnector(...connectors) {
-        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;
-            authConnector?.provider?.syncDappData?.({
-                metadata: optionsState.metadata,
-                sdkVersion: optionsState.sdkVersion,
-                projectId: optionsState.projectId,
-                sdkType: optionsState.sdkType
-            });
-            authConnector.provider.syncTheme({
-                themeMode,
-                themeVariables,
-                w3mThemeVariables: getW3mThemeVariables(themeVariables, themeMode)
-            });
-        }
         const connectorsAdded = new Set();
         this.availableConnectors = [...connectors, ...this.availableConnectors].filter(connector => {
             if (connectorsAdded.has(connector.id)) {
@@ -150,5 +120,47 @@ export class AdapterBlueprint {
             listeners.forEach(callback => callback(data));
         }
     }
+    /**
+     * Connects to WalletConnect.
+     * @param {(uri: string) => void} onUri - Callback function to handle the WalletConnect URI
+     * @param {number | string} [_chainId] - Optional chain ID to connect to
+     */
+    async connectWalletConnect(onUri, _chainId) {
+        const connector = this.getWalletConnectConnector();
+        const result = await connector.connectWalletConnect({ onUri });
+        return { clientId: result.clientId };
+    }
+    /**
+     * Switches the network.
+     * @param {AdapterBlueprint.SwitchNetworkParams} params - Network switching parameters
+     */
+    async switchNetwork(params) {
+        const { caipNetwork, providerType } = params;
+        if (!params.provider) {
+            return;
+        }
+        const provider = 'provider' in params.provider ? params.provider.provider : params.provider;
+        if (providerType === 'WALLET_CONNECT') {
+            ;
+            provider.setDefaultChain(caipNetwork.caipNetworkId);
+            return;
+        }
+        if (provider && providerType === 'AUTH') {
+            const authProvider = provider;
+            await authProvider.switchNetwork(caipNetwork.caipNetworkId);
+            const user = await authProvider.getUser({
+                chainId: caipNetwork.caipNetworkId,
+                preferredAccountType: OptionsController.state.defaultAccountTypes[caipNetwork.chainNamespace]
+            });
+            this.emit('switchNetwork', user);
+        }
+    }
+    getWalletConnectConnector() {
+        const connector = this.connectors.find(c => c instanceof WalletConnectConnector);
+        if (!connector) {
+            throw new Error('WalletConnectConnector not found');
+        }
+        return connector;
+    }
 }
 //# sourceMappingURL=ChainAdapterBlueprint.js.map

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

@@ -1,45 +1,17 @@
-/* eslint-disable max-depth */
-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 UniversalProvider from '@walletconnect/universal-provider';
+import { ConstantsUtil, NetworkUtil, ParseUtil, getW3mThemeVariables } from '@reown/appkit-common';
+import { ConstantsUtil as CoreConstantsUtil } from '@reown/appkit-core';
+import { AccountController, AlertController, ApiController, AssetUtil, BlockchainApiController, ChainController, ConnectionController, ConnectorController, CoreHelperUtil, EnsController, EventsController, ModalController, OptionsController, PublicStateController, RouterController, SnackController, StorageUtil, ThemeController } from '@reown/appkit-core';
+import { WalletUtil } from '@reown/appkit-scaffold-ui/utils';
 import { setColorTheme, setThemeVariables } from '@reown/appkit-ui';
-import { NetworkUtil, ConstantsUtil, ParseUtil } from '@reown/appkit-common';
-import { UniversalAdapter, UniversalAdapter as UniversalAdapterClient } from './universal-adapter/client.js';
 import { CaipNetworksUtil, ErrorUtil, HelpersUtil, LoggerUtil, ConstantsUtil as UtilConstantsUtil } from '@reown/appkit-utils';
-import { W3mFrameHelpers, W3mFrameRpcConstants } from '@reown/appkit-wallet';
-import { ProviderUtil } from './store/ProviderUtil.js';
-import UniversalProvider from '@walletconnect/universal-provider';
+import { W3mFrameHelpers, W3mFrameProvider, W3mFrameRpcConstants } from '@reown/appkit-wallet';
 import { W3mFrameProviderSingleton } from './auth-provider/W3MFrameProviderSingleton.js';
+import { ProviderUtil } from './store/ProviderUtil.js';
+import { UniversalAdapter, UniversalAdapter as UniversalAdapterClient } from './universal-adapter/client.js';
 import { WcHelpersUtil } from './utils/HelpersUtil.js';
-import { WalletUtil } from '@reown/appkit-scaffold-ui/utils';
 // -- Export Controllers -------------------------------------------------------
 export { AccountController };
-// -- Constants ----------------------------------------- //
-const OPTIONAL_METHODS = [
-    'eth_accounts',
-    'eth_requestAccounts',
-    'eth_sendRawTransaction',
-    'eth_sign',
-    'eth_signTransaction',
-    'eth_signTypedData',
-    'eth_signTypedData_v3',
-    'eth_signTypedData_v4',
-    'eth_sendTransaction',
-    'personal_sign',
-    'wallet_switchEthereumChain',
-    'wallet_addEthereumChain',
-    'wallet_getPermissions',
-    'wallet_requestPermissions',
-    'wallet_registerOnboarding',
-    'wallet_watchAsset',
-    'wallet_scanQRCode',
-    // EIP-5792
-    'wallet_getCallsStatus',
-    'wallet_sendCalls',
-    'wallet_getCapabilities',
-    // EIP-7715
-    'wallet_grantPermissions',
-    'wallet_revokePermissions'
-];
 // -- Helpers -------------------------------------------------------------------
 let isInitialized = false;
 // -- Client --------------------------------------------------------------------
@@ -440,6 +412,7 @@ export class AppKit {
         OptionsController.setCustomWallets(options.customWallets);
         OptionsController.setFeatures(options.features);
         OptionsController.setAllowUnsupportedChain(options.allowUnsupportedChain);
+        OptionsController.setDefaultAccountTypes(options.defaultAccountTypes);
         const defaultMetaData = this.getDefaultMetaData();
         if (!options.metadata && defaultMetaData) {
             options.metadata = defaultMetaData;
@@ -541,24 +514,13 @@ export class AppKit {
         this.connectionControllerClient = {
             connectWalletConnect: async (onUri) => {
                 const adapter = this.getAdapter(ChainController.state.activeChain);
-                this.universalProvider?.on('display_uri', onUri);
-                this.setClientId((await this.universalProvider?.client?.core?.crypto?.getClientId()) || null);
-                let isAuthenticated = false;
-                if (this.universalProvider) {
-                    const chains = this.caipNetworks?.map(network => network.caipNetworkId) || [];
-                    isAuthenticated = await SIWXUtil.universalProviderAuthenticate({
-                        universalProvider: this.universalProvider,
-                        chains,
-                        methods: OPTIONAL_METHODS
-                    });
-                }
-                if (isAuthenticated) {
-                    this.close();
-                }
-                else {
-                    await adapter?.connectWalletConnect(onUri, this.getCaipNetwork()?.id);
-                    StorageUtil.setConnectedNamespaces([...ChainController.state.chains.keys()]);
+                if (!adapter) {
+                    throw new Error('Adapter not found');
                 }
+                const result = await adapter.connectWalletConnect(onUri, this.getCaipNetwork()?.id);
+                this.close();
+                this.setClientId(result?.clientId || null);
+                StorageUtil.setConnectedNamespaces([...ChainController.state.chains.keys()]);
                 await this.syncWalletConnectAccount();
             },
             connectExternal: async ({ id, info, type, provider, chain, caipNetwork }) => {
@@ -583,24 +545,14 @@ export class AppKit {
                     rpcUrl: caipNetwork?.rpcUrls?.default?.http?.[0] ||
                         this.getCaipNetwork()?.rpcUrls?.default?.http?.[0]
                 });
-                StorageUtil.addConnectedNamespace(chainToUse);
-                if (res) {
-                    this.syncProvider({
-                        ...res,
-                        chainNamespace: chainToUse
-                    });
-                    await this.syncAccount({
-                        ...res,
-                        chainNamespace: chainToUse
-                    });
-                    const { accounts } = await adapter.getAccounts({ namespace: chainToUse, id });
-                    this.setAllAccounts(accounts, chainToUse);
-                }
-                if (!this.caipNetworks?.some(network => network.id === res?.chainId)) {
-                    if (res?.chainId) {
-                        this.setUnsupportedNetwork(res.chainId);
-                    }
+                if (!res) {
+                    return;
                 }
+                StorageUtil.addConnectedNamespace(chainToUse);
+                this.syncProvider({ ...res, chainNamespace: chainToUse });
+                await this.syncAccount({ ...res, chainNamespace: chainToUse });
+                const { accounts } = await adapter.getAccounts({ namespace: chainToUse, id });
+                this.setAllAccounts(accounts, chainToUse);
             },
             reconnectExternal: async ({ id, info, type, provider }) => {
                 const namespace = ChainController.state.activeChain;
@@ -748,6 +700,7 @@ export class AppKit {
                                 type: UtilConstantsUtil.CONNECTOR_TYPE_AUTH,
                                 caipNetwork
                             });
+                            this.setCaipNetwork(caipNetwork);
                         }
                         catch (error) {
                             const adapter = this.getAdapter(caipNetwork.chainNamespace);
@@ -855,18 +808,8 @@ export class AppKit {
                 this.setLoading(false);
             }
         });
-        provider.onIsConnected(() => {
-            provider.connect();
-            StorageUtil.addConnectedNamespace(ChainController.state.activeChain);
-        });
         provider.onConnect(async (user) => {
             const namespace = ChainController.state.activeChain;
-            this.syncProvider({
-                type: UtilConstantsUtil.CONNECTOR_TYPE_AUTH,
-                provider,
-                id: ConstantsUtil.CONNECTOR_ID.AUTH,
-                chainNamespace: namespace
-            });
             // To keep backwards compatibility, eip155 chainIds are numbers and not actual caipChainIds
             const caipAddress = namespace === ConstantsUtil.CHAIN.EVM
                 ? `eip155:${user.chainId}:${user.address}`
@@ -881,9 +824,10 @@ export class AppKit {
             }
             this.setCaipAddress(caipAddress, namespace);
             this.setUser({ ...(AccountController.state.user || {}), email: user.email });
-            const preferredAccountType = (user.preferredAccountType || 'eoa');
+            const preferredAccountType = (user.preferredAccountType ||
+                OptionsController.state.defaultAccountTypes[namespace]);
             this.setPreferredAccountType(preferredAccountType, namespace);
-            const userAccounts = user.accounts?.map(account => CoreHelperUtil.createAccount(namespace, account.address, namespace === ConstantsUtil.CHAIN.EVM ? account.type : 'eoa'));
+            const userAccounts = user.accounts?.map(account => CoreHelperUtil.createAccount(namespace, account.address, account.type || OptionsController.state.defaultAccountTypes[namespace]));
             this.setAllAccounts(userAccounts || [
                 CoreHelperUtil.createAccount(namespace, user.address, preferredAccountType)
             ], namespace);
@@ -915,6 +859,19 @@ export class AppKit {
         this.setUser({ ...(AccountController.state?.user || {}), username, email });
         this.setupAuthConnectorListeners(provider);
         const { isConnected } = await provider.isConnected();
+        const theme = ThemeController.getSnapshot();
+        const options = OptionsController.getSnapshot();
+        provider.syncDappData({
+            metadata: options.metadata,
+            sdkVersion: options.sdkVersion,
+            projectId: options.projectId,
+            sdkType: options.sdkType
+        });
+        provider.syncTheme({
+            themeMode: theme.themeMode,
+            themeVariables: theme.themeVariables,
+            w3mThemeVariables: getW3mThemeVariables(theme.themeVariables, theme.themeMode)
+        });
         const namespace = StorageUtil.getActiveNamespace();
         if (namespace) {
             if (isConnected && this.connectionControllerClient?.connectExternal) {
@@ -944,15 +901,14 @@ export class AppKit {
                 ConnectionController.resetWcConnection();
             });
             this.universalProvider.on('chainChanged', (chainId) => {
-                const caipNetwork = this.caipNetworks?.find(
                 // eslint-disable-next-line eqeqeq
-                c => c.chainNamespace === ChainController.state.activeChain && c.id == chainId);
+                const caipNetwork = this.caipNetworks?.find(c => c.id == chainId);
                 const currentCaipNetwork = this.getCaipNetwork();
                 if (!caipNetwork) {
                     this.setUnsupportedNetwork(chainId);
                     return;
                 }
-                if (!currentCaipNetwork || currentCaipNetwork?.id !== caipNetwork?.id) {
+                if (currentCaipNetwork?.id !== caipNetwork?.id) {
                     this.setCaipNetwork(caipNetwork);
                 }
             });
@@ -981,7 +937,8 @@ export class AppKit {
             this.setStatus(connectionStatus, chainNamespace);
         }
         adapter.on('switchNetwork', ({ address, chainId }) => {
-            if (chainId && this.caipNetworks?.find(n => n.id === chainId)) {
+            if (chainId &&
+                this.caipNetworks?.find(n => n.id === chainId || n.caipNetworkId === chainId)) {
                 if (ChainController.state.activeChain === chainNamespace && address) {
                     this.syncAccount({ address, chainId, chainNamespace });
                 }
@@ -1124,7 +1081,7 @@ export class AppKit {
     }
     async syncAccount(params) {
         const { address, chainId, chainNamespace } = params;
-        const { namespace: activeNamespace, chainId: activeChainId } = StorageUtil.getActiveNetworkProps();
+        const { chainId: activeChainId } = StorageUtil.getActiveNetworkProps();
         const chainIdToUse = chainId || activeChainId;
         // Only update state when needed
         if (!HelpersUtil.isLowerCaseMatch(address, AccountController.state.address)) {
@@ -1132,20 +1089,24 @@ export class AppKit {
             await this.syncIdentity({ address, chainId, chainNamespace });
         }
         this.setStatus('connected', chainNamespace);
-        if (chainIdToUse && chainNamespace === activeNamespace) {
+        if (chainIdToUse) {
             let caipNetwork = this.caipNetworks?.find(n => n.id.toString() === chainIdToUse.toString());
             let fallbackCaipNetwork = this.caipNetworks?.find(n => n.chainNamespace === chainNamespace);
-            const shouldSupportsAllNetworks = ChainController.getNetworkProp('supportsAllNetworks', chainNamespace);
-            if (!shouldSupportsAllNetworks) {
+            const shouldSupportAllNetworks = ChainController.getNetworkProp('supportsAllNetworks', chainNamespace);
+            if (!shouldSupportAllNetworks) {
                 // Connection can be requested for a chain that is not supported by the wallet so we need to use approved networks here
                 const caipNetworkIds = this.getApprovedCaipNetworkIds() || [];
                 const caipNetworkId = caipNetworkIds.find(id => ParseUtil.parseCaipNetworkId(id)?.chainId === chainIdToUse.toString());
                 const fallBackCaipNetworkId = caipNetworkIds.find(id => ParseUtil.parseCaipNetworkId(id)?.chainNamespace === chainNamespace);
                 caipNetwork = this.caipNetworks?.find(n => n.caipNetworkId === caipNetworkId);
-                fallbackCaipNetwork = this.caipNetworks?.find(n => n.caipNetworkId === fallBackCaipNetworkId);
+                fallbackCaipNetwork = this.caipNetworks?.find(n => n.caipNetworkId === fallBackCaipNetworkId ||
+                    // This is a workaround used in Solana network to support deprecated caipNetworkId
+                    ('deprecatedCaipNetworkId' in n && n.deprecatedCaipNetworkId === fallBackCaipNetworkId));
             }
             const network = (caipNetwork || fallbackCaipNetwork);
-            this.setCaipNetwork(network);
+            if (network.chainNamespace === ChainController.state.activeChain) {
+                this.setCaipNetwork(network);
+            }
             this.syncConnectedWalletInfo(chainNamespace);
             await this.syncBalance({ address, chainId: network.id, chainNamespace });
         }
@@ -1318,6 +1279,9 @@ export class AppKit {
         await Promise.allSettled(this.chainNamespaces.map(namespace => this.syncNamespaceConnection(namespace)));
     }
     getAdapter(namespace) {
+        if (!namespace) {
+            return undefined;
+        }
         return this.chainAdapters?.[namespace];
     }
     createUniversalProvider() {
@@ -1386,6 +1350,7 @@ export class AppKit {
             this.authProvider = W3mFrameProviderSingleton.getInstance({
                 projectId: this.options.projectId,
                 enableLogger: this.options.enableAuthLogger,
+                chainId: this.getCaipNetwork()?.caipNetworkId,
                 onTimeout: () => {
                     AlertController.open(ErrorUtil.ALERT_ERRORS.SOCIALS_TIMEOUT, 'error');
                 }