@dynamic-labs/sdk-react-core 4.20.1 → 4.20.3

package/src/lib/utils/hooks/useDynamicWaas/useDynamicWaas.js

@@ -6,9 +6,9 @@ import { DynamicError } from '@dynamic-labs/utils';
 import { useUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../constants/values.js';
 import '@dynamic-labs/multi-wallet';
-import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
 import '../../../shared/logger.js';
 import '../../constants/colors.js';
+import { getMinAuthToken } from '../../functions/getMinAuthToken/getMinAuthToken.js';
 import 'react-international-phone';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
@@ -24,6 +24,7 @@ import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import { useApiBaseUrl, useEnvironmentId } from '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import { useRefreshUser } from '../useRefreshUser/useRefreshUser.js';
+import { compareChains } from '../../functions/compareChains/compareChains.js';
 import { useUser } from '../../../store/state/user/user.js';
 import { useWalletConnectorOptions } from '../../../store/state/walletOptions/walletOptions.js';
 import '../../../context/DynamicContext/DynamicContext.js';
@@ -40,8 +41,8 @@ import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import { findSmartWallet } from '../useWalletConnectors/utils/smartWallet/smartWallet.js';
 import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
+import { useEmbeddedWalletSessionKeys } from '../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js';
 import '../../../context/ThemeContext/ThemeContext.js';
-import '../../functions/compareChains/compareChains.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';
 import '@dynamic-labs/types';
@@ -84,6 +85,7 @@ import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../context/ErrorContext/hooks/useErrorText/useErrorText.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
+import '../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.js';
 import '../../../store/state/sendBalances.js';
 import '../../../store/state/connectorsInitializing/connectorsInitializing.js';
 import '../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';
@@ -100,11 +102,12 @@ import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 
 const dynamicWaasKey = 'dynamicwaas';
-const configWaasWalletConnector = ({ walletConnector, environmentId, apiBaseUrl, authToken, relayUrl, }) => {
+const configWaasWalletConnector = ({ walletConnector, environmentId, apiBaseUrl, authToken, relayUrl, getSignedSessionId, }) => {
     var _a;
     walletConnector.setEnvironmentId(environmentId);
     walletConnector.setBaseApiUrl((_a = (apiBaseUrl || DEFAULT_WAAS_API_URL)) === null || _a === void 0 ? void 0 : _a.replace('/api/v0', ''));
     walletConnector.setGetAuthTokenFunction(() => authToken !== null && authToken !== void 0 ? authToken : '');
+    walletConnector.setGetSignedSessionIdFunction(getSignedSessionId);
     walletConnector.setRelayUrl(relayUrl);
     return walletConnector;
 };
@@ -127,7 +130,10 @@ const useDynamicWaas = () => {
     const automaticEmbeddedWalletCreationForExternalEnabled = embeddedWalletSettings === null || embeddedWalletSettings === void 0 ? void 0 : embeddedWalletSettings.automaticEmbeddedWalletCreationForExternal;
     const defaultWalletVersion = embeddedWalletSettings === null || embeddedWalletSettings === void 0 ? void 0 : embeddedWalletSettings.defaultWalletVersion;
     const dynamicWaasIsEnabled = defaultWalletVersion === EmbeddedWalletVersionEnum.V3;
-    const authToken = getAuthToken();
+    const authToken = getMinAuthToken();
+    const { getSignedSessionId } = useEmbeddedWalletSessionKeys({
+        environmentId,
+    });
     const isCookieAuthEnabled = projectSettings && isCookieEnabled(projectSettings);
     const getWalletConnector = useCallback((chainName) => {
         var _a;
@@ -145,17 +151,21 @@ const useDynamicWaas = () => {
             apiBaseUrl: apiBaseUrl || DEFAULT_WAAS_API_URL,
             authToken,
             environmentId,
+            getSignedSessionId,
             relayUrl: relayUrl !== null && relayUrl !== void 0 ? relayUrl : '',
             walletConnector,
         });
         return configuredWalletConnector;
     }, [
+        isCookieAuthEnabled,
+        authToken,
         walletConnectorOptions,
         environmentId,
-        authToken,
         apiBaseUrl,
-        isCookieAuthEnabled,
+        relayUrl,
     ]);
+    // If no chain names are provided, filter out chains that already have a wallet
+    // and make a wallet for each enabled chain
     const createWalletAccount = useCallback((chainNames) => __awaiter(void 0, void 0, void 0, function* () {
         if (!(enabledChainNames === null || enabledChainNames === void 0 ? void 0 : enabledChainNames.length)) {
             throw new DynamicError(NO_ENABLED_CHAINS_ERROR);
@@ -164,8 +174,7 @@ const useDynamicWaas = () => {
         if (invalidChains && invalidChains.length) {
             throw new DynamicError(`${INVALID_CHAINS_ERROR}: ${invalidChains.join(', ')}`);
         }
-        const chainsToCreate = chainNames ? chainNames : enabledChainNames;
-        const createdWalletAccounts = yield Promise.all(chainsToCreate === null || chainsToCreate === void 0 ? void 0 : chainsToCreate.map((chain) => __awaiter(void 0, void 0, void 0, function* () {
+        const createdWalletAccounts = yield Promise.all(chainNames === null || chainNames === void 0 ? void 0 : chainNames.map((chain) => __awaiter(void 0, void 0, void 0, function* () {
             const walletConnector = getWalletConnector(chain);
             if (!walletConnector)
                 return undefined;
@@ -189,33 +198,49 @@ const useDynamicWaas = () => {
         }
         setShowAuthFlow(false, { performMultiWalletChecks: false }); // close email otp pin modal
         return createdWalletAccounts;
-    }), [getWalletConnector, primaryChain, enabledChainNames, refresh]);
-    const shouldAutoCreateDynamicWaasWallet = useMemo(() => {
-        const hasDynamicWaasWallet = user === null || user === void 0 ? void 0 : user.verifiedCredentials.some((wallet) => { var _a; return (_a = wallet.walletName) === null || _a === void 0 ? void 0 : _a.includes('dynamicwaas'); });
+    }), [
+        getWalletConnector,
+        primaryChain,
+        enabledChainNames,
+        refresh,
+        setShowAuthFlow,
+    ]);
+    const needsAutoCreateWalletChains = useMemo(() => {
+        const hasDynamicWaasWalletForChain = (chain) => {
+            var _a;
+            return (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials.some((wallet) => {
+                var _a;
+                return ((_a = wallet.walletName) === null || _a === void 0 ? void 0 : _a.includes('dynamicwaas')) &&
+                    wallet.chain &&
+                    compareChains(wallet.chain, chain);
+            })) !== null && _a !== void 0 ? _a : false;
+        };
+        const hasDynamicWaasWalletForAllEnabledChains = enabledChainNames === null || enabledChainNames === void 0 ? void 0 : enabledChainNames.every(hasDynamicWaasWalletForChain);
+        const missingChains = enabledChainNames === null || enabledChainNames === void 0 ? void 0 : enabledChainNames.filter((chain) => !hasDynamicWaasWalletForChain(chain));
         const hasExistingV1orV2Wallet = user === null || user === void 0 ? void 0 : user.verifiedCredentials.some((wallet) => {
             var _a, _b;
             return ((_a = wallet.walletProperties) === null || _a === void 0 ? void 0 : _a.version) === EmbeddedWalletVersionEnum.V1 || // V1 wallet
                 ((_b = wallet.walletProperties) === null || _b === void 0 ? void 0 : _b.version) === EmbeddedWalletVersionEnum.V2;
         });
         if (!user ||
-            hasDynamicWaasWallet || // already has a dynamic waas wallet for all enabled chains
+            hasDynamicWaasWalletForAllEnabledChains || // already has a dynamic waas wallet for all enabled chains
             !dynamicWaasIsEnabled || // dynamic waas is not enabled
             !automaticEmbeddedWalletCreationEnabled || // automatic embedded wallet creation is not enabled
             hasExistingV1orV2Wallet // already has a v2 or v1 wallet
         )
-            return false;
+            return [];
         const hasExternalWallet = user === null || user === void 0 ? void 0 : user.verifiedCredentials.some((vc) => vc.format === JwtVerifiedCredentialFormatEnum.Blockchain &&
             vc.walletProvider !== WalletProviderEnum.EmbeddedWallet);
         const shouldCreateDynamicWaasWallet = hasExternalWallet
             ? automaticEmbeddedWalletCreationForExternalEnabled
             : true;
-        return shouldCreateDynamicWaasWallet;
+        return shouldCreateDynamicWaasWallet ? missingChains : [];
     }, [
         user,
         dynamicWaasIsEnabled,
         automaticEmbeddedWalletCreationEnabled,
         automaticEmbeddedWalletCreationForExternalEnabled,
-        walletConnectorOptions,
+        enabledChainNames,
     ]);
     const importPrivateKey = (_d) => __awaiter(void 0, [_d], void 0, function* ({ chainName, privateKey, }) {
         const walletConnector = getWalletConnector(chainName);
@@ -234,7 +259,7 @@ const useDynamicWaas = () => {
         getWaasWallets,
         getWalletConnector,
         importPrivateKey,
-        shouldAutoCreateDynamicWaasWallet,
+        needsAutoCreateWalletChains,
     };
 };
 

package/src/lib/utils/hooks/useEmailProvider/useEmailProvider.cjs

@@ -85,6 +85,7 @@ require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/ErrorContext/hooks/useErrorText/useErrorText.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.cjs');
 require('../../../store/state/sendBalances.cjs');
 require('../../../store/state/connectorsInitializing/connectorsInitializing.cjs');
 require('../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');

package/src/lib/utils/hooks/useEmailProvider/useEmailProvider.js

@@ -81,6 +81,7 @@ import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../context/ErrorContext/hooks/useErrorText/useErrorText.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
+import '../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.js';
 import '../../../store/state/sendBalances.js';
 import '../../../store/state/connectorsInitializing/connectorsInitializing.js';
 import '../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';

package/src/lib/utils/hooks/useEmbeddedReveal/useEmbeddedReveal.cjs

@@ -87,6 +87,7 @@ require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/ErrorContext/hooks/useErrorText/useErrorText.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.cjs');
 require('../../../store/state/sendBalances.cjs');
 require('../../../store/state/connectorsInitializing/connectorsInitializing.cjs');
 require('../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');

package/src/lib/utils/hooks/useEmbeddedReveal/useEmbeddedReveal.js

@@ -83,6 +83,7 @@ import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../context/ErrorContext/hooks/useErrorText/useErrorText.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
+import '../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.js';
 import '../../../store/state/sendBalances.js';
 import '../../../store/state/connectorsInitializing/connectorsInitializing.js';
 import '../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';

package/src/lib/utils/hooks/useEmbeddedWallet/useEmbeddedWallet.cjs

@@ -90,6 +90,7 @@ require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/ErrorContext/hooks/useErrorText/useErrorText.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.cjs');
 require('../../../store/state/sendBalances.cjs');
 require('../../../store/state/connectorsInitializing/connectorsInitializing.cjs');
 require('../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');

package/src/lib/utils/hooks/useEmbeddedWallet/useEmbeddedWallet.js

@@ -86,6 +86,7 @@ import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../context/ErrorContext/hooks/useErrorText/useErrorText.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
+import '../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.js';
 import '../../../store/state/sendBalances.js';
 import '../../../store/state/connectorsInitializing/connectorsInitializing.js';
 import '../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.cjs

@@ -105,6 +105,7 @@ require('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../context/ErrorContext/hooks/useErrorText/useErrorText.cjs');
 require('../../../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.cjs');
 require('../../../../store/state/sendBalances.cjs');
 require('../../../../store/state/connectorsInitializing/connectorsInitializing.cjs');
 require('../../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.js

@@ -101,6 +101,7 @@ import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../../context/FooterAnimationContext/index.js';
 import '../../../../context/ErrorContext/hooks/useErrorText/useErrorText.js';
 import '../../../../context/PasskeyContext/PasskeyContext.js';
+import '../../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.js';
 import '../../../../store/state/sendBalances.js';
 import '../../../../store/state/connectorsInitializing/connectorsInitializing.js';
 import '../../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useTurnkey/useTurnkey.cjs

@@ -93,6 +93,7 @@ require('../../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs')
 require('../../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../../context/ErrorContext/hooks/useErrorText/useErrorText.cjs');
 require('../../../../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.cjs');
 require('../../../../../store/state/sendBalances.cjs');
 require('../../../../../store/state/connectorsInitializing/connectorsInitializing.cjs');
 require('../../../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useTurnkey/useTurnkey.js

@@ -89,6 +89,7 @@ import '../../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../../../context/FooterAnimationContext/index.js';
 import '../../../../../context/ErrorContext/hooks/useErrorText/useErrorText.js';
 import '../../../../../context/PasskeyContext/PasskeyContext.js';
+import '../../../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.js';
 import '../../../../../store/state/sendBalances.js';
 import '../../../../../store/state/connectorsInitializing/connectorsInitializing.js';
 import '../../../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';

package/src/lib/utils/hooks/useEmbeddedWalletAuthenticator/useEmbeddedWalletAuthenticator.cjs

@@ -84,6 +84,7 @@ require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/ErrorContext/hooks/useErrorText/useErrorText.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.cjs');
 require('../../../store/state/sendBalances.cjs');
 require('../../../store/state/connectorsInitializing/connectorsInitializing.cjs');
 require('../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');

package/src/lib/utils/hooks/useEmbeddedWalletAuthenticator/useEmbeddedWalletAuthenticator.js

@@ -80,6 +80,7 @@ import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../context/ErrorContext/hooks/useErrorText/useErrorText.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
+import '../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.js';
 import '../../../store/state/sendBalances.js';
 import '../../../store/state/connectorsInitializing/connectorsInitializing.js';
 import '../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';

package/src/lib/utils/hooks/useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.cjs

@@ -157,6 +157,21 @@ const useEmbeddedWalletSessionKeys = ({ environmentId, projectSettings, }) => {
         const sessionKeysString = JSON.stringify(sessionKeys);
         return Buffer.from(sessionKeysString).toString('base64');
     };
+    const getSignedSessionId = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const sessionId = user$1 === null || user$1 === void 0 ? void 0 : user$1.sessionId;
+        if (!sessionId) {
+            throw new Error('Session ID not found');
+        }
+        const sessionKeysSS = utils.StorageService.getItem(localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS, localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS);
+        const decodedSessionKeys = sessionKeysSS
+            ? JSON.parse(Buffer.from(sessionKeysSS, 'base64').toString())
+            : undefined;
+        if (!(decodedSessionKeys === null || decodedSessionKeys === void 0 ? void 0 : decodedSessionKeys.privateKeyJwk)) {
+            throw new Error('Private key JWK not found');
+        }
+        const signedSessionId = yield utils$1.p256Sign(decodedSessionKeys.privateKeyJwk, sessionId);
+        return signedSessionId;
+    });
     const removeSessionKey = React.useCallback(() => {
         utils.tracing.logEvent('session-key', 'removeSessionKey');
         utils.StorageService.removeItem(localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS, localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS);
@@ -164,6 +179,7 @@ const useEmbeddedWalletSessionKeys = ({ environmentId, projectSettings, }) => {
     return {
         generateSessionKey,
         getSessionPublicKey,
+        getSignedSessionId,
         registerEmbeddedWalletSessionKey,
         removeSessionKey,
         shouldRegisterSessionKeysOnSignin,

package/src/lib/utils/hooks/useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.d.ts

@@ -16,6 +16,7 @@ export declare const useEmbeddedWalletSessionKeys: ({ environmentId, projectSett
         publicKey: string;
     }>;
     getSessionPublicKey: () => string;
+    getSignedSessionId: () => Promise<string>;
     registerEmbeddedWalletSessionKey: ({ ignoreRestore, }?: {
         ignoreRestore?: boolean;
     }) => Promise<SessionKey | {

package/src/lib/utils/hooks/useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js

@@ -153,6 +153,21 @@ const useEmbeddedWalletSessionKeys = ({ environmentId, projectSettings, }) => {
         const sessionKeysString = JSON.stringify(sessionKeys);
         return Buffer.from(sessionKeysString).toString('base64');
     };
+    const getSignedSessionId = () => __awaiter(void 0, void 0, void 0, function* () {
+        const sessionId = user === null || user === void 0 ? void 0 : user.sessionId;
+        if (!sessionId) {
+            throw new Error('Session ID not found');
+        }
+        const sessionKeysSS = StorageService.getItem(SECURE_ENCLAVE_WALLET_SESSION_KEYS, SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS);
+        const decodedSessionKeys = sessionKeysSS
+            ? JSON.parse(Buffer.from(sessionKeysSS, 'base64').toString())
+            : undefined;
+        if (!(decodedSessionKeys === null || decodedSessionKeys === void 0 ? void 0 : decodedSessionKeys.privateKeyJwk)) {
+            throw new Error('Private key JWK not found');
+        }
+        const signedSessionId = yield p256Sign(decodedSessionKeys.privateKeyJwk, sessionId);
+        return signedSessionId;
+    });
     const removeSessionKey = useCallback(() => {
         tracing.logEvent('session-key', 'removeSessionKey');
         StorageService.removeItem(SECURE_ENCLAVE_WALLET_SESSION_KEYS, SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS);
@@ -160,6 +175,7 @@ const useEmbeddedWalletSessionKeys = ({ environmentId, projectSettings, }) => {
     return {
         generateSessionKey,
         getSessionPublicKey,
+        getSignedSessionId,
         registerEmbeddedWalletSessionKey,
         removeSessionKey,
         shouldRegisterSessionKeysOnSignin,

package/src/lib/utils/hooks/useExternalAuth/useExternalAuth.cjs

@@ -86,6 +86,7 @@ require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/ErrorContext/hooks/useErrorText/useErrorText.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.cjs');
 require('../../../store/state/sendBalances.cjs');
 require('../../../store/state/connectorsInitializing/connectorsInitializing.cjs');
 require('../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');

package/src/lib/utils/hooks/useExternalAuth/useExternalAuth.js

@@ -82,6 +82,7 @@ import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../context/ErrorContext/hooks/useErrorText/useErrorText.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
+import '../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.js';
 import '../../../store/state/sendBalances.js';
 import '../../../store/state/connectorsInitializing/connectorsInitializing.js';
 import '../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';

package/src/lib/utils/hooks/useFundWithWallet/useChooseLinkedWallet/useChooseLinkedWallet.cjs

@@ -84,6 +84,7 @@ var DynamicWidgetContext = require('../../../../widgets/DynamicWidget/context/Dy
 require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../context/ErrorContext/hooks/useErrorText/useErrorText.cjs');
 require('../../../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.cjs');
 require('../../../../store/state/sendBalances.cjs');
 require('../../../../store/state/connectorsInitializing/connectorsInitializing.cjs');
 require('../../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');

package/src/lib/utils/hooks/useFundWithWallet/useChooseLinkedWallet/useChooseLinkedWallet.js

@@ -80,6 +80,7 @@ import { useWidgetContext } from '../../../../widgets/DynamicWidget/context/Dyna
 import '../../../../context/FooterAnimationContext/index.js';
 import '../../../../context/ErrorContext/hooks/useErrorText/useErrorText.js';
 import '../../../../context/PasskeyContext/PasskeyContext.js';
+import '../../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.js';
 import '../../../../store/state/sendBalances.js';
 import '../../../../store/state/connectorsInitializing/connectorsInitializing.js';
 import '../../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';

package/src/lib/utils/hooks/useFundWithWallet/useConnectWalletForFunding/useConnectWalletForFunding.cjs

@@ -86,6 +86,7 @@ require('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../context/ErrorContext/hooks/useErrorText/useErrorText.cjs');
 require('../../../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.cjs');
 require('../../../../store/state/sendBalances.cjs');
 require('../../../../store/state/connectorsInitializing/connectorsInitializing.cjs');
 require('../../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');
@@ -160,49 +161,70 @@ const useConnectWalletForFunding = () => {
         yield (walletOption === null || walletOption === void 0 ? void 0 : walletOption.walletConnector.endSession());
         yield (walletOption === null || walletOption === void 0 ? void 0 : walletOption.walletConnector.init());
     }), [hasWalletConnectWallet]);
-    return React.useCallback((_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ initiatedByWidget }) {
-        if (connectWalletPromiseRef.current) {
-            return connectWalletPromiseRef.current.promise;
-        }
-        resetWalletConnectSession();
-        connectWalletPromiseRef.current = new utils.DeferredPromise();
-        clearStackAndPush('external-funding-wallet-list', {
-            onSelectWallet: (_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ walletConnector }) {
-                if (!connectWalletPromiseRef.current)
+    const openWalletList = React.useCallback((initiatedByWidget) => {
+        const onSelectWallet = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ walletConnector, }) {
+            let isDuplicate = false;
+            if (!connectWalletPromiseRef.current)
+                return;
+            try {
+                initiatedByWidgetRef.current = initiatedByWidget;
+                const walletAddress = yield getWalletAddress(walletConnector);
+                if (!walletAddress) {
+                    rejectPromiseRef.rejectPromiseRef(connectWalletPromiseRef, new utils.DynamicError('No wallet address found'));
                     return;
-                try {
-                    initiatedByWidgetRef.current = initiatedByWidget;
-                    const walletAddress = yield getWalletAddress(walletConnector);
-                    if (!walletAddress) {
-                        rejectPromiseRef.rejectPromiseRef(connectWalletPromiseRef, new utils.DynamicError('No wallet address found'));
-                        return;
-                    }
-                    const wallet = walletConnector.createWallet({
-                        address: walletAddress,
-                        chain: walletConnector.connectedChain,
-                        connector: walletConnector,
-                        id: 'external-funding-wallet',
-                        isAuthenticated: false,
-                        key: walletConnector.key,
-                    });
-                    resolvePromiseRef.resolvePromiseRef(connectWalletPromiseRef, wallet);
-                    dynamicEvents.dynamicEvents.emit('walletConnectedForFunding', {
+                }
+                if (walletAddress === (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address)) {
+                    isDuplicate = true;
+                    clearStackAndPush('duplicate-wallet', {
                         initiatedByWidget,
-                        isPhantomRedirect: false,
-                        wallet,
+                        onReturn: openWalletList,
                     });
-                }
-                catch (error) {
-                    rejectPromiseRef.rejectPromiseRef(connectWalletPromiseRef, error);
                     return;
                 }
-                finally {
+                const wallet = walletConnector.createWallet({
+                    address: walletAddress,
+                    chain: walletConnector.connectedChain,
+                    connector: walletConnector,
+                    id: 'external-funding-wallet',
+                    isAuthenticated: false,
+                    key: walletConnector.key,
+                });
+                resolvePromiseRef.resolvePromiseRef(connectWalletPromiseRef, wallet);
+                dynamicEvents.dynamicEvents.emit('walletConnectedForFunding', {
+                    initiatedByWidget: initiatedByWidget,
+                    isPhantomRedirect: false,
+                    wallet,
+                });
+            }
+            catch (error) {
+                rejectPromiseRef.rejectPromiseRef(connectWalletPromiseRef, error);
+                return;
+            }
+            finally {
+                if (!isDuplicate) {
                     setShowAuthFlow(false);
                 }
-            }),
+            }
+        });
+        clearStackAndPush('external-funding-wallet-list', {
+            onSelectWallet,
             showDefaultFooter: true,
             viewWalletsFilter: utils.pipe(FilterWalletsForExternalFunding.FilterWalletsForExternalFunding).pipe(index.FilterChain(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain)),
         });
+    }, [
+        clearStackAndPush,
+        getWalletAddress,
+        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address,
+        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain,
+        setShowAuthFlow,
+    ]);
+    return React.useCallback((_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ initiatedByWidget }) {
+        if (connectWalletPromiseRef.current) {
+            return connectWalletPromiseRef.current.promise;
+        }
+        resetWalletConnectSession();
+        connectWalletPromiseRef.current = new utils.DeferredPromise();
+        openWalletList(initiatedByWidget);
         setShowAuthFlow(true, {
             emitCancelAuth: false,
             ignoreIfIsEmbeddedWidget: true,
@@ -210,13 +232,7 @@ const useConnectWalletForFunding = () => {
             performMultiWalletChecks: false,
         });
         return connectWalletPromiseRef.current.promise;
-    }), [
-        resetWalletConnectSession,
-        clearStackAndPush,
-        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain,
-        setShowAuthFlow,
-        getWalletAddress,
-    ]);
+    }), [resetWalletConnectSession, openWalletList, setShowAuthFlow]);
 };
 
 exports.useConnectWalletForFunding = useConnectWalletForFunding;