@dynamic-labs/sdk-react-core 3.0.0-alpha.3 → 3.0.0-alpha.30

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

@@ -20,15 +20,76 @@ import 'react-international-phone';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../locale/locale.js';
-import { getWalletIdentifier } from '../../functions/getWalletIdentifier/getWalletIdentifier.js';
-import 'viem';
-import 'viem/chains';
+import '../../../events/dynamicEvents.js';
+import '../../../context/DynamicContext/DynamicContext.js';
+import '../../../context/CaptchaContext/CaptchaContext.js';
+import '../../../context/ErrorContext/ErrorContext.js';
+import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
+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';
+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 { useWalletsConnectionState } from '../useWalletsConnectionState/useWalletsConnectionState.js';
 import { reconnectSocialWallet } from './reconnectSocialWallet.js';
 import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
 import { updateUserWalletsFromLinkedWallets } from './utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.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 '../../../context/WalletGroupContext/WalletGroupContext.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 { 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) {
@@ -40,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.
@@ -59,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
@@ -66,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)
@@ -113,6 +172,7 @@ 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);
+        newPrimaryWallet.isPrimary = true;
         if (!primaryWalletId) {
             yield newPrimaryWallet.connector.connect();
             setPrimaryWalletId(walletId);
@@ -136,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');
@@ -24,11 +24,73 @@ require('../../../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../../../../locale/locale.cjs');
 var shouldManuallyReconnectOnRefresh = require('../../../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
-require('viem');
-require('viem/chains');
-var findWallet = require('../findWallet/findWallet.cjs');
+require('../../../../../events/dynamicEvents.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');
+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');
+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 findWallet = require('../findWallet/findWallet.cjs');
 var convertLegacyPhantomLedgerConnector = require('../convertLegacyPhantomLedgerConnector/convertLegacyPhantomLedgerConnector.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');
+require('../../../../../context/WalletGroupContext/WalletGroupContext.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');
 
 const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, primaryWalletId, }) => {
     // wallet state should be null while loading all the wallets or when there is no user
@@ -38,6 +100,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
     return user.verifiedCredentials
         .map(convertLegacyPhantomLedger)
         .map((account) => {
+        var _a;
         const wallet = findWallet.findWallet(account, walletConnectorOptions);
         // this probably shouldn't happen. this would mean that the user has an account linked
         // with wallet W, but the customer has toggled off wallet W or the chain that
@@ -61,15 +124,15 @@ 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,
+                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';
@@ -20,11 +20,73 @@ import '../../../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../../../locale/locale.js';
 import { shouldManuallyReconnectOnRefresh } from '../../../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
-import 'viem';
-import 'viem/chains';
-import { findWallet } from '../findWallet/findWallet.js';
+import '../../../../../events/dynamicEvents.js';
+import '../../../../../context/DynamicContext/DynamicContext.js';
+import '../../../../../context/CaptchaContext/CaptchaContext.js';
+import '../../../../../context/ErrorContext/ErrorContext.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 { 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';
+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 { findWallet } from '../findWallet/findWallet.js';
 import { convertLegacyPhantomLedgerConnector } from '../convertLegacyPhantomLedgerConnector/convertLegacyPhantomLedgerConnector.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 '../../../../../context/WalletGroupContext/WalletGroupContext.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';
 
 const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, primaryWalletId, }) => {
     // wallet state should be null while loading all the wallets or when there is no user
@@ -34,6 +96,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
     return user.verifiedCredentials
         .map(convertLegacyPhantomLedger)
         .map((account) => {
+        var _a;
         const wallet = findWallet(account, walletConnectorOptions);
         // this probably shouldn't happen. this would mean that the user has an account linked
         // with wallet W, but the customer has toggled off wallet W or the chain that
@@ -57,15 +120,15 @@ 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,
+                key: (_a = account.walletName) !== null && _a !== void 0 ? _a : wallet.walletConnector.key,
+            });
         }
         return null;
     })

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var values = require('../../../../constants/values.cjs');
 
 const findWallet = (account, walletOptions) => {
+    var _a;
     const walletKey = account.walletName;
     if (walletKey === 'turnkeyhd') {
         const chain = account.chain
@@ -14,7 +15,9 @@ const findWallet = (account, walletOptions) => {
         return walletOptions.find((wallet) => walletKey === wallet.key &&
             wallet.walletConnector.connectedChain === chain);
     }
-    return walletOptions.find((wallet) => walletKey === wallet.key);
+    // 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 === 'fallbackconnector'));
 };
 
 exports.findWallet = findWallet;

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

@@ -2,6 +2,7 @@
 import { VerifiedCredentialNameToChainEnum } from '../../../../constants/values.js';
 
 const findWallet = (account, walletOptions) => {
+    var _a;
     const walletKey = account.walletName;
     if (walletKey === 'turnkeyhd') {
         const chain = account.chain
@@ -10,7 +11,9 @@ const findWallet = (account, walletOptions) => {
         return walletOptions.find((wallet) => walletKey === wallet.key &&
             wallet.walletConnector.connectedChain === chain);
     }
-    return walletOptions.find((wallet) => walletKey === wallet.key);
+    // 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 === '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('../../../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('../../../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 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;