@dynamic-labs/global-wallet-client 4.19.5 → 4.19.7

package/CHANGELOG.md

@@ -1,4 +1,31 @@
 
+### [4.19.7](https://github.com/dynamic-labs/dynamic-auth/compare/v4.19.6...v4.19.7) (2025-06-06)
+
+
+### Features
+
+* add util to find waas wallets ([#8871](https://github.com/dynamic-labs/dynamic-auth/issues/8871)) ([2d7114e](https://github.com/dynamic-labs/dynamic-auth/commit/2d7114e51f5badf1d04600597f1fd9433fabf3d0))
+
+
+### Bug Fixes
+
+* make sure smart account is deployed before creating sessions ([#8894](https://github.com/dynamic-labs/dynamic-auth/issues/8894)) ([5ba3d23](https://github.com/dynamic-labs/dynamic-auth/commit/5ba3d23bb8ef7c7438809128c8ef74c390ba1d48))
+* only deploy zksync smart account if not deployed ([#8840](https://github.com/dynamic-labs/dynamic-auth/issues/8840)) ([66a306a](https://github.com/dynamic-labs/dynamic-auth/commit/66a306aaee25c58f685fa050a5d6aea79b196fce))
+* primary wallet loading time when using React 19 ([#8896](https://github.com/dynamic-labs/dynamic-auth/issues/8896)) ([f5690f3](https://github.com/dynamic-labs/dynamic-auth/commit/f5690f31012e8fc6a5650423d4ece6c04f7c1811))
+
+### [4.19.6](https://github.com/dynamic-labs/dynamic-auth/compare/v4.19.5...v4.19.6) (2025-06-04)
+
+
+### Features
+
+* backup unsuccessful popup when create wallet fails ([#8872](https://github.com/dynamic-labs/dynamic-auth/issues/8872)) ([c8f88f2](https://github.com/dynamic-labs/dynamic-auth/commit/c8f88f2cafdb7856764305764a230e159f09dadf))
+* **global-wallet:** new native api method to return the eoa wallet for a connected smart wallet ([#8864](https://github.com/dynamic-labs/dynamic-auth/issues/8864)) ([5d0e200](https://github.com/dynamic-labs/dynamic-auth/commit/5d0e2002caefb658f6120b102abe145d6caafaf4))
+
+
+### Bug Fixes
+
+* dont call select endpoint when signing in with 7702 wallet ([#8854](https://github.com/dynamic-labs/dynamic-auth/issues/8854)) ([9828a8f](https://github.com/dynamic-labs/dynamic-auth/commit/9828a8fb758b07dd4dc51cb9eadee483b884defe))
+
 ### [4.19.5](https://github.com/dynamic-labs/dynamic-auth/compare/v4.19.4...v4.19.5) (2025-06-02)
 
 

package/package.cjs

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

package/package.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/global-wallet-client",
-  "version": "4.19.5",
+  "version": "4.19.7",
   "description": "Core package for building Dynamic's Global Wallet",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -55,12 +55,12 @@
   },
   "homepage": "https://www.dynamic.xyz/",
   "dependencies": {
-    "@dynamic-labs/assert-package-version": "4.19.5",
-    "@dynamic-labs/logger": "4.19.5",
-    "@dynamic-labs/message-transport": "4.19.5",
-    "@dynamic-labs/store": "4.19.5",
-    "@dynamic-labs/types": "4.19.5",
-    "@dynamic-labs/utils": "4.19.5",
+    "@dynamic-labs/assert-package-version": "4.19.7",
+    "@dynamic-labs/logger": "4.19.7",
+    "@dynamic-labs/message-transport": "4.19.7",
+    "@dynamic-labs/store": "4.19.7",
+    "@dynamic-labs/types": "4.19.7",
+    "@dynamic-labs/utils": "4.19.7",
     "eventemitter3": "5.0.1"
   },
   "peerDependencies": {

package/src/features.cjs

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var connect = require('./lib/functions/connect/connect.cjs');
 var disconnect = require('./lib/functions/disconnect/disconnect.cjs');
+var getEoaWalletForSmartWallet = require('./lib/functions/getEoaWalletForSmartWallet/getEoaWalletForSmartWallet.cjs');
 var getEthereumWallets = require('./lib/functions/getEthereumWallets/getEthereumWallets.cjs');
 var getSolanaWallets = require('./lib/functions/getSolanaWallets/getSolanaWallets.cjs');
 var getSupportedEthereumNetworks = require('./lib/functions/getSupportedEthereumNetworks/getSupportedEthereumNetworks.cjs');
@@ -14,11 +15,13 @@ var isSolanaWallet = require('./lib/functions/isSolanaWallet/isSolanaWallet.cjs'
 var onEvent = require('./lib/functions/onEvent/onEvent.cjs');
 var signMessage = require('./lib/functions/signMessage/signMessage.cjs');
 var switchNetwork = require('./lib/functions/switchNetwork/switchNetwork.cjs');
+var sendTransaction = require('./lib/functions/sendTransaction/sendTransaction.cjs');
 
 
 
 exports.connect = connect.connect;
 exports.disconnect = disconnect.disconnect;
+exports.getEoaWalletForSmartWallet = getEoaWalletForSmartWallet.getEoaWalletForSmartWallet;
 exports.getEthereumWallets = getEthereumWallets.getEthereumWallets;
 exports.getSolanaWallets = getSolanaWallets.getSolanaWallets;
 exports.getSupportedEthereumNetworks = getSupportedEthereumNetworks.getSupportedEthereumNetworks;
@@ -28,3 +31,4 @@ exports.isSolanaWallet = isSolanaWallet.isSolanaWallet;
 exports.onEvent = onEvent.onEvent;
 exports.signMessage = signMessage.signMessage;
 exports.switchNetwork = switchNetwork.switchNetwork;
+exports.sendTransaction = sendTransaction.sendTransaction;

package/src/features.d.ts

@@ -1,5 +1,6 @@
 export { connect } from './lib/functions/connect';
 export { disconnect } from './lib/functions/disconnect';
+export { getEoaWalletForSmartWallet } from './lib/functions/getEoaWalletForSmartWallet';
 export { getEthereumWallets } from './lib/functions/getEthereumWallets';
 export { getSolanaWallets } from './lib/functions/getSolanaWallets';
 export { getSupportedEthereumNetworks } from './lib/functions/getSupportedEthereumNetworks';
@@ -9,3 +10,4 @@ export { isSolanaWallet } from './lib/functions/isSolanaWallet';
 export { onEvent } from './lib/functions/onEvent';
 export { signMessage } from './lib/functions/signMessage';
 export { switchNetwork } from './lib/functions/switchNetwork';
+export { sendTransaction } from './lib/functions/sendTransaction';

package/src/features.js

@@ -1,6 +1,7 @@
 'use client'
 export { connect } from './lib/functions/connect/connect.js';
 export { disconnect } from './lib/functions/disconnect/disconnect.js';
+export { getEoaWalletForSmartWallet } from './lib/functions/getEoaWalletForSmartWallet/getEoaWalletForSmartWallet.js';
 export { getEthereumWallets } from './lib/functions/getEthereumWallets/getEthereumWallets.js';
 export { getSolanaWallets } from './lib/functions/getSolanaWallets/getSolanaWallets.js';
 export { getSupportedEthereumNetworks } from './lib/functions/getSupportedEthereumNetworks/getSupportedEthereumNetworks.js';
@@ -10,3 +11,4 @@ export { isSolanaWallet } from './lib/functions/isSolanaWallet/isSolanaWallet.js
 export { onEvent } from './lib/functions/onEvent/onEvent.js';
 export { signMessage } from './lib/functions/signMessage/signMessage.js';
 export { switchNetwork } from './lib/functions/switchNetwork/switchNetwork.js';
+export { sendTransaction } from './lib/functions/sendTransaction/sendTransaction.js';

package/src/lib/client/createClientStore/createClientStore.cjs

@@ -12,6 +12,7 @@ const createClientStore = ({ environmentId, storage = localStorage, }) => store.
     store: store.createStore(() => ({
         connection: null,
         ethereum: null,
+        settings: {},
         solana: null,
         wallets: [],
     })),

package/src/lib/client/createClientStore/createClientStore.d.ts

@@ -1,5 +1,5 @@
 import { StoreApi } from '@dynamic-labs/store';
-import { BaseWallet, GlobalWalletConnection } from '@dynamic-labs/types';
+import { type BaseWallet, type GlobalWalletConnection, type Provider } from '@dynamic-labs/types';
 export type ClientStore = StoreApi<ClientStoreState>;
 type CreateClientStoreProps = {
     storage?: Storage;
@@ -18,6 +18,7 @@ export type ClientStoreState = {
      * Ethereum specific state
      */
     ethereum: {
+        eoaWallets: Record<string, BaseWallet>;
         supportedNetworks: {
             chainId: number;
             rpcUrl?: string;
@@ -30,6 +31,12 @@ export type ClientStoreState = {
     solana: {
         currentNetwork: string;
     } | null;
+    /**
+     * providers settings
+     */
+    settings: {
+        zeroDevSettings?: Partial<Provider>;
+    };
 };
 export declare const createClientStore: ({ environmentId, storage, }: CreateClientStoreProps) => ClientStore;
 export {};

package/src/lib/client/createClientStore/createClientStore.js

@@ -8,6 +8,7 @@ const createClientStore = ({ environmentId, storage = localStorage, }) => persis
     store: createStore(() => ({
         connection: null,
         ethereum: null,
+        settings: {},
         solana: null,
         wallets: [],
     })),

package/src/lib/ethereum/functions/eip1193Provider/createEIP1193Provider.cjs

@@ -24,7 +24,7 @@ var getSupportedEthereumNetworks = require('../../../functions/getSupportedEther
 var switchEthereumNetwork = require('../../../functions/switchEthereumNetwork/switchEthereumNetwork.cjs');
 var getActiveConnection = require('../../../functions/getActiveConnection/getActiveConnection.cjs');
 
-const createEIP1193Provider = (client) => {
+const createEIP1193Provider = (client, { sessionId } = {}) => {
     const eventEmitter = new eventemitter3.EventEmitter();
     onEvent.onEvent(client, 'connect', () => {
         const currentNetwork = getCurrentEthereumNetworkId.getCurrentEthereumNetworkId(client);
@@ -46,17 +46,22 @@ const createEIP1193Provider = (client) => {
                     eth_accounts: () => handleEthAccounts(client),
                     eth_chainId: () => handleEthChainId(client),
                     eth_requestAccounts: () => handleEthRequestAccounts(client),
-                    eth_sendTransaction: () => handleMethodInPopup({
+                    eth_sendTransaction: () => handleMethodInGlobalWallet({
                         client,
                         method: 'eth_sendTransaction',
                         params,
+                        useIframe: sessionId ? true : false,
                     }),
-                    eth_signTypedData_v4: () => handleMethodInPopup({
+                    eth_signTypedData_v4: () => handleMethodInGlobalWallet({
                         client,
                         method: 'eth_signTypedData_v4',
                         params,
                     }),
-                    personal_sign: () => handleMethodInPopup({ client, method: 'personal_sign', params }),
+                    personal_sign: () => handleMethodInGlobalWallet({
+                        client,
+                        method: 'personal_sign',
+                        params,
+                    }),
                     wallet_requestPermissions: () => handleEthRequestAccounts(client),
                     wallet_revokePermissions: () => handleWalletRevokePermissions(client),
                     wallet_switchEthereumChain: () => handleWalletSwitchEthereumChain(client, eventEmitter, params),
@@ -147,7 +152,7 @@ const handleWalletSwitchEthereumChain = (client, eventEmitter, params) => {
     eventEmitter.emit('chainChanged', chainId);
     return null;
 };
-const handleMethodInPopup = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ client, method, params, }) {
+const handleMethodInGlobalWallet = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ client, method, params, useIframe, }) {
     const currentEthereumNetworkId = getCurrentEthereumNetworkId.getCurrentEthereumNetworkId(client);
     if (!currentEthereumNetworkId) {
         throw new Error('No network id found');
@@ -161,6 +166,7 @@ const handleMethodInPopup = (_a) => _tslib.__awaiter(void 0, [_a], void 0, funct
         },
         connection: getActiveConnection.getActiveConnection(client),
         name: 'eth-request',
+        useIframe,
     })
         .catch(mapErrorToStandard);
     return data;

package/src/lib/ethereum/functions/eip1193Provider/createEIP1193Provider.d.ts

@@ -1,3 +1,5 @@
 import { EIP1193Provider } from 'viem';
 import { GlobalWalletClient } from '../../../client';
-export declare const createEIP1193Provider: (client: GlobalWalletClient) => EIP1193Provider;
+export declare const createEIP1193Provider: (client: GlobalWalletClient, { sessionId }?: {
+    sessionId?: string;
+}) => EIP1193Provider;

package/src/lib/ethereum/functions/eip1193Provider/createEIP1193Provider.js

@@ -20,7 +20,7 @@ import { getSupportedEthereumNetworks } from '../../../functions/getSupportedEth
 import { switchEthereumNetwork } from '../../../functions/switchEthereumNetwork/switchEthereumNetwork.js';
 import { getActiveConnection } from '../../../functions/getActiveConnection/getActiveConnection.js';
 
-const createEIP1193Provider = (client) => {
+const createEIP1193Provider = (client, { sessionId } = {}) => {
     const eventEmitter = new EventEmitter();
     onEvent(client, 'connect', () => {
         const currentNetwork = getCurrentEthereumNetworkId(client);
@@ -42,17 +42,22 @@ const createEIP1193Provider = (client) => {
                     eth_accounts: () => handleEthAccounts(client),
                     eth_chainId: () => handleEthChainId(client),
                     eth_requestAccounts: () => handleEthRequestAccounts(client),
-                    eth_sendTransaction: () => handleMethodInPopup({
+                    eth_sendTransaction: () => handleMethodInGlobalWallet({
                         client,
                         method: 'eth_sendTransaction',
                         params,
+                        useIframe: sessionId ? true : false,
                     }),
-                    eth_signTypedData_v4: () => handleMethodInPopup({
+                    eth_signTypedData_v4: () => handleMethodInGlobalWallet({
                         client,
                         method: 'eth_signTypedData_v4',
                         params,
                     }),
-                    personal_sign: () => handleMethodInPopup({ client, method: 'personal_sign', params }),
+                    personal_sign: () => handleMethodInGlobalWallet({
+                        client,
+                        method: 'personal_sign',
+                        params,
+                    }),
                     wallet_requestPermissions: () => handleEthRequestAccounts(client),
                     wallet_revokePermissions: () => handleWalletRevokePermissions(client),
                     wallet_switchEthereumChain: () => handleWalletSwitchEthereumChain(client, eventEmitter, params),
@@ -143,7 +148,7 @@ const handleWalletSwitchEthereumChain = (client, eventEmitter, params) => {
     eventEmitter.emit('chainChanged', chainId);
     return null;
 };
-const handleMethodInPopup = (_a) => __awaiter(void 0, [_a], void 0, function* ({ client, method, params, }) {
+const handleMethodInGlobalWallet = (_a) => __awaiter(void 0, [_a], void 0, function* ({ client, method, params, useIframe, }) {
     const currentEthereumNetworkId = getCurrentEthereumNetworkId(client);
     if (!currentEthereumNetworkId) {
         throw new Error('No network id found');
@@ -157,6 +162,7 @@ const handleMethodInPopup = (_a) => __awaiter(void 0, [_a], void 0, function* ({
         },
         connection: getActiveConnection(client),
         name: 'eth-request',
+        useIframe,
     })
         .catch(mapErrorToStandard);
     return data;

package/src/lib/functions/addWebWalletOpenerService/addWebWalletOpenerService.cjs

@@ -4,21 +4,14 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../_virtual/_tslib.cjs');
-var utils = require('@dynamic-labs/utils');
 require('eventemitter3');
 require('@dynamic-labs/logger');
 require('@dynamic-labs/store');
 require('../../errors/DisconnectError.cjs');
-var addVersionPostfixToUrl = require('../addVersionPostfixToUrl/addVersionPostfixToUrl.cjs');
-var _package = require('../../../../package.cjs');
-var getCenteredPopupFeatures = require('../getCenteredPopupFeatures/getCenteredPopupFeatures.cjs');
-var mergeAndEncryptParams = require('../mergeAndEncryptParams/mergeAndEncryptParams.cjs');
-var waitForPopupResponse = require('../waitForPopupResponse/waitForPopupResponse.cjs');
-var onPopupClose = require('../onPopupClose/onPopupClose.cjs');
-var PopupClosedError = require('../../errors/PopupClosedError.cjs');
+var iframeWalletOpener = require('./methods/iframeWalletOpener.cjs');
+var popupWalletOpener = require('./methods/popupWalletOpener.cjs');
 var getCore = require('../../client/getCore/getCore.cjs');
 
-const popupActionTimeout = 1000;
 /**
  * Adds a web wallet opener service to the client.
  * This service is used to open a popup to connect a wallet
@@ -27,120 +20,46 @@ const popupActionTimeout = 1000;
 const addWebWalletOpenerService = (client, globalWindow = global.window) => {
     var _a, _b, _c;
     const { developmentOptions, popupInfo, logger, registry, environmentId, eventEmitter, } = getCore.getCore(client);
+    const popupState = {
+        didOpenPopup: false,
+        lastActionId: null,
+        popup: null,
+    };
+    const iframeState = {
+        iframe: null,
+        lastActionId: null,
+    };
     const popupHeight = (_a = popupInfo.height) !== null && _a !== void 0 ? _a : 640;
     const popupWidth = (_b = popupInfo.width) !== null && _b !== void 0 ? _b : 420;
-    let popup = null;
-    let didOpenPopup = false;
-    let lastActionId = null;
-    const postfixPopupUrlWithVersion = (_c = developmentOptions.postfixPopupUrlWithVersion) !== null && _c !== void 0 ? _c : true;
-    const popupUrl = postfixPopupUrlWithVersion
-        ? addVersionPostfixToUrl.addVersionPostfixToUrl(_package.version, popupInfo.url)
-        : popupInfo.url;
-    const closePopup = () => {
-        logger.logVerboseTroubleshootingMessage('closePopup', { lastActionId });
-        popup === null || popup === void 0 ? void 0 : popup.close();
-        popup = null;
-        didOpenPopup = false;
-        lastActionId = null;
-    };
-    /**
-     * Close popup on page unload
-     */
-    if (typeof globalWindow !== 'undefined') {
-        globalWindow.addEventListener('beforeunload', closePopup);
-    }
-    const popupOpener = (_d) => _tslib.__awaiter(void 0, [_d], void 0, function* ({ args, name, connection, }) {
-        logger.logVerboseTroubleshootingMessage('new popup action', {
-            args,
-            name,
+    const postfixUrlWithVersion = (_c = developmentOptions.postfixPopupUrlWithVersion) !== null && _c !== void 0 ? _c : true;
+    const walletOpener = (props) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const iframeWalletOpener$1 = iframeWalletOpener.createIframeWalletOpener({
+            environmentId,
+            eventEmitter,
+            globalWindow,
+            iframeState,
+            logger,
+            popupInfo,
+            postfixUrlWithVersion,
         });
-        // Used as a unique identifier for the action
-        const actionId = new Date().getTime();
-        lastActionId = actionId;
-        const popupFinalUrl = new URL(popupUrl);
-        const resultDeferredPromise = new utils.DeferredPromise();
-        // Setup popup URL and data
-        popupFinalUrl.hash = `/${name}`;
-        popupFinalUrl.searchParams.set('provider_env_id', environmentId);
-        // TODO: use PlatformService
-        popupFinalUrl.searchParams.set('requester_origin', globalWindow.location.origin);
-        if (popup === null) {
-            const features = getCenteredPopupFeatures.getCenteredPopupFeatures({
-                height: popupHeight,
-                width: popupWidth,
-            });
-            // Open popup
-            popup = globalWindow.open('', '_blank', features);
-        }
-        // Encrypt params if active connection is present
-        if (args) {
-            yield mergeAndEncryptParams.mergeAndEncryptParams(popupFinalUrl, args, connection);
-        }
-        if (popup === null) {
-            throw new Error('Failed to open popup');
-        }
-        waitForPopupResponse.waitForPopupResponse({
-            decode: (data) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                if (connection && utils.isEncryptedMessage(data)) {
-                    const decryptedData = yield utils.decryptMessage(connection.sharedSecret, data.encryptedMessage, data.iv);
-                    return JSON.parse(decryptedData);
-                }
-                return data;
-            }),
-            onError: (error) => resultDeferredPromise.reject(error),
-            onResponse: (response) => resultDeferredPromise.resolve(response.data),
-            popupUrl: popupFinalUrl.toString(),
-        });
-        onPopupClose.onPopupClose(popup, () => {
-            resultDeferredPromise.reject(new PopupClosedError.PopupClosedError());
+        const popupWalletOpener$1 = popupWalletOpener.createPopupWalletOpener({
+            environmentId,
+            eventEmitter,
+            globalWindow,
+            logger,
+            popupHeight,
+            popupInfo,
+            popupState,
+            popupWidth,
+            postfixUrlWithVersion,
         });
-        /**
-         * Assign action to popup
-         */
-        if (didOpenPopup) {
-            popup === null || popup === void 0 ? void 0 : popup.postMessage({
-                actionPath: popupFinalUrl.search + popupFinalUrl.hash,
-                event: 'new-action',
-            }, popupFinalUrl.origin);
+        if (props.useIframe) {
+            return iframeWalletOpener$1(props);
         }
-        else {
-            // Load popup
-            popup.location = popupFinalUrl.href;
-        }
-        didOpenPopup = true;
-        return resultDeferredPromise.promise
-            .then((result) => {
-            logger.logVerboseTroubleshootingMessage('popup action result', {
-                actionId,
-                lastActionId,
-                result,
-            });
-            return result;
-        })
-            .catch((err) => {
-            logger.logVerboseTroubleshootingMessage('popup action error', {
-                actionId,
-                err,
-                lastActionId,
-            });
-            eventEmitter.emit('error', err);
-            closePopup();
-            throw err;
-        })
-            .finally(() => {
-            /**
-             * Sets a timeout to close the popup.
-             * It will only no new actions were fired.
-             */
-            setTimeout(() => {
-                if (lastActionId === actionId) {
-                    closePopup();
-                }
-            }, popupActionTimeout);
-        });
+        return popupWalletOpener$1(props);
     });
     registry.set('walletOpenerService', {
-        openWallet: popupOpener,
+        openWallet: walletOpener,
     });
 };
 

package/src/lib/functions/addWebWalletOpenerService/addWebWalletOpenerService.js

@@ -1,20 +1,13 @@
 'use client'
 import { __awaiter } from '../../../../_virtual/_tslib.js';
-import { DeferredPromise, isEncryptedMessage, decryptMessage } from '@dynamic-labs/utils';
 import 'eventemitter3';
 import '@dynamic-labs/logger';
 import '@dynamic-labs/store';
 import '../../errors/DisconnectError.js';
-import { addVersionPostfixToUrl } from '../addVersionPostfixToUrl/addVersionPostfixToUrl.js';
-import { version } from '../../../../package.js';
-import { getCenteredPopupFeatures } from '../getCenteredPopupFeatures/getCenteredPopupFeatures.js';
-import { mergeAndEncryptParams } from '../mergeAndEncryptParams/mergeAndEncryptParams.js';
-import { waitForPopupResponse } from '../waitForPopupResponse/waitForPopupResponse.js';
-import { onPopupClose } from '../onPopupClose/onPopupClose.js';
-import { PopupClosedError } from '../../errors/PopupClosedError.js';
+import { createIframeWalletOpener } from './methods/iframeWalletOpener.js';
+import { createPopupWalletOpener } from './methods/popupWalletOpener.js';
 import { getCore } from '../../client/getCore/getCore.js';
 
-const popupActionTimeout = 1000;
 /**
  * Adds a web wallet opener service to the client.
  * This service is used to open a popup to connect a wallet
@@ -23,120 +16,46 @@ const popupActionTimeout = 1000;
 const addWebWalletOpenerService = (client, globalWindow = global.window) => {
     var _a, _b, _c;
     const { developmentOptions, popupInfo, logger, registry, environmentId, eventEmitter, } = getCore(client);
+    const popupState = {
+        didOpenPopup: false,
+        lastActionId: null,
+        popup: null,
+    };
+    const iframeState = {
+        iframe: null,
+        lastActionId: null,
+    };
     const popupHeight = (_a = popupInfo.height) !== null && _a !== void 0 ? _a : 640;
     const popupWidth = (_b = popupInfo.width) !== null && _b !== void 0 ? _b : 420;
-    let popup = null;
-    let didOpenPopup = false;
-    let lastActionId = null;
-    const postfixPopupUrlWithVersion = (_c = developmentOptions.postfixPopupUrlWithVersion) !== null && _c !== void 0 ? _c : true;
-    const popupUrl = postfixPopupUrlWithVersion
-        ? addVersionPostfixToUrl(version, popupInfo.url)
-        : popupInfo.url;
-    const closePopup = () => {
-        logger.logVerboseTroubleshootingMessage('closePopup', { lastActionId });
-        popup === null || popup === void 0 ? void 0 : popup.close();
-        popup = null;
-        didOpenPopup = false;
-        lastActionId = null;
-    };
-    /**
-     * Close popup on page unload
-     */
-    if (typeof globalWindow !== 'undefined') {
-        globalWindow.addEventListener('beforeunload', closePopup);
-    }
-    const popupOpener = (_d) => __awaiter(void 0, [_d], void 0, function* ({ args, name, connection, }) {
-        logger.logVerboseTroubleshootingMessage('new popup action', {
-            args,
-            name,
+    const postfixUrlWithVersion = (_c = developmentOptions.postfixPopupUrlWithVersion) !== null && _c !== void 0 ? _c : true;
+    const walletOpener = (props) => __awaiter(void 0, void 0, void 0, function* () {
+        const iframeWalletOpener = createIframeWalletOpener({
+            environmentId,
+            eventEmitter,
+            globalWindow,
+            iframeState,
+            logger,
+            popupInfo,
+            postfixUrlWithVersion,
         });
-        // Used as a unique identifier for the action
-        const actionId = new Date().getTime();
-        lastActionId = actionId;
-        const popupFinalUrl = new URL(popupUrl);
-        const resultDeferredPromise = new DeferredPromise();
-        // Setup popup URL and data
-        popupFinalUrl.hash = `/${name}`;
-        popupFinalUrl.searchParams.set('provider_env_id', environmentId);
-        // TODO: use PlatformService
-        popupFinalUrl.searchParams.set('requester_origin', globalWindow.location.origin);
-        if (popup === null) {
-            const features = getCenteredPopupFeatures({
-                height: popupHeight,
-                width: popupWidth,
-            });
-            // Open popup
-            popup = globalWindow.open('', '_blank', features);
-        }
-        // Encrypt params if active connection is present
-        if (args) {
-            yield mergeAndEncryptParams(popupFinalUrl, args, connection);
-        }
-        if (popup === null) {
-            throw new Error('Failed to open popup');
-        }
-        waitForPopupResponse({
-            decode: (data) => __awaiter(void 0, void 0, void 0, function* () {
-                if (connection && isEncryptedMessage(data)) {
-                    const decryptedData = yield decryptMessage(connection.sharedSecret, data.encryptedMessage, data.iv);
-                    return JSON.parse(decryptedData);
-                }
-                return data;
-            }),
-            onError: (error) => resultDeferredPromise.reject(error),
-            onResponse: (response) => resultDeferredPromise.resolve(response.data),
-            popupUrl: popupFinalUrl.toString(),
-        });
-        onPopupClose(popup, () => {
-            resultDeferredPromise.reject(new PopupClosedError());
+        const popupWalletOpener = createPopupWalletOpener({
+            environmentId,
+            eventEmitter,
+            globalWindow,
+            logger,
+            popupHeight,
+            popupInfo,
+            popupState,
+            popupWidth,
+            postfixUrlWithVersion,
         });
-        /**
-         * Assign action to popup
-         */
-        if (didOpenPopup) {
-            popup === null || popup === void 0 ? void 0 : popup.postMessage({
-                actionPath: popupFinalUrl.search + popupFinalUrl.hash,
-                event: 'new-action',
-            }, popupFinalUrl.origin);
+        if (props.useIframe) {
+            return iframeWalletOpener(props);
         }
-        else {
-            // Load popup
-            popup.location = popupFinalUrl.href;
-        }
-        didOpenPopup = true;
-        return resultDeferredPromise.promise
-            .then((result) => {
-            logger.logVerboseTroubleshootingMessage('popup action result', {
-                actionId,
-                lastActionId,
-                result,
-            });
-            return result;
-        })
-            .catch((err) => {
-            logger.logVerboseTroubleshootingMessage('popup action error', {
-                actionId,
-                err,
-                lastActionId,
-            });
-            eventEmitter.emit('error', err);
-            closePopup();
-            throw err;
-        })
-            .finally(() => {
-            /**
-             * Sets a timeout to close the popup.
-             * It will only no new actions were fired.
-             */
-            setTimeout(() => {
-                if (lastActionId === actionId) {
-                    closePopup();
-                }
-            }, popupActionTimeout);
-        });
+        return popupWalletOpener(props);
     });
     registry.set('walletOpenerService', {
-        openWallet: popupOpener,
+        openWallet: walletOpener,
     });
 };