@dynamic-labs/sdk-react-core 3.0.0-alpha.5 → 3.0.0-alpha.50

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');
@@ -34,6 +33,7 @@ require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../context/WalletContext/WalletContext.cjs');
+require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
@@ -71,17 +71,29 @@ require('../../../views/WalletList/WalletList.cjs');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
+require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
-require('../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
+require('@dynamic-labs/ethereum-core');
 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 logVerboseTroubleshootingMessage = require('../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.cjs');
 
-const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, }) => {
+const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, walletBook, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = React.useState(false);
     const linkedWallets = React.useMemo(() => {
         if (!user) {
@@ -93,7 +105,8 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
             walletConnectorOptions,
         });
     }, [user, primaryWalletId, walletConnectorOptions]);
-    const walletsBasedOnAuthMode = React.useMemo(() => {
+    logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('linkedWallets', linkedWallets);
+    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.
@@ -112,6 +125,7 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
         }
         return connectedWallets !== null && connectedWallets !== void 0 ? connectedWallets : [];
     }, [authMode, connectedWallets, linkedWallets, user]);
+    logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('wallets', wallets);
     /**
      * This useEffect is temporary.
      * While the wallet connectors don't use the event emitter, we need to manually
@@ -119,21 +133,17 @@ 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);
-    const wallets = React.useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletsMap[getWalletIdentifier.getWalletIdentifier(wallet)]) }))), [connectedWalletsMap, walletsBasedOnAuthMode]);
+    }), [wallets]);
+    const { didConnectedStateLoad } = useWalletsConnectionState.useWalletsConnectionState(wallets, walletBook, primaryWalletId, authMode);
+    logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('didConnectedStateLoad', didConnectedStateLoad);
     const { setUserWallets } = UserWalletsContext.useInternalUserWallets();
     // Keep userWallets in sync whenever linkedWallets changes
     React.useEffect(() => {
-        // we don't want to set the user wallets until their connected states have been computed
-        // but that doesn't matter if the wallets list is empty, and if we return early when
-        // the wallets list is empty, we'll never set the user wallets correctly after logout
-        if (!didConnectedStateLoad.current && wallets.length)
-            return;
+        logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('[useWalletConnectors] will call setUserWallets', wallets);
         setUserWallets((userWallets) => updateUserWalletsFromLinkedWallets.updateUserWalletsFromLinkedWallets(userWallets, wallets));
-    }, [didConnectedStateLoad, setUserWallets, wallets]);
+    }, [setUserWallets, wallets]);
     const primaryWallet = React.useMemo(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
     const secondaryWallets = React.useMemo(() => canHaveMultipleWalletsConnected
         ? wallets.filter((wallet) => wallet.id !== primaryWalletId)
@@ -166,7 +176,8 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
         !wallet.connector.canConnectViaCustodialService, []);
     const setPrimaryWallet = React.useCallback((walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const { newWallet: newPrimaryWallet, connectedAccounts } = yield getSelectedWallet(walletId);
-        if (!primaryWalletId) {
+        newPrimaryWallet.isPrimary = true;
+        if (!primaryWalletId && !checkIfShowQrCodeModal(newPrimaryWallet)) {
             yield newPrimaryWallet.connector.connect();
             setPrimaryWalletId(walletId);
             return;
@@ -189,8 +200,9 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
                 emailConnector.setEmail(email);
             }
         }
-        if (walletConnectorCore.isSocialWalletConnector(newPrimaryWallet.connector) &&
-            !newPrimaryWallet.connected) {
+        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.d.ts

@@ -1,5 +1,6 @@
 import { Dispatch, SetStateAction } from 'react';
 import { UserProfile } from '@dynamic-labs/types';
+import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { AuthModeType, MultiWalletWidgetState, Wallet, WalletOption } from '../../../shared';
 import { MultiWalletWidgetStateSetter } from '../multiWallet';
 type Props = {
@@ -14,6 +15,7 @@ type Props = {
     primaryWalletId: string | undefined;
     user?: UserProfile;
     canHaveMultipleWalletsConnected?: boolean;
+    walletBook: WalletBookSchema;
 };
 export interface UseWalletConnectors {
     didConnectedStateLoad: boolean;
@@ -24,5 +26,5 @@ export interface UseWalletConnectors {
     showQrcodeModal: boolean;
     wallets: Wallet[];
 }
-export declare const useWalletConnectors: ({ authMode, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, }: Props) => UseWalletConnectors;
+export declare const useWalletConnectors: ({ authMode, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, walletBook, }: Props) => UseWalletConnectors;
 export {};

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';
@@ -30,6 +29,7 @@ import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../context/WalletContext/WalletContext.js';
+import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
@@ -67,17 +67,29 @@ import '../../../views/WalletList/WalletList.js';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
+import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
-import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
+import '@dynamic-labs/ethereum-core';
 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 { logVerboseTroubleshootingMessage } from '../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.js';
 
-const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, }) => {
+const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, walletBook, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = useState(false);
     const linkedWallets = useMemo(() => {
         if (!user) {
@@ -89,7 +101,8 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
             walletConnectorOptions,
         });
     }, [user, primaryWalletId, walletConnectorOptions]);
-    const walletsBasedOnAuthMode = useMemo(() => {
+    logVerboseTroubleshootingMessage('linkedWallets', linkedWallets);
+    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.
@@ -108,6 +121,7 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
         }
         return connectedWallets !== null && connectedWallets !== void 0 ? connectedWallets : [];
     }, [authMode, connectedWallets, linkedWallets, user]);
+    logVerboseTroubleshootingMessage('wallets', wallets);
     /**
      * This useEffect is temporary.
      * While the wallet connectors don't use the event emitter, we need to manually
@@ -115,21 +129,17 @@ 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);
-    const wallets = useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletsMap[getWalletIdentifier(wallet)]) }))), [connectedWalletsMap, walletsBasedOnAuthMode]);
+    }), [wallets]);
+    const { didConnectedStateLoad } = useWalletsConnectionState(wallets, walletBook, primaryWalletId, authMode);
+    logVerboseTroubleshootingMessage('didConnectedStateLoad', didConnectedStateLoad);
     const { setUserWallets } = useInternalUserWallets();
     // Keep userWallets in sync whenever linkedWallets changes
     useEffect(() => {
-        // we don't want to set the user wallets until their connected states have been computed
-        // but that doesn't matter if the wallets list is empty, and if we return early when
-        // the wallets list is empty, we'll never set the user wallets correctly after logout
-        if (!didConnectedStateLoad.current && wallets.length)
-            return;
+        logVerboseTroubleshootingMessage('[useWalletConnectors] will call setUserWallets', wallets);
         setUserWallets((userWallets) => updateUserWalletsFromLinkedWallets(userWallets, wallets));
-    }, [didConnectedStateLoad, setUserWallets, wallets]);
+    }, [setUserWallets, wallets]);
     const primaryWallet = useMemo(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
     const secondaryWallets = useMemo(() => canHaveMultipleWalletsConnected
         ? wallets.filter((wallet) => wallet.id !== primaryWalletId)
@@ -162,7 +172,8 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
         !wallet.connector.canConnectViaCustodialService, []);
     const setPrimaryWallet = useCallback((walletId) => __awaiter(void 0, void 0, void 0, function* () {
         const { newWallet: newPrimaryWallet, connectedAccounts } = yield getSelectedWallet(walletId);
-        if (!primaryWalletId) {
+        newPrimaryWallet.isPrimary = true;
+        if (!primaryWalletId && !checkIfShowQrCodeModal(newPrimaryWallet)) {
             yield newPrimaryWallet.connector.connect();
             setPrimaryWalletId(walletId);
             return;
@@ -185,8 +196,9 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
                 emailConnector.setEmail(email);
             }
         }
-        if (isSocialWalletConnector(newPrimaryWallet.connector) &&
-            !newPrimaryWallet.connected) {
+        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

@@ -4,7 +4,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
-require('@dynamic-labs/wallet-connector-core');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('../../../../constants/values.cjs');
 require('@dynamic-labs/utils');
 require('../../../../../../../_virtual/_tslib.cjs');
@@ -35,6 +35,7 @@ require('../../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 var smartWallet = require('../smartWallet/smartWallet.cjs');
 require('../../../../../context/WalletContext/WalletContext.cjs');
+require('../../../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../../../context/ThemeContext/ThemeContext.cjs');
 require('../../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
@@ -70,15 +71,26 @@ require('../../../../../views/WalletList/WalletList.cjs');
 require('../../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
+require('../../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../../context/WalletGroupContext/WalletGroupContext.cjs');
-require('../../../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
 require('../../../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../../../context/PasskeyContext/PasskeyContext.cjs');
+require('@dynamic-labs/ethereum-core');
 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');
 
 const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, primaryWalletId, }) => {
     // wallet state should be null while loading all the wallets or when there is no user
@@ -112,16 +124,16 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
                     walletConnectorOptions,
                 });
             }
-            return {
+            return new walletConnectorCore.Wallet({
                 additionalAddresses: account.walletAdditionalAddresses,
                 address: account.address,
-                authenticated: true,
                 chain: account.chain,
-                connected: false,
                 connector: wallet.walletConnector,
                 id: account.id,
+                isAuthenticated: true,
+                isPrimary: account.id === primaryWalletId,
                 key: (_a = account.walletName) !== null && _a !== void 0 ? _a : wallet.walletConnector.key,
-            };
+            });
         }
         return null;
     })

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.d.ts

@@ -1,4 +1,5 @@
-import { Wallet, WalletOption } from '../../../../../shared';
+import { Wallet } from '@dynamic-labs/wallet-connector-core';
+import { WalletOption } from '../../../../../shared';
 import { UserProfile } from '../../../../../..';
 type CreateWalletsFromWalletOptionsProps = {
     user: UserProfile;

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

@@ -1,6 +1,6 @@
 'use client'
 import { WalletProviderEnum } from '@dynamic-labs/sdk-api-core';
-import '@dynamic-labs/wallet-connector-core';
+import { Wallet } from '@dynamic-labs/wallet-connector-core';
 import '../../../../constants/values.js';
 import '@dynamic-labs/utils';
 import '../../../../../../../_virtual/_tslib.js';
@@ -31,6 +31,7 @@ import '../../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import { isOwnerOfASmartWallet, initializeSmartWallet } from '../smartWallet/smartWallet.js';
 import '../../../../../context/WalletContext/WalletContext.js';
+import '../../../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../../../context/ThemeContext/ThemeContext.js';
 import '../../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
@@ -66,15 +67,26 @@ import '../../../../../views/WalletList/WalletList.js';
 import '../../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
+import '../../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../../../context/FooterAnimationContext/index.js';
 import '../../../../../context/WalletGroupContext/WalletGroupContext.js';
-import '../../../../../context/MfaSettingsContext/MfaSettingsContext.js';
 import '../../../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../../../context/PasskeyContext/PasskeyContext.js';
+import '@dynamic-labs/ethereum-core';
 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';
 
 const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, primaryWalletId, }) => {
     // wallet state should be null while loading all the wallets or when there is no user
@@ -108,16 +120,16 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
                     walletConnectorOptions,
                 });
             }
-            return {
+            return new Wallet({
                 additionalAddresses: account.walletAdditionalAddresses,
                 address: account.address,
-                authenticated: true,
                 chain: account.chain,
-                connected: false,
                 connector: wallet.walletConnector,
                 id: account.id,
+                isAuthenticated: true,
+                isPrimary: account.id === primaryWalletId,
                 key: (_a = account.walletName) !== null && _a !== void 0 ? _a : wallet.walletConnector.key,
-            };
+            });
         }
         return null;
     })

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

@@ -17,7 +17,7 @@ const findWallet = (account, walletOptions) => {
     }
     // if we cannot find the correct connector for the wallet, we default to the unknown
     // this way the wallet will appear in user wallets, but will not be able to be interacted with
-    return ((_a = walletOptions.find((wallet) => walletKey === wallet.key)) !== null && _a !== void 0 ? _a : walletOptions.find((wallet) => wallet.key === 'unknown'));
+    return ((_a = walletOptions.find((wallet) => walletKey === wallet.key)) !== null && _a !== void 0 ? _a : walletOptions.find((wallet) => wallet.key === 'fallbackconnector'));
 };
 
 exports.findWallet = findWallet;

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

@@ -13,7 +13,7 @@ const findWallet = (account, walletOptions) => {
     }
     // if we cannot find the correct connector for the wallet, we default to the unknown
     // this way the wallet will appear in user wallets, but will not be able to be interacted with
-    return ((_a = walletOptions.find((wallet) => walletKey === wallet.key)) !== null && _a !== void 0 ? _a : walletOptions.find((wallet) => wallet.key === 'unknown'));
+    return ((_a = walletOptions.find((wallet) => walletKey === wallet.key)) !== null && _a !== void 0 ? _a : walletOptions.find((wallet) => wallet.key === 'fallbackconnector'));
 };
 
 export { findWallet };

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

@@ -18,8 +18,78 @@ require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
-require('../../../events/dynamicEvents.cjs');
+var useDynamicEvents = require('../events/useDynamicEvents/useDynamicEvents.cjs');
 var useWalletConnectorEvent = require('../events/useWalletConnectorEvent/useWalletConnectorEvent.cjs');
+require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
+require('../../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/store');
+require('../../../locale/locale.cjs');
+require('../../../context/DynamicContext/DynamicContext.cjs');
+require('../../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../../context/ErrorContext/ErrorContext.cjs');
+require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
+var dynamicEvents = require('../../../events/dynamicEvents.cjs');
+require('../../../context/VerificationContext/VerificationContext.cjs');
+require('react-dom');
+require('../../../context/WalletContext/WalletContext.cjs');
+require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.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');
+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('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
+require('../../../context/FooterAnimationContext/index.cjs');
+require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
+require('../../../context/PasskeyContext/PasskeyContext.cjs');
+require('@dynamic-labs/ethereum-core');
+require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.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 logVerboseTroubleshootingMessage = require('../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.cjs');
 
 const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
     useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'disconnect', () => {
@@ -33,9 +103,46 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
         }
         refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
     });
-    useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'accountChange', ({ accounts }) => {
-        logger.logger.debug('primary wallet account change', {
+    const handleAccountChangeWhenAwaitingAccountSwitch = React.useCallback((isPrimaryWallet, newAddress) => {
+        logger.logger.debug('handleAccountChangeWhenAwaitingAccountSwitch', {
+            isPrimaryWallet,
+            newAddress,
+        });
+        const linkedSecondaryWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
+        logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('[handleAccountChangeWhenAwaitingAccountSwitch]', { linkedSecondaryWallet });
+        // this means the user is linking a new account, so we need proof of ownership...
+        if (!linkedSecondaryWallet) {
+            setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
+            if (isPrimaryWallet && primaryWallet) {
+                setSelectedWalletConnectorKey(primaryWallet.connector.key);
+            }
+            return;
+        }
+        const isTryingToUpdateUnkownWallet = linkedSecondaryWallet.connector.key === 'unknown';
+        if (isTryingToUpdateUnkownWallet) {
+            //prompt the user to connect and sign with the wallet
+            dynamicEvents.dynamicEvents.emit('triggerConnectAndSign');
+            return;
+        }
+        // ...otherwise, the user is switching primary accounts betweeen the same wallet
+        setSelectedWalletWithAction(null);
+        setPrimaryWalletId(linkedSecondaryWallet.id);
+        setMultiWalletWidgetState('idle');
+    }, [
+        setMultiWalletWidgetState,
+        primaryWallet,
+        secondaryWallets,
+        setSelectedWalletConnectorKey,
+        setSelectedWalletWithAction,
+        setPrimaryWalletId,
+    ]);
+    const calculatePrimaryWalletMultiWalletStateFromAccounts = React.useCallback(({ accounts }) => {
+        logger.logger.debug('calculatePrimaryWalletMultiWalletStateFromAccounts', {
             accounts,
+            authMode,
+            multiWallet,
+            multiWalletWidgetState,
+            primaryWallet,
         });
         // change the api here
         if (!primaryWallet)
@@ -75,6 +182,26 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
             logger.logger.error(`Unexpected multiWalletWidgetState (${multiWalletWidgetState}) and onAccountChange combination. Resetting state to idle.`);
             setMultiWalletWidgetState('idle');
         }
+    }, [
+        authMode,
+        handleAccountChangeWhenAwaitingAccountSwitch,
+        multiWallet,
+        multiWalletWidgetState,
+        primaryWallet,
+        refreshConnectedWallet,
+        secondaryWallets,
+        setMultiWalletWidgetState,
+        setPrimaryWalletId,
+        setSelectedWalletConnectorKey,
+        setSelectedWalletWithAction,
+        user,
+    ]);
+    useDynamicEvents.useInternalDynamicEvents('triggerComputePrimaryWalletMultiWalletStateFromAccounts', calculatePrimaryWalletMultiWalletStateFromAccounts);
+    useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'accountChange', ({ accounts }) => {
+        logger.logger.debug('primary wallet account change', {
+            accounts,
+        });
+        calculatePrimaryWalletMultiWalletStateFromAccounts({ accounts });
     });
     const uniqueNonPrimaryWallets = React.useMemo(() => {
         const primaryConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
@@ -118,28 +245,6 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
             }
         }
     });
-    const handleAccountChangeWhenAwaitingAccountSwitch = React.useCallback((isPrimaryWallet, newAddress) => {
-        const linkedSecondaryWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
-        // this means the user is linking a new account, so we need proof of ownership...
-        if (!linkedSecondaryWallet) {
-            setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
-            if (isPrimaryWallet && primaryWallet) {
-                setSelectedWalletConnectorKey(primaryWallet.connector.key);
-            }
-            return;
-        }
-        // ...otherwise, the user is switching primary accounts betweeen the same wallet
-        setSelectedWalletWithAction(null);
-        setPrimaryWalletId(linkedSecondaryWallet.id);
-        setMultiWalletWidgetState('idle');
-    }, [
-        setMultiWalletWidgetState,
-        primaryWallet,
-        secondaryWallets,
-        setSelectedWalletConnectorKey,
-        setSelectedWalletWithAction,
-        setPrimaryWalletId,
-    ]);
 };
 
 exports.useWalletEventListeners = useWalletEventListeners;