@dynamic-labs/ethereum 2.0.0-alpha.20 → 2.0.0-alpha.22

package/CHANGELOG.md

@@ -1,4 +1,53 @@
 
+## [2.0.0-alpha.22](https://github.com/dynamic-labs/DynamicAuth/compare/v2.0.0-alpha.21...v2.0.0-alpha.22) (2024-03-27)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove isFullyConnected (#5066)
+* remove and deprecated exported methods (#5065)
+* remove emailOnly provider
+
+### Features
+
+* add method property to track which phantom connector function was called ([#5044](https://github.com/dynamic-labs/DynamicAuth/issues/5044)) ([f820cd4](https://github.com/dynamic-labs/DynamicAuth/commit/f820cd4c7e047fd5181115b4d388e54df682e5c8))
+* add signAndSendTransaction to phantom redirect connector ([#5054](https://github.com/dynamic-labs/DynamicAuth/issues/5054)) ([694a300](https://github.com/dynamic-labs/DynamicAuth/commit/694a3003c8765098878a5c95174be5eba4509fc2))
+* implement remaining signer methods on phantom redirect connector ([#5060](https://github.com/dynamic-labs/DynamicAuth/issues/5060)) ([29db446](https://github.com/dynamic-labs/DynamicAuth/commit/29db4464de6eea11c92a8080fed1eb3e7588b2b8))
+
+
+### Bug Fixes
+
+* add recommended wallet tags to the WalletSimpleSignIn component ([#5041](https://github.com/dynamic-labs/DynamicAuth/issues/5041)) ([aefde4d](https://github.com/dynamic-labs/DynamicAuth/commit/aefde4d927427c131dce4402eb3c705527c64e8f))
+* display invalid phone number error ([#5103](https://github.com/dynamic-labs/DynamicAuth/issues/5103)) ([842c0ba](https://github.com/dynamic-labs/DynamicAuth/commit/842c0ba3cfe1120c166f12410efbc346d8e30ed0))
+* ensure the user field modals uses the base widget context ([#5105](https://github.com/dynamic-labs/DynamicAuth/issues/5105)) ([aa2a545](https://github.com/dynamic-labs/DynamicAuth/commit/aa2a545bdbf6f38f4131ccdde61142389dbf5480))
+* force aspect ratio for social icon pfps ([#5072](https://github.com/dynamic-labs/DynamicAuth/issues/5072)) ([6f611a7](https://github.com/dynamic-labs/DynamicAuth/commit/6f611a7cbe41d66796449b28af919bc93a7bae42))
+* handle too many email verifications error ([#5051](https://github.com/dynamic-labs/DynamicAuth/issues/5051)) ([7af96df](https://github.com/dynamic-labs/DynamicAuth/commit/7af96dfb85cdc68577fdb8cc880e2fd09bcff5af))
+* hardcode zerion provider and update walletbook to prevent showing up as metamask when not installed ([#5071](https://github.com/dynamic-labs/DynamicAuth/issues/5071)) ([3ab6c37](https://github.com/dynamic-labs/DynamicAuth/commit/3ab6c3772efe2c2e3259ca7a9dbb92e924314029))
+* issue where ethereum is tree shaken ([#5028](https://github.com/dynamic-labs/DynamicAuth/issues/5028)) ([fda542d](https://github.com/dynamic-labs/DynamicAuth/commit/fda542db2b65a437004fe809a0ea9f90fde47b13))
+* not clearing the loading when creating an embedded wallet  ([323086f](https://github.com/dynamic-labs/DynamicAuth/commit/323086f673fb8a2108b8262181511987d0bc1d09))
+* solflare double connection on page refresh ([#5083](https://github.com/dynamic-labs/DynamicAuth/issues/5083)) ([ef76005](https://github.com/dynamic-labs/DynamicAuth/commit/ef7600564b646cf45396287a0d6b6f1420473b04))
+* swap out findProvider for getSigner on solflare ([#5057](https://github.com/dynamic-labs/DynamicAuth/issues/5057)) ([b78827f](https://github.com/dynamic-labs/DynamicAuth/commit/b78827f8fd87a594114908d890f58b8771123383))
+* validate user session whenever user is connected/authenticated ([#5082](https://github.com/dynamic-labs/DynamicAuth/issues/5082)) ([432faa0](https://github.com/dynamic-labs/DynamicAuth/commit/432faa0a69b43cb7324a252a2450db3cbd3b4b12))
+* walletconnect improvements and fixes ([#5085](https://github.com/dynamic-labs/DynamicAuth/issues/5085)) ([bb42566](https://github.com/dynamic-labs/DynamicAuth/commit/bb425666aef5071b7827ef0aa167a328493f1ae7))
+
+
+* remove and deprecated exported methods ([#5065](https://github.com/dynamic-labs/DynamicAuth/issues/5065)) ([63af7ea](https://github.com/dynamic-labs/DynamicAuth/commit/63af7ea691b2112032de332f2b3558ac6260a38d))
+* remove emailOnly provider ([60a30bc](https://github.com/dynamic-labs/DynamicAuth/commit/60a30bc2f242de19d9c6167279fc44b7f9395ac8))
+* remove isFullyConnected ([#5066](https://github.com/dynamic-labs/DynamicAuth/issues/5066)) ([0a662d9](https://github.com/dynamic-labs/DynamicAuth/commit/0a662d9eda19045f13c21ad1b5238ca11594fde5))
+
+## [2.0.0-alpha.21](https://github.com/dynamic-labs/DynamicAuth/compare/v2.0.0-alpha.20...v2.0.0-alpha.21) (2024-03-20)
+
+
+### Features
+
+* implement barebones signer in PhantomRedirect connector ([#5043](https://github.com/dynamic-labs/DynamicAuth/issues/5043)) ([4d7ff79](https://github.com/dynamic-labs/DynamicAuth/commit/4d7ff79acfe554d651791139b5e1d23ebafe712c))
+
+
+### Bug Fixes
+
+* find embedded wallets when no chain is specified ([#5036](https://github.com/dynamic-labs/DynamicAuth/issues/5036)) ([ac50742](https://github.com/dynamic-labs/DynamicAuth/commit/ac50742c6002f48aae7b60c9ec094eb12df8dcca))
+* ignore walletconnect chainChange event when it's the same chain ([#5029](https://github.com/dynamic-labs/DynamicAuth/issues/5029)) ([115311a](https://github.com/dynamic-labs/DynamicAuth/commit/115311a4a64ae35317b8864f93c38203566714fc))
+
 ## [2.0.0-alpha.20](https://github.com/dynamic-labs/DynamicAuth/compare/v2.0.0-alpha.19...v2.0.0-alpha.20) (2024-03-19)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum",
-  "version": "2.0.0-alpha.20",
+  "version": "2.0.0-alpha.22",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -27,16 +27,16 @@
   },
   "dependencies": {
     "@coinbase/wallet-sdk": "3.9.2",
-    "@walletconnect/universal-provider": "2.10.6",
+    "@walletconnect/ethereum-provider": "2.11.2",
     "eventemitter3": "5.0.1",
     "buffer": "6.0.3",
-    "@dynamic-labs/rpc-provider-ethereum": "2.0.0-alpha.20",
-    "@dynamic-labs/turnkey": "2.0.0-alpha.20",
-    "@dynamic-labs/types": "2.0.0-alpha.20",
-    "@dynamic-labs/utils": "2.0.0-alpha.20",
-    "@dynamic-labs/viem-utils": "2.0.0-alpha.20",
-    "@dynamic-labs/wallet-book": "2.0.0-alpha.20",
-    "@dynamic-labs/wallet-connector-core": "2.0.0-alpha.20",
+    "@dynamic-labs/rpc-provider-ethereum": "2.0.0-alpha.22",
+    "@dynamic-labs/turnkey": "2.0.0-alpha.22",
+    "@dynamic-labs/types": "2.0.0-alpha.22",
+    "@dynamic-labs/utils": "2.0.0-alpha.22",
+    "@dynamic-labs/viem-utils": "2.0.0-alpha.22",
+    "@dynamic-labs/wallet-book": "2.0.0-alpha.22",
+    "@dynamic-labs/wallet-connector-core": "2.0.0-alpha.22",
     "stream": "0.0.2"
   },
   "peerDependencies": {

package/src/injected/Zerion.cjs

@@ -0,0 +1,38 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var InjectedWalletBase = require('./InjectedWalletBase.cjs');
+
+// on desktop, we use EIP-6963 to connect to the wallet so the injectedConfig
+// is not needed.
+const zerionWalletBookConfig = {
+    eip6963Config: {
+        rdns: 'io.zerion.wallet',
+    },
+    filterFromWalletConnect: true,
+    injectedConfig: [
+        {
+            chain: 'evm',
+            // adds isMetaMask flag to the wallet connector so that the window provider works
+            // in the zerion in-app browser.
+            extensionLocators: [{ flag: 'isMetaMask', value: true }],
+            windowLocations: ['zerionWallet', 'zerionwallet.ethereum'],
+        },
+    ],
+    name: 'Zerion',
+};
+class Zerion extends InjectedWalletBase {
+    constructor(props) {
+        super(props);
+        this.name = 'Zerion';
+        this.overrideKey = 'zerion';
+        this.wallet = zerionWalletBookConfig;
+    }
+    isInstalledOnBrowser() {
+        var _a;
+        return Boolean(window.zerionWallet || ((_a = window.zerionwallet) === null || _a === void 0 ? void 0 : _a.ethereum));
+    }
+}
+
+exports.Zerion = Zerion;

package/src/injected/Zerion.d.ts

@@ -0,0 +1,23 @@
+import { EthWalletConnectorOpts } from '../EthWalletConnector';
+import InjectedWalletBase from './InjectedWalletBase';
+export declare class Zerion extends InjectedWalletBase {
+    name: string;
+    overrideKey: string;
+    wallet: {
+        eip6963Config: {
+            rdns: string;
+        };
+        filterFromWalletConnect: boolean;
+        injectedConfig: {
+            chain: string;
+            extensionLocators: {
+                flag: string;
+                value: boolean;
+            }[];
+            windowLocations: string[];
+        }[];
+        name: string;
+    };
+    constructor(props: EthWalletConnectorOpts);
+    isInstalledOnBrowser(): boolean;
+}

package/src/injected/Zerion.js

@@ -0,0 +1,34 @@
+import InjectedWalletBase from './InjectedWalletBase.js';
+
+// on desktop, we use EIP-6963 to connect to the wallet so the injectedConfig
+// is not needed.
+const zerionWalletBookConfig = {
+    eip6963Config: {
+        rdns: 'io.zerion.wallet',
+    },
+    filterFromWalletConnect: true,
+    injectedConfig: [
+        {
+            chain: 'evm',
+            // adds isMetaMask flag to the wallet connector so that the window provider works
+            // in the zerion in-app browser.
+            extensionLocators: [{ flag: 'isMetaMask', value: true }],
+            windowLocations: ['zerionWallet', 'zerionwallet.ethereum'],
+        },
+    ],
+    name: 'Zerion',
+};
+class Zerion extends InjectedWalletBase {
+    constructor(props) {
+        super(props);
+        this.name = 'Zerion';
+        this.overrideKey = 'zerion';
+        this.wallet = zerionWalletBookConfig;
+    }
+    isInstalledOnBrowser() {
+        var _a;
+        return Boolean(window.zerionWallet || ((_a = window.zerionwallet) === null || _a === void 0 ? void 0 : _a.ethereum));
+    }
+}
+
+export { Zerion };

package/src/injected/fetchInjectedWalletConnectors.cjs

@@ -5,15 +5,18 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var InjectedWalletBase = require('./InjectedWalletBase.cjs');
 var PhantomEvm = require('./PhantomEvm.cjs');
 var ExodusEvm = require('./ExodusEvm.cjs');
+var Zerion = require('./Zerion.cjs');
 
 const injectedWalletOverrides = [
     PhantomEvm.PhantomEvm,
     ExodusEvm.ExodusEvm,
+    Zerion.Zerion,
 ];
 const filteredInjectedWalletKeysOverrides = [
     'phantomevm',
     'coinbase',
     'exodusevm',
+    'zerion',
 ];
 const fetchInjectedWalletConnector = ({ walletBook, }) => {
     var _a;

package/src/injected/fetchInjectedWalletConnectors.js

@@ -1,15 +1,18 @@
 import InjectedWalletBase from './InjectedWalletBase.js';
 import { PhantomEvm } from './PhantomEvm.js';
 import { ExodusEvm } from './ExodusEvm.js';
+import { Zerion } from './Zerion.js';
 
 const injectedWalletOverrides = [
     PhantomEvm,
     ExodusEvm,
+    Zerion,
 ];
 const filteredInjectedWalletKeysOverrides = [
     'phantomevm',
     'coinbase',
     'exodusevm',
+    'zerion',
 ];
 const fetchInjectedWalletConnector = ({ walletBook, }) => {
     var _a;

package/src/walletConnect/index.d.ts

@@ -1,2 +1,2 @@
-export { WalletConnect, type WalletConnectOpts } from './walletConnect';
+export { WalletConnect } from './walletConnect';
 export { fetchWalletConnectWallets } from './fetchWalletConnectWallets';

package/src/walletConnect/walletConnect.cjs

@@ -3,20 +3,20 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../_virtual/_tslib.cjs');
-var Provider = require('@walletconnect/universal-provider');
+var EthereumProvider = require('@walletconnect/ethereum-provider');
 var EventEmitter = require('eventemitter3');
 var viem = require('viem');
 var accounts = require('viem/accounts');
-var utils = require('@dynamic-labs/utils');
-var walletBook = require('@dynamic-labs/wallet-book');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var walletBook = require('@dynamic-labs/wallet-book');
+var utils = require('@dynamic-labs/utils');
 var viemUtils = require('@dynamic-labs/viem-utils');
 var EthWalletConnector = require('../EthWalletConnector.cjs');
 var parseIntSafe = require('../utils/parseIntSafe.cjs');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var Provider__default = /*#__PURE__*/_interopDefaultLegacy(Provider);
+var EthereumProvider__default = /*#__PURE__*/_interopDefaultLegacy(EthereumProvider);
 var EventEmitter__default = /*#__PURE__*/_interopDefaultLegacy(EventEmitter);
 
 const activeAccountKey = (walletName) => `dynamic-wc2-active-account-${walletName}`;
@@ -37,6 +37,8 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
         // When trying to switch network for MetaMask, the switch promise gets stuck
         // if the switch got trigged once already, so we need to keep track of that
         this._hasSwitchedNetwork = false;
+        this.sessionEventHandler = () => { };
+        this.sessionDeleteHandler = () => { };
         this.name = opts.walletName;
         this.projectId = opts.projectId;
         this.deepLinkPreference = opts.deepLinkPreference || 'native';
@@ -58,7 +60,7 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
         const allChains = this.getMappedChains();
         const reorderedChains = this.preferredChains.filter((chain) => allChains.includes(chain));
         const remainingChains = allChains.filter((chain) => !this.preferredChains.includes(chain));
-        return [...reorderedChains, ...remainingChains];
+        return [...reorderedChains, ...remainingChains].map((chain) => Number(chain.split(':')[1]));
     }
     initConnection() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -67,43 +69,51 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
                 throw new utils.DynamicError('No provider found (init connection)');
             }
             // this means there is already a connection in progress, so don't call connect again
-            if (provider === null || provider === void 0 ? void 0 : provider.uri) {
+            if (provider === null || provider === void 0 ? void 0 : provider.signer.uri) {
                 return;
             }
-            const optionalNamespaces = {
-                eip155: {
-                    chains: this.getMappedChainsByPreferredOrder(),
-                    events: ['chainChanged', 'accountsChanged'],
-                    methods: [
-                        'eth_chainId',
-                        'eth_signTypedData',
-                        'eth_signTransaction',
-                        'eth_sign',
-                        'personal_sign',
-                        'eth_sendTransaction',
-                        'eth_signTypedData_v4',
-                        'wallet_switchEthereumChain',
-                        'wallet_addEthereumChain',
-                    ],
-                    rpcMap: this.evmNetworkRpcMap(),
-                },
-            };
-            provider
-                .connect({
-                optionalNamespaces,
-            })
-                .catch((e) => {
+            provider.connect().catch((e) => {
                 walletConnectorCore.logger.error(e);
                 ee.emit('walletconnect_connection_failed', e);
             });
         });
     }
-    createInitProviderPromise() {
+    createProvider() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            WalletConnect.provider = yield Provider__default["default"].init({
-                logger: walletConnectorCore.logger.logLevel.toLowerCase() === 'debug' ? 'debug' : undefined,
+            return EthereumProvider__default["default"].init({
+                events: ['chainChanged', 'accountsChanged'],
+                methods: [],
+                optionalChains: this.getMappedChainsByPreferredOrder(),
+                optionalMethods: [
+                    'eth_chainId',
+                    'eth_signTypedData',
+                    'eth_signTransaction',
+                    'eth_sign',
+                    'personal_sign',
+                    'eth_sendTransaction',
+                    'eth_signTypedData_v4',
+                    'wallet_switchEthereumChain',
+                    'wallet_addEthereumChain',
+                ],
                 projectId: this.projectId,
+                rpcMap: this.evmNetworkRpcMap(),
+                showQrModal: false,
+            });
+        });
+    }
+    getWalletClientFromInitializedProvider() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const walletConnect = this.createProvider();
+            const walletClient = viem.createWalletClient({
+                account: this.activeAccount ? accounts.toAccount(this.activeAccount) : undefined,
+                transport: viem.custom(yield walletConnect),
             });
+            return walletClient;
+        });
+    }
+    createInitProviderPromise() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            WalletConnect.provider = yield this.createProvider();
             this.teardownEventListeners();
             this.setupEventListeners();
         });
@@ -182,7 +192,7 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
         if (!WalletConnect.provider) {
             return;
         }
-        WalletConnect.provider.client.on('session_event', ({ params }) => {
+        this.sessionEventHandler = ({ params, }) => {
             walletConnectorCore.logger.debug('session_event was called', { params });
             if (!params || !params.event) {
                 walletConnectorCore.logger.debug('session_event was called without params or params.event');
@@ -191,12 +201,17 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
             const { name, data } = params.event;
             if (name === 'chainChanged') {
                 const chainId = parseIntSafe.parseIntSafe(data);
+                if (chainId === this.currentChainId) {
+                    walletConnectorCore.logger.debug(`ignoring chainChanged event with same chain id as current chain id: ${chainId}`);
+                    return;
+                }
                 if (chainId === undefined) {
                     walletConnectorCore.logger.debug(`received unexpected data for chainChanged: ${data} with type ${typeof data}}`);
                     return;
                 }
                 this.currentChainId = chainId;
                 this.emit('chainChange', { chain: String(chainId) });
+                this.hasSwitchedNetwork = true;
                 // When a user switches network from their wallet, we need the provider to change network
                 // such that any future calls to `getNetwork` will return the correct network
                 this.switchNetwork({ networkChainId: chainId });
@@ -210,18 +225,20 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
                 const account = data[0].split(':')[2];
                 this.setActiveAccount(account);
             }
-        });
-        WalletConnect.provider.client.on('session_delete', () => _tslib.__awaiter(this, void 0, void 0, function* () {
+        };
+        WalletConnect.provider.on('session_event', this.sessionEventHandler);
+        this.sessionDeleteHandler = () => _tslib.__awaiter(this, void 0, void 0, function* () {
             this.endSession();
             this.emit('disconnect');
-        }));
+        });
+        WalletConnect.provider.on('session_delete', this.sessionDeleteHandler);
     }
     teardownEventListeners() {
         if (!WalletConnect.provider) {
             return;
         }
-        WalletConnect.provider.client.removeAllListeners('session_event');
-        WalletConnect.provider.client.removeAllListeners('session_delete');
+        WalletConnect.provider.off('session_event', this.sessionEventHandler);
+        WalletConnect.provider.off('session_delete', this.sessionDeleteHandler);
     }
     getWalletClient(chainId) {
         if (!WalletConnect.provider) {
@@ -229,7 +246,7 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
         }
         return viem.createWalletClient({
             account: this.activeAccount ? accounts.toAccount(this.activeAccount) : undefined,
-            chain: chainId ? viemUtils.chainsMap[chainId] : undefined,
+            chain: viemUtils.chainsMap[chainId !== null && chainId !== void 0 ? chainId : String(this.currentChainId)],
             transport: viem.custom(WalletConnect.provider),
         });
     }
@@ -239,7 +256,7 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
             if (this.activeAccount) {
                 return this.activeAccount;
             }
-            if (!WalletConnect.provider || !((_a = WalletConnect.provider) === null || _a === void 0 ? void 0 : _a.uri)) {
+            if (!WalletConnect.provider || !((_a = WalletConnect.provider) === null || _a === void 0 ? void 0 : _a.signer.uri)) {
                 walletConnectorCore.logger.debug('No WC2 provider found, re-initializing...');
                 yield this.endSession();
                 yield this.init();
@@ -249,13 +266,13 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
                 // finish setting up the connection URI and making it available
                 // on the provider
                 yield utils.sleep(1000);
-                if (!WalletConnect.provider || !((_b = WalletConnect.provider) === null || _b === void 0 ? void 0 : _b.uri)) {
+                if (!WalletConnect.provider || !((_b = WalletConnect.provider) === null || _b === void 0 ? void 0 : _b.signer.uri)) {
                     walletConnectorCore.logger.debug('No WC2 provider found, escaping and throwing error');
                     throw new utils.DynamicError('No provider found');
                 }
             }
             const metadata = walletBook.getWalletBookWallet(this.walletBook, this.key);
-            walletConnectorCore.performPlatformSpecificConnectionMethod(WalletConnect.provider.uri, metadata, {
+            walletConnectorCore.performPlatformSpecificConnectionMethod(WalletConnect.provider.signer.uri, metadata, {
                 onDesktopUri: opts === null || opts === void 0 ? void 0 : opts.onDesktopUri,
                 onDisplayUri: opts === null || opts === void 0 ? void 0 : opts.onDisplayUri,
             }, this.deepLinkPreference);
@@ -268,7 +285,7 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
                     const error = new utils.DynamicError('Connection rejected. Please try again.');
                     error.code = 'connection_rejected';
                     if (WalletConnect.provider) {
-                        WalletConnect.provider.uri = undefined;
+                        WalletConnect.provider.signer.uri = undefined;
                         // this is needed for mobile to work when using universal links.
                         // if the user cancels the connection, we need to re-initialize the provider
                         // so that the async work is done ahead of time, before the user tries to connect again,
@@ -280,13 +297,19 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
                     // whenever the connection attempt either succeeds or fails
                     cleanupListeners();
                 };
-                const onConnect = ({ session }) => {
+                const onConnect = () => {
+                    var _a;
+                    const session = (_a = WalletConnect.provider) === null || _a === void 0 ? void 0 : _a.session;
                     if (!session) {
                         reject(new utils.DynamicError('No session found'));
+                        return;
                     }
                     this.setSession(session);
                     this.setActiveAccount(session.namespaces.eip155.accounts[0].split(':')[2]);
-                    resolve(this.activeAccount);
+                    this.getNetwork().then((chainId) => {
+                        this.currentChainId = chainId;
+                        resolve(this.activeAccount);
+                    });
                     // We must clean up the onConnect and onFail listeners
                     // whenever the connection attempt either succeeds or fails
                     cleanupListeners();
@@ -314,10 +337,12 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
      */
     waitForSignMessage(signMessageFn, messageToSign) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            const raceConditionPromise = new Promise((resolve) => {
+            const raceConditionPromise = new Promise((resolve, reject) => {
                 // Create listener for chain change event
                 this.on('chainChange', () => resolve({ success: false }));
-                signMessageFn(messageToSign).then((result) => resolve({ signedMessage: result, success: true }));
+                signMessageFn(messageToSign)
+                    .then((result) => resolve({ signedMessage: result, success: true }))
+                    .catch(reject);
             });
             const signedMessageResult = yield raceConditionPromise;
             if (signedMessageResult.success === false) {
@@ -336,7 +361,7 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
             metadata,
             mode: 'regular',
             preference: this.deepLinkPreference,
-            uri: (_a = WalletConnect.provider) === null || _a === void 0 ? void 0 : _a.uri,
+            uri: (_a = WalletConnect.provider) === null || _a === void 0 ? void 0 : _a.signer.uri,
         });
         if (!deepLink) {
             return;
@@ -350,10 +375,6 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
             if (!this.session) {
                 throw new utils.DynamicError('no session');
             }
-            const web3Provider = this.getWalletClient();
-            if (!web3Provider) {
-                throw new utils.DynamicError('No WalletConnect provider found to handle signing');
-            }
             const deepLink = this.getDeepLink();
             if (utils.isMobile() && deepLink) {
                 window.location.href = deepLink;
@@ -363,7 +384,8 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
                 if (!activeAccount) {
                     return;
                 }
-                return web3Provider.signMessage({
+                const walletClient = yield this.getWalletClientFromInitializedProvider();
+                return walletClient.signMessage({
                     account: activeAccount,
                     message: messageToSign,
                 });
@@ -422,11 +444,17 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
             return _super.getNetwork.call(this);
         });
     }
-    providerSwitchNetwork({ network, provider, }) {
+    providerSwitchNetwork({ network, }) {
         const _super = Object.create(null, {
             providerSwitchNetwork: { get: () => super.providerSwitchNetwork }
         });
         return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const supportedNetworks = yield this.getSupportedNetworks();
+            if (!(supportedNetworks === null || supportedNetworks === void 0 ? void 0 : supportedNetworks.includes(network.chainId.toString()))) {
+                const error = new utils.DynamicError('Network switching is not available at this time. The user should manually switch network in their wallet');
+                error.code = 'network_switching_only_available_in_wallet';
+                throw error;
+            }
             const currentNetworkId = yield this.getNetwork();
             if (currentNetworkId && currentNetworkId === network.chainId) {
                 return;
@@ -437,10 +465,14 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
             if (!this.supportsNetworkSwitching()) {
                 throw new utils.DynamicError('Network switching not supported');
             }
-            if (!provider) {
-                throw new utils.DynamicError('Provider not found');
+            const walletClient = yield this.getWalletClientFromInitializedProvider();
+            if (this.isMetaMask()) {
+                const deepLink = this.getDeepLink();
+                if (deepLink) {
+                    window.location.href = deepLink;
+                }
             }
-            yield _super.providerSwitchNetwork.call(this, { network, provider });
+            yield _super.providerSwitchNetwork.call(this, { network, provider: walletClient });
             this.currentChainId = network.chainId;
             this.hasSwitchedNetwork = true;
             this.emit('chainChange', { chain: String(network.chainId) });
@@ -466,13 +498,14 @@ class WalletConnect extends EthWalletConnector.EthWalletConnector {
     getSupportedNetworks() {
         var _a;
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            // MM allows you to switch to any network the first time, even if it's not enabled in MM
-            // so we should consider all networks as supported if network switching hasn't been triggered yet
-            if (this.isMetaMask() && !this.hasSwitchedNetwork) {
-                return this.evmNetworks.map((network) => network.chainId.toString());
-            }
             yield this.initProvider();
             this.refreshSession();
+            if (this.isMetaMask()) {
+                if (this.hasSwitchedNetwork) {
+                    return [String(this.currentChainId)];
+                }
+                return this.evmNetworks.map((network) => network.chainId.toString());
+            }
             if (!this.session) {
                 return [];
             }

package/src/walletConnect/walletConnect.d.ts

@@ -1,7 +1,7 @@
 import type { SessionTypes } from '@walletconnect/types';
-import { Hex, WalletClient } from 'viem';
+import { Hex } from 'viem';
+import { Chain, GetAddressOpts, DeepLinkVariant, IWalletConnectConnector } from '@dynamic-labs/wallet-connector-core';
 import { EvmNetwork } from '@dynamic-labs/types';
-import { Chain, DeepLinkVariant, GetAddressOpts, IWalletConnectConnector } from '@dynamic-labs/wallet-connector-core';
 import { EthWalletConnector, EthWalletConnectorOpts } from '../EthWalletConnector';
 export type WalletConnectOpts = EthWalletConnectorOpts & {
     projectId?: string;
@@ -29,6 +29,8 @@ export declare class WalletConnect extends EthWalletConnector implements IWallet
     private getMappedChains;
     private getMappedChainsByPreferredOrder;
     private initConnection;
+    private createProvider;
+    private getWalletClientFromInitializedProvider;
     private createInitProviderPromise;
     private initProvider;
     private refreshSession;
@@ -42,6 +44,8 @@ export declare class WalletConnect extends EthWalletConnector implements IWallet
     private set hasSwitchedNetwork(value);
     private get hasSwitchedNetwork();
     supportsNetworkSwitching(): boolean;
+    private sessionEventHandler;
+    private sessionDeleteHandler;
     setupEventListeners(): void;
     teardownEventListeners(): void;
     getWalletClient(chainId?: string): {
@@ -53,7 +57,7 @@ export declare class WalletConnect extends EthWalletConnector implements IWallet
             } | undefined;
         } | undefined;
         cacheTime: number;
-        chain: import("viem").Chain | undefined;
+        chain: import("viem").Chain;
         key: string;
         name: string;
         pollingInterval: number;
@@ -62,20 +66,20 @@ export declare class WalletConnect extends EthWalletConnector implements IWallet
         type: string;
         uid: string;
         addChain: (args: import("viem").AddChainParameters) => Promise<void>;
-        deployContract: <const abi extends import("viem").Abi | readonly unknown[], chainOverride extends import("viem").Chain | undefined>(args: import("viem").DeployContractParameters<abi, import("viem").Chain | undefined, import("viem").JsonRpcAccount | undefined, chainOverride>) => Promise<`0x${string}`>;
+        deployContract: <const abi extends import("viem").Abi | readonly unknown[], chainOverride extends import("viem").Chain | undefined>(args: import("viem").DeployContractParameters<abi, import("viem").Chain, import("viem").JsonRpcAccount | undefined, chainOverride>) => Promise<`0x${string}`>;
         getAddresses: () => Promise<import("viem").GetAddressesReturnType>;
         getChainId: () => Promise<number>;
         getPermissions: () => Promise<import("viem").GetPermissionsReturnType>;
-        prepareTransactionRequest: <TParameterType extends import("viem").PrepareTransactionRequestParameterType, TChainOverride extends import("viem").Chain | undefined = undefined, TAccountOverride extends `0x${string}` | import("viem").Account | undefined = undefined>(args: import("viem").PrepareTransactionRequestParameters<import("viem").Chain | undefined, import("viem").JsonRpcAccount | undefined, TChainOverride, TAccountOverride, TParameterType>) => Promise<import("viem").PrepareTransactionRequestReturnType<import("viem").Chain, import("viem").JsonRpcAccount | undefined, TChainOverride, TAccountOverride, TParameterType>>;
+        prepareTransactionRequest: <TParameterType extends import("viem").PrepareTransactionRequestParameterType, TChainOverride extends import("viem").Chain | undefined = undefined, TAccountOverride extends `0x${string}` | import("viem").Account | undefined = undefined>(args: import("viem").PrepareTransactionRequestParameters<import("viem").Chain, import("viem").JsonRpcAccount | undefined, TChainOverride, TAccountOverride, TParameterType>) => Promise<import("viem").PrepareTransactionRequestReturnType<import("viem").Chain, import("viem").JsonRpcAccount | undefined, TChainOverride, TAccountOverride, TParameterType>>;
         requestAddresses: () => Promise<import("viem").RequestAddressesReturnType>;
         requestPermissions: (args: {
             [x: string]: Record<string, any>;
             eth_accounts: Record<string, any>;
         }) => Promise<import("viem").RequestPermissionsReturnType>;
         sendRawTransaction: (args: import("viem").SendRawTransactionParameters) => Promise<`0x${string}`>;
-        sendTransaction: <TChainOverride_1 extends import("viem").Chain | undefined = undefined>(args: import("viem").SendTransactionParameters<import("viem").Chain | undefined, import("viem").JsonRpcAccount | undefined, TChainOverride_1>) => Promise<`0x${string}`>;
+        sendTransaction: <TChainOverride_1 extends import("viem").Chain | undefined = undefined>(args: import("viem").SendTransactionParameters<import("viem").Chain, import("viem").JsonRpcAccount | undefined, TChainOverride_1>) => Promise<`0x${string}`>;
         signMessage: (args: import("viem").SignMessageParameters<import("viem").JsonRpcAccount | undefined>) => Promise<`0x${string}`>;
-        signTransaction: <TChainOverride_2 extends import("viem").Chain | undefined>(args: import("viem").SignTransactionParameters<import("viem").Chain | undefined, import("viem").JsonRpcAccount | undefined, TChainOverride_2>) => Promise<`0x${string}`>;
+        signTransaction: <TChainOverride_2 extends import("viem").Chain | undefined>(args: import("viem").SignTransactionParameters<import("viem").Chain, import("viem").JsonRpcAccount | undefined, TChainOverride_2>) => Promise<`0x${string}`>;
         signTypedData: <const TTypedData extends {
             [x: string]: readonly import("viem").TypedDataParameter[];
             [x: `string[${string}]`]: undefined;
@@ -286,7 +290,7 @@ export declare class WalletConnect extends EthWalletConnector implements IWallet
         }, TPrimaryType extends string>(args: import("viem").SignTypedDataParameters<TTypedData, TPrimaryType, import("viem").JsonRpcAccount | undefined>) => Promise<`0x${string}`>;
         switchChain: (args: import("viem").SwitchChainParameters) => Promise<void>;
         watchAsset: (args: import("viem").WatchAssetParams) => Promise<boolean>;
-        writeContract: <const abi_1 extends import("viem").Abi | readonly unknown[], functionName extends import("viem").ContractFunctionName<abi_1, "nonpayable" | "payable">, args extends import("viem").ContractFunctionArgs<abi_1, "pure" | "view", functionName>, TChainOverride_3 extends import("viem").Chain | undefined = undefined>(args: import("viem").WriteContractParameters<abi_1, functionName, args, import("viem").Chain | undefined, import("viem").JsonRpcAccount | undefined, TChainOverride_3>) => Promise<`0x${string}`>;
+        writeContract: <const abi_1 extends import("viem").Abi | readonly unknown[], functionName extends import("viem").ContractFunctionName<abi_1, "nonpayable" | "payable">, args extends import("viem").ContractFunctionArgs<abi_1, "pure" | "view", functionName>, TChainOverride_3 extends import("viem").Chain | undefined = undefined>(args: import("viem").WriteContractParameters<abi_1, functionName, args, import("viem").Chain, import("viem").JsonRpcAccount | undefined, TChainOverride_3>) => Promise<`0x${string}`>;
         extend: <const client extends {
             [x: string]: unknown;
             account?: undefined;
@@ -300,7 +304,7 @@ export declare class WalletConnect extends EthWalletConnector implements IWallet
             transport?: undefined;
             type?: undefined;
             uid?: undefined;
-        } & Partial<Pick<import("viem").PublicActions<import("viem").CustomTransport, import("viem").Chain | undefined, import("viem").JsonRpcAccount | undefined>, "getChainId" | "prepareTransactionRequest" | "sendRawTransaction" | "call" | "createContractEventFilter" | "createEventFilter" | "estimateContractGas" | "estimateGas" | "getBlock" | "getBlockNumber" | "getContractEvents" | "getEnsText" | "getFilterChanges" | "getGasPrice" | "getLogs" | "getTransaction" | "getTransactionCount" | "getTransactionReceipt" | "readContract" | "simulateContract" | "uninstallFilter" | "watchBlockNumber" | "watchContractEvent"> & Pick<import("viem").WalletActions<import("viem").Chain | undefined, import("viem").JsonRpcAccount | undefined>, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<import("viem").CustomTransport, import("viem").Chain | undefined, import("viem").JsonRpcAccount | undefined, import("viem").WalletRpcSchema, import("viem").WalletActions<import("viem").Chain | undefined, import("viem").JsonRpcAccount | undefined>>) => client) => import("viem").Client<import("viem").CustomTransport, import("viem").Chain | undefined, import("viem").JsonRpcAccount | undefined, import("viem").WalletRpcSchema, { [K in keyof client]: client[K]; } & import("viem").WalletActions<import("viem").Chain | undefined, import("viem").JsonRpcAccount | undefined>>;
+        } & Partial<Pick<import("viem").PublicActions<import("viem").CustomTransport, import("viem").Chain, import("viem").JsonRpcAccount | undefined>, "getChainId" | "prepareTransactionRequest" | "sendRawTransaction" | "call" | "createContractEventFilter" | "createEventFilter" | "estimateContractGas" | "estimateGas" | "getBlock" | "getBlockNumber" | "getContractEvents" | "getEnsText" | "getFilterChanges" | "getGasPrice" | "getLogs" | "getTransaction" | "getTransactionCount" | "getTransactionReceipt" | "readContract" | "simulateContract" | "uninstallFilter" | "watchBlockNumber" | "watchContractEvent"> & Pick<import("viem").WalletActions<import("viem").Chain, import("viem").JsonRpcAccount | undefined>, "sendTransaction" | "writeContract">>>(fn: (client: import("viem").Client<import("viem").CustomTransport, import("viem").Chain, import("viem").JsonRpcAccount | undefined, import("viem").WalletRpcSchema, import("viem").WalletActions<import("viem").Chain, import("viem").JsonRpcAccount | undefined>>) => client) => import("viem").Client<import("viem").CustomTransport, import("viem").Chain, import("viem").JsonRpcAccount | undefined, import("viem").WalletRpcSchema, { [K in keyof client]: client[K]; } & import("viem").WalletActions<import("viem").Chain, import("viem").JsonRpcAccount | undefined>>;
     } | undefined;
     getAddress(opts?: GetAddressOpts): Promise<string | undefined>;
     /**
@@ -323,9 +327,8 @@ export declare class WalletConnect extends EthWalletConnector implements IWallet
     private setSession;
     endSession(): Promise<void>;
     getNetwork(): Promise<number | undefined>;
-    providerSwitchNetwork({ network, provider, }: {
+    providerSwitchNetwork({ network, }: {
         network: EvmNetwork;
-        provider: WalletClient;
     }): Promise<void>;
     getConnectedAccounts(): Promise<string[]>;
     private isMetaMask;

package/src/walletConnect/walletConnect.js

@@ -1,11 +1,11 @@
 import { __awaiter } from '../../_virtual/_tslib.js';
-import Provider from '@walletconnect/universal-provider';
+import EthereumProvider from '@walletconnect/ethereum-provider';
 import EventEmitter from 'eventemitter3';
 import { createWalletClient, custom } from 'viem';
 import { toAccount } from 'viem/accounts';
-import { DynamicError, sleep, isMobile } from '@dynamic-labs/utils';
-import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { logger, performPlatformSpecificConnectionMethod, getDeepLink } from '@dynamic-labs/wallet-connector-core';
+import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
+import { DynamicError, sleep, isMobile } from '@dynamic-labs/utils';
 import { chainsMap } from '@dynamic-labs/viem-utils';
 import { EthWalletConnector } from '../EthWalletConnector.js';
 import { parseIntSafe } from '../utils/parseIntSafe.js';
@@ -28,6 +28,8 @@ class WalletConnect extends EthWalletConnector {
         // When trying to switch network for MetaMask, the switch promise gets stuck
         // if the switch got trigged once already, so we need to keep track of that
         this._hasSwitchedNetwork = false;
+        this.sessionEventHandler = () => { };
+        this.sessionDeleteHandler = () => { };
         this.name = opts.walletName;
         this.projectId = opts.projectId;
         this.deepLinkPreference = opts.deepLinkPreference || 'native';
@@ -49,7 +51,7 @@ class WalletConnect extends EthWalletConnector {
         const allChains = this.getMappedChains();
         const reorderedChains = this.preferredChains.filter((chain) => allChains.includes(chain));
         const remainingChains = allChains.filter((chain) => !this.preferredChains.includes(chain));
-        return [...reorderedChains, ...remainingChains];
+        return [...reorderedChains, ...remainingChains].map((chain) => Number(chain.split(':')[1]));
     }
     initConnection() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -58,43 +60,51 @@ class WalletConnect extends EthWalletConnector {
                 throw new DynamicError('No provider found (init connection)');
             }
             // this means there is already a connection in progress, so don't call connect again
-            if (provider === null || provider === void 0 ? void 0 : provider.uri) {
+            if (provider === null || provider === void 0 ? void 0 : provider.signer.uri) {
                 return;
             }
-            const optionalNamespaces = {
-                eip155: {
-                    chains: this.getMappedChainsByPreferredOrder(),
-                    events: ['chainChanged', 'accountsChanged'],
-                    methods: [
-                        'eth_chainId',
-                        'eth_signTypedData',
-                        'eth_signTransaction',
-                        'eth_sign',
-                        'personal_sign',
-                        'eth_sendTransaction',
-                        'eth_signTypedData_v4',
-                        'wallet_switchEthereumChain',
-                        'wallet_addEthereumChain',
-                    ],
-                    rpcMap: this.evmNetworkRpcMap(),
-                },
-            };
-            provider
-                .connect({
-                optionalNamespaces,
-            })
-                .catch((e) => {
+            provider.connect().catch((e) => {
                 logger.error(e);
                 ee.emit('walletconnect_connection_failed', e);
             });
         });
     }
-    createInitProviderPromise() {
+    createProvider() {
         return __awaiter(this, void 0, void 0, function* () {
-            WalletConnect.provider = yield Provider.init({
-                logger: logger.logLevel.toLowerCase() === 'debug' ? 'debug' : undefined,
+            return EthereumProvider.init({
+                events: ['chainChanged', 'accountsChanged'],
+                methods: [],
+                optionalChains: this.getMappedChainsByPreferredOrder(),
+                optionalMethods: [
+                    'eth_chainId',
+                    'eth_signTypedData',
+                    'eth_signTransaction',
+                    'eth_sign',
+                    'personal_sign',
+                    'eth_sendTransaction',
+                    'eth_signTypedData_v4',
+                    'wallet_switchEthereumChain',
+                    'wallet_addEthereumChain',
+                ],
                 projectId: this.projectId,
+                rpcMap: this.evmNetworkRpcMap(),
+                showQrModal: false,
+            });
+        });
+    }
+    getWalletClientFromInitializedProvider() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const walletConnect = this.createProvider();
+            const walletClient = createWalletClient({
+                account: this.activeAccount ? toAccount(this.activeAccount) : undefined,
+                transport: custom(yield walletConnect),
             });
+            return walletClient;
+        });
+    }
+    createInitProviderPromise() {
+        return __awaiter(this, void 0, void 0, function* () {
+            WalletConnect.provider = yield this.createProvider();
             this.teardownEventListeners();
             this.setupEventListeners();
         });
@@ -173,7 +183,7 @@ class WalletConnect extends EthWalletConnector {
         if (!WalletConnect.provider) {
             return;
         }
-        WalletConnect.provider.client.on('session_event', ({ params }) => {
+        this.sessionEventHandler = ({ params, }) => {
             logger.debug('session_event was called', { params });
             if (!params || !params.event) {
                 logger.debug('session_event was called without params or params.event');
@@ -182,12 +192,17 @@ class WalletConnect extends EthWalletConnector {
             const { name, data } = params.event;
             if (name === 'chainChanged') {
                 const chainId = parseIntSafe(data);
+                if (chainId === this.currentChainId) {
+                    logger.debug(`ignoring chainChanged event with same chain id as current chain id: ${chainId}`);
+                    return;
+                }
                 if (chainId === undefined) {
                     logger.debug(`received unexpected data for chainChanged: ${data} with type ${typeof data}}`);
                     return;
                 }
                 this.currentChainId = chainId;
                 this.emit('chainChange', { chain: String(chainId) });
+                this.hasSwitchedNetwork = true;
                 // When a user switches network from their wallet, we need the provider to change network
                 // such that any future calls to `getNetwork` will return the correct network
                 this.switchNetwork({ networkChainId: chainId });
@@ -201,18 +216,20 @@ class WalletConnect extends EthWalletConnector {
                 const account = data[0].split(':')[2];
                 this.setActiveAccount(account);
             }
-        });
-        WalletConnect.provider.client.on('session_delete', () => __awaiter(this, void 0, void 0, function* () {
+        };
+        WalletConnect.provider.on('session_event', this.sessionEventHandler);
+        this.sessionDeleteHandler = () => __awaiter(this, void 0, void 0, function* () {
             this.endSession();
             this.emit('disconnect');
-        }));
+        });
+        WalletConnect.provider.on('session_delete', this.sessionDeleteHandler);
     }
     teardownEventListeners() {
         if (!WalletConnect.provider) {
             return;
         }
-        WalletConnect.provider.client.removeAllListeners('session_event');
-        WalletConnect.provider.client.removeAllListeners('session_delete');
+        WalletConnect.provider.off('session_event', this.sessionEventHandler);
+        WalletConnect.provider.off('session_delete', this.sessionDeleteHandler);
     }
     getWalletClient(chainId) {
         if (!WalletConnect.provider) {
@@ -220,7 +237,7 @@ class WalletConnect extends EthWalletConnector {
         }
         return createWalletClient({
             account: this.activeAccount ? toAccount(this.activeAccount) : undefined,
-            chain: chainId ? chainsMap[chainId] : undefined,
+            chain: chainsMap[chainId !== null && chainId !== void 0 ? chainId : String(this.currentChainId)],
             transport: custom(WalletConnect.provider),
         });
     }
@@ -230,7 +247,7 @@ class WalletConnect extends EthWalletConnector {
             if (this.activeAccount) {
                 return this.activeAccount;
             }
-            if (!WalletConnect.provider || !((_a = WalletConnect.provider) === null || _a === void 0 ? void 0 : _a.uri)) {
+            if (!WalletConnect.provider || !((_a = WalletConnect.provider) === null || _a === void 0 ? void 0 : _a.signer.uri)) {
                 logger.debug('No WC2 provider found, re-initializing...');
                 yield this.endSession();
                 yield this.init();
@@ -240,13 +257,13 @@ class WalletConnect extends EthWalletConnector {
                 // finish setting up the connection URI and making it available
                 // on the provider
                 yield sleep(1000);
-                if (!WalletConnect.provider || !((_b = WalletConnect.provider) === null || _b === void 0 ? void 0 : _b.uri)) {
+                if (!WalletConnect.provider || !((_b = WalletConnect.provider) === null || _b === void 0 ? void 0 : _b.signer.uri)) {
                     logger.debug('No WC2 provider found, escaping and throwing error');
                     throw new DynamicError('No provider found');
                 }
             }
             const metadata = getWalletBookWallet(this.walletBook, this.key);
-            performPlatformSpecificConnectionMethod(WalletConnect.provider.uri, metadata, {
+            performPlatformSpecificConnectionMethod(WalletConnect.provider.signer.uri, metadata, {
                 onDesktopUri: opts === null || opts === void 0 ? void 0 : opts.onDesktopUri,
                 onDisplayUri: opts === null || opts === void 0 ? void 0 : opts.onDisplayUri,
             }, this.deepLinkPreference);
@@ -259,7 +276,7 @@ class WalletConnect extends EthWalletConnector {
                     const error = new DynamicError('Connection rejected. Please try again.');
                     error.code = 'connection_rejected';
                     if (WalletConnect.provider) {
-                        WalletConnect.provider.uri = undefined;
+                        WalletConnect.provider.signer.uri = undefined;
                         // this is needed for mobile to work when using universal links.
                         // if the user cancels the connection, we need to re-initialize the provider
                         // so that the async work is done ahead of time, before the user tries to connect again,
@@ -271,13 +288,19 @@ class WalletConnect extends EthWalletConnector {
                     // whenever the connection attempt either succeeds or fails
                     cleanupListeners();
                 };
-                const onConnect = ({ session }) => {
+                const onConnect = () => {
+                    var _a;
+                    const session = (_a = WalletConnect.provider) === null || _a === void 0 ? void 0 : _a.session;
                     if (!session) {
                         reject(new DynamicError('No session found'));
+                        return;
                     }
                     this.setSession(session);
                     this.setActiveAccount(session.namespaces.eip155.accounts[0].split(':')[2]);
-                    resolve(this.activeAccount);
+                    this.getNetwork().then((chainId) => {
+                        this.currentChainId = chainId;
+                        resolve(this.activeAccount);
+                    });
                     // We must clean up the onConnect and onFail listeners
                     // whenever the connection attempt either succeeds or fails
                     cleanupListeners();
@@ -305,10 +328,12 @@ class WalletConnect extends EthWalletConnector {
      */
     waitForSignMessage(signMessageFn, messageToSign) {
         return __awaiter(this, void 0, void 0, function* () {
-            const raceConditionPromise = new Promise((resolve) => {
+            const raceConditionPromise = new Promise((resolve, reject) => {
                 // Create listener for chain change event
                 this.on('chainChange', () => resolve({ success: false }));
-                signMessageFn(messageToSign).then((result) => resolve({ signedMessage: result, success: true }));
+                signMessageFn(messageToSign)
+                    .then((result) => resolve({ signedMessage: result, success: true }))
+                    .catch(reject);
             });
             const signedMessageResult = yield raceConditionPromise;
             if (signedMessageResult.success === false) {
@@ -327,7 +352,7 @@ class WalletConnect extends EthWalletConnector {
             metadata,
             mode: 'regular',
             preference: this.deepLinkPreference,
-            uri: (_a = WalletConnect.provider) === null || _a === void 0 ? void 0 : _a.uri,
+            uri: (_a = WalletConnect.provider) === null || _a === void 0 ? void 0 : _a.signer.uri,
         });
         if (!deepLink) {
             return;
@@ -341,10 +366,6 @@ class WalletConnect extends EthWalletConnector {
             if (!this.session) {
                 throw new DynamicError('no session');
             }
-            const web3Provider = this.getWalletClient();
-            if (!web3Provider) {
-                throw new DynamicError('No WalletConnect provider found to handle signing');
-            }
             const deepLink = this.getDeepLink();
             if (isMobile() && deepLink) {
                 window.location.href = deepLink;
@@ -354,7 +375,8 @@ class WalletConnect extends EthWalletConnector {
                 if (!activeAccount) {
                     return;
                 }
-                return web3Provider.signMessage({
+                const walletClient = yield this.getWalletClientFromInitializedProvider();
+                return walletClient.signMessage({
                     account: activeAccount,
                     message: messageToSign,
                 });
@@ -413,11 +435,17 @@ class WalletConnect extends EthWalletConnector {
             return _super.getNetwork.call(this);
         });
     }
-    providerSwitchNetwork({ network, provider, }) {
+    providerSwitchNetwork({ network, }) {
         const _super = Object.create(null, {
             providerSwitchNetwork: { get: () => super.providerSwitchNetwork }
         });
         return __awaiter(this, void 0, void 0, function* () {
+            const supportedNetworks = yield this.getSupportedNetworks();
+            if (!(supportedNetworks === null || supportedNetworks === void 0 ? void 0 : supportedNetworks.includes(network.chainId.toString()))) {
+                const error = new DynamicError('Network switching is not available at this time. The user should manually switch network in their wallet');
+                error.code = 'network_switching_only_available_in_wallet';
+                throw error;
+            }
             const currentNetworkId = yield this.getNetwork();
             if (currentNetworkId && currentNetworkId === network.chainId) {
                 return;
@@ -428,10 +456,14 @@ class WalletConnect extends EthWalletConnector {
             if (!this.supportsNetworkSwitching()) {
                 throw new DynamicError('Network switching not supported');
             }
-            if (!provider) {
-                throw new DynamicError('Provider not found');
+            const walletClient = yield this.getWalletClientFromInitializedProvider();
+            if (this.isMetaMask()) {
+                const deepLink = this.getDeepLink();
+                if (deepLink) {
+                    window.location.href = deepLink;
+                }
             }
-            yield _super.providerSwitchNetwork.call(this, { network, provider });
+            yield _super.providerSwitchNetwork.call(this, { network, provider: walletClient });
             this.currentChainId = network.chainId;
             this.hasSwitchedNetwork = true;
             this.emit('chainChange', { chain: String(network.chainId) });
@@ -457,13 +489,14 @@ class WalletConnect extends EthWalletConnector {
     getSupportedNetworks() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            // MM allows you to switch to any network the first time, even if it's not enabled in MM
-            // so we should consider all networks as supported if network switching hasn't been triggered yet
-            if (this.isMetaMask() && !this.hasSwitchedNetwork) {
-                return this.evmNetworks.map((network) => network.chainId.toString());
-            }
             yield this.initProvider();
             this.refreshSession();
+            if (this.isMetaMask()) {
+                if (this.hasSwitchedNetwork) {
+                    return [String(this.currentChainId)];
+                }
+                return this.evmNetworks.map((network) => network.chainId.toString());
+            }
             if (!this.session) {
                 return [];
             }