@metamask/connect-multichain 0.5.3 → 0.6.0

package/dist/browser/es/connect-multichain.mjs

@@ -34,14 +34,6 @@ var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read fr
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
-var __privateWrapper = (obj, member, setter, getter) => ({
-  set _(value) {
-    __privateSet(obj, member, value, setter);
-  },
-  get _() {
-    return __privateGet(obj, member, getter);
-  }
-});
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -243,8 +235,8 @@ var init_logger = __esm({
       debug.enable(namespace);
     };
     isEnabled = (namespace, storage) => __async(null, null, function* () {
-      var _a2;
-      if ("process" in globalThis && ((_a2 = process == null ? void 0 : process.env) == null ? void 0 : _a2.DEBUG)) {
+      var _a3;
+      if ("process" in globalThis && ((_a3 = process == null ? void 0 : process.env) == null ? void 0 : _a3.DEBUG)) {
         const { DEBUG } = process.env;
         return isNamespaceEnabled(DEBUG, namespace);
       }
@@ -407,6 +399,34 @@ var init_multichain = __esm({
         super();
         this.options = options;
       }
+      /**
+       * Merges the given options into the current instance options.
+       * Only the mergeable keys are updated (api.supportedNetworks, ui.*, mobile.*, transport.extensionId, debug).
+       * The main thing to note is that the value for `dapp` is not merged as it does not make sense for
+       * subsequent calls to `createMultichainClient` to have a different `dapp` value.
+       * Used when createMultichainClient is called with an existing singleton.
+       *
+       * @param partial - Options to merge/overwrite onto the current instance
+       */
+      mergeOptions(partial) {
+        var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+        const opts = this.options;
+        this.options = __spreadProps(__spreadValues({}, opts), {
+          api: __spreadProps(__spreadValues({}, opts.api), {
+            supportedNetworks: __spreadValues(__spreadValues({}, opts.api.supportedNetworks), (_b = (_a3 = partial.api) == null ? void 0 : _a3.supportedNetworks) != null ? _b : {})
+          }),
+          ui: __spreadProps(__spreadValues({}, opts.ui), {
+            headless: (_d = (_c = partial.ui) == null ? void 0 : _c.headless) != null ? _d : opts.ui.headless,
+            preferExtension: (_f = (_e = partial.ui) == null ? void 0 : _e.preferExtension) != null ? _f : opts.ui.preferExtension,
+            showInstallModal: (_h = (_g = partial.ui) == null ? void 0 : _g.showInstallModal) != null ? _h : opts.ui.showInstallModal
+          }),
+          mobile: __spreadValues(__spreadValues({}, opts.mobile), (_i = partial.mobile) != null ? _i : {}),
+          transport: __spreadProps(__spreadValues({}, (_j = opts.transport) != null ? _j : {}), {
+            extensionId: (_m = (_k = partial.transport) == null ? void 0 : _k.extensionId) != null ? _m : (_l = opts.transport) == null ? void 0 : _l.extensionId
+          }),
+          debug: (_n = partial.debug) != null ? _n : opts.debug
+        });
+      }
     };
   }
 });
@@ -414,35 +434,35 @@ var init_multichain = __esm({
 // src/domain/platform/index.ts
 import Bowser from "bowser";
 function isNotBrowser() {
-  var _a2;
+  var _a3;
   if (typeof window === "undefined") {
     return true;
   }
   if (!(window == null ? void 0 : window.navigator)) {
     return true;
   }
-  if (typeof global !== "undefined" && ((_a2 = global == null ? void 0 : global.navigator) == null ? void 0 : _a2.product) === "ReactNative") {
+  if (typeof global !== "undefined" && ((_a3 = global == null ? void 0 : global.navigator) == null ? void 0 : _a3.product) === "ReactNative") {
     return true;
   }
   return (navigator == null ? void 0 : navigator.product) === "ReactNative";
 }
 function isReactNative() {
-  var _a2;
+  var _a3;
   const hasWindowNavigator = typeof window !== "undefined" && window.navigator !== void 0;
   const nav = hasWindowNavigator ? window.navigator : void 0;
   if (!nav) {
     return false;
   }
-  return hasWindowNavigator && ((_a2 = window.navigator) == null ? void 0 : _a2.product) === "ReactNative";
+  return hasWindowNavigator && ((_a3 = window.navigator) == null ? void 0 : _a3.product) === "ReactNative";
 }
 function isMetaMaskMobileWebView() {
   return typeof window !== "undefined" && // @ts-expect-error ReactNativeWebView should be defined
   Boolean(window.ReactNativeWebView) && Boolean(window.navigator.userAgent.endsWith("MetaMaskMobile"));
 }
 function isMobile() {
-  var _a2, _b;
+  var _a3, _b;
   const browser = Bowser.parse(window.navigator.userAgent);
-  return ((_a2 = browser == null ? void 0 : browser.platform) == null ? void 0 : _a2.type) === "mobile" || ((_b = browser == null ? void 0 : browser.platform) == null ? void 0 : _b.type) === "tablet";
+  return ((_a3 = browser == null ? void 0 : browser.platform) == null ? void 0 : _a3.type) === "mobile" || ((_b = browser == null ? void 0 : browser.platform) == null ? void 0 : _b.type) === "tablet";
 }
 function getPlatformType() {
   if (isReactNative()) {
@@ -460,11 +480,11 @@ function getPlatformType() {
   return "web-desktop" /* DesktopWeb */;
 }
 function isMetamaskExtensionInstalled() {
-  var _a2;
+  var _a3;
   if (typeof window === "undefined") {
     return false;
   }
-  return Boolean((_a2 = window.ethereum) == null ? void 0 : _a2.isMetaMask);
+  return Boolean((_a3 = window.ethereum) == null ? void 0 : _a3.isMetaMask);
 }
 function isSecure() {
   const platformType = getPlatformType();
@@ -495,8 +515,8 @@ var init_platform = __esm({
       return new Promise((resolve) => {
         const providers = [];
         const handler = (event) => {
-          var _a2, _b;
-          if ((_b = (_a2 = event == null ? void 0 : event.detail) == null ? void 0 : _a2.info) == null ? void 0 : _b.rdns) {
+          var _a3, _b;
+          if ((_b = (_a3 = event == null ? void 0 : event.detail) == null ? void 0 : _a3.info) == null ? void 0 : _b.rdns) {
             providers.push(event.detail);
           }
         };
@@ -506,8 +526,8 @@ var init_platform = __esm({
           window.removeEventListener("eip6963:announceProvider", handler);
           const hasMetaMask = providers.some(
             (provider) => {
-              var _a2, _b;
-              return (_b = (_a2 = provider == null ? void 0 : provider.info) == null ? void 0 : _a2.rdns) == null ? void 0 : _b.startsWith("io.metamask");
+              var _a3, _b;
+              return (_b = (_a3 = provider == null ? void 0 : provider.info) == null ? void 0 : _a3.rdns) == null ? void 0 : _b.startsWith("io.metamask");
             }
           );
           resolve(hasMetaMask);
@@ -591,12 +611,108 @@ var init_ui = __esm({
   }
 });
 
+// src/multichain/utils/analytics.ts
+function isRejectionError(error) {
+  var _a3, _b;
+  if (typeof error !== "object" || error === null) {
+    return false;
+  }
+  const errorObj = error;
+  const errorCode = errorObj.code;
+  const errorMessage = (_b = (_a3 = errorObj.message) == null ? void 0 : _a3.toLowerCase()) != null ? _b : "";
+  return errorCode === 4001 || // User rejected request (common EIP-1193 code)
+  errorCode === 4100 || // Unauthorized (common rejection code)
+  errorMessage.includes("reject") || errorMessage.includes("denied") || errorMessage.includes("cancel") || errorMessage.includes("user");
+}
+function getBaseAnalyticsProperties(options, storage) {
+  return __async(this, null, function* () {
+    var _a3, _b;
+    const version = getVersion();
+    const dappId = getDappId(options.dapp);
+    const platform = getPlatformType();
+    const anonId = yield storage.getAnonId();
+    const integrationType = (_b = (_a3 = options.analytics) == null ? void 0 : _a3.integrationType) != null ? _b : "unknown" /* UNKNOWN */;
+    return {
+      mmconnect_version: version,
+      dapp_id: dappId,
+      platform,
+      integration_type: integrationType,
+      anon_id: anonId
+    };
+  });
+}
+function getWalletActionAnalyticsProperties(options, storage, invokeOptions) {
+  return __async(this, null, function* () {
+    var _a3, _b;
+    const version = getVersion();
+    const dappId = getDappId(options.dapp);
+    const anonId = yield storage.getAnonId();
+    const integrationType = (_b = (_a3 = options.analytics) == null ? void 0 : _a3.integrationType) != null ? _b : "unknown";
+    return {
+      mmconnect_version: version,
+      dapp_id: dappId,
+      method: invokeOptions.request.method,
+      integration_type: integrationType,
+      caip_chain_id: invokeOptions.scope,
+      anon_id: anonId
+    };
+  });
+}
+var init_analytics = __esm({
+  "src/multichain/utils/analytics.ts"() {
+    "use strict";
+    init_utils2();
+    init_domain();
+  }
+});
+
+// src/domain/utils/index.ts
+function getVersion() {
+  return "0.0.0";
+}
+var init_utils = __esm({
+  "src/domain/utils/index.ts"() {
+    "use strict";
+    init_analytics();
+  }
+});
+
+// src/domain/index.ts
+var init_domain = __esm({
+  "src/domain/index.ts"() {
+    "use strict";
+    init_errors();
+    init_events();
+    init_logger();
+    init_multichain();
+    init_platform();
+    init_store();
+    init_ui();
+    init_utils();
+  }
+});
+
 // src/multichain/utils/index.ts
 import {
   parseCaipAccountId,
   parseCaipChainId
 } from "@metamask/utils";
 import { deflate } from "pako";
+function getGlobalObject() {
+  if (typeof globalThis !== "undefined") {
+    return globalThis;
+  }
+  if (typeof global !== "undefined") {
+    return global;
+  }
+  if (typeof self !== "undefined") {
+    return self;
+  }
+  if (typeof window !== "undefined") {
+    return window;
+  }
+  throw new Error("Unable to locate global object");
+}
 function base64Encode(str) {
   if (typeof btoa !== "undefined") {
     return btoa(str);
@@ -611,13 +727,13 @@ function compressString(str) {
   return base64Encode(binaryString);
 }
 function getDappId(dapp) {
-  var _a2;
-  return (_a2 = dapp.url) != null ? _a2 : dapp.name;
+  var _a3;
+  return (_a3 = dapp.url) != null ? _a3 : dapp.name;
 }
 function openDeeplink(options, deeplink, universalLink) {
-  var _a2;
+  var _a3;
   const { mobile } = options;
-  const useDeeplink = (_a2 = mobile == null ? void 0 : mobile.useDeeplink) != null ? _a2 : true;
+  const useDeeplink = (_a3 = mobile == null ? void 0 : mobile.useDeeplink) != null ? _a3 : true;
   if (useDeeplink) {
     if (typeof window !== "undefined") {
       window.location.href = deeplink;
@@ -630,6 +746,29 @@ function openDeeplink(options, deeplink, universalLink) {
     link.click();
   }
 }
+function mergeRequestedSessionWithExisting(sessionData, scopes, caipAccountIds, sessionProperties) {
+  const existingCaipChainIds = Object.keys(sessionData.sessionScopes);
+  const existingCaipAccountIds = [];
+  Object.values(sessionData.sessionScopes).forEach((scopeObject) => {
+    if ((scopeObject == null ? void 0 : scopeObject.accounts) && Array.isArray(scopeObject.accounts)) {
+      scopeObject.accounts.forEach((account) => {
+        existingCaipAccountIds.push(account);
+      });
+    }
+  });
+  const mergedScopes = Array.from(
+    /* @__PURE__ */ new Set([...existingCaipChainIds, ...scopes])
+  );
+  const mergedCaipAccountIds = Array.from(
+    /* @__PURE__ */ new Set([...existingCaipAccountIds, ...caipAccountIds])
+  );
+  const mergedSessionProperties = __spreadValues(__spreadValues({}, sessionData.sessionProperties), sessionProperties);
+  return {
+    mergedScopes,
+    mergedCaipAccountIds,
+    mergedSessionProperties
+  };
+}
 function getOptionalScopes(scopes) {
   return scopes.reduce(
     (prev, scope) => __spreadProps(__spreadValues({}, prev), {
@@ -643,10 +782,10 @@ function getOptionalScopes(scopes) {
   );
 }
 function setupDappMetadata(options) {
-  var _a2, _b;
+  var _a3, _b;
   const platform = getPlatformType();
   const isBrowser = platform === "web-desktop" /* DesktopWeb */ || platform === "web-mobile" /* MobileWeb */ || platform === "in-app-browser" /* MetaMaskMobileWebview */;
-  if (!((_a2 = options.dapp) == null ? void 0 : _a2.name)) {
+  if (!((_a3 = options.dapp) == null ? void 0 : _a3.name)) {
     throw new Error("You must provide dapp name");
   }
   if (isBrowser) {
@@ -720,17 +859,17 @@ function getValidAccounts(caipAccountIds) {
   );
 }
 function addValidAccounts(optionalScopes, validAccounts) {
-  var _a2;
+  var _a3;
   if (!optionalScopes || !(validAccounts == null ? void 0 : validAccounts.length)) {
     return optionalScopes;
   }
   const result = Object.fromEntries(
     Object.entries(optionalScopes).map(([scope, scopeData]) => {
-      var _a3, _b, _c;
+      var _a4, _b, _c;
       return [
         scope,
         {
-          methods: [...(_a3 = scopeData == null ? void 0 : scopeData.methods) != null ? _a3 : []],
+          methods: [...(_a4 = scopeData == null ? void 0 : scopeData.methods) != null ? _a4 : []],
           notifications: [...(_b = scopeData == null ? void 0 : scopeData.notifications) != null ? _b : []],
           accounts: [...(_c = scopeData == null ? void 0 : scopeData.accounts) != null ? _c : []]
         }
@@ -744,7 +883,7 @@ function addValidAccounts(optionalScopes, validAccounts) {
     if (!accountsByChain.has(chainKey)) {
       accountsByChain.set(chainKey, []);
     }
-    (_a2 = accountsByChain.get(chainKey)) == null ? void 0 : _a2.push(accountId);
+    (_a3 = accountsByChain.get(chainKey)) == null ? void 0 : _a3.push(accountId);
   }
   for (const [scopeKey, scopeData] of Object.entries(result)) {
     if (!(scopeData == null ? void 0 : scopeData.accounts)) {
@@ -768,13 +907,13 @@ function addValidAccounts(optionalScopes, validAccounts) {
   }
   return result;
 }
-var extractFavicon;
-var init_utils = __esm({
+var extractFavicon, MAX, idCounter, getUniqueRequestId;
+var init_utils2 = __esm({
   "src/multichain/utils/index.ts"() {
     "use strict";
     init_domain();
     extractFavicon = () => {
-      var _a2;
+      var _a3;
       if (typeof document === "undefined") {
         return void 0;
       }
@@ -782,92 +921,17 @@ var init_utils = __esm({
       const nodeList = document.getElementsByTagName("link");
       for (let i = 0; i < nodeList.length; i++) {
         if (nodeList[i].getAttribute("rel") === "icon" || nodeList[i].getAttribute("rel") === "shortcut icon") {
-          favicon = (_a2 = nodeList[i].getAttribute("href")) != null ? _a2 : void 0;
+          favicon = (_a3 = nodeList[i].getAttribute("href")) != null ? _a3 : void 0;
         }
       }
       return favicon;
     };
-  }
-});
-
-// src/multichain/utils/analytics.ts
-function isRejectionError(error) {
-  var _a2, _b;
-  if (typeof error !== "object" || error === null) {
-    return false;
-  }
-  const errorObj = error;
-  const errorCode = errorObj.code;
-  const errorMessage = (_b = (_a2 = errorObj.message) == null ? void 0 : _a2.toLowerCase()) != null ? _b : "";
-  return errorCode === 4001 || // User rejected request (common EIP-1193 code)
-  errorCode === 4100 || // Unauthorized (common rejection code)
-  errorMessage.includes("reject") || errorMessage.includes("denied") || errorMessage.includes("cancel") || errorMessage.includes("user");
-}
-function getBaseAnalyticsProperties(options, storage) {
-  return __async(this, null, function* () {
-    var _a2, _b;
-    const version = getVersion();
-    const dappId = getDappId(options.dapp);
-    const platform = getPlatformType();
-    const anonId = yield storage.getAnonId();
-    const integrationType = (_b = (_a2 = options.analytics) == null ? void 0 : _a2.integrationType) != null ? _b : "unknown" /* UNKNOWN */;
-    return {
-      mmconnect_version: version,
-      dapp_id: dappId,
-      platform,
-      integration_type: integrationType,
-      anon_id: anonId
+    MAX = 4294967295;
+    idCounter = Math.floor(Math.random() * MAX);
+    getUniqueRequestId = () => {
+      idCounter = (idCounter + 1) % MAX;
+      return idCounter;
     };
-  });
-}
-function getWalletActionAnalyticsProperties(options, storage, invokeOptions) {
-  return __async(this, null, function* () {
-    var _a2, _b;
-    const version = getVersion();
-    const dappId = getDappId(options.dapp);
-    const anonId = yield storage.getAnonId();
-    const integrationType = (_b = (_a2 = options.analytics) == null ? void 0 : _a2.integrationType) != null ? _b : "unknown";
-    return {
-      mmconnect_version: version,
-      dapp_id: dappId,
-      method: invokeOptions.request.method,
-      integration_type: integrationType,
-      caip_chain_id: invokeOptions.scope,
-      anon_id: anonId
-    };
-  });
-}
-var init_analytics = __esm({
-  "src/multichain/utils/analytics.ts"() {
-    "use strict";
-    init_utils();
-    init_domain();
-  }
-});
-
-// src/domain/utils/index.ts
-function getVersion() {
-  return "0.0.0";
-}
-var init_utils2 = __esm({
-  "src/domain/utils/index.ts"() {
-    "use strict";
-    init_analytics();
-  }
-});
-
-// src/domain/index.ts
-var init_domain = __esm({
-  "src/domain/index.ts"() {
-    "use strict";
-    init_errors();
-    init_events();
-    init_logger();
-    init_multichain();
-    init_platform();
-    init_store();
-    init_ui();
-    init_utils2();
   }
 });
 
@@ -996,7 +1060,7 @@ var init_install = __esm({
       renderQRCode() {
       }
       mount() {
-        var _a2;
+        var _a3;
         const { options } = this;
         const modal = document.createElement(
           "mm-install-modal"
@@ -1013,14 +1077,14 @@ var init_install = __esm({
         );
         modal.link = options.link;
         this.instance = modal;
-        (_a2 = options.parentElement) == null ? void 0 : _a2.appendChild(modal);
+        (_a3 = options.parentElement) == null ? void 0 : _a3.appendChild(modal);
         this.startExpirationCheck(options.connectionRequest);
       }
       unmount() {
-        var _a2;
+        var _a3;
         const { options, instance: modal } = this;
         this.stopExpirationCheck();
-        if (modal && ((_a2 = options.parentElement) == null ? void 0 : _a2.contains(modal))) {
+        if (modal && ((_a3 = options.parentElement) == null ? void 0 : _a3.contains(modal))) {
           options.parentElement.removeChild(modal);
           this.instance = void 0;
         }
@@ -1132,8 +1196,8 @@ var init_web2 = __esm({
               const request = store.get(key);
               request.onerror = () => reject(new Error("Failed to get value from IndexedDB."));
               request.onsuccess = () => {
-                var _a2;
-                return resolve((_a2 = request.result) != null ? _a2 : null);
+                var _a3;
+                return resolve((_a3 = request.result) != null ? _a3 : null);
               };
             } catch (error) {
               reject(error);
@@ -1177,17 +1241,17 @@ var init_web2 = __esm({
       }
     };
     _StoreAdapterWeb.stores = ["sdk-kv-store", "key-value-pairs"];
-    _StoreAdapterWeb.DB_NAME = "mmsdk";
+    _StoreAdapterWeb.DB_NAME = "mmconnect";
     StoreAdapterWeb = _StoreAdapterWeb;
   }
 });
 
 // src/polyfills/buffer-shim.ts
+init_utils2();
 import { Buffer as Buffer2 } from "buffer";
-var globalObj = typeof globalThis !== "undefined" ? globalThis : typeof global !== "undefined" ? global : typeof window !== "undefined" ? window : {};
-if (!globalObj.Buffer) {
-  globalObj.Buffer = Buffer2;
-}
+var globalObj = getGlobalObject();
+var _a;
+(_a = globalObj.Buffer) != null ? _a : globalObj.Buffer = Buffer2;
 
 // src/index.browser.ts
 init_domain();
@@ -1260,8 +1324,8 @@ var RpcClient = class {
     });
   }
   getRpcEndpoint(scope) {
-    var _a2, _b, _c;
-    const supportedNetworks = (_c = (_b = (_a2 = this.config) == null ? void 0 : _a2.api) == null ? void 0 : _b.supportedNetworks) != null ? _c : {};
+    var _a3, _b, _c;
+    const supportedNetworks = (_c = (_b = (_a3 = this.config) == null ? void 0 : _a3.api) == null ? void 0 : _b.supportedNetworks) != null ? _c : {};
     const rpcEndpoint = supportedNetworks[scope];
     if (!rpcEndpoint) {
       throw new MissingRpcEndpointErr(
@@ -1325,7 +1389,7 @@ var RpcClient = class {
 // src/multichain/rpc/requestRouter.ts
 import { analytics } from "@metamask/analytics";
 init_domain();
-init_utils();
+init_utils2();
 init_analytics();
 var _RequestRouter_instances, withAnalyticsTracking_fn, trackWalletActionRequested_fn, trackWalletActionSucceeded_fn, trackWalletActionFailed_fn, trackWalletActionRejected_fn;
 var RequestRouter = class {
@@ -1492,12 +1556,12 @@ trackWalletActionRejected_fn = function(options) {
 };
 
 // src/multichain/transports/default/index.ts
-init_utils();
+init_utils2();
 import {
   getDefaultTransport
 } from "@metamask/multichain-api-client";
 var DEFAULT_REQUEST_TIMEOUT = 60 * 1e3;
-var _notificationCallbacks, _transport, _defaultRequestOptions, _reqId, _pendingRequests, _handleResponseListener, _handleNotificationListener, _DefaultTransport_instances, notifyCallbacks_fn, isMetamaskProviderEvent_fn, handleResponse_fn, handleNotification_fn, setupMessageListener_fn;
+var _notificationCallbacks, _transport, _defaultRequestOptions, _pendingRequests, _handleResponseListener, _handleNotificationListener, _DefaultTransport_instances, notifyCallbacks_fn, isMetamaskProviderEvent_fn, handleResponse_fn, handleNotification_fn, setupMessageListener_fn;
 var DefaultTransport = class {
   constructor() {
     __privateAdd(this, _DefaultTransport_instances);
@@ -1506,8 +1570,6 @@ var DefaultTransport = class {
     __privateAdd(this, _defaultRequestOptions, {
       timeout: DEFAULT_REQUEST_TIMEOUT
     });
-    // Use timestamp-based ID to avoid conflicts across disconnect/reconnect cycles
-    __privateAdd(this, _reqId, Date.now());
     __privateAdd(this, _pendingRequests, /* @__PURE__ */ new Map());
     __privateAdd(this, _handleResponseListener);
     __privateAdd(this, _handleNotificationListener);
@@ -1515,18 +1577,17 @@ var DefaultTransport = class {
   sendEip1193Message(payload, options) {
     return __async(this, null, function* () {
       __privateMethod(this, _DefaultTransport_instances, setupMessageListener_fn).call(this);
-      __privateSet(this, _reqId, __privateGet(this, _reqId) + 1);
-      const requestId = `${__privateGet(this, _reqId)}`;
+      const requestId = String(getUniqueRequestId());
       const request = __spreadValues({
         jsonrpc: "2.0",
         id: requestId
       }, payload);
       return new Promise((resolve, reject) => {
-        var _a2;
+        var _a3;
         const timeout = setTimeout(() => {
           __privateGet(this, _pendingRequests).delete(requestId);
           reject(new Error("Request timeout"));
-        }, (_a2 = options == null ? void 0 : options.timeout) != null ? _a2 : __privateGet(this, _defaultRequestOptions).timeout);
+        }, (_a3 = options == null ? void 0 : options.timeout) != null ? _a3 : __privateGet(this, _defaultRequestOptions).timeout);
         __privateGet(this, _pendingRequests).set(requestId, {
           resolve: (response) => {
             resolve(response);
@@ -1550,7 +1611,7 @@ var DefaultTransport = class {
   }
   connect(options) {
     return __async(this, null, function* () {
-      var _a2, _b, _c, _d, _e;
+      var _a3, _b, _c, _d, _e;
       __privateMethod(this, _DefaultTransport_instances, setupMessageListener_fn).call(this);
       yield __privateGet(this, _transport).connect();
       const sessionRequest = yield this.request(
@@ -1563,7 +1624,7 @@ var DefaultTransport = class {
       let walletSession = sessionRequest.result;
       const createSessionParams = {
         optionalScopes: addValidAccounts(
-          getOptionalScopes((_a2 = options == null ? void 0 : options.scopes) != null ? _a2 : []),
+          getOptionalScopes((_a3 = options == null ? void 0 : options.scopes) != null ? _a3 : []),
           getValidAccounts((_b = options == null ? void 0 : options.caipAccountIds) != null ? _b : [])
         ),
         sessionProperties: options == null ? void 0 : options.sessionProperties
@@ -1581,10 +1642,6 @@ var DefaultTransport = class {
           proposedCaipAccountIds
         );
         if (!hasSameScopesAndAccounts) {
-          yield this.request(
-            { method: "wallet_revokeSession", params: walletSession },
-            __privateGet(this, _defaultRequestOptions)
-          );
           const response = yield this.request(
             { method: "wallet_createSession", params: createSessionParams },
             __privateGet(this, _defaultRequestOptions)
@@ -1611,9 +1668,14 @@ var DefaultTransport = class {
     });
   }
   disconnect() {
-    return __async(this, null, function* () {
+    return __async(this, arguments, function* (scopes = []) {
+      yield this.request({ method: "wallet_revokeSession", params: { scopes } });
+      const response = yield this.request({ method: "wallet_getSession" });
+      const { sessionScopes } = response.result;
+      if (Object.keys(sessionScopes).length > 0) {
+        return;
+      }
       __privateGet(this, _notificationCallbacks).clear();
-      yield this.request({ method: "wallet_revokeSession", params: {} });
       if (__privateGet(this, _handleResponseListener)) {
         window.removeEventListener("message", __privateGet(this, _handleResponseListener));
         __privateSet(this, _handleResponseListener, void 0);
@@ -1627,7 +1689,7 @@ var DefaultTransport = class {
         request.reject(new Error("Transport disconnected"));
       }
       __privateGet(this, _pendingRequests).clear();
-      return __privateGet(this, _transport).disconnect();
+      yield __privateGet(this, _transport).disconnect();
     });
   }
   isConnected() {
@@ -1652,11 +1714,17 @@ var DefaultTransport = class {
       );
     });
   }
+  getStoredPendingSessionRequest() {
+    return __async(this, null, function* () {
+      throw new Error(
+        "getStoredPendingSessionRequest is purposely not implemented for the DefaultTransport"
+      );
+    });
+  }
 };
 _notificationCallbacks = new WeakMap();
 _transport = new WeakMap();
 _defaultRequestOptions = new WeakMap();
-_reqId = new WeakMap();
 _pendingRequests = new WeakMap();
 _handleResponseListener = new WeakMap();
 _handleNotificationListener = new WeakMap();
@@ -1674,16 +1742,16 @@ notifyCallbacks_fn = function(data) {
   }
 };
 isMetamaskProviderEvent_fn = function(event) {
-  var _a2, _b;
-  return ((_b = (_a2 = event == null ? void 0 : event.data) == null ? void 0 : _a2.data) == null ? void 0 : _b.name) === "metamask-provider" && // eslint-disable-next-line no-restricted-globals
+  var _a3, _b;
+  return ((_b = (_a3 = event == null ? void 0 : event.data) == null ? void 0 : _a3.data) == null ? void 0 : _b.name) === "metamask-provider" && // eslint-disable-next-line no-restricted-globals
   event.origin === location.origin;
 };
 handleResponse_fn = function(event) {
-  var _a2, _b;
+  var _a3, _b;
   if (!__privateMethod(this, _DefaultTransport_instances, isMetamaskProviderEvent_fn).call(this, event)) {
     return;
   }
-  const responseData = (_b = (_a2 = event == null ? void 0 : event.data) == null ? void 0 : _a2.data) == null ? void 0 : _b.data;
+  const responseData = (_b = (_a3 = event == null ? void 0 : event.data) == null ? void 0 : _a3.data) == null ? void 0 : _b.data;
   if (typeof responseData === "object" && responseData !== null && "method" in responseData) {
     return;
   }
@@ -1705,11 +1773,11 @@ handleResponse_fn = function(event) {
   }
 };
 handleNotification_fn = function(event) {
-  var _a2, _b;
+  var _a3, _b;
   if (!__privateMethod(this, _DefaultTransport_instances, isMetamaskProviderEvent_fn).call(this, event)) {
     return;
   }
-  const responseData = (_b = (_a2 = event == null ? void 0 : event.data) == null ? void 0 : _a2.data) == null ? void 0 : _b.data;
+  const responseData = (_b = (_a3 = event == null ? void 0 : event.data) == null ? void 0 : _a3.data) == null ? void 0 : _b.data;
   if (typeof responseData === "object" && responseData.method === "metamask_chainChanged" || responseData.method === "metamask_accountsChanged") {
     __privateMethod(this, _DefaultTransport_instances, notifyCallbacks_fn).call(this, responseData);
   }
@@ -1725,19 +1793,13 @@ setupMessageListener_fn = function() {
 };
 
 // src/multichain/transports/multichainApiClientWrapper/index.ts
+init_utils2();
 import { providerErrors } from "@metamask/rpc-errors";
-var MAX = 4294967295;
-var idCounter = Math.floor(Math.random() * MAX);
-var getUniqueId = () => {
-  idCounter = (idCounter + 1) % MAX;
-  return idCounter;
-};
-var _requestId, _notificationCallbacks2, _MultichainApiClientWrapperTransport_instances, walletCreateSession_fn, walletGetSession_fn, walletRevokeSession_fn, walletInvokeMethod_fn;
+var _notificationCallbacks2, _MultichainApiClientWrapperTransport_instances, walletCreateSession_fn, walletGetSession_fn, walletRevokeSession_fn, walletInvokeMethod_fn;
 var MultichainApiClientWrapperTransport = class {
   constructor(metamaskConnectMultichain) {
     this.metamaskConnectMultichain = metamaskConnectMultichain;
     __privateAdd(this, _MultichainApiClientWrapperTransport_instances);
-    __privateAdd(this, _requestId, getUniqueId());
     __privateAdd(this, _notificationCallbacks2, /* @__PURE__ */ new Set());
   }
   isTransportDefined() {
@@ -1755,15 +1817,23 @@ var MultichainApiClientWrapperTransport = class {
       callback(data);
     });
   }
-  setupNotifcationListener() {
-    this.metamaskConnectMultichain.transport.onNotification(
+  clearTransportNotificationListener() {
+    var _a3;
+    (_a3 = this.notificationListener) == null ? void 0 : _a3.call(this);
+    this.notificationListener = void 0;
+  }
+  setupTransportNotificationListener() {
+    if (!this.isTransportDefined() || this.notificationListener) {
+      return;
+    }
+    this.notificationListener = this.metamaskConnectMultichain.transport.onNotification(
       this.notifyCallbacks.bind(this)
     );
   }
   connect() {
     return __async(this, null, function* () {
       console.log("\u{1F4DA} connect");
-      return Promise.resolve();
+      yield this.metamaskConnectMultichain.emitSessionChanged();
     });
   }
   disconnect() {
@@ -1776,7 +1846,7 @@ var MultichainApiClientWrapperTransport = class {
   }
   request(_0) {
     return __async(this, arguments, function* (params, _options = {}) {
-      const id = __privateWrapper(this, _requestId)._++;
+      const id = getUniqueRequestId();
       const requestPayload = __spreadValues({
         id,
         jsonrpc: "2.0"
@@ -1797,16 +1867,13 @@ var MultichainApiClientWrapperTransport = class {
     });
   }
   onNotification(callback) {
-    if (!this.isTransportDefined()) {
-      __privateGet(this, _notificationCallbacks2).add(callback);
-      return () => {
-        __privateGet(this, _notificationCallbacks2).delete(callback);
-      };
-    }
-    return this.metamaskConnectMultichain.transport.onNotification(callback);
+    this.setupTransportNotificationListener();
+    __privateGet(this, _notificationCallbacks2).add(callback);
+    return () => {
+      __privateGet(this, _notificationCallbacks2).delete(callback);
+    };
   }
 };
-_requestId = new WeakMap();
 _notificationCallbacks2 = new WeakMap();
 _MultichainApiClientWrapperTransport_instances = new WeakSet();
 walletCreateSession_fn = function(request) {
@@ -1816,8 +1883,8 @@ walletCreateSession_fn = function(request) {
     const scopes = Object.keys(__spreadValues(__spreadValues({}, createSessionParams.optionalScopes), createSessionParams.requiredScopes));
     const scopeAccounts = [];
     scopes.forEach((scope) => {
-      var _a2, _b, _c, _d;
-      const requiredScope = (_a2 = createSessionParams.requiredScopes) == null ? void 0 : _a2[scope];
+      var _a3, _b, _c, _d;
+      const requiredScope = (_a3 = createSessionParams.requiredScopes) == null ? void 0 : _a3[scope];
       const optionalScope = (_b = createSessionParams.optionalScopes) == null ? void 0 : _b[scope];
       if (requiredScope) {
         scopeAccounts.push(...(_c = requiredScope.accounts) != null ? _c : []);
@@ -1857,11 +1924,14 @@ walletGetSession_fn = function(request) {
 };
 walletRevokeSession_fn = function(request) {
   return __async(this, null, function* () {
+    var _a3;
     if (!this.isTransportDefined()) {
       return { jsonrpc: "2.0", id: request.id, result: true };
     }
+    const revokeSessionParams = request.params;
+    const scopes = (_a3 = revokeSessionParams == null ? void 0 : revokeSessionParams.scopes) != null ? _a3 : [];
     try {
-      this.metamaskConnectMultichain.disconnect();
+      yield this.metamaskConnectMultichain.disconnect(scopes);
       return { jsonrpc: "2.0", id: request.id, result: true };
     } catch (_error) {
       return { jsonrpc: "2.0", id: request.id, result: false };
@@ -1884,11 +1954,12 @@ walletInvokeMethod_fn = function(request) {
 
 // src/multichain/transports/mwp/index.ts
 init_domain();
-init_utils();
+init_utils2();
 import { SessionStore } from "@metamask/mobile-wallet-protocol-core";
 import {
   TransportTimeoutError
 } from "@metamask/multichain-api-client";
+import { providerErrors as providerErrors2, rpcErrors } from "@metamask/rpc-errors";
 
 // src/multichain/transports/constants.ts
 var MULTICHAIN_PROVIDER_STREAM_NAME = "metamask-multichain-provider";
@@ -1901,6 +1972,7 @@ var DEFAULT_RESUME_TIMEOUT = 10 * 1e3;
 var SESSION_STORE_KEY = "cache_wallet_getSession";
 var ACCOUNTS_STORE_KEY = "cache_eth_accounts";
 var CHAIN_STORE_KEY = "cache_eth_chainId";
+var PENDING_SESSION_REQUEST_KEY = "pending_session_request";
 var CACHED_METHOD_LIST = [
   "wallet_getSession",
   "wallet_createSession",
@@ -1920,10 +1992,15 @@ var MWPTransport = class {
     this.dappClient = dappClient;
     this.kvstore = kvstore;
     this.options = options;
-    this.__reqId = 0;
     this.__pendingRequests = /* @__PURE__ */ new Map();
     this.notificationCallbacks = /* @__PURE__ */ new Set();
     this.dappClient.on("message", this.handleMessage.bind(this));
+    this.dappClient.on("session_request", (sessionRequest) => {
+      this.currentSessionRequest = sessionRequest;
+      this.kvstore.set(PENDING_SESSION_REQUEST_KEY, JSON.stringify(sessionRequest)).catch((err) => {
+        logger("Failed to store pending session request", err);
+      });
+    });
     if (typeof window !== "undefined" && typeof window.addEventListener !== "undefined") {
       this.windowFocusHandler = this.onWindowFocus.bind(this);
       window.addEventListener("focus", this.windowFocusHandler);
@@ -1938,6 +2015,34 @@ var MWPTransport = class {
   get sessionRequest() {
     return this.currentSessionRequest;
   }
+  /**
+   * Returns the stored pending session request from the dappClient session_request event, if any.
+   *
+   * @returns The stored SessionRequest, or null if none or invalid.
+   */
+  getStoredPendingSessionRequest() {
+    return __async(this, null, function* () {
+      try {
+        const raw = yield this.kvstore.get(PENDING_SESSION_REQUEST_KEY);
+        if (!raw) {
+          return null;
+        }
+        return JSON.parse(raw);
+      } catch (e) {
+        return null;
+      }
+    });
+  }
+  /**
+   * Removes the stored pending session request from the KVStore.
+   * This is necessary to ensure that ConnectMultichain is able to correctly
+   * infer the MWP Transport connection attempt status.
+   */
+  removeStoredPendingSessionRequest() {
+    return __async(this, null, function* () {
+      yield this.kvstore.delete(PENDING_SESSION_REQUEST_KEY);
+    });
+  }
   onWindowFocus() {
     if (!this.isConnected()) {
       this.dappClient.reconnect();
@@ -1954,6 +2059,17 @@ var MWPTransport = class {
       request.reject(error);
     }
   }
+  parseWalletError(errorPayload) {
+    const errorData = errorPayload;
+    if (typeof errorData.code === "number" && typeof errorData.message === "string") {
+      return providerErrors2.custom({
+        code: errorData.code,
+        message: errorData.message
+      });
+    }
+    const message = errorPayload instanceof Error ? errorPayload.message : JSON.stringify(errorPayload);
+    return rpcErrors.internal({ message });
+  }
   handleMessage(message) {
     if (typeof message === "object" && message !== null) {
       if ("data" in message) {
@@ -1961,6 +2077,12 @@ var MWPTransport = class {
         if ("id" in messagePayload && typeof messagePayload.id === "string") {
           const request = this.pendingRequests.get(messagePayload.id);
           if (request) {
+            clearTimeout(request.timeout);
+            if ("error" in messagePayload && messagePayload.error) {
+              this.pendingRequests.delete(messagePayload.id);
+              request.reject(this.parseWalletError(messagePayload.error));
+              return;
+            }
             const requestWithName = __spreadProps(__spreadValues({}, messagePayload), {
               method: request.method === "wallet_getSession" || request.method === "wallet_createSession" ? "wallet_sessionChanged" : request.method
             });
@@ -1968,7 +2090,6 @@ var MWPTransport = class {
               method: request.method === "wallet_getSession" || request.method === "wallet_createSession" ? "wallet_sessionChanged" : request.method,
               params: requestWithName.result
             });
-            clearTimeout(request.timeout);
             this.notifyCallbacks(notification);
             request.resolve(requestWithName);
             this.pendingRequests.delete(messagePayload.id);
@@ -2004,7 +2125,7 @@ var MWPTransport = class {
   }
   onResumeSuccess(resumeResolve, resumeReject, options) {
     return __async(this, null, function* () {
-      var _a2, _b, _c, _d, _e, _f, _g;
+      var _a3, _b, _c, _d, _e, _f, _g;
       try {
         yield this.waitForWalletSessionIfNotCached();
         const sessionRequest = yield this.request({
@@ -2016,7 +2137,7 @@ var MWPTransport = class {
         let walletSession = sessionRequest.result;
         if (walletSession && options) {
           const currentScopes = Object.keys(
-            (_a2 = walletSession == null ? void 0 : walletSession.sessionScopes) != null ? _a2 : {}
+            (_a3 = walletSession == null ? void 0 : walletSession.sessionScopes) != null ? _a3 : {}
           );
           const proposedScopes = (_b = options == null ? void 0 : options.scopes) != null ? _b : [];
           const proposedCaipAccountIds = (_c = options == null ? void 0 : options.caipAccountIds) != null ? _c : [];
@@ -2058,6 +2179,7 @@ var MWPTransport = class {
           }
           walletSession = response.result;
         }
+        yield this.removeStoredPendingSessionRequest();
         this.notifyCallbacks({
           method: "wallet_sessionChanged",
           params: walletSession
@@ -2073,7 +2195,7 @@ var MWPTransport = class {
     return __async(this, null, function* () {
       const request = __spreadValues({
         jsonrpc: "2.0",
-        id: `${this.__reqId++}`
+        id: String(getUniqueRequestId())
       }, payload);
       const cachedWalletSession = yield this.getCachedResponse(request);
       if (cachedWalletSession) {
@@ -2081,10 +2203,10 @@ var MWPTransport = class {
         return cachedWalletSession;
       }
       return new Promise((resolve, reject) => {
-        var _a2;
+        var _a3;
         const timeout = setTimeout(() => {
           this.rejectRequest(request.id, new TransportTimeoutError());
-        }, (_a2 = options == null ? void 0 : options.timeout) != null ? _a2 : this.options.requestTimeout);
+        }, (_a3 = options == null ? void 0 : options.timeout) != null ? _a3 : this.options.requestTimeout);
         this.pendingRequests.set(request.id, {
           request,
           method: request.method,
@@ -2109,28 +2231,29 @@ var MWPTransport = class {
       if (session) {
         logger("active session found", session);
       }
+      const storedSessionRequestBeforeConnectionAttempt = yield this.getStoredPendingSessionRequest();
       let timeout;
       let initialConnectionMessageHandler;
       const connectionPromise = new Promise((resolve, reject) => __async(this, null, function* () {
         let connection;
         if (session) {
           connection = new Promise((resumeResolve, resumeReject) => {
-            var _a2;
+            var _a3;
             if (this.dappClient.state === "CONNECTED") {
               this.onResumeSuccess(resumeResolve, resumeReject, options);
             } else {
               this.dappClient.once("connected", () => __async(this, null, function* () {
                 this.onResumeSuccess(resumeResolve, resumeReject, options);
               }));
-              dappClient.resume((_a2 = session == null ? void 0 : session.id) != null ? _a2 : "");
+              dappClient.resume((_a3 = session == null ? void 0 : session.id) != null ? _a3 : "");
             }
           });
         } else {
           connection = new Promise(
             (resolveConnection, rejectConnection) => {
-              var _a2, _b;
+              var _a3, _b;
               const optionalScopes = addValidAccounts(
-                getOptionalScopes((_a2 = options == null ? void 0 : options.scopes) != null ? _a2 : []),
+                getOptionalScopes((_a3 = options == null ? void 0 : options.scopes) != null ? _a3 : []),
                 getValidAccounts((_b = options == null ? void 0 : options.caipAccountIds) != null ? _b : [])
               );
               const sessionRequest = {
@@ -2139,33 +2262,35 @@ var MWPTransport = class {
               };
               const request = {
                 jsonrpc: "2.0",
-                id: `${this.__reqId++}`,
+                id: String(getUniqueRequestId()),
                 method: "wallet_createSession",
                 params: sessionRequest
               };
               initialConnectionMessageHandler = (message) => __async(this, null, function* () {
-                if (typeof message === "object" && message !== null) {
-                  if ("data" in message) {
-                    const messagePayload = message.data;
-                    if (messagePayload.method === "wallet_createSession" || messagePayload.method === "wallet_sessionChanged") {
-                      if (messagePayload.error) {
-                        if (initialConnectionMessageHandler) {
-                          this.dappClient.off(
-                            "message",
-                            initialConnectionMessageHandler
-                          );
-                        }
-                        return rejectConnection(messagePayload.error);
-                      }
-                      yield this.storeWalletSession(
-                        request,
-                        messagePayload
-                      );
-                      this.notifyCallbacks(messagePayload);
-                      return resolveConnection();
-                    }
-                  }
+                if (typeof message !== "object" || message === null) {
+                  return;
+                }
+                if (!("data" in message)) {
+                  return;
                 }
+                const messagePayload = message.data;
+                const isMatchingId = messagePayload.id === request.id;
+                const isMatchingMethod = messagePayload.method === "wallet_createSession" || messagePayload.method === "wallet_sessionChanged";
+                if (!isMatchingId && !isMatchingMethod) {
+                  return;
+                }
+                if (messagePayload.error) {
+                  return rejectConnection(
+                    this.parseWalletError(messagePayload.error)
+                  );
+                }
+                yield this.storeWalletSession(
+                  request,
+                  messagePayload
+                );
+                yield this.removeStoredPendingSessionRequest();
+                this.notifyCallbacks(messagePayload);
+                return resolveConnection();
               });
               this.dappClient.on("message", initialConnectionMessageHandler);
               dappClient.connect({
@@ -2186,14 +2311,18 @@ var MWPTransport = class {
             }
           );
         }
-        timeout = setTimeout(() => {
-          reject(new TransportTimeoutError());
-        }, this.options.connectionTimeout);
+        timeout = setTimeout(
+          () => {
+            reject(new TransportTimeoutError());
+          },
+          storedSessionRequestBeforeConnectionAttempt ? this.options.resumeTimeout : this.options.connectionTimeout
+        );
         connection.then(resolve).catch(reject);
       }));
-      return connectionPromise.catch((error) => {
+      return connectionPromise.catch((error) => __async(this, null, function* () {
+        yield this.dappClient.disconnect();
         throw error;
-      }).finally(() => {
+      })).finally(() => {
         if (timeout) {
           clearTimeout(timeout);
         }
@@ -2201,24 +2330,68 @@ var MWPTransport = class {
           this.dappClient.off("message", initialConnectionMessageHandler);
           initialConnectionMessageHandler = void 0;
         }
+        this.removeStoredPendingSessionRequest();
       });
     });
   }
   /**
    * Disconnects from the Mobile Wallet Protocol
    *
+   * @param [scopes] - The scopes to revoke. If not provided or empty, all scopes will be revoked.
    * @returns Nothing
    */
   disconnect() {
-    return __async(this, null, function* () {
-      if (typeof window !== "undefined" && typeof window.removeEventListener !== "undefined" && this.windowFocusHandler) {
-        window.removeEventListener("focus", this.windowFocusHandler);
-        this.windowFocusHandler = void 0;
-      }
-      this.kvstore.delete(SESSION_STORE_KEY);
-      this.kvstore.delete(ACCOUNTS_STORE_KEY);
-      this.kvstore.delete(CHAIN_STORE_KEY);
-      return this.dappClient.disconnect();
+    return __async(this, arguments, function* (scopes = []) {
+      var _a3, _b;
+      const cachedSession = yield this.getCachedResponse({
+        jsonrpc: "2.0",
+        id: "0",
+        method: "wallet_getSession"
+      });
+      const cachedSessionScopes = (_b = (_a3 = cachedSession == null ? void 0 : cachedSession.result) == null ? void 0 : _a3.sessionScopes) != null ? _b : {};
+      const remainingScopes = scopes.length === 0 ? [] : Object.keys(cachedSessionScopes).filter(
+        (scope) => !scopes.includes(scope)
+      );
+      const newSessionScopes = Object.fromEntries(
+        Object.entries(cachedSessionScopes).filter(
+          ([key]) => remainingScopes.includes(key)
+        )
+      );
+      this.request({ method: "wallet_revokeSession", params: { scopes } }).catch(
+        (err) => {
+          console.error("error revoking session", err);
+        }
+      );
+      const remainingScopesIncludeEip155 = remainingScopes.some(
+        (scope) => scope.includes("eip155")
+      );
+      if (!remainingScopesIncludeEip155) {
+        this.kvstore.delete(ACCOUNTS_STORE_KEY);
+        this.kvstore.delete(CHAIN_STORE_KEY);
+      }
+      if (remainingScopes.length > 0) {
+        this.kvstore.set(
+          SESSION_STORE_KEY,
+          JSON.stringify({
+            result: {
+              sessionScopes: newSessionScopes
+            }
+          })
+        );
+      } else {
+        this.kvstore.delete(SESSION_STORE_KEY);
+        if (typeof window !== "undefined" && typeof window.removeEventListener !== "undefined" && this.windowFocusHandler) {
+          window.removeEventListener("focus", this.windowFocusHandler);
+          this.windowFocusHandler = void 0;
+        }
+        yield this.dappClient.disconnect();
+      }
+      this.notifyCallbacks({
+        method: "wallet_sessionChanged",
+        params: {
+          sessionScopes: newSessionScopes
+        }
+      });
     });
   }
   /**
@@ -2263,7 +2436,7 @@ var MWPTransport = class {
   }
   getCachedResponse(request) {
     return __async(this, null, function* () {
-      var _a2;
+      var _a3;
       if (request.method === "wallet_getSession") {
         const walletGetSession = yield this.kvstore.get(SESSION_STORE_KEY);
         if (walletGetSession) {
@@ -2271,7 +2444,7 @@ var MWPTransport = class {
           return {
             id: request.id,
             jsonrpc: "2.0",
-            result: (_a2 = walletSession.params) != null ? _a2 : walletSession.result,
+            result: (_a3 = walletSession.params) != null ? _a3 : walletSession.result,
             // "what?... why walletSession.params?.."
             method: request.method
           };
@@ -2324,7 +2497,7 @@ var MWPTransport = class {
     return __async(this, null, function* () {
       const request = __spreadValues({
         jsonrpc: "2.0",
-        id: `${this.__reqId++}`
+        id: String(getUniqueRequestId())
       }, payload);
       const cachedWalletSession = yield this.getCachedResponse(request);
       if (cachedWalletSession) {
@@ -2335,10 +2508,10 @@ var MWPTransport = class {
         yield this.attemptResumeSession();
       }
       return new Promise((resolve, reject) => {
-        var _a2;
+        var _a3;
         const timeout = setTimeout(() => {
           this.rejectRequest(request.id, new TransportTimeoutError());
-        }, (_a2 = options == null ? void 0 : options.timeout) != null ? _a2 : this.options.requestTimeout);
+        }, (_a3 = options == null ? void 0 : options.timeout) != null ? _a3 : this.options.requestTimeout);
         this.pendingRequests.set(request.id, {
           request,
           method: request.method,
@@ -2406,6 +2579,7 @@ var MWPTransport = class {
       const timeoutPromise = new Promise((_resolve, reject) => {
         setTimeout(() => {
           unsubscribe();
+          this.removeStoredPendingSessionRequest();
           reject(new TransportTimeoutError());
         }, this.options.resumeTimeout);
       });
@@ -2442,14 +2616,15 @@ var KeyManager = class {
 var keymanager = new KeyManager();
 
 // src/multichain/index.ts
-init_utils();
+init_utils2();
 var logger2 = createLogger("metamask-sdk:core");
-var _a, _provider, _providerTransportWrapper, _transport2, _dappClient, _beforeUnloadListener, _listener, _sdkInfo, _MetaMaskConnectMultichain_instances, setupAnalytics_fn, onTransportNotification_fn, getStoredTransport_fn, setupTransport_fn, init_fn, createDappClient_fn, setupMWP_fn, onBeforeUnload_fn, createBeforeUnloadListener_fn, renderInstallModalAsync_fn, showInstallModal_fn, headlessConnect_fn, setupDefaultTransport_fn, deeplinkConnect_fn, handleConnection_fn;
+var SINGLETON_KEY = "__METAMASK_CONNECT_MULTICHAIN_SINGLETON__";
+var _a2, _provider, _providerTransportWrapper, _transport2, _dappClient, _beforeUnloadListener, _listener, _sdkInfo, _MetaMaskConnectMultichain_instances, setupAnalytics_fn, onTransportNotification_fn, getStoredTransport_fn, setupTransport_fn, init_fn, createDappClient_fn, setupMWP_fn, onBeforeUnload_fn, createBeforeUnloadListener_fn, renderInstallModalAsync_fn, showInstallModal_fn, headlessConnect_fn, setupDefaultTransport_fn, deeplinkConnect_fn, handleConnection_fn, getCaipSession_fn, openConnectDeeplinkIfNeeded_fn;
 var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends MultichainCore {
   constructor(options) {
-    var _a2, _b, _c, _d, _e, _f;
+    var _a3, _b, _c, _d, _e, _f;
     const withDappMetadata = setupDappMetadata(options);
-    const integrationType = (_b = (_a2 = options.analytics) == null ? void 0 : _a2.integrationType) != null ? _b : "direct";
+    const integrationType = (_b = (_a3 = options.analytics) == null ? void 0 : _a3.integrationType) != null ? _b : "direct";
     const allOptions = __spreadProps(__spreadValues({}, withDappMetadata), {
       ui: __spreadProps(__spreadValues({}, withDappMetadata.ui), {
         preferExtension: (_c = withDappMetadata.ui.preferExtension) != null ? _c : true,
@@ -2469,7 +2644,7 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
     __privateAdd(this, _beforeUnloadListener);
     this._status = "pending";
     __privateAdd(this, _listener);
-    __privateAdd(this, _sdkInfo, `Sdk/Javascript SdkVersion/${getVersion()} Platform/${getPlatformType()} dApp/${(_a = this.options.dapp.url) != null ? _a : this.options.dapp.name} dAppTitle/${this.options.dapp.name}`);
+    __privateAdd(this, _sdkInfo, `Sdk/Javascript SdkVersion/${getVersion()} Platform/${getPlatformType()} dApp/${(_a2 = this.options.dapp.url) != null ? _a2 : this.options.dapp.name} dAppTitle/${this.options.dapp.name}`);
     __privateSet(this, _providerTransportWrapper, new MultichainApiClientWrapperTransport(
       this
     ));
@@ -2481,9 +2656,9 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
     return this._status;
   }
   set status(value) {
-    var _a2, _b;
+    var _a3, _b;
     this._status = value;
-    (_b = (_a2 = this.options.transport) == null ? void 0 : _a2.onNotification) == null ? void 0 : _b.call(_a2, {
+    (_b = (_a3 = this.options.transport) == null ? void 0 : _a3.onNotification) == null ? void 0 : _b.call(_a3, {
       method: "stateChanged",
       params: value
     });
@@ -2509,27 +2684,54 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
   get transportType() {
     return __privateGet(this, _transport2) instanceof MWPTransport ? "mwp" /* MWP */ : "browser" /* Browser */;
   }
+  // Creates a singleton instance of MetaMaskConnectMultichain.
+  // If the singleton already exists, it merges the incoming options with the
+  // existing singleton options for the following keys: `api.supportedNetworks`,
+  // `ui.*`, `mobile.*`, `transport.extensionId`, `debug`. Take note that the
+  // value for `dapp` is not merged as it does not make sense for subsequent calls to
+  // `createMultichainClient` to have a different `dapp` value.
   static create(options) {
     return __async(this, null, function* () {
-      var _a2;
-      const instance = new _MetaMaskConnectMultichain(options);
-      const isEnabled2 = yield isEnabled(
-        "metamask-sdk:core",
-        instance.options.storage
-      );
-      if (isEnabled2) {
-        enableDebug("metamask-sdk:core");
-      }
-      yield __privateMethod(_a2 = instance, _MetaMaskConnectMultichain_instances, init_fn).call(_a2);
-      return instance;
+      const globalObject = getGlobalObject();
+      const existing = globalObject[SINGLETON_KEY];
+      if (existing) {
+        const instance = yield existing;
+        instance.mergeOptions(options);
+        if (options.debug) {
+          enableDebug("metamask-sdk:*");
+        }
+        return instance;
+      }
+      const instancePromise = (() => __async(null, null, function* () {
+        var _a3;
+        const instance = new _MetaMaskConnectMultichain(options);
+        const isEnabled2 = yield isEnabled(
+          "metamask-sdk:core",
+          instance.options.storage
+        );
+        if (isEnabled2) {
+          enableDebug("metamask-sdk:core");
+        }
+        yield __privateMethod(_a3 = instance, _MetaMaskConnectMultichain_instances, init_fn).call(_a3);
+        return instance;
+      }))();
+      globalObject[SINGLETON_KEY] = instancePromise;
+      instancePromise.catch((error) => {
+        globalObject[SINGLETON_KEY] = void 0;
+        console.error("Error initializing MetaMaskConnectMultichain", error);
+      });
+      return instancePromise;
     });
   }
   // TODO: make this into param object
   connect(scopes, caipAccountIds, sessionProperties, forceRequest) {
     return __async(this, null, function* () {
-      var _a2;
-      if (this.status !== "connected") {
-        yield this.disconnect();
+      var _a3;
+      if (this.status === "connecting" && this.transportType === "mwp" /* MWP */) {
+        yield __privateMethod(this, _MetaMaskConnectMultichain_instances, openConnectDeeplinkIfNeeded_fn).call(this);
+        throw new Error(
+          "Existing connection is pending. Please check your MetaMask Mobile app to continue."
+        );
       }
       const { ui } = this.options;
       const platformType = getPlatformType();
@@ -2559,12 +2761,19 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
       } catch (error) {
         logger2("Error tracking connection_initiated event", error);
       }
-      const nonEmptySessionProperites = Object.keys(sessionProperties != null ? sessionProperties : {}).length > 0 ? sessionProperties : void 0;
-      if (((_a2 = __privateGet(this, _transport2)) == null ? void 0 : _a2.isConnected()) && !secure) {
+      const sessionData = yield __privateMethod(this, _MetaMaskConnectMultichain_instances, getCaipSession_fn).call(this);
+      const { mergedScopes, mergedCaipAccountIds, mergedSessionProperties } = mergeRequestedSessionWithExisting(
+        sessionData,
+        scopes,
+        caipAccountIds,
+        sessionProperties
+      );
+      const nonEmptySessionProperties = Object.keys(mergedSessionProperties != null ? mergedSessionProperties : {}).length > 0 ? mergedSessionProperties : void 0;
+      if (((_a3 = __privateGet(this, _transport2)) == null ? void 0 : _a3.isConnected()) && !secure) {
         return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, __privateGet(this, _transport2).connect({
-          scopes,
-          caipAccountIds,
-          sessionProperties: nonEmptySessionProperites,
+          scopes: mergedScopes,
+          caipAccountIds: mergedCaipAccountIds,
+          sessionProperties: nonEmptySessionProperties,
           forceRequest
         }).then(() => __async(this, null, function* () {
           if (__privateGet(this, _transport2) instanceof MWPTransport) {
@@ -2576,47 +2785,53 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
       if (platformType === "in-app-browser" /* MetaMaskMobileWebview */) {
         const defaultTransport = yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupDefaultTransport_fn).call(this);
         return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, defaultTransport.connect({
-          scopes,
-          caipAccountIds,
-          sessionProperties: nonEmptySessionProperites,
+          scopes: mergedScopes,
+          caipAccountIds: mergedCaipAccountIds,
+          sessionProperties: nonEmptySessionProperties,
           forceRequest
         }), scopes, transportType);
       }
       if (isWeb && hasExtensionInstalled && preferExtension) {
         const defaultTransport = yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupDefaultTransport_fn).call(this);
         return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, defaultTransport.connect({
-          scopes,
-          caipAccountIds,
-          sessionProperties: nonEmptySessionProperites,
+          scopes: mergedScopes,
+          caipAccountIds: mergedCaipAccountIds,
+          sessionProperties: nonEmptySessionProperties,
           forceRequest
         }), scopes, transportType);
       }
       yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupMWP_fn).call(this);
       const shouldShowInstallModal = hasExtensionInstalled ? showInstallModal : !preferExtension || showInstallModal;
       if (secure && !shouldShowInstallModal) {
-        return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, __privateMethod(this, _MetaMaskConnectMultichain_instances, deeplinkConnect_fn).call(this, scopes, caipAccountIds, nonEmptySessionProperites), scopes, transportType);
+        return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, __privateMethod(this, _MetaMaskConnectMultichain_instances, deeplinkConnect_fn).call(this, mergedScopes, mergedCaipAccountIds, nonEmptySessionProperties), scopes, transportType);
       }
-      return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, __privateMethod(this, _MetaMaskConnectMultichain_instances, showInstallModal_fn).call(this, shouldShowInstallModal, scopes, caipAccountIds, nonEmptySessionProperites), scopes, transportType);
+      return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, __privateMethod(this, _MetaMaskConnectMultichain_instances, showInstallModal_fn).call(this, shouldShowInstallModal, mergedScopes, mergedCaipAccountIds, nonEmptySessionProperties), scopes, transportType);
     });
   }
   emit(event, args) {
-    var _a2, _b;
-    (_b = (_a2 = this.options.transport) == null ? void 0 : _a2.onNotification) == null ? void 0 : _b.call(_a2, { method: event, params: args });
+    var _a3, _b;
+    (_b = (_a3 = this.options.transport) == null ? void 0 : _a3.onNotification) == null ? void 0 : _b.call(_a3, { method: event, params: args });
     super.emit(event, args);
   }
   disconnect() {
-    return __async(this, null, function* () {
-      var _a2, _b, _c;
-      yield (_a2 = __privateGet(this, _listener)) == null ? void 0 : _a2.call(this);
-      (_b = __privateGet(this, _beforeUnloadListener)) == null ? void 0 : _b.call(this);
-      yield (_c = __privateGet(this, _transport2)) == null ? void 0 : _c.disconnect();
-      yield this.storage.removeTransport();
-      this.emit("stateChanged", "disconnected");
-      __privateSet(this, _listener, void 0);
-      __privateSet(this, _beforeUnloadListener, void 0);
-      __privateSet(this, _transport2, void 0);
-      __privateGet(this, _providerTransportWrapper).clearNotificationCallbacks();
-      __privateSet(this, _dappClient, void 0);
+    return __async(this, arguments, function* (scopes = []) {
+      var _a3, _b, _c;
+      const sessionData = yield __privateMethod(this, _MetaMaskConnectMultichain_instances, getCaipSession_fn).call(this);
+      const remainingScopes = scopes.length === 0 ? [] : Object.keys(sessionData.sessionScopes).filter(
+        (scope) => !scopes.includes(scope)
+      );
+      yield (_a3 = __privateGet(this, _transport2)) == null ? void 0 : _a3.disconnect(scopes);
+      if (remainingScopes.length === 0) {
+        yield (_b = __privateGet(this, _listener)) == null ? void 0 : _b.call(this);
+        (_c = __privateGet(this, _beforeUnloadListener)) == null ? void 0 : _c.call(this);
+        yield this.storage.removeTransport();
+        __privateSet(this, _listener, void 0);
+        __privateSet(this, _beforeUnloadListener, void 0);
+        __privateSet(this, _transport2, void 0);
+        __privateGet(this, _providerTransportWrapper).clearTransportNotificationListener();
+        __privateSet(this, _dappClient, void 0);
+        this.status = "disconnected";
+      }
     });
   }
   invokeMethod(request) {
@@ -2628,7 +2843,7 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
     });
   }
   // DRY THIS WITH REQUEST ROUTER
-  openDeeplinkIfNeeded() {
+  openSimpleDeeplinkIfNeeded() {
     const { ui, mobile } = this.options;
     const { showInstallModal = false } = ui != null ? ui : {};
     const secure = isSecure();
@@ -2648,6 +2863,23 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
       }), 10);
     }
   }
+  // Provides a way for ecosystem clients (EVM, Solana, etc.) to get the current CAIP session data
+  // when instantiating themselves (as they would have already missed any initial sessionChanged events emitted by ConnectMultichain)
+  // without having to concern themselves with the current transport connection status.
+  emitSessionChanged() {
+    return __async(this, null, function* () {
+      var _a3;
+      const emptySession = { sessionScopes: {} };
+      if (this.status !== "connected" && this.status !== "connecting") {
+        this.emit("wallet_sessionChanged", emptySession);
+        return;
+      }
+      const response = yield this.transport.request({
+        method: "wallet_getSession"
+      });
+      this.emit("wallet_sessionChanged", (_a3 = response.result) != null ? _a3 : emptySession);
+    });
+  }
 };
 _provider = new WeakMap();
 _providerTransportWrapper = new WeakMap();
@@ -2659,7 +2891,7 @@ _sdkInfo = new WeakMap();
 _MetaMaskConnectMultichain_instances = new WeakSet();
 setupAnalytics_fn = function() {
   return __async(this, null, function* () {
-    var _a2;
+    var _a3;
     const platform = getPlatformType();
     const isBrowser = platform === "in-app-browser" /* MetaMaskMobileWebview */ || platform === "web-desktop" /* DesktopWeb */ || platform === "web-mobile" /* MobileWeb */;
     const isReactNative2 = platform === "react-native" /* ReactNative */;
@@ -2669,7 +2901,7 @@ setupAnalytics_fn = function() {
     const version = getVersion();
     const dappId = getDappId(this.options.dapp);
     const anonId = yield this.storage.getAnonId();
-    const { integrationType } = (_a2 = this.options.analytics) != null ? _a2 : {
+    const { integrationType } = (_a3 = this.options.analytics) != null ? _a3 : {
       integrationType: ""
     };
     analytics2.setGlobalProperty("mmconnect_version", version);
@@ -2682,9 +2914,9 @@ setupAnalytics_fn = function() {
 };
 onTransportNotification_fn = function(payload) {
   return __async(this, null, function* () {
-    var _a2;
+    var _a3;
     if (typeof payload === "object" && payload !== null && "method" in payload) {
-      this.emit(payload.method, (_a2 = payload.params) != null ? _a2 : payload.result);
+      this.emit(payload.method, (_a3 = payload.params) != null ? _a3 : payload.result);
     }
   });
 };
@@ -2697,7 +2929,7 @@ getStoredTransport_fn = function() {
         if (hasExtensionInstalled) {
           const apiTransport = new DefaultTransport();
           __privateSet(this, _transport2, apiTransport);
-          __privateGet(this, _providerTransportWrapper).setupNotifcationListener();
+          __privateGet(this, _providerTransportWrapper).setupTransportNotificationListener();
           __privateSet(this, _listener, apiTransport.onNotification(
             __privateMethod(this, _MetaMaskConnectMultichain_instances, onTransportNotification_fn).bind(this)
           ));
@@ -2709,7 +2941,7 @@ getStoredTransport_fn = function() {
         const apiTransport = new MWPTransport(dappClient, kvstore);
         __privateSet(this, _dappClient, dappClient);
         __privateSet(this, _transport2, apiTransport);
-        __privateGet(this, _providerTransportWrapper).setupNotifcationListener();
+        __privateGet(this, _providerTransportWrapper).setupTransportNotificationListener();
         __privateSet(this, _listener, apiTransport.onNotification(
           __privateMethod(this, _MetaMaskConnectMultichain_instances, onTransportNotification_fn).bind(this)
         ));
@@ -2741,25 +2973,17 @@ setupTransport_fn = function() {
 };
 init_fn = function() {
   return __async(this, null, function* () {
-    var _a2;
     try {
-      if (typeof window !== "undefined" && ((_a2 = window.mmsdk) == null ? void 0 : _a2.isInitialized)) {
-        logger2("MetaMaskSDK: init already initialized");
-      } else {
-        yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupAnalytics_fn).call(this);
-        yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupTransport_fn).call(this);
-        try {
-          const baseProps = yield getBaseAnalyticsProperties(
-            this.options,
-            this.storage
-          );
-          analytics2.track("mmconnect_initialized", baseProps);
-        } catch (error) {
-          logger2("Error tracking initialized event", error);
-        }
-        if (typeof window !== "undefined") {
-          window.mmsdk = this;
-        }
+      yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupAnalytics_fn).call(this);
+      yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupTransport_fn).call(this);
+      try {
+        const baseProps = yield getBaseAnalyticsProperties(
+          this.options,
+          this.storage
+        );
+        analytics2.track("mmconnect_initialized", baseProps);
+      } catch (error) {
+        logger2("Error tracking initialized event", error);
       }
     } catch (error) {
       yield this.storage.removeTransport();
@@ -2795,7 +3019,7 @@ setupMWP_fn = function() {
     __privateSet(this, _dappClient, dappClient);
     const apiTransport = new MWPTransport(dappClient, kvstore);
     __privateSet(this, _transport2, apiTransport);
-    __privateGet(this, _providerTransportWrapper).setupNotifcationListener();
+    __privateGet(this, _providerTransportWrapper).setupTransportNotificationListener();
     __privateSet(this, _listener, this.transport.onNotification(
       __privateMethod(this, _MetaMaskConnectMultichain_instances, onTransportNotification_fn).bind(this)
     ));
@@ -2804,22 +3028,20 @@ setupMWP_fn = function() {
 };
 onBeforeUnload_fn = function() {
   return __async(this, null, function* () {
-    var _a2;
-    if ((_a2 = this.options.ui.factory.modal) == null ? void 0 : _a2.isMounted) {
+    var _a3;
+    if ((_a3 = this.options.ui.factory.modal) == null ? void 0 : _a3.isMounted) {
       yield this.storage.removeTransport();
     }
   });
 };
 createBeforeUnloadListener_fn = function() {
+  const handler = __privateMethod(this, _MetaMaskConnectMultichain_instances, onBeforeUnload_fn).bind(this);
   if (typeof window !== "undefined" && typeof window.addEventListener !== "undefined") {
-    window.addEventListener("beforeunload", __privateMethod(this, _MetaMaskConnectMultichain_instances, onBeforeUnload_fn).bind(this));
+    window.addEventListener("beforeunload", handler);
   }
   return () => {
     if (typeof window !== "undefined" && typeof window.removeEventListener !== "undefined") {
-      window.removeEventListener(
-        "beforeunload",
-        __privateMethod(this, _MetaMaskConnectMultichain_instances, onBeforeUnload_fn).bind(this)
-      );
+      window.removeEventListener("beforeunload", handler);
     }
   };
 };
@@ -2849,7 +3071,7 @@ renderInstallModalAsync_fn = function(desktopPreferred, scopes, caipAccountIds,
               }
             );
             (() => __async(this, null, function* () {
-              var _a2;
+              var _a3;
               try {
                 yield this.transport.connect({
                   scopes,
@@ -2857,20 +3079,21 @@ renderInstallModalAsync_fn = function(desktopPreferred, scopes, caipAccountIds,
                   sessionProperties
                 });
                 yield this.options.ui.factory.unload();
-                (_a2 = this.options.ui.factory.modal) == null ? void 0 : _a2.unmount();
+                (_a3 = this.options.ui.factory.modal) == null ? void 0 : _a3.unmount();
                 this.status = "connected";
                 yield this.storage.setTransport("mwp" /* MWP */);
               } catch (error) {
                 if (error instanceof ProtocolError) {
                   if (error.code !== ErrorCode.REQUEST_EXPIRED) {
                     this.status = "disconnected";
+                    yield this.options.ui.factory.unload(error);
                     reject(error);
                   }
                 } else {
                   this.status = "disconnected";
-                  reject(
-                    error instanceof Error ? error : new Error(String(error))
-                  );
+                  const normalizedError = error instanceof Error ? error : new Error(String(error));
+                  yield this.options.ui.factory.unload(normalizedError);
+                  reject(normalizedError);
                 }
               }
             }))().catch(() => {
@@ -2897,8 +3120,8 @@ renderInstallModalAsync_fn = function(desktopPreferred, scopes, caipAccountIds,
 };
 showInstallModal_fn = function(desktopPreferred, scopes, caipAccountIds, sessionProperties) {
   return __async(this, null, function* () {
-    var _a2;
-    (_a2 = __privateGet(this, _beforeUnloadListener)) != null ? _a2 : __privateSet(this, _beforeUnloadListener, __privateMethod(this, _MetaMaskConnectMultichain_instances, createBeforeUnloadListener_fn).call(this));
+    var _a3;
+    (_a3 = __privateGet(this, _beforeUnloadListener)) != null ? _a3 : __privateSet(this, _beforeUnloadListener, __privateMethod(this, _MetaMaskConnectMultichain_instances, createBeforeUnloadListener_fn).call(this));
     if (this.options.ui.headless) {
       yield __privateMethod(this, _MetaMaskConnectMultichain_instances, headlessConnect_fn).call(this, scopes, caipAccountIds, sessionProperties);
     } else {
@@ -2957,7 +3180,7 @@ setupDefaultTransport_fn = function() {
       __privateMethod(this, _MetaMaskConnectMultichain_instances, onTransportNotification_fn).bind(this)
     ));
     __privateSet(this, _transport2, transport);
-    __privateGet(this, _providerTransportWrapper).setupNotifcationListener();
+    __privateGet(this, _providerTransportWrapper).setupTransportNotificationListener();
     return transport;
   });
 };
@@ -2965,7 +3188,7 @@ deeplinkConnect_fn = function(scopes, caipAccountIds, sessionProperties) {
   return __async(this, null, function* () {
     return new Promise((resolve, reject) => __async(this, null, function* () {
       const dappClientMessageHandler = (payload) => {
-        var _a2;
+        var _a3;
         if (typeof payload !== "object" || payload === null || !("data" in payload)) {
           return;
         }
@@ -2975,7 +3198,7 @@ deeplinkConnect_fn = function(scopes, caipAccountIds, sessionProperties) {
             this.dappClient.off("message", dappClientMessageHandler);
             reject(data.error);
           }
-          if ((_a2 = data == null ? void 0 : data.result) == null ? void 0 : _a2.sessionScopes) {
+          if ((_a3 = data == null ? void 0 : data.result) == null ? void 0 : _a3.sessionScopes) {
             this.dappClient.off("message", dappClientMessageHandler);
           }
         }
@@ -2984,13 +3207,13 @@ deeplinkConnect_fn = function(scopes, caipAccountIds, sessionProperties) {
       let timeout;
       if (this.transport.isConnected()) {
         timeout = setTimeout(() => {
-          this.openDeeplinkIfNeeded();
+          this.openSimpleDeeplinkIfNeeded();
         }, 250);
       } else {
         this.dappClient.once(
           "session_request",
           (sessionRequest) => {
-            var _a2;
+            var _a3;
             const connectionRequest = {
               sessionRequest,
               metadata: {
@@ -3005,7 +3228,7 @@ deeplinkConnect_fn = function(scopes, caipAccountIds, sessionProperties) {
               connectionRequest
             );
             this.emit("display_uri", deeplink);
-            if ((_a2 = this.options.mobile) == null ? void 0 : _a2.preferredOpenLink) {
+            if ((_a3 = this.options.mobile) == null ? void 0 : _a3.preferredOpenLink) {
               this.options.mobile.preferredOpenLink(deeplink, "_self");
             } else {
               openDeeplink(this.options, deeplink, universalLink);
@@ -3067,6 +3290,53 @@ handleConnection_fn = function(promise, scopes, transportType) {
     }));
   });
 };
+getCaipSession_fn = function() {
+  return __async(this, null, function* () {
+    let sessionData = {
+      sessionScopes: {},
+      sessionProperties: {}
+    };
+    if (this.status === "connected") {
+      const response = yield this.transport.request({
+        method: "wallet_getSession"
+      });
+      if (response.result) {
+        sessionData = response.result;
+      }
+    }
+    return sessionData;
+  });
+};
+openConnectDeeplinkIfNeeded_fn = function() {
+  return __async(this, null, function* () {
+    var _a3, _b;
+    const { ui } = this.options;
+    const { showInstallModal = false } = ui != null ? ui : {};
+    const secure = isSecure();
+    const shouldOpenDeeplink = secure && !showInstallModal;
+    if (!shouldOpenDeeplink) {
+      return;
+    }
+    const storedSessionRequest = yield (_a3 = __privateGet(this, _transport2)) == null ? void 0 : _a3.getStoredPendingSessionRequest();
+    if (!storedSessionRequest) {
+      return;
+    }
+    const connectionRequest = {
+      sessionRequest: storedSessionRequest,
+      metadata: {
+        dapp: this.options.dapp,
+        sdk: { version: getVersion(), platform: getPlatformType() }
+      }
+    };
+    const deeplink = this.options.ui.factory.createConnectionDeeplink(connectionRequest);
+    const universalLink = this.options.ui.factory.createConnectionUniversalLink(connectionRequest);
+    if ((_b = this.options.mobile) == null ? void 0 : _b.preferredOpenLink) {
+      this.options.mobile.preferredOpenLink(deeplink, "_self");
+    } else {
+      openDeeplink(this.options, deeplink, universalLink);
+    }
+  });
+};
 var MetaMaskConnectMultichain = _MetaMaskConnectMultichain;
 
 // src/store/index.ts
@@ -3251,7 +3521,7 @@ var Store = class extends StoreClient {
 // src/ui/ModalFactory.ts
 import MetaMaskOnboarding from "@metamask/onboarding";
 init_domain();
-init_utils();
+init_utils2();
 var BaseModalFactory = class {
   /**
    * Creates a new modal factory instance.
@@ -3274,8 +3544,8 @@ var BaseModalFactory = class {
   }
   unload(error) {
     return __async(this, null, function* () {
-      var _a2, _b;
-      (_a2 = this.modal) == null ? void 0 : _a2.unmount();
+      var _a3, _b;
+      (_a3 = this.modal) == null ? void 0 : _a3.unmount();
       yield (_b = this.successCallback) == null ? void 0 : _b.call(this, error);
     });
   }
@@ -3345,8 +3615,8 @@ var BaseModalFactory = class {
   }
   renderInstallModal(showInstallModal, createConnectionRequest, successCallback, onDisplayUri) {
     return __async(this, null, function* () {
-      var _a2, _b;
-      (_a2 = this.modal) == null ? void 0 : _a2.unmount();
+      var _a3, _b;
+      (_a3 = this.modal) == null ? void 0 : _a3.unmount();
       yield this.preload();
       this.successCallback = successCallback;
       this.displayUriCallback = onDisplayUri;
@@ -3362,9 +3632,9 @@ var BaseModalFactory = class {
         link: qrCodeLink,
         sdkVersion: getVersion(),
         generateQRCode: (request) => __async(this, null, function* () {
-          var _a3;
+          var _a4;
           const newLink = this.createConnectionDeeplink(request);
-          (_a3 = this.displayUriCallback) == null ? void 0 : _a3.call(this, newLink);
+          (_a4 = this.displayUriCallback) == null ? void 0 : _a4.call(this, newLink);
           return newLink;
         }),
         onClose: this.onCloseModal.bind(this),
@@ -3378,8 +3648,8 @@ var BaseModalFactory = class {
   }
   renderOTPCodeModal(createOTPCode, successCallback, updateOTPCode) {
     return __async(this, null, function* () {
-      var _a2;
-      (_a2 = this.modal) == null ? void 0 : _a2.unmount();
+      var _a3;
+      (_a3 = this.modal) == null ? void 0 : _a3.unmount();
       yield this.preload();
       this.successCallback = successCallback;
       const container = this.getMountedContainer();