@dynamic-labs/sdk-react-core 4.22.7 → 4.23.0

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

@@ -9,8 +9,8 @@ require('@dynamic-labs-sdk/client/core');
 require('@dynamic-labs/sdk-api-core');
 require('@dynamic-labs-sdk/client');
 require('../../../client/client.cjs');
-require('../../constants/values.cjs');
 require('@dynamic-labs/utils');
+require('../../constants/values.cjs');
 require('@dynamic-labs/multi-wallet');
 require('../../../shared/logger.cjs');
 require('../../constants/colors.cjs');
@@ -23,7 +23,7 @@ require('@dynamic-labs/wallet-book');
 require('../../../shared/consts/index.cjs');
 require('../../../store/state/nonce/nonce.cjs');
 require('../../../config/ApiEndpoint.cjs');
-var projectSettings = require('../../../store/state/projectSettings/projectSettings.cjs');
+require('../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../locale/locale.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
@@ -96,79 +96,94 @@ require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCa
 require('../../../context/OnrampContext/OnrampContext.cjs');
 require('../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
 require('../../../../index.cjs');
+var useIsMfaEnabled = require('../useIsMfaEnabled/useIsMfaEnabled.cjs');
+var useIsTotpMfaEnabled = require('../useIsTotpMfaEnabled/useIsTotpMfaEnabled.cjs');
 require('../../../store/state/tokenBalances.cjs');
 require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 
 const useMfaModals = () => {
-    var _a;
     const { setShowAuthFlow, setShowDynamicUserProfile } = useInternalDynamicContext.useInternalDynamicContext();
-    const projectSettings$1 = projectSettings.useProjectSettings();
     const { setDynamicWidgetView } = DynamicWidgetContext.useWidgetContext();
     const { clearStackAndPush } = ViewContext.useViewContext();
-    const isMfaEnabled = (_a = projectSettings$1 === null || projectSettings$1 === void 0 ? void 0 : projectSettings$1.security.mfa) === null || _a === void 0 ? void 0 : _a.enabled;
-    const setShowMFAManage = React.useCallback((value) => {
+    const isMfaEnabled = useIsMfaEnabled.useIsMfaEnabled();
+    const isTotpMfaEnabled = useIsTotpMfaEnabled.useIsTotpMfaEnabled();
+    const setShowTotpMfaManage = React.useCallback((value) => {
         if (value) {
-            if (!isMfaEnabled) {
+            if (!isTotpMfaEnabled) {
                 return;
             }
-            setDynamicWidgetView('manage-mfa-no-footer');
+            setDynamicWidgetView('manage-totp-mfa-no-footer');
         }
         setShowDynamicUserProfile(value);
-    }, [isMfaEnabled, setShowDynamicUserProfile, setDynamicWidgetView]);
+    }, [isTotpMfaEnabled, setShowDynamicUserProfile, setDynamicWidgetView]);
     const setShowMfaChooseType = React.useCallback((value) => {
         if (value) {
-            if (!isMfaEnabled)
+            if (!isMfaEnabled) {
                 return;
+            }
             clearStackAndPush('mfa-choose-device');
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
     }, [isMfaEnabled, setShowAuthFlow, clearStackAndPush]);
     const setShowMfaQRCode = React.useCallback((value) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         if (value) {
-            if (!isMfaEnabled)
+            if (!isTotpMfaEnabled) {
                 return;
+            }
             const user = getUserProfile.getUserProfile();
             // Already have MFA configured
             if (user === null || user === void 0 ? void 0 : user.mfaBackupCodeAcknowledgement) {
-                setShowMFAManage(true);
+                setShowTotpMfaManage(true);
                 return;
             }
             clearStackAndPush('mfa-secure-device', { isInitialSetup: true });
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
-    }), [isMfaEnabled, setShowAuthFlow, clearStackAndPush, setShowMFAManage]);
+    }), [
+        isTotpMfaEnabled,
+        setShowAuthFlow,
+        clearStackAndPush,
+        setShowTotpMfaManage,
+    ]);
     const setShowOTPVerification = React.useCallback((value) => {
         if (value) {
-            if (!isMfaEnabled)
+            if (!isTotpMfaEnabled) {
                 return;
+            }
             clearStackAndPush('mfa-verification');
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
-    }, [isMfaEnabled, setShowAuthFlow, clearStackAndPush]);
+    }, [isTotpMfaEnabled, setShowAuthFlow, clearStackAndPush]);
     const setShowMfaViewBackupCodes = React.useCallback((value) => {
         if (value) {
-            if (!isMfaEnabled)
+            if (!isMfaEnabled) {
                 return;
+            }
             clearStackAndPush('mfa-display-backup-codes');
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
     }, [isMfaEnabled, setShowAuthFlow, clearStackAndPush]);
     const setShowMfaEnterBackupCodes = React.useCallback((value) => {
         if (value) {
-            if (!isMfaEnabled)
+            if (!isMfaEnabled) {
                 return;
+            }
             clearStackAndPush('mfa-recovery');
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
     }, [isMfaEnabled, setShowAuthFlow, clearStackAndPush]);
     return {
-        setShowMFAManage,
+        /**
+         * @deprecated use setShowTotpMfaManage instead
+         */
+        setShowMFAManage: setShowTotpMfaManage,
         setShowMfaChooseType,
         setShowMfaEnterBackupCodes,
         setShowMfaQRCode,
         setShowMfaViewBackupCodes,
         setShowOTPVerification,
+        setShowTotpMfaManage,
     };
 };
 

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

@@ -1,9 +1,13 @@
 import { Dispatch, SetStateAction } from 'react';
 export declare const useMfaModals: () => {
+    /**
+     * @deprecated use setShowTotpMfaManage instead
+     */
     setShowMFAManage: Dispatch<SetStateAction<boolean>>;
     setShowMfaChooseType: Dispatch<SetStateAction<boolean>>;
     setShowMfaEnterBackupCodes: Dispatch<SetStateAction<boolean>>;
     setShowMfaQRCode: Dispatch<SetStateAction<boolean>>;
     setShowMfaViewBackupCodes: Dispatch<SetStateAction<boolean>>;
     setShowOTPVerification: Dispatch<SetStateAction<boolean>>;
+    setShowTotpMfaManage: Dispatch<SetStateAction<boolean>>;
 };

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

@@ -5,8 +5,8 @@ import '@dynamic-labs-sdk/client/core';
 import '@dynamic-labs/sdk-api-core';
 import '@dynamic-labs-sdk/client';
 import '../../../client/client.js';
-import '../../constants/values.js';
 import '@dynamic-labs/utils';
+import '../../constants/values.js';
 import '@dynamic-labs/multi-wallet';
 import '../../../shared/logger.js';
 import '../../constants/colors.js';
@@ -19,7 +19,7 @@ import '@dynamic-labs/wallet-book';
 import '../../../shared/consts/index.js';
 import '../../../store/state/nonce/nonce.js';
 import '../../../config/ApiEndpoint.js';
-import { useProjectSettings } from '../../../store/state/projectSettings/projectSettings.js';
+import '../../../store/state/projectSettings/projectSettings.js';
 import '../../../locale/locale.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
@@ -92,79 +92,94 @@ import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCar
 import '../../../context/OnrampContext/OnrampContext.js';
 import '../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../../index.js';
+import { useIsMfaEnabled } from '../useIsMfaEnabled/useIsMfaEnabled.js';
+import { useIsTotpMfaEnabled } from '../useIsTotpMfaEnabled/useIsTotpMfaEnabled.js';
 import '../../../store/state/tokenBalances.js';
 import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 
 const useMfaModals = () => {
-    var _a;
     const { setShowAuthFlow, setShowDynamicUserProfile } = useInternalDynamicContext();
-    const projectSettings = useProjectSettings();
     const { setDynamicWidgetView } = useWidgetContext();
     const { clearStackAndPush } = useViewContext();
-    const isMfaEnabled = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.mfa) === null || _a === void 0 ? void 0 : _a.enabled;
-    const setShowMFAManage = useCallback((value) => {
+    const isMfaEnabled = useIsMfaEnabled();
+    const isTotpMfaEnabled = useIsTotpMfaEnabled();
+    const setShowTotpMfaManage = useCallback((value) => {
         if (value) {
-            if (!isMfaEnabled) {
+            if (!isTotpMfaEnabled) {
                 return;
             }
-            setDynamicWidgetView('manage-mfa-no-footer');
+            setDynamicWidgetView('manage-totp-mfa-no-footer');
         }
         setShowDynamicUserProfile(value);
-    }, [isMfaEnabled, setShowDynamicUserProfile, setDynamicWidgetView]);
+    }, [isTotpMfaEnabled, setShowDynamicUserProfile, setDynamicWidgetView]);
     const setShowMfaChooseType = useCallback((value) => {
         if (value) {
-            if (!isMfaEnabled)
+            if (!isMfaEnabled) {
                 return;
+            }
             clearStackAndPush('mfa-choose-device');
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
     }, [isMfaEnabled, setShowAuthFlow, clearStackAndPush]);
     const setShowMfaQRCode = useCallback((value) => __awaiter(void 0, void 0, void 0, function* () {
         if (value) {
-            if (!isMfaEnabled)
+            if (!isTotpMfaEnabled) {
                 return;
+            }
             const user = getUserProfile();
             // Already have MFA configured
             if (user === null || user === void 0 ? void 0 : user.mfaBackupCodeAcknowledgement) {
-                setShowMFAManage(true);
+                setShowTotpMfaManage(true);
                 return;
             }
             clearStackAndPush('mfa-secure-device', { isInitialSetup: true });
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
-    }), [isMfaEnabled, setShowAuthFlow, clearStackAndPush, setShowMFAManage]);
+    }), [
+        isTotpMfaEnabled,
+        setShowAuthFlow,
+        clearStackAndPush,
+        setShowTotpMfaManage,
+    ]);
     const setShowOTPVerification = useCallback((value) => {
         if (value) {
-            if (!isMfaEnabled)
+            if (!isTotpMfaEnabled) {
                 return;
+            }
             clearStackAndPush('mfa-verification');
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
-    }, [isMfaEnabled, setShowAuthFlow, clearStackAndPush]);
+    }, [isTotpMfaEnabled, setShowAuthFlow, clearStackAndPush]);
     const setShowMfaViewBackupCodes = useCallback((value) => {
         if (value) {
-            if (!isMfaEnabled)
+            if (!isMfaEnabled) {
                 return;
+            }
             clearStackAndPush('mfa-display-backup-codes');
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
     }, [isMfaEnabled, setShowAuthFlow, clearStackAndPush]);
     const setShowMfaEnterBackupCodes = useCallback((value) => {
         if (value) {
-            if (!isMfaEnabled)
+            if (!isMfaEnabled) {
                 return;
+            }
             clearStackAndPush('mfa-recovery');
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
     }, [isMfaEnabled, setShowAuthFlow, clearStackAndPush]);
     return {
-        setShowMFAManage,
+        /**
+         * @deprecated use setShowTotpMfaManage instead
+         */
+        setShowMFAManage: setShowTotpMfaManage,
         setShowMfaChooseType,
         setShowMfaEnterBackupCodes,
         setShowMfaQRCode,
         setShowMfaViewBackupCodes,
         setShowOTPVerification,
+        setShowTotpMfaManage,
     };
 };
 

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

@@ -9,8 +9,8 @@ var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 require('@dynamic-labs-sdk/client/core');
 require('@dynamic-labs-sdk/client');
 require('../../../client/client.cjs');
-require('../../constants/values.cjs');
 require('@dynamic-labs/utils');
+require('../../constants/values.cjs');
 require('@dynamic-labs/multi-wallet');
 var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
 var logger = require('../../../shared/logger.cjs');

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

@@ -5,8 +5,8 @@ import { JwtVerifiedCredentialFormatEnum } from '@dynamic-labs/sdk-api-core';
 import '@dynamic-labs-sdk/client/core';
 import '@dynamic-labs-sdk/client';
 import '../../../client/client.js';
-import '../../constants/values.js';
 import '@dynamic-labs/utils';
+import '../../constants/values.js';
 import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
 import { logger } from '../../../shared/logger.js';

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

@@ -9,8 +9,8 @@ var client = require('../../../client/client.cjs');
 require('@dynamic-labs-sdk/client/core');
 require('@dynamic-labs/sdk-api-core');
 require('@dynamic-labs-sdk/client');
-require('../../constants/values.cjs');
 require('@dynamic-labs/utils');
+require('../../constants/values.cjs');
 require('@dynamic-labs/multi-wallet');
 var logger = require('../../../shared/logger.cjs');
 require('../../constants/colors.cjs');

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

@@ -5,8 +5,8 @@ import { getDynamicClient } from '../../../client/client.js';
 import '@dynamic-labs-sdk/client/core';
 import '@dynamic-labs/sdk-api-core';
 import '@dynamic-labs-sdk/client';
-import '../../constants/values.js';
 import '@dynamic-labs/utils';
+import '../../constants/values.js';
 import '@dynamic-labs/multi-wallet';
 import { logger } from '../../../shared/logger.js';
 import '../../constants/colors.js';

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

@@ -9,8 +9,8 @@ var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 require('@dynamic-labs-sdk/client/core');
 require('@dynamic-labs-sdk/client');
 require('../../../client/client.cjs');
-require('../../constants/values.cjs');
 require('@dynamic-labs/utils');
+require('../../constants/values.cjs');
 var errors = require('../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
 var logger = require('../../../shared/logger.cjs');

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

@@ -5,8 +5,8 @@ import { ChainEnum } from '@dynamic-labs/sdk-api-core';
 import '@dynamic-labs-sdk/client/core';
 import '@dynamic-labs-sdk/client';
 import '../../../client/client.js';
-import '../../constants/values.js';
 import '@dynamic-labs/utils';
+import '../../constants/values.js';
 import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 import '@dynamic-labs/multi-wallet';
 import { logger } from '../../../shared/logger.js';

package/src/lib/utils/hooks/useValidateSession/handleWalletInfoOutOfSync/handleWalletInfoOutOfSync.cjs

@@ -9,8 +9,8 @@ require('@dynamic-labs/sdk-api-core');
 require('react');
 require('@dynamic-labs-sdk/client');
 require('../../../../client/client.cjs');
-require('../../../constants/values.cjs');
 require('@dynamic-labs/utils');
+require('../../../constants/values.cjs');
 require('@dynamic-labs/multi-wallet');
 require('../../../../shared/logger.cjs');
 require('../../../constants/colors.cjs');

package/src/lib/utils/hooks/useValidateSession/handleWalletInfoOutOfSync/handleWalletInfoOutOfSync.js

@@ -5,8 +5,8 @@ import '@dynamic-labs/sdk-api-core';
 import 'react';
 import '@dynamic-labs-sdk/client';
 import '../../../../client/client.js';
-import '../../../constants/values.js';
 import '@dynamic-labs/utils';
+import '../../../constants/values.js';
 import '@dynamic-labs/multi-wallet';
 import '../../../../shared/logger.js';
 import '../../../constants/colors.js';

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

@@ -13,8 +13,8 @@ require('@dynamic-labs/sdk-api-core');
 var useInitStatus = require('../../../client/extension/hooks/useClientInitStatus/useInitStatus.cjs');
 require('@dynamic-labs-sdk/client');
 require('../../../client/client.cjs');
-require('../../constants/values.cjs');
 require('@dynamic-labs/utils');
+require('../../constants/values.cjs');
 require('@dynamic-labs/multi-wallet');
 require('../../constants/colors.cjs');
 require('react-international-phone');

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

@@ -9,8 +9,8 @@ import '@dynamic-labs/sdk-api-core';
 import { useClientInitStatus } from '../../../client/extension/hooks/useClientInitStatus/useInitStatus.js';
 import '@dynamic-labs-sdk/client';
 import '../../../client/client.js';
-import '../../constants/values.js';
 import '@dynamic-labs/utils';
+import '../../constants/values.js';
 import '@dynamic-labs/multi-wallet';
 import '../../constants/colors.js';
 import 'react-international-phone';

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

@@ -3,10 +3,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 require('../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 require('@dynamic-labs/sdk-api-core');
@@ -19,7 +18,8 @@ require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 var isWalletGroup = require('../../functions/walletListBuilder/utils/isWalletGroup/isWalletGroup.cjs');
 require('../../../shared/consts/index.cjs');
-require('../../../events/dynamicEvents.cjs');
+var dynamicEvents = require('../../../events/dynamicEvents.cjs');
+require('../../../../../_virtual/_tslib.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
@@ -133,7 +133,7 @@ const useWalletOptions = () => {
         });
     }, [walletConnectorOptions, walletGroups]);
     const allWalletOptions = React.useMemo(() => getFilteredWalletOptions((options) => options), [getFilteredWalletOptions]);
-    const selectWalletOption = React.useCallback((walletKey_1, ...args_1) => _tslib.__awaiter(void 0, [walletKey_1, ...args_1], void 0, function* (walletKey, selectGroupIfAvailable = true) {
+    const selectWalletOption = React.useCallback((walletKey, selectGroupIfAvailable = true) => new Promise((resolve, reject) => {
         const group = groupWalletOptions.groupWalletOptions(walletGroups, walletConnectorOptions);
         const walletGroup = group.find((wallet) => wallet.key === walletKey);
         const walletOption = walletConnectorOptions === null || walletConnectorOptions === void 0 ? void 0 : walletConnectorOptions.find((wallet) => wallet.key === walletKey);
@@ -143,9 +143,12 @@ const useWalletOptions = () => {
             walletOption: walletOption === null || walletOption === void 0 ? void 0 : walletOption.key,
         });
         if (!walletOption) {
-            throw new utils.DynamicError('Invalid wallet option key provided.');
+            reject(new utils.DynamicError('Invalid wallet option key provided.'));
+            return;
         }
-        if (selectGroupIfAvailable && walletGroup && isWalletGroup.isWalletGroup(walletGroup)) {
+        if (selectGroupIfAvailable &&
+            walletGroup &&
+            isWalletGroup.isWalletGroup(walletGroup)) {
             navigateToWalletGroup(walletGroup);
         }
         else if (walletConnectorCore.isHardwareWalletConnector(walletOption.walletConnector) &&
@@ -159,6 +162,40 @@ const useWalletOptions = () => {
             handleWalletItemClick(walletOption);
         }
         setShowAuthFlow(true);
+        const walletAdded = (wallet) => {
+            if (wallet.key !== walletKey) {
+                return;
+            }
+            resolve(wallet);
+            setShowAuthFlow(false);
+            cleanup();
+        };
+        const walletConnectionFailed = (walletConnector, error) => {
+            if (walletConnector.key !== walletKey) {
+                return;
+            }
+            reject(error);
+            setShowAuthFlow(false);
+            cleanup();
+        };
+        const authFailure = (method, reason) => {
+            if (method.type !== 'wallet' ||
+                method.connectorName !== walletOption.walletConnector.name) {
+                return;
+            }
+            const error = typeof reason === 'object' ? reason.error : reason;
+            reject(error);
+            setShowAuthFlow(false);
+            cleanup();
+        };
+        const cleanup = () => {
+            dynamicEvents.dynamicEvents.off('walletConnectionFailed', walletConnectionFailed);
+            dynamicEvents.dynamicEvents.off('authFailure', authFailure);
+            dynamicEvents.dynamicEvents.off('walletAdded', walletAdded);
+        };
+        dynamicEvents.dynamicEvents.on('walletAdded', walletAdded);
+        dynamicEvents.dynamicEvents.on('walletConnectionFailed', walletConnectionFailed);
+        dynamicEvents.dynamicEvents.on('authFailure', authFailure);
     }), [
         handleWalletItemClick,
         navigateToWalletGroup,

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

@@ -1,3 +1,4 @@
+import { Wallet } from '@dynamic-labs/wallet-connector-core';
 import { WalletOption } from '../../../shared';
 export declare const useWalletOptions: () => {
     getFilteredWalletOptions: (filter: (options: WalletOption[]) => WalletOption[]) => {
@@ -9,7 +10,7 @@ export declare const useWalletOptions: () => {
         key: string;
         name: string;
     }[];
-    selectWalletOption: (walletKey: string, selectGroupIfAvailable?: boolean) => Promise<void>;
+    selectWalletOption: (walletKey: string, selectGroupIfAvailable?: boolean) => Promise<Wallet<import("@dynamic-labs/wallet-connector-core").WalletConnectorCore.WalletConnector>>;
     walletOptions: {
         chain: "ETH" | "FLOW" | "SOL" | "EVM" | "ALGO" | "STARK" | "ATOM" | "COSMOS" | "BTC" | "ECLIPSE" | "SUI";
         group: string | undefined;

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

@@ -1,8 +1,7 @@
 'use client'
-import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback, useMemo } from 'react';
-import { isHardwareWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { DynamicError } from '@dynamic-labs/utils';
+import { isHardwareWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
 import '@dynamic-labs/sdk-api-core';
@@ -15,7 +14,8 @@ import '../../constants/colors.js';
 import '../../constants/values.js';
 import { isWalletGroup } from '../../functions/walletListBuilder/utils/isWalletGroup/isWalletGroup.js';
 import '../../../shared/consts/index.js';
-import '../../../events/dynamicEvents.js';
+import { dynamicEvents } from '../../../events/dynamicEvents.js';
+import '../../../../../_virtual/_tslib.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
@@ -129,7 +129,7 @@ const useWalletOptions = () => {
         });
     }, [walletConnectorOptions, walletGroups]);
     const allWalletOptions = useMemo(() => getFilteredWalletOptions((options) => options), [getFilteredWalletOptions]);
-    const selectWalletOption = useCallback((walletKey_1, ...args_1) => __awaiter(void 0, [walletKey_1, ...args_1], void 0, function* (walletKey, selectGroupIfAvailable = true) {
+    const selectWalletOption = useCallback((walletKey, selectGroupIfAvailable = true) => new Promise((resolve, reject) => {
         const group = groupWalletOptions(walletGroups, walletConnectorOptions);
         const walletGroup = group.find((wallet) => wallet.key === walletKey);
         const walletOption = walletConnectorOptions === null || walletConnectorOptions === void 0 ? void 0 : walletConnectorOptions.find((wallet) => wallet.key === walletKey);
@@ -139,9 +139,12 @@ const useWalletOptions = () => {
             walletOption: walletOption === null || walletOption === void 0 ? void 0 : walletOption.key,
         });
         if (!walletOption) {
-            throw new DynamicError('Invalid wallet option key provided.');
+            reject(new DynamicError('Invalid wallet option key provided.'));
+            return;
         }
-        if (selectGroupIfAvailable && walletGroup && isWalletGroup(walletGroup)) {
+        if (selectGroupIfAvailable &&
+            walletGroup &&
+            isWalletGroup(walletGroup)) {
             navigateToWalletGroup(walletGroup);
         }
         else if (isHardwareWalletConnector(walletOption.walletConnector) &&
@@ -155,6 +158,40 @@ const useWalletOptions = () => {
             handleWalletItemClick(walletOption);
         }
         setShowAuthFlow(true);
+        const walletAdded = (wallet) => {
+            if (wallet.key !== walletKey) {
+                return;
+            }
+            resolve(wallet);
+            setShowAuthFlow(false);
+            cleanup();
+        };
+        const walletConnectionFailed = (walletConnector, error) => {
+            if (walletConnector.key !== walletKey) {
+                return;
+            }
+            reject(error);
+            setShowAuthFlow(false);
+            cleanup();
+        };
+        const authFailure = (method, reason) => {
+            if (method.type !== 'wallet' ||
+                method.connectorName !== walletOption.walletConnector.name) {
+                return;
+            }
+            const error = typeof reason === 'object' ? reason.error : reason;
+            reject(error);
+            setShowAuthFlow(false);
+            cleanup();
+        };
+        const cleanup = () => {
+            dynamicEvents.off('walletConnectionFailed', walletConnectionFailed);
+            dynamicEvents.off('authFailure', authFailure);
+            dynamicEvents.off('walletAdded', walletAdded);
+        };
+        dynamicEvents.on('walletAdded', walletAdded);
+        dynamicEvents.on('walletConnectionFailed', walletConnectionFailed);
+        dynamicEvents.on('authFailure', authFailure);
     }), [
         handleWalletItemClick,
         navigateToWalletGroup,

package/src/lib/views/EmailVerification/EmailVerification.cjs

@@ -12,8 +12,8 @@ var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs-sdk/client/core');
 require('@dynamic-labs-sdk/client');
 require('../../client/client.cjs');
-var findEmbeddedWalletFromVerifiedCredentials = require('../../utils/functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
 require('@dynamic-labs/utils');
+var findEmbeddedWalletFromVerifiedCredentials = require('../../utils/functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
 require('../../utils/constants/values.cjs');
 require('@dynamic-labs/multi-wallet');
 var logger = require('../../shared/logger.cjs');

package/src/lib/views/EmailVerification/EmailVerification.js

@@ -8,8 +8,8 @@ import { isSessionKeyCompatibleWallet } from '@dynamic-labs/wallet-connector-cor
 import '@dynamic-labs-sdk/client/core';
 import '@dynamic-labs-sdk/client';
 import '../../client/client.js';
-import { findEmbeddedWalletFromVerifiedCredentials } from '../../utils/functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
 import '@dynamic-labs/utils';
+import { findEmbeddedWalletFromVerifiedCredentials } from '../../utils/functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
 import '../../utils/constants/values.js';
 import '@dynamic-labs/multi-wallet';
 import { logger } from '../../shared/logger.js';

package/src/lib/views/ExchangeList/ExchangeList.cjs

@@ -7,18 +7,18 @@ var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var reactI18next = require('react-i18next');
 var utils = require('@dynamic-labs/utils');
+var noWalletFound = require('../../assets/no-wallet-found.cjs');
 var ErrorContainer = require('../../components/ErrorContainer/ErrorContainer.cjs');
 var Search = require('../../components/Search/Search.cjs');
 var Skeleton = require('../../components/Skeleton/Skeleton.cjs');
 var ErrorContext = require('../../context/ErrorContext/ErrorContext.cjs');
 var DefaultFooter = require('../../layout/DynamicAuthLayout/DefaultFooter/DefaultFooter.cjs');
-var useEffectOnce = require('../../utils/hooks/useEffectOnce/useEffectOnce.cjs');
-var classNames = require('../../utils/functions/classNames/classNames.cjs');
-var localStorage = require('../../utils/constants/localStorage.cjs');
 var projectSettings = require('../../store/state/projectSettings/projectSettings.cjs');
+var localStorage = require('../../utils/constants/localStorage.cjs');
+var classNames = require('../../utils/functions/classNames/classNames.cjs');
+var useEffectOnce = require('../../utils/hooks/useEffectOnce/useEffectOnce.cjs');
 var convertExchangeKeyAndProviderEnum = require('../../widgets/DynamicWidget/helpers/convertExchangeKeyAndProviderEnum.cjs');
 var SearchNotFoundMessage = require('../WalletList/SearchNotFoundMessage/SearchNotFoundMessage.cjs');
-var noWalletFound = require('../../assets/no-wallet-found.cjs');
 var ExchangeListItem = require('./ExchangeListItem/ExchangeListItem.cjs');
 
 const ExchangeList = ({ onSelectExchange, showDefaultFooter, scrollContainerClassName, }) => {
@@ -79,7 +79,7 @@ const ExchangeList = ({ onSelectExchange, showDefaultFooter, scrollContainerClas
                     'exchange-list__scroll-container--fixed-height': false,
                 }), "data-testid": 'exchange-list-scroll-container', ref: exchangeListScrollRef, onScroll: handleScroll, children: !projectSettings$1 ? (jsxRuntime.jsx(Skeleton.Skeleton, { count: 10, className: 'exchange-list__tile-skeleton' })) : (
                 // eslint-disable-next-line react/jsx-no-useless-fragment
-                jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [exchangeNames.length === 0 && (jsxRuntime.jsx(ErrorContainer.ErrorContainer, { copykey: 'dyn_exchange_list.no_exchange', children: t('dyn_exchange_list.no_exchanges') })), exchangeNames.length && filteredExchangeNames.length === 0 ? (jsxRuntime.jsx(SearchNotFoundMessage.SearchNotFoundMessage, { title: t('dyn_exchange_list.search.not_found.title'), subtitle: t('dyn_exchange_list.search.not_found.description'), image: jsxRuntime.jsx(noWalletFound.ReactComponent, {}) })) : (filteredExchangeNames.map((exchange, index) => (jsxRuntime.jsx(ExchangeListItem.ExchangeListItem, { exchange: convertExchangeKeyAndProviderEnum.convertProviderToExchangeKeyEnum(exchange), onResetSearchValue: () => handleFilterValueChange(''), onSelectExchange: onSelectExchange }, `${exchange}_${index}`))))] })) }), showDefaultFooter && (jsxRuntime.jsx(DefaultFooter.DefaultFooter, { hideBorder: !footerBorderIsVisible }))] }));
+                jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [exchangeNames.length === 0 && (jsxRuntime.jsx(ErrorContainer.ErrorContainer, { copykey: 'dyn_exchange_list.no_exchange', children: t('dyn_exchange_list.no_exchanges') })), exchangeNames.length && filteredExchangeNames.length === 0 ? (jsxRuntime.jsx(SearchNotFoundMessage.SearchNotFoundMessage, { titleKey: 'dyn_exchange_list.search.not_found.title', subtitleKey: 'dyn_exchange_list.search.not_found.description', image: jsxRuntime.jsx(noWalletFound.ReactComponent, {}) })) : (filteredExchangeNames.map((exchange, index) => (jsxRuntime.jsx(ExchangeListItem.ExchangeListItem, { exchange: convertExchangeKeyAndProviderEnum.convertProviderToExchangeKeyEnum(exchange), onResetSearchValue: () => handleFilterValueChange(''), onSelectExchange: onSelectExchange }, `${exchange}_${index}`))))] })) }), showDefaultFooter && (jsxRuntime.jsx(DefaultFooter.DefaultFooter, { hideBorder: !footerBorderIsVisible }))] }));
 };
 
 exports.ExchangeList = ExchangeList;