@dynamic-labs/ethereum 4.9.4 → 4.9.6

package/CHANGELOG.md

@@ -1,4 +1,32 @@
 
+### [4.9.6](https://github.com/dynamic-labs/dynamic-auth/compare/v4.9.5...v4.9.6) (2025-03-21)
+
+
+### Features
+
+* add initial sui support ([#8317](https://github.com/dynamic-labs/dynamic-auth/issues/8317)) ([88c0234](https://github.com/dynamic-labs/dynamic-auth/commit/88c023483bad5736f38cb313b035279460f6e256))
+
+
+### Bug Fixes
+
+* allow metmask sdk to retry connection ([#8322](https://github.com/dynamic-labs/dynamic-auth/issues/8322)) ([603ed99](https://github.com/dynamic-labs/dynamic-auth/commit/603ed99de3b5d90ac4f5eabcdcd3b2e90863298f))
+* css for profile page without embedded wallets ([#8339](https://github.com/dynamic-labs/dynamic-auth/issues/8339)) ([7f696e9](https://github.com/dynamic-labs/dynamic-auth/commit/7f696e9986ddd899d140640f9af7cfd2dcd7c37a))
+* ensure metamask connector can get display uri for multiple connections ([#8324](https://github.com/dynamic-labs/dynamic-auth/issues/8324)) ([1d95f08](https://github.com/dynamic-labs/dynamic-auth/commit/1d95f089589779e8ef078b80bd84fa0754179696))
+* pass HttpTransportConfig to WalletClient, not just PublicClient ([#8333](https://github.com/dynamic-labs/dynamic-auth/issues/8333)) ([a0ddd10](https://github.com/dynamic-labs/dynamic-auth/commit/a0ddd10f1df57555cf0a3ed777f5d354eb140582))
+
+### [4.9.5](https://github.com/dynamic-labs/dynamic-auth/compare/v4.9.4...v4.9.5) (2025-03-19)
+
+
+### Features
+
+* add support for AA to Global Wallet ([#8294](https://github.com/dynamic-labs/dynamic-auth/issues/8294)) ([173dfb9](https://github.com/dynamic-labs/dynamic-auth/commit/173dfb9c00e4307feec6ab11913f1a80310885eb))
+
+
+### Bug Fixes
+
+* Remove the usage of random uuid in Global Wallet ([#8314](https://github.com/dynamic-labs/dynamic-auth/issues/8314)) ([79a7a64](https://github.com/dynamic-labs/dynamic-auth/commit/79a7a640b9ce470051a3c877ea46e8d4c94ea542))
+* Fix UI when token balance is 0 ([#8299](https://github.com/dynamic-labs/dynamic-auth/issues/8299)) ([e8a2eca](https://github.com/dynamic-labs/dynamic-auth/commit/e8a2eca9876d914db738557a74751537eee2e129))
+
 ### [4.9.4](https://github.com/dynamic-labs/dynamic-auth/compare/v4.9.3...v4.9.4) (2025-03-17)
 
 

package/package.cjs

@@ -3,6 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.9.4";
+var version = "4.9.6";
 
 exports.version = version;

package/package.js

@@ -1,4 +1,4 @@
 'use client'
-var version = "4.9.4";
+var version = "4.9.6";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/ethereum",
-  "version": "4.9.4",
+  "version": "4.9.6",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -23,15 +23,15 @@
     "eventemitter3": "5.0.1",
     "buffer": "6.0.3",
     "@metamask/sdk": "0.32.0",
-    "@dynamic-labs/assert-package-version": "4.9.4",
-    "@dynamic-labs/embedded-wallet-evm": "4.9.4",
-    "@dynamic-labs/ethereum-core": "4.9.4",
-    "@dynamic-labs/logger": "4.9.4",
-    "@dynamic-labs/rpc-providers": "4.9.4",
-    "@dynamic-labs/types": "4.9.4",
-    "@dynamic-labs/utils": "4.9.4",
-    "@dynamic-labs/wallet-book": "4.9.4",
-    "@dynamic-labs/wallet-connector-core": "4.9.4"
+    "@dynamic-labs/assert-package-version": "4.9.6",
+    "@dynamic-labs/embedded-wallet-evm": "4.9.6",
+    "@dynamic-labs/ethereum-core": "4.9.6",
+    "@dynamic-labs/logger": "4.9.6",
+    "@dynamic-labs/rpc-providers": "4.9.6",
+    "@dynamic-labs/types": "4.9.6",
+    "@dynamic-labs/utils": "4.9.6",
+    "@dynamic-labs/wallet-book": "4.9.6",
+    "@dynamic-labs/wallet-connector-core": "4.9.6"
   },
   "peerDependencies": {
     "viem": "^2.21.55"

package/src/EthereumWalletConnectorsWithConfig.cjs

@@ -10,7 +10,11 @@ const EthereumWalletConnectorsWithConfig = (providersConfig) => {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         constructor(...args) {
             const [opts] = args;
-            super(Object.assign(Object.assign({}, opts), { providersConfig }));
+            // TODO: remove this once we remove the deprecated `publicClientHttpTransportConfig`
+            const updatedProviderConfig = {
+                httpTransportConfig: Object.assign(Object.assign({}, providersConfig.httpTransportConfig), providersConfig.publicClientHttpTransportConfig),
+            };
+            super(Object.assign(Object.assign({}, opts), { providersConfig: updatedProviderConfig }));
         }
     };
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/EthereumWalletConnectorsWithConfig.js

@@ -6,7 +6,11 @@ const EthereumWalletConnectorsWithConfig = (providersConfig) => {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         constructor(...args) {
             const [opts] = args;
-            super(Object.assign(Object.assign({}, opts), { providersConfig }));
+            // TODO: remove this once we remove the deprecated `publicClientHttpTransportConfig`
+            const updatedProviderConfig = {
+                httpTransportConfig: Object.assign(Object.assign({}, providersConfig.httpTransportConfig), providersConfig.publicClientHttpTransportConfig),
+            };
+            super(Object.assign(Object.assign({}, opts), { providersConfig: updatedProviderConfig }));
         }
     };
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/coinbase/coinbase.cjs

@@ -90,7 +90,7 @@ class Coinbase extends ethereumCore.EthereumWalletConnector {
         return viem.createWalletClient({
             account: this.getActiveAccount(),
             chain: chainId ? ethereumCore.chainsMap[chainId] : this.getActiveChain(),
-            transport: viem.custom(this.coinbaseProvider),
+            transport: viem.custom(this.coinbaseProvider, this.providersConfig.httpTransportConfig),
         });
     }
 }

package/src/coinbase/coinbase.js

@@ -86,7 +86,7 @@ class Coinbase extends EthereumWalletConnector {
         return createWalletClient({
             account: this.getActiveAccount(),
             chain: chainId ? chainsMap[chainId] : this.getActiveChain(),
-            transport: custom(this.coinbaseProvider),
+            transport: custom(this.coinbaseProvider, this.providersConfig.httpTransportConfig),
         });
     }
 }

package/src/ethProviderHelper.cjs

@@ -90,7 +90,7 @@ class EthProviderHelper {
             chain: chainId ? ethereumCore.chainsMap[chainId] : this.connector.getActiveChain(),
             transport: viem.custom({
                 request: (args) => provider.request(args).catch(normalizeRpcError.normalizeRpcError),
-            }),
+            }, this.connector.providersConfig.httpTransportConfig),
         });
     }
     getAddress() {

package/src/ethProviderHelper.js

@@ -86,7 +86,7 @@ class EthProviderHelper {
             chain: chainId ? chainsMap[chainId] : this.connector.getActiveChain(),
             transport: custom({
                 request: (args) => provider.request(args).catch(normalizeRpcError),
-            }),
+            }, this.connector.providersConfig.httpTransportConfig),
         });
     }
     getAddress() {

package/src/metaMask/MetaMaskConnector.cjs

@@ -11,7 +11,6 @@ var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
 var logger = require('../utils/logger.cjs');
 var InjectedWalletBase = require('../injected/InjectedWalletBase.cjs');
-var createMetaMaskSDKDisplayUriState = require('./utils/createMetaMaskSDKDisplayUriState.cjs');
 var waitForConnection = require('./utils/waitForConnection.cjs');
 var isPendingWalletRequestPermissionError = require('./utils/isPendingWalletRequestPermissionError.cjs');
 
@@ -20,8 +19,11 @@ var isPendingWalletRequestPermissionError = require('./utils/isPendingWalletRequ
  * in these variables to avoid initializing it multiple times
  */
 let _metaMaskSDK = null;
-let _metaMaskSDKDisplayUriState = null;
+let _metaMaskDisplayUri = null;
 const eventTimeline = utils.createEventTimeline();
+const setMetaMaskDisplayUri = (displayUri) => {
+    _metaMaskDisplayUri = displayUri;
+};
 class MetaMaskConnector extends InjectedWalletBase.InjectedWalletBase {
     constructor(props) {
         super(props);
@@ -44,6 +46,11 @@ class MetaMaskConnector extends InjectedWalletBase.InjectedWalletBase {
          * to prevent a false negative
          */
         this.isInAppBrowser = this.getIsInAppBrowser();
+        /**
+         * We can handle multiple connections in MetaMask only when the provider
+         * is installed on the browser.
+         */
+        this.canHandleMultipleConnections = this.isInstalledOnBrowser();
         if (!_metaMaskSDK) {
             this.createMetaMaskSDK();
         }
@@ -67,11 +74,6 @@ class MetaMaskConnector extends InjectedWalletBase.InjectedWalletBase {
     set metaMaskSDK(metaMaskSDK) {
         _metaMaskSDK = metaMaskSDK;
     }
-    get metaMaskSDKDisplayUriState() {
-        if (!_metaMaskSDKDisplayUriState)
-            throw new Error('MetaMaskSDKDisplayUriState not initialized');
-        return _metaMaskSDKDisplayUriState;
-    }
     createMetaMaskSDK() {
         const dappMetadata = {
             iconUrl: this.appLogoUrl,
@@ -90,8 +92,6 @@ class MetaMaskConnector extends InjectedWalletBase.InjectedWalletBase {
             readonlyRPCMap: getReadonlyRPCMap(this.evmNetworkRpcMap()),
             useDeeplink: true,
         });
-        _metaMaskSDKDisplayUriState =
-            createMetaMaskSDKDisplayUriState.createMetaMaskSDKDisplayUriState(_metaMaskSDK);
     }
     endSession() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
@@ -103,7 +103,6 @@ class MetaMaskConnector extends InjectedWalletBase.InjectedWalletBase {
             if (utils.isMobile()) {
                 return this.metaMaskSDK.terminate().then(() => {
                     _metaMaskSDK = null;
-                    _metaMaskSDKDisplayUriState = null;
                     return this.createMetaMaskSDK();
                 });
             }
@@ -115,50 +114,62 @@ class MetaMaskConnector extends InjectedWalletBase.InjectedWalletBase {
     }
     getAddress(opts) {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                // QR Code flow
-                if (!utils.isMobile() && Boolean(opts === null || opts === void 0 ? void 0 : opts.onDisplayUri)) {
-                    this.metaMaskSDKDisplayUriState
-                        .consumeDisplayUri()
-                        .then((displayUri) => {
-                        var _a;
-                        if (!displayUri) {
-                            reject(new Error('MetaMask display uri not found'));
-                            return;
-                        }
-                        (_a = opts === null || opts === void 0 ? void 0 : opts.onDisplayUri) === null || _a === void 0 ? void 0 : _a.call(opts, displayUri);
-                    });
-                }
+            yield this.metaMaskSDK.sdkInitPromise;
+            // QR Code flow
+            const handleDisplayUri = (displayUri) => {
+                var _a;
+                if (!displayUri)
+                    return;
+                setMetaMaskDisplayUri(displayUri);
+                (_a = opts === null || opts === void 0 ? void 0 : opts.onDisplayUri) === null || _a === void 0 ? void 0 : _a.call(opts, displayUri);
+            };
+            if (!utils.isMobile() && Boolean(opts === null || opts === void 0 ? void 0 : opts.onDisplayUri)) {
+                this.metaMaskSDK.on('display_uri', handleDisplayUri);
+            }
+            try {
                 // Deep link to MetaMask app in-app browser
                 if (this.shouldDeepLinkToMetaMaskInAppBrowser() &&
                     this.metadata.inAppBrowserUrl) {
                     // Redirect to the in-app browser and append the current url
                     utils.PlatformService.openURL(`${this.metadata.inAppBrowserUrl}/${window.location.href}`);
-                    resolve(undefined);
                     return;
                 }
                 // Connect to MetaMask
-                this.getConnectedAccountsSafely().then((initialConnectedAccounts) => _tslib.__awaiter(this, void 0, void 0, function* () {
-                    if (initialConnectedAccounts.length) {
-                        resolve(this.parseAddress(initialConnectedAccounts[0]));
-                        return;
+                const initialConnectedAccounts = yield this.getConnectedAccountsSafely();
+                if (initialConnectedAccounts.length) {
+                    return this.parseAddress(initialConnectedAccounts[0]);
+                }
+                try {
+                    yield this.metaMaskSDK.connect();
+                }
+                catch (error) {
+                    /**
+                     * In case of a getAddress call was already made and is pending
+                     * and a new getAddress call is made after a endSession call, the
+                     * MetaMask SDK will reject the original connect calls in the getAddress
+                     * promise.
+                     *
+                     * In this case we want to cast the error to GetAddressCancelledError
+                     * so the SDK knows the original getAddres call is cancelled and
+                     * be clear to start the new getAddress flow
+                     */
+                    if (eventTimeline.isEventRecent('disconnect', 1000)) {
+                        throw new utils.GetAddressCancelledError();
                     }
-                    try {
-                        yield this.metaMaskSDK.connect();
+                    const isRequestPendingError = isPendingWalletRequestPermissionError.isPendingWalletRequestPermissionError(error);
+                    if (!isRequestPendingError) {
+                        throw utils.MetaMaskError.fromError(error);
                     }
-                    catch (error) {
-                        const isRequestPendingError = isPendingWalletRequestPermissionError.isPendingWalletRequestPermissionError(error);
-                        if (!isRequestPendingError) {
-                            reject(utils.MetaMaskError.fromError(error));
-                        }
-                        else {
-                            yield waitForConnection.waitForConnection(this.getProvider());
-                        }
+                    else {
+                        yield waitForConnection.waitForConnection(this.getProvider());
                     }
-                    const accounts = yield this.getConnectedAccounts();
-                    resolve(accounts[0]);
-                }));
-            });
+                }
+                const accounts = yield this.getConnectedAccounts();
+                return accounts[0];
+            }
+            finally {
+                this.metaMaskSDK.off('display_uri', handleDisplayUri);
+            }
         });
     }
     getConnectedAccountsSafely() {
@@ -318,7 +329,7 @@ class MetaMaskConnector extends InjectedWalletBase.InjectedWalletBase {
         return viem.createWalletClient({
             account: address,
             chain: network ? ethereumCore.getOrMapViemChain(network) : this.getActiveChain(),
-            transport: viem.custom(provider),
+            transport: viem.custom(provider, this.providersConfig.httpTransportConfig),
         });
     }
     toInt(chainId) {
@@ -372,7 +383,7 @@ class MetaMaskConnector extends InjectedWalletBase.InjectedWalletBase {
         return true;
     }
     getConnectionUri() {
-        return this.metaMaskSDKDisplayUriState.getConnectionUri();
+        return _metaMaskDisplayUri !== null && _metaMaskDisplayUri !== void 0 ? _metaMaskDisplayUri : undefined;
     }
 }
 // Utils
@@ -386,3 +397,5 @@ const waitForFocusWindowEvent = () => new Promise((resolve) => {
 }).then(() => new Promise((resolve) => setTimeout(resolve, 1000)));
 
 exports.MetaMaskConnector = MetaMaskConnector;
+exports.eventTimeline = eventTimeline;
+exports.setMetaMaskDisplayUri = setMetaMaskDisplayUri;

package/src/metaMask/MetaMaskConnector.d.ts

@@ -3,11 +3,12 @@ import { Account, Transport, WalletClient, Chain as ViemChain } from 'viem';
 import { EthereumWalletConnectorOpts } from '@dynamic-labs/ethereum-core';
 import { GetAddressOpts, IWalletConnectConnector } from '@dynamic-labs/wallet-connector-core';
 import { InjectedWalletBase } from '../injected/InjectedWalletBase';
-import { MetaMaskSDKDisplayUriState } from './utils/createMetaMaskSDKDisplayUriState';
 export type MetaMaskConnectorProps = EthereumWalletConnectorOpts & {
     appName: string;
     appLogoUrl: string;
 };
+export declare const eventTimeline: import("@dynamic-labs/utils").EventTimeline<"connect" | "disconnect">;
+export declare const setMetaMaskDisplayUri: (displayUri: string) => void;
 export declare const clearMetaMaskSdk: () => void;
 export declare class MetaMaskConnector extends InjectedWalletBase implements IWalletConnectConnector {
     name: string;
@@ -21,7 +22,6 @@ export declare class MetaMaskConnector extends InjectedWalletBase implements IWa
     getSupportedNetworks(): Promise<string[]>;
     get metaMaskSDK(): MetaMaskSDK;
     set metaMaskSDK(metaMaskSDK: MetaMaskSDK);
-    get metaMaskSDKDisplayUriState(): MetaMaskSDKDisplayUriState;
     createMetaMaskSDK(): void;
     endSession(): Promise<void>;
     getAddress(opts?: GetAddressOpts): Promise<string | undefined>;

package/src/metaMask/MetaMaskConnector.js

@@ -4,10 +4,9 @@ import { MetaMaskSDK } from '@metamask/sdk';
 import { createWalletClient, custom, isHex, toHex } from 'viem';
 import { getOrMapViemChain } from '@dynamic-labs/ethereum-core';
 import { eventListenerHandlers } from '@dynamic-labs/wallet-connector-core';
-import { createEventTimeline, PlatformService, isMobile, MetaMaskError, retryableFn, PlatformEventsService } from '@dynamic-labs/utils';
+import { createEventTimeline, PlatformService, isMobile, GetAddressCancelledError, MetaMaskError, retryableFn, PlatformEventsService } from '@dynamic-labs/utils';
 import { logger } from '../utils/logger.js';
 import { InjectedWalletBase } from '../injected/InjectedWalletBase.js';
-import { createMetaMaskSDKDisplayUriState } from './utils/createMetaMaskSDKDisplayUriState.js';
 import { waitForConnection } from './utils/waitForConnection.js';
 import { isPendingWalletRequestPermissionError } from './utils/isPendingWalletRequestPermissionError.js';
 
@@ -16,8 +15,11 @@ import { isPendingWalletRequestPermissionError } from './utils/isPendingWalletRe
  * in these variables to avoid initializing it multiple times
  */
 let _metaMaskSDK = null;
-let _metaMaskSDKDisplayUriState = null;
+let _metaMaskDisplayUri = null;
 const eventTimeline = createEventTimeline();
+const setMetaMaskDisplayUri = (displayUri) => {
+    _metaMaskDisplayUri = displayUri;
+};
 class MetaMaskConnector extends InjectedWalletBase {
     constructor(props) {
         super(props);
@@ -40,6 +42,11 @@ class MetaMaskConnector extends InjectedWalletBase {
          * to prevent a false negative
          */
         this.isInAppBrowser = this.getIsInAppBrowser();
+        /**
+         * We can handle multiple connections in MetaMask only when the provider
+         * is installed on the browser.
+         */
+        this.canHandleMultipleConnections = this.isInstalledOnBrowser();
         if (!_metaMaskSDK) {
             this.createMetaMaskSDK();
         }
@@ -63,11 +70,6 @@ class MetaMaskConnector extends InjectedWalletBase {
     set metaMaskSDK(metaMaskSDK) {
         _metaMaskSDK = metaMaskSDK;
     }
-    get metaMaskSDKDisplayUriState() {
-        if (!_metaMaskSDKDisplayUriState)
-            throw new Error('MetaMaskSDKDisplayUriState not initialized');
-        return _metaMaskSDKDisplayUriState;
-    }
     createMetaMaskSDK() {
         const dappMetadata = {
             iconUrl: this.appLogoUrl,
@@ -86,8 +88,6 @@ class MetaMaskConnector extends InjectedWalletBase {
             readonlyRPCMap: getReadonlyRPCMap(this.evmNetworkRpcMap()),
             useDeeplink: true,
         });
-        _metaMaskSDKDisplayUriState =
-            createMetaMaskSDKDisplayUriState(_metaMaskSDK);
     }
     endSession() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -99,7 +99,6 @@ class MetaMaskConnector extends InjectedWalletBase {
             if (isMobile()) {
                 return this.metaMaskSDK.terminate().then(() => {
                     _metaMaskSDK = null;
-                    _metaMaskSDKDisplayUriState = null;
                     return this.createMetaMaskSDK();
                 });
             }
@@ -111,50 +110,62 @@ class MetaMaskConnector extends InjectedWalletBase {
     }
     getAddress(opts) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                // QR Code flow
-                if (!isMobile() && Boolean(opts === null || opts === void 0 ? void 0 : opts.onDisplayUri)) {
-                    this.metaMaskSDKDisplayUriState
-                        .consumeDisplayUri()
-                        .then((displayUri) => {
-                        var _a;
-                        if (!displayUri) {
-                            reject(new Error('MetaMask display uri not found'));
-                            return;
-                        }
-                        (_a = opts === null || opts === void 0 ? void 0 : opts.onDisplayUri) === null || _a === void 0 ? void 0 : _a.call(opts, displayUri);
-                    });
-                }
+            yield this.metaMaskSDK.sdkInitPromise;
+            // QR Code flow
+            const handleDisplayUri = (displayUri) => {
+                var _a;
+                if (!displayUri)
+                    return;
+                setMetaMaskDisplayUri(displayUri);
+                (_a = opts === null || opts === void 0 ? void 0 : opts.onDisplayUri) === null || _a === void 0 ? void 0 : _a.call(opts, displayUri);
+            };
+            if (!isMobile() && Boolean(opts === null || opts === void 0 ? void 0 : opts.onDisplayUri)) {
+                this.metaMaskSDK.on('display_uri', handleDisplayUri);
+            }
+            try {
                 // Deep link to MetaMask app in-app browser
                 if (this.shouldDeepLinkToMetaMaskInAppBrowser() &&
                     this.metadata.inAppBrowserUrl) {
                     // Redirect to the in-app browser and append the current url
                     PlatformService.openURL(`${this.metadata.inAppBrowserUrl}/${window.location.href}`);
-                    resolve(undefined);
                     return;
                 }
                 // Connect to MetaMask
-                this.getConnectedAccountsSafely().then((initialConnectedAccounts) => __awaiter(this, void 0, void 0, function* () {
-                    if (initialConnectedAccounts.length) {
-                        resolve(this.parseAddress(initialConnectedAccounts[0]));
-                        return;
+                const initialConnectedAccounts = yield this.getConnectedAccountsSafely();
+                if (initialConnectedAccounts.length) {
+                    return this.parseAddress(initialConnectedAccounts[0]);
+                }
+                try {
+                    yield this.metaMaskSDK.connect();
+                }
+                catch (error) {
+                    /**
+                     * In case of a getAddress call was already made and is pending
+                     * and a new getAddress call is made after a endSession call, the
+                     * MetaMask SDK will reject the original connect calls in the getAddress
+                     * promise.
+                     *
+                     * In this case we want to cast the error to GetAddressCancelledError
+                     * so the SDK knows the original getAddres call is cancelled and
+                     * be clear to start the new getAddress flow
+                     */
+                    if (eventTimeline.isEventRecent('disconnect', 1000)) {
+                        throw new GetAddressCancelledError();
                     }
-                    try {
-                        yield this.metaMaskSDK.connect();
+                    const isRequestPendingError = isPendingWalletRequestPermissionError(error);
+                    if (!isRequestPendingError) {
+                        throw MetaMaskError.fromError(error);
                     }
-                    catch (error) {
-                        const isRequestPendingError = isPendingWalletRequestPermissionError(error);
-                        if (!isRequestPendingError) {
-                            reject(MetaMaskError.fromError(error));
-                        }
-                        else {
-                            yield waitForConnection(this.getProvider());
-                        }
+                    else {
+                        yield waitForConnection(this.getProvider());
                     }
-                    const accounts = yield this.getConnectedAccounts();
-                    resolve(accounts[0]);
-                }));
-            });
+                }
+                const accounts = yield this.getConnectedAccounts();
+                return accounts[0];
+            }
+            finally {
+                this.metaMaskSDK.off('display_uri', handleDisplayUri);
+            }
         });
     }
     getConnectedAccountsSafely() {
@@ -314,7 +325,7 @@ class MetaMaskConnector extends InjectedWalletBase {
         return createWalletClient({
             account: address,
             chain: network ? getOrMapViemChain(network) : this.getActiveChain(),
-            transport: custom(provider),
+            transport: custom(provider, this.providersConfig.httpTransportConfig),
         });
     }
     toInt(chainId) {
@@ -368,7 +379,7 @@ class MetaMaskConnector extends InjectedWalletBase {
         return true;
     }
     getConnectionUri() {
-        return this.metaMaskSDKDisplayUriState.getConnectionUri();
+        return _metaMaskDisplayUri !== null && _metaMaskDisplayUri !== void 0 ? _metaMaskDisplayUri : undefined;
     }
 }
 // Utils
@@ -381,4 +392,4 @@ const waitForFocusWindowEvent = () => new Promise((resolve) => {
     PlatformEventsService.once('appFocused', resolve);
 }).then(() => new Promise((resolve) => setTimeout(resolve, 1000)));
 
-export { MetaMaskConnector };
+export { MetaMaskConnector, eventTimeline, setMetaMaskDisplayUri };

package/src/walletConnect/WalletConnectConnector/WalletConnectConnector.cjs

@@ -18,6 +18,7 @@ class WalletConnectConnector extends ethereumCore.EthereumWalletConnector {
         super(opts);
         this.canConnectViaQrCode = true;
         this.isWalletConnect = true;
+        this.canHandleMultipleConnections = false;
         this.name = opts.walletName;
         this.deepLinkPreference = opts.deepLinkPreference || 'native';
         const storedChainId = utils.StorageService.getItem(WC_CURRENT_CHAIN_KEY);
@@ -123,7 +124,7 @@ class WalletConnectConnector extends ethereumCore.EthereumWalletConnector {
                     this.deepLinkIfApplicable(args.method);
                     return provider.request(args).catch(normalizeRpcError.normalizeRpcError);
                 },
-            }),
+            }, this.providersConfig.httpTransportConfig),
         });
         return walletClient;
     }

package/src/walletConnect/WalletConnectConnector/WalletConnectConnector.d.ts

@@ -12,6 +12,7 @@ export declare class WalletConnectConnector extends EthereumWalletConnector impl
     name: string;
     canConnectViaQrCode: boolean;
     isWalletConnect: boolean;
+    canHandleMultipleConnections: boolean;
     private deepLinkPreference;
     constructor(opts: WalletConnectConnectorOpts);
     init(): Promise<void>;

package/src/walletConnect/WalletConnectConnector/WalletConnectConnector.js

@@ -14,6 +14,7 @@ class WalletConnectConnector extends EthereumWalletConnector {
         super(opts);
         this.canConnectViaQrCode = true;
         this.isWalletConnect = true;
+        this.canHandleMultipleConnections = false;
         this.name = opts.walletName;
         this.deepLinkPreference = opts.deepLinkPreference || 'native';
         const storedChainId = StorageService.getItem(WC_CURRENT_CHAIN_KEY);
@@ -119,7 +120,7 @@ class WalletConnectConnector extends EthereumWalletConnector {
                     this.deepLinkIfApplicable(args.method);
                     return provider.request(args).catch(normalizeRpcError);
                 },
-            }),
+            }, this.providersConfig.httpTransportConfig),
         });
         return walletClient;
     }

package/src/metaMask/utils/createMetaMaskSDKDisplayUriState.cjs

@@ -1,59 +0,0 @@
-'use client'
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var _tslib = require('../../../_virtual/_tslib.cjs');
-
-/**
- * Listens for the `display_uri` event emitted by the MetaMask SDK.
- *
- * The `display_uri` event is triggered during SDK initialization or when the `connect` method is called.
- * Calling `terminate` in the MetaMask SDK resets the connection, and a new `display_uri` will only be emitted
- * when `connect` is called again.
- *
- * This function manages the new `display_uri` received from these events.
- */
-const createMetaMaskSDKDisplayUriState = (metaMaskSDK) => {
-    let lastKnownMetaMaskDeepLinkUri = null;
-    let displayUri = null;
-    metaMaskSDK.on('display_uri', (latestDisplayUri) => {
-        if (lastKnownMetaMaskDeepLinkUri !== latestDisplayUri) {
-            lastKnownMetaMaskDeepLinkUri = latestDisplayUri;
-            displayUri = latestDisplayUri.trim();
-        }
-    });
-    return {
-        consumeDisplayUri: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            const currentDisplayUri = displayUri;
-            if (currentDisplayUri) {
-                displayUri = null;
-                return currentDisplayUri;
-            }
-            return new Promise((resolve) => {
-                let timeoutId = null;
-                let intervalId = null;
-                const cleanUp = () => {
-                    if (timeoutId)
-                        clearTimeout(timeoutId);
-                    if (intervalId)
-                        clearInterval(intervalId);
-                };
-                timeoutId = setTimeout(() => {
-                    cleanUp();
-                    resolve(undefined);
-                }, 1000);
-                intervalId = setInterval(() => {
-                    if (displayUri) {
-                        cleanUp();
-                        resolve(displayUri);
-                        displayUri = null;
-                    }
-                }, 10);
-            });
-        }),
-        getConnectionUri: () => displayUri !== null && displayUri !== void 0 ? displayUri : undefined,
-    };
-};
-
-exports.createMetaMaskSDKDisplayUriState = createMetaMaskSDKDisplayUriState;

package/src/metaMask/utils/createMetaMaskSDKDisplayUriState.d.ts

@@ -1,15 +0,0 @@
-import { MetaMaskSDK } from '@metamask/sdk';
-export type MetaMaskSDKDisplayUriState = {
-    consumeDisplayUri: () => Promise<string | undefined>;
-    getConnectionUri: () => string | undefined;
-};
-/**
- * Listens for the `display_uri` event emitted by the MetaMask SDK.
- *
- * The `display_uri` event is triggered during SDK initialization or when the `connect` method is called.
- * Calling `terminate` in the MetaMask SDK resets the connection, and a new `display_uri` will only be emitted
- * when `connect` is called again.
- *
- * This function manages the new `display_uri` received from these events.
- */
-export declare const createMetaMaskSDKDisplayUriState: (metaMaskSDK: MetaMaskSDK) => MetaMaskSDKDisplayUriState;

package/src/metaMask/utils/createMetaMaskSDKDisplayUriState.js

@@ -1,55 +0,0 @@
-'use client'
-import { __awaiter } from '../../../_virtual/_tslib.js';
-
-/**
- * Listens for the `display_uri` event emitted by the MetaMask SDK.
- *
- * The `display_uri` event is triggered during SDK initialization or when the `connect` method is called.
- * Calling `terminate` in the MetaMask SDK resets the connection, and a new `display_uri` will only be emitted
- * when `connect` is called again.
- *
- * This function manages the new `display_uri` received from these events.
- */
-const createMetaMaskSDKDisplayUriState = (metaMaskSDK) => {
-    let lastKnownMetaMaskDeepLinkUri = null;
-    let displayUri = null;
-    metaMaskSDK.on('display_uri', (latestDisplayUri) => {
-        if (lastKnownMetaMaskDeepLinkUri !== latestDisplayUri) {
-            lastKnownMetaMaskDeepLinkUri = latestDisplayUri;
-            displayUri = latestDisplayUri.trim();
-        }
-    });
-    return {
-        consumeDisplayUri: () => __awaiter(void 0, void 0, void 0, function* () {
-            const currentDisplayUri = displayUri;
-            if (currentDisplayUri) {
-                displayUri = null;
-                return currentDisplayUri;
-            }
-            return new Promise((resolve) => {
-                let timeoutId = null;
-                let intervalId = null;
-                const cleanUp = () => {
-                    if (timeoutId)
-                        clearTimeout(timeoutId);
-                    if (intervalId)
-                        clearInterval(intervalId);
-                };
-                timeoutId = setTimeout(() => {
-                    cleanUp();
-                    resolve(undefined);
-                }, 1000);
-                intervalId = setInterval(() => {
-                    if (displayUri) {
-                        cleanUp();
-                        resolve(displayUri);
-                        displayUri = null;
-                    }
-                }, 10);
-            });
-        }),
-        getConnectionUri: () => displayUri !== null && displayUri !== void 0 ? displayUri : undefined,
-    };
-};
-
-export { createMetaMaskSDKDisplayUriState };