@dynamic-labs/sdk-react-core 3.0.0-alpha.15 → 3.0.0-alpha.17

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

@@ -314,7 +314,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<string> - returns the embedded wallet recovery phrase or private key
      */
     const revealEmbeddedWalletKey = (_y) => __awaiter(void 0, [_y], void 0, function* ({ type, htmlContainerId, }) {
-        var _z, _0, _1, _2, _3;
+        var _z, _0, _1, _2, _3, _4;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
@@ -330,26 +330,37 @@ const useSecureEnclaveEmbeddedWallet = () => {
         // hide the iframe container until the export is done
         // since it will show unrelated turnkey content
         iframeContainerElement.current.style.display = 'none';
-        const isSessionKeyCompatibleAAConnector = ((_1 = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _1 === void 0 ? void 0 : _1.key) === 'zerodev'
-            ? isSessionKeyCompatibleWalletConnector((wallet === null || wallet === void 0 ? void 0 : wallet.connector).getEOAConnector())
-            : false;
         if (isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-            yield ((_2 = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _2 === void 0 ? void 0 : _2.createOrRestoreSession());
-        }
-        else if (isSessionKeyCompatibleAAConnector) {
-            yield ((_3 = (wallet === null || wallet === void 0 ? void 0 : wallet.connector).getEOAConnector()) === null || _3 === void 0 ? void 0 : _3.createOrRestoreSession());
+            yield ((_1 = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _1 === void 0 ? void 0 : _1.createOrRestoreSession());
         }
         yield initExport({
             iframeContainer: iframeContainerElement.current,
             iframeElementId: revealIframeElementId,
             wallet,
         });
-        yield exportCredential({
-            address: type === 'privateKey' ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
-            environmentId,
-            user,
-            wallet,
-        });
+        try {
+            yield exportCredential({
+                address: type === 'privateKey' ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
+                environmentId,
+                user,
+                wallet,
+            });
+        }
+        catch (_5) {
+            if (isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector) &&
+                ((_2 = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _2 === void 0 ? void 0 : _2.removeSessionKeys)) {
+                yield ((_3 = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _3 === void 0 ? void 0 : _3.removeSessionKeys());
+                yield ((_4 = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _4 === void 0 ? void 0 : _4.createOrRestoreSession({
+                    ignoreRestore: true,
+                }));
+            }
+            yield exportCredential({
+                address: type === 'privateKey' ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
+                environmentId,
+                user,
+                wallet,
+            });
+        }
         // show the iframe container after the export is done
         // to show the exported content only
         iframeContainerElement.current.style.display = 'block';
@@ -360,11 +371,11 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<'code_sent'>
      */
     const sendOneTimeCode = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _4, _5;
+        var _6, _7;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
-        const targetTurnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_4 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _4 === void 0 ? void 0 : _4.chainConfigurations, user.verifiedCredentials);
+        const targetTurnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_6 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _6 === void 0 ? void 0 : _6.chainConfigurations, user.verifiedCredentials);
         if (!targetTurnkeyWallet || !('id' in targetTurnkeyWallet)) {
             throw new DynamicError('User does not have a valid secure enclave wallet', INVALID_WALLET_DATA);
         }
@@ -375,7 +386,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
             throw new DynamicError('Session is active. No need to create a new one', ACTIVE_SESSION);
         }
         const turnkeyAuthIframeContainerRef = createRootElement(iframeContainerId);
-        const publicKey = yield turnkeyAuthenticatorHandler.initRecovery('email', turnkeyAuthIframeContainerRef.current, iframeElementId, getEmbeddedWalletSessionExpiration((_5 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _5 === void 0 ? void 0 : _5.sessionKeyDuration));
+        const publicKey = yield turnkeyAuthenticatorHandler.initRecovery('email', turnkeyAuthIframeContainerRef.current, iframeElementId, getEmbeddedWalletSessionExpiration((_7 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _7 === void 0 ? void 0 : _7.sessionKeyDuration));
         if (!publicKey) {
             throw new DynamicError(ERROR_SENDING_CODE);
         }

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

@@ -170,7 +170,6 @@ const useTurnkey = () => {
             connector: (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) || {},
             id: embeddedWalletVerifiedCredential.id,
             isAuthenticated,
-            isConnected: true,
             key: embeddedWalletVerifiedCredential.walletName ||
                 (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector.key) ||
                 '',
@@ -223,7 +222,6 @@ const useTurnkey = () => {
                     connector: walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
                     isAuthenticated: Boolean((_h = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _h === void 0 ? void 0 : _h.isAuthenticatorAttached),
-                    isConnected: true,
                     key: (_j = embeddedWalletVerifiedCredential.walletName) !== null && _j !== void 0 ? _j : walletConnector.key,
                 });
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);

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

@@ -166,7 +166,6 @@ const useTurnkey = () => {
             connector: (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) || {},
             id: embeddedWalletVerifiedCredential.id,
             isAuthenticated,
-            isConnected: true,
             key: embeddedWalletVerifiedCredential.walletName ||
                 (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector.key) ||
                 '',
@@ -219,7 +218,6 @@ const useTurnkey = () => {
                     connector: walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
                     isAuthenticated: Boolean((_h = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _h === void 0 ? void 0 : _h.isAuthenticatorAttached),
-                    isConnected: true,
                     key: (_j = embeddedWalletVerifiedCredential.walletName) !== null && _j !== void 0 ? _j : walletConnector.key,
                 });
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);

package/src/lib/utils/hooks/useSelectWalletOption/index.d.ts

@@ -0,0 +1 @@
+export { useSelectWalletOption } from './useSelectWalletOption';

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

@@ -0,0 +1,128 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../_virtual/_tslib.cjs');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var walletBook = require('@dynamic-labs/wallet-book');
+var utils = require('@dynamic-labs/utils');
+require('react');
+require('../../../context/DynamicContext/DynamicContext.cjs');
+require('@dynamic-labs/sdk-api-core');
+require('../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('react/jsx-runtime');
+var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
+require('../../constants/colors.cjs');
+require('../../constants/values.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../shared/utils/classes/storage/sessionStorage.cjs');
+var isWalletGroup = require('../../functions/walletListBuilder/utils/isWalletGroup/isWalletGroup.cjs');
+require('../../../shared/consts/index.cjs');
+require('../../../events/dynamicEvents.cjs');
+require('../../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../../context/ErrorContext/ErrorContext.cjs');
+require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
+require('../../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/store');
+require('../../../locale/locale.cjs');
+var logVerboseTroubleshootingMessage = require('../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.cjs');
+require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
+require('../../../context/VerificationContext/VerificationContext.cjs');
+require('react-dom');
+require('../../../context/WalletContext/WalletContext.cjs');
+require('../../../context/ThemeContext/ThemeContext.cjs');
+require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
+require('@dynamic-labs/types');
+require('../../../context/LoadingContext/LoadingContext.cjs');
+require('yup');
+require('../../../context/MockContext/MockContext.cjs');
+require('../../../views/CollectUserDataView/useFields.cjs');
+require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('@dynamic-labs/rpc-providers');
+var useWalletItemActions = require('../useWalletItemActions/useWalletItemActions.cjs');
+require('react-i18next');
+require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
+require('../../../components/Alert/Alert.cjs');
+require('../../../components/ShadowDOM/ShadowDOM.cjs');
+require('../../../components/IconButton/IconButton.cjs');
+require('../../../components/InlineWidget/InlineWidget.cjs');
+require('../../../components/Input/Input.cjs');
+require('../../../components/IsBrowser/IsBrowser.cjs');
+require('../../../components/MenuList/Dropdown/Dropdown.cjs');
+require('../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
+require('../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
+require('../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
+require('../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.cjs');
+require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
+require('../../../components/Popper/Popper/Popper.cjs');
+require('../../../components/Popper/PopperContext/PopperContext.cjs');
+require('react-focus-lock');
+require('qrcode');
+require('formik');
+require('../../../views/WalletList/WalletList.cjs');
+require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
+require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
+require('@hcaptcha/react-hcaptcha');
+require('../../../context/FooterAnimationContext/index.cjs');
+var WalletGroupContext = require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+var groupWalletOptions = require('../../functions/walletListBuilder/utils/groupWalletOptions/groupWalletOptions.cjs');
+require('../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
+require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
+require('../../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
+require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
+require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+require('../../../../polyfills.cjs');
+require('../../../context/ErrorBoundary/ErrorBoundaryBase.cjs');
+require('../../../context/ErrorBoundary/ErrorBoundaryContext.cjs');
+require('../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
+require('../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.cjs');
+require('../../../context/WidgetRegistry/WidgetRegistryContextProvider.cjs');
+require('../../../context/FundingContext/FundingContext.cjs');
+require('../../../context/SendBalanceContext/SendBalanceContext.cjs');
+require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
+require('../../../context/ConnectWithOtpContext/constants.cjs');
+require('../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
+var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
+
+const useSelectWalletOption = () => {
+    const { walletConnectorOptions, setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
+    const { walletBook: walletBook$1 } = walletBook.useWalletBookContext();
+    const { setView } = ViewContext.useViewContext();
+    const { navigateToWalletGroup } = WalletGroupContext.useWalletGroupContext();
+    const { handleWalletItemClick } = useWalletItemActions.useWalletItemActions();
+    const selectWalletOption = (walletKey) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const group = groupWalletOptions.groupWalletOptions(walletBook$1, walletConnectorOptions);
+        const walletOption = group.find((wallet) => wallet.key === walletKey);
+        logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('[useSelectWalletOption] selectWalletOption', { walletKey, walletOption: walletOption === null || walletOption === void 0 ? void 0 : walletOption.key });
+        if (!walletOption) {
+            throw new utils.DynamicError('Invalid wallet option key provided.');
+        }
+        if (isWalletGroup.isWalletGroup(walletOption)) {
+            navigateToWalletGroup(walletOption);
+        }
+        else if (walletConnectorCore.isHardwareWalletConnector(walletOption.walletConnector) &&
+            walletOption.walletConnector.canConnectWithHardwareWallet()) {
+            setView('select-hardware-wallet', {
+                onSelectWallet: handleWalletItemClick,
+                wallet: walletOption,
+            });
+        }
+        else {
+            handleWalletItemClick(walletOption);
+        }
+        setShowAuthFlow(true);
+    });
+    return {
+        selectWalletOption,
+    };
+};
+
+exports.useSelectWalletOption = useSelectWalletOption;

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

@@ -0,0 +1,3 @@
+export declare const useSelectWalletOption: () => {
+    selectWalletOption: (walletKey: string) => Promise<void>;
+};

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

@@ -0,0 +1,124 @@
+'use client'
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { isHardwareWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { useWalletBookContext } from '@dynamic-labs/wallet-book';
+import { DynamicError } from '@dynamic-labs/utils';
+import 'react';
+import '../../../context/DynamicContext/DynamicContext.js';
+import '@dynamic-labs/sdk-api-core';
+import '../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import 'react/jsx-runtime';
+import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
+import '../../constants/colors.js';
+import '../../constants/values.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
+import '../../../shared/utils/classes/storage/sessionStorage.js';
+import { isWalletGroup } from '../../functions/walletListBuilder/utils/isWalletGroup/isWalletGroup.js';
+import '../../../shared/consts/index.js';
+import '../../../events/dynamicEvents.js';
+import '../../../context/CaptchaContext/CaptchaContext.js';
+import '../../../context/ErrorContext/ErrorContext.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import '../../../config/ApiEndpoint.js';
+import '@dynamic-labs/store';
+import '../../../locale/locale.js';
+import { logVerboseTroubleshootingMessage } from '../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.js';
+import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
+import '../../../context/AccountExistsContext/AccountExistsContext.js';
+import '../../../context/UserWalletsContext/UserWalletsContext.js';
+import '../../../context/VerificationContext/VerificationContext.js';
+import 'react-dom';
+import '../../../context/WalletContext/WalletContext.js';
+import '../../../context/ThemeContext/ThemeContext.js';
+import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
+import '@dynamic-labs/types';
+import '../../../context/LoadingContext/LoadingContext.js';
+import 'yup';
+import '../../../context/MockContext/MockContext.js';
+import '../../../views/CollectUserDataView/useFields.js';
+import '../../../context/FieldsStateContext/FieldsStateContext.js';
+import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import '@dynamic-labs/rpc-providers';
+import { useWalletItemActions } from '../useWalletItemActions/useWalletItemActions.js';
+import 'react-i18next';
+import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
+import '../../../components/Alert/Alert.js';
+import '../../../components/ShadowDOM/ShadowDOM.js';
+import '../../../components/IconButton/IconButton.js';
+import '../../../components/InlineWidget/InlineWidget.js';
+import '../../../components/Input/Input.js';
+import '../../../components/IsBrowser/IsBrowser.js';
+import '../../../components/MenuList/Dropdown/Dropdown.js';
+import '../../../components/Transition/ZoomTransition/ZoomTransition.js';
+import '../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
+import '../../../components/Transition/OpacityTransition/OpacityTransition.js';
+import '../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.js';
+import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
+import '../../../components/Popper/Popper/Popper.js';
+import '../../../components/Popper/PopperContext/PopperContext.js';
+import 'react-focus-lock';
+import 'qrcode';
+import 'formik';
+import '../../../views/WalletList/WalletList.js';
+import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
+import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
+import '@hcaptcha/react-hcaptcha';
+import '../../../context/FooterAnimationContext/index.js';
+import { useWalletGroupContext } from '../../../context/WalletGroupContext/WalletGroupContext.js';
+import { groupWalletOptions } from '../../functions/walletListBuilder/utils/groupWalletOptions/groupWalletOptions.js';
+import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
+import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
+import '../../../context/PasskeyContext/PasskeyContext.js';
+import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
+import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
+import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
+import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import '../../../../polyfills.js';
+import '../../../context/ErrorBoundary/ErrorBoundaryBase.js';
+import '../../../context/ErrorBoundary/ErrorBoundaryContext.js';
+import '../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
+import '../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.js';
+import '../../../context/WidgetRegistry/WidgetRegistryContextProvider.js';
+import '../../../context/FundingContext/FundingContext.js';
+import '../../../context/SendBalanceContext/SendBalanceContext.js';
+import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
+import '../../../context/ConnectWithOtpContext/constants.js';
+import '../../../context/ReinitializeContext/ReinitializeContextProvider.js';
+import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
+
+const useSelectWalletOption = () => {
+    const { walletConnectorOptions, setShowAuthFlow } = useInternalDynamicContext();
+    const { walletBook } = useWalletBookContext();
+    const { setView } = useViewContext();
+    const { navigateToWalletGroup } = useWalletGroupContext();
+    const { handleWalletItemClick } = useWalletItemActions();
+    const selectWalletOption = (walletKey) => __awaiter(void 0, void 0, void 0, function* () {
+        const group = groupWalletOptions(walletBook, walletConnectorOptions);
+        const walletOption = group.find((wallet) => wallet.key === walletKey);
+        logVerboseTroubleshootingMessage('[useSelectWalletOption] selectWalletOption', { walletKey, walletOption: walletOption === null || walletOption === void 0 ? void 0 : walletOption.key });
+        if (!walletOption) {
+            throw new DynamicError('Invalid wallet option key provided.');
+        }
+        if (isWalletGroup(walletOption)) {
+            navigateToWalletGroup(walletOption);
+        }
+        else if (isHardwareWalletConnector(walletOption.walletConnector) &&
+            walletOption.walletConnector.canConnectWithHardwareWallet()) {
+            setView('select-hardware-wallet', {
+                onSelectWallet: handleWalletItemClick,
+                wallet: walletOption,
+            });
+        }
+        else {
+            handleWalletItemClick(walletOption);
+        }
+        setShowAuthFlow(true);
+    });
+    return {
+        selectWalletOption,
+    };
+};
+
+export { useSelectWalletOption };

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

@@ -24,7 +24,6 @@ require('react-international-phone');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');
-var getWalletIdentifier = require('../../functions/getWalletIdentifier/getWalletIdentifier.cjs');
 require('../../../events/dynamicEvents.cjs');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -106,7 +105,7 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
         });
     }, [user, primaryWalletId, walletConnectorOptions]);
     logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('linkedWallets', linkedWallets);
-    const walletsBasedOnAuthMode = React.useMemo(() => {
+    const wallets = React.useMemo(() => {
         // Before signing the first message we are using connected wallets list
         // This is because we want the first connected wallet to have events applied by useWalletEventListeners
         // In connect-and-sign mode, events are only applied after the message is signed.
@@ -125,7 +124,7 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
         }
         return connectedWallets !== null && connectedWallets !== void 0 ? connectedWallets : [];
     }, [authMode, connectedWallets, linkedWallets, user]);
-    logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('walletsBasedOnAuthMode', walletsBasedOnAuthMode);
+    logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('wallets', wallets);
     /**
      * This useEffect is temporary.
      * While the wallet connectors don't use the event emitter, we need to manually
@@ -133,15 +132,10 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
      * When the wallet connectors are migrated to the new event emitter, there will be no
      * need to initialize or teardown event listeners, then we can remove this useEffect.
      */
-    React.useEffect(() => walletsBasedOnAuthMode.forEach((wallet) => {
+    React.useEffect(() => wallets.forEach((wallet) => {
         wallet.connector.initEventListener();
-    }), [walletsBasedOnAuthMode]);
-    const { connectedWalletsMap, didConnectedStateLoad } = useWalletsConnectionState.useWalletsConnectionState(walletsBasedOnAuthMode, walletBook, primaryWalletId, authMode);
-    const wallets = React.useMemo(() => walletsBasedOnAuthMode.map((wallet) => {
-        wallet.isConnected = Boolean(connectedWalletsMap[getWalletIdentifier.getWalletIdentifier(wallet)]);
-        return wallet;
-    }), [connectedWalletsMap, walletsBasedOnAuthMode]);
-    logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('wallets', wallets);
+    }), [wallets]);
+    const { didConnectedStateLoad } = useWalletsConnectionState.useWalletsConnectionState(wallets, walletBook, primaryWalletId, authMode);
     logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('didConnectedStateLoad', didConnectedStateLoad);
     const { setUserWallets } = UserWalletsContext.useInternalUserWallets();
     // Keep userWallets in sync whenever linkedWallets changes
@@ -205,8 +199,9 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
                 emailConnector.setEmail(email);
             }
         }
-        if (walletConnectorCore.isSocialWalletConnector(newPrimaryWallet.connector) &&
-            !newPrimaryWallet.isConnected) {
+        const shouldReconnectSocialWallet = walletConnectorCore.isSocialWalletConnector(newPrimaryWallet.connector) &&
+            !(yield newPrimaryWallet.connector.getConnectedAccounts()).length;
+        if (shouldReconnectSocialWallet) {
             reconnectSocialWallet.reconnectSocialWallet(user, newPrimaryWallet);
             return;
         }

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

@@ -20,7 +20,6 @@ import 'react-international-phone';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../locale/locale.js';
-import { getWalletIdentifier } from '../../functions/getWalletIdentifier/getWalletIdentifier.js';
 import '../../../events/dynamicEvents.js';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
@@ -102,7 +101,7 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
         });
     }, [user, primaryWalletId, walletConnectorOptions]);
     logVerboseTroubleshootingMessage('linkedWallets', linkedWallets);
-    const walletsBasedOnAuthMode = useMemo(() => {
+    const wallets = useMemo(() => {
         // Before signing the first message we are using connected wallets list
         // This is because we want the first connected wallet to have events applied by useWalletEventListeners
         // In connect-and-sign mode, events are only applied after the message is signed.
@@ -121,7 +120,7 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
         }
         return connectedWallets !== null && connectedWallets !== void 0 ? connectedWallets : [];
     }, [authMode, connectedWallets, linkedWallets, user]);
-    logVerboseTroubleshootingMessage('walletsBasedOnAuthMode', walletsBasedOnAuthMode);
+    logVerboseTroubleshootingMessage('wallets', wallets);
     /**
      * This useEffect is temporary.
      * While the wallet connectors don't use the event emitter, we need to manually
@@ -129,15 +128,10 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
      * When the wallet connectors are migrated to the new event emitter, there will be no
      * need to initialize or teardown event listeners, then we can remove this useEffect.
      */
-    useEffect(() => walletsBasedOnAuthMode.forEach((wallet) => {
+    useEffect(() => wallets.forEach((wallet) => {
         wallet.connector.initEventListener();
-    }), [walletsBasedOnAuthMode]);
-    const { connectedWalletsMap, didConnectedStateLoad } = useWalletsConnectionState(walletsBasedOnAuthMode, walletBook, primaryWalletId, authMode);
-    const wallets = useMemo(() => walletsBasedOnAuthMode.map((wallet) => {
-        wallet.isConnected = Boolean(connectedWalletsMap[getWalletIdentifier(wallet)]);
-        return wallet;
-    }), [connectedWalletsMap, walletsBasedOnAuthMode]);
-    logVerboseTroubleshootingMessage('wallets', wallets);
+    }), [wallets]);
+    const { didConnectedStateLoad } = useWalletsConnectionState(wallets, walletBook, primaryWalletId, authMode);
     logVerboseTroubleshootingMessage('didConnectedStateLoad', didConnectedStateLoad);
     const { setUserWallets } = useInternalUserWallets();
     // Keep userWallets in sync whenever linkedWallets changes
@@ -201,8 +195,9 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
                 emailConnector.setEmail(email);
             }
         }
-        if (isSocialWalletConnector(newPrimaryWallet.connector) &&
-            !newPrimaryWallet.isConnected) {
+        const shouldReconnectSocialWallet = isSocialWalletConnector(newPrimaryWallet.connector) &&
+            !(yield newPrimaryWallet.connector.getConnectedAccounts()).length;
+        if (shouldReconnectSocialWallet) {
             reconnectSocialWallet(user, newPrimaryWallet);
             return;
         }

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs

@@ -130,7 +130,6 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
                 connector: wallet.walletConnector,
                 id: account.id,
                 isAuthenticated: true,
-                isConnected: false,
                 key: (_a = account.walletName) !== null && _a !== void 0 ? _a : wallet.walletConnector.key,
             });
         }

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js

@@ -126,7 +126,6 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
                 connector: wallet.walletConnector,
                 id: account.id,
                 isAuthenticated: true,
-                isConnected: false,
                 key: (_a = account.walletName) !== null && _a !== void 0 ? _a : wallet.walletConnector.key,
             });
         }

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

@@ -47,6 +47,7 @@ require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
+require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('react-dom');
 require('../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../components/IconButton/IconButton.cjs');
@@ -69,7 +70,6 @@ require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../../../context/FooterAnimationContext/index.cjs');
-require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 var CreatePasswordModal = require('../../../modals/CreatePasswordModal/CreatePasswordModal.cjs');

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

@@ -43,6 +43,7 @@ import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
+import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import 'react-dom';
 import '../../../components/ShadowDOM/ShadowDOM.js';
 import '../../../components/IconButton/IconButton.js';
@@ -65,7 +66,6 @@ import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../../context/FooterAnimationContext/index.js';
-import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import { CreatePasswordModal } from '../../../modals/CreatePasswordModal/CreatePasswordModal.js';

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

@@ -75,7 +75,6 @@ require('react-focus-lock');
 var IconWithSpinner = require('../../components/IconWithSpinner/IconWithSpinner.cjs');
 var Icon = require('../../components/Icon/Icon.cjs');
 var LoadingContext = require('../../context/LoadingContext/LoadingContext.cjs');
-var IconWithStatus = require('../../components/IconWithStatus/IconWithStatus.cjs');
 require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
@@ -83,6 +82,7 @@ var ErrorContainer = require('../../components/ErrorContainer/ErrorContainer.cjs
 require('formik');
 require('../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../components/Input/Input.cjs');
+var IconWithStatus = require('../../components/IconWithStatus/IconWithStatus.cjs');
 require('../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
@@ -202,7 +202,6 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
                     connector: walletOption.walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
                     isAuthenticated: false,
-                    isConnected: true,
                     key: (_k = embeddedWalletVerifiedCredential.walletName) !== null && _k !== void 0 ? _k : '',
                 });
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);

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

@@ -71,7 +71,6 @@ import 'react-focus-lock';
 import { IconWithSpinner } from '../../components/IconWithSpinner/IconWithSpinner.js';
 import { Icon } from '../../components/Icon/Icon.js';
 import { useLoadingContext } from '../../context/LoadingContext/LoadingContext.js';
-import { IconWithStatus } from '../../components/IconWithStatus/IconWithStatus.js';
 import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
@@ -79,6 +78,7 @@ import { ErrorContainer } from '../../components/ErrorContainer/ErrorContainer.j
 import 'formik';
 import '../TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../components/Input/Input.js';
+import { IconWithStatus } from '../../components/IconWithStatus/IconWithStatus.js';
 import '../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
 import '../../context/PasskeyContext/PasskeyContext.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
@@ -198,7 +198,6 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
                     connector: walletOption.walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
                     isAuthenticated: false,
-                    isConnected: true,
                     key: (_k = embeddedWalletVerifiedCredential.walletName) !== null && _k !== void 0 ? _k : '',
                 });
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);

package/src/lib/views/Passkey/PasskeyRecovery/BundleValidation/PasskeyBundleRecovery.cjs

@@ -68,7 +68,6 @@ require('../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/Dynami
 require('react-focus-lock');
 var IconWithSpinner = require('../../../../components/IconWithSpinner/IconWithSpinner.cjs');
 var Icon = require('../../../../components/Icon/Icon.cjs');
-var IconWithStatus = require('../../../../components/IconWithStatus/IconWithStatus.cjs');
 require('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 var IconButton = require('../../../../components/IconButton/IconButton.cjs');
 require('../../../../components/MenuList/Dropdown/Dropdown.cjs');
@@ -76,6 +75,7 @@ require('formik');
 require('../../../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 var ModalHeader = require('../../../../components/ModalHeader/ModalHeader.cjs');
 var Input = require('../../../../components/Input/Input.cjs');
+var IconWithStatus = require('../../../../components/IconWithStatus/IconWithStatus.cjs');
 require('../../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');