@dynamic-labs/sdk-react-core 3.0.0-alpha.52 → 3.0.0-alpha.53

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

@@ -2,20 +2,20 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useMemo, useEffect, useCallback } from 'react';
 import { DynamicError } from '@dynamic-labs/utils';
-import { isEmbeddedConnector, isEmailWalletConnector, isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { isEmbeddedConnector, isEmailWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '@dynamic-labs/sdk-api-core';
-import { logger } from '../../../shared/logger.js';
+import '../../constants/values.js';
+import '@dynamic-labs/multi-wallet';
+import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
-import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import '../../../shared/utils/classes/storage/sessionStorage.js';
 import '../../../shared/consts/index.js';
-import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
@@ -40,8 +40,6 @@ 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';
@@ -89,7 +87,7 @@ 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, walletBook, }) => {
+const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = useState(false);
     const linkedWallets = useMemo(() => {
         if (!user) {
@@ -132,8 +130,6 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
     useEffect(() => wallets.forEach((wallet) => {
         wallet.connector.initEventListener();
     }), [wallets]);
-    const { didConnectedStateLoad } = useWalletsConnectionState(wallets, walletBook, primaryWalletId, authMode);
-    logVerboseTroubleshootingMessage('didConnectedStateLoad', didConnectedStateLoad);
     const { setUserWallets } = useInternalUserWallets();
     // Keep userWallets in sync whenever linkedWallets changes
     useEffect(() => {
@@ -149,46 +145,17 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
         if (!newWallet) {
             throw new DynamicError(`Wallet with id: ${walletId} not found`);
         }
-        const connectedAccounts = yield newWallet.connector.getConnectedAccounts();
-        return { connectedAccounts, newWallet };
+        return newWallet;
     }), [wallets]);
-    const checkIfAccountChangeIsRequired = useCallback((primaryWallet, newPrimaryWallet, connectedAccounts) => {
-        /**
-         * we need to check multiWalletWidgetState here because `setPrimaryWallet` currently gets
-         * called twice: once when the user clicks "make active" and once when the user performs
-         * the expected account switch in their wallet. this will change once this PR
-         * (https://github.com/dynamic-labs/DynamicAuth/pull/550) is merged, since setting the
-         * primary wallet will be simpler, so we won't need to call `setPrimaryWallet` twice.
-         */
-        if (!primaryWallet || multiWalletWidgetState !== 'idle')
-            return;
-        const accountIsNotConnectedInSecondaryWallet = connectedAccounts &&
-            !connectedAccounts.find((connectedAccount) => connectedAccount.toLowerCase() ===
-                newPrimaryWallet.address.toLowerCase());
-        return (newPrimaryWallet.connector.key === primaryWallet.connector.key ||
-            accountIsNotConnectedInSecondaryWallet);
-    }, [multiWalletWidgetState]);
-    const checkIfShowQrCodeModal = useCallback((wallet) => !wallet.connector.isInstalledOnBrowser() &&
-        !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 && !checkIfShowQrCodeModal(newPrimaryWallet)) {
+        const newPrimaryWallet = yield getSelectedWallet(walletId);
+        if (!primaryWalletId) {
             yield newPrimaryWallet.connector.connect();
             setPrimaryWalletId(walletId);
             return;
         }
         if (primaryWalletId === walletId)
             return;
-        if (checkIfAccountChangeIsRequired(primaryWallet, newPrimaryWallet)) {
-            yield newPrimaryWallet.connector.connect();
-            setPrimaryWalletId(walletId);
-            return;
-        }
-        if (!connectedAccounts.length) {
-            setMultiWalletWidgetState('awaiting_connection');
-            setShowQrcodeModal(checkIfShowQrCodeModal(newPrimaryWallet));
-        }
         if (isEmailWalletConnector(newPrimaryWallet.connector)) {
             const emailConnector = newPrimaryWallet.connector;
             const email = localStorage.getItem('magic-link-email');
@@ -196,52 +163,15 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
                 emailConnector.setEmail(email);
             }
         }
-        const shouldReconnectSocialWallet = isSocialWalletConnector(newPrimaryWallet.connector) &&
-            !(yield newPrimaryWallet.connector.getConnectedAccounts()).length;
-        if (shouldReconnectSocialWallet) {
-            reconnectSocialWallet(user, newPrimaryWallet);
-            return;
-        }
-        /* istanbul ignore next */
-        const publicAddress = yield newPrimaryWallet.connector.getAddress({
-            onDesktopUri: (uri) => __awaiter(void 0, void 0, void 0, function* () {
-                setDesktopUri(uri);
-            }),
-            onDisplayUri: (uri) => __awaiter(void 0, void 0, void 0, function* () {
-                setQrcodeUri(uri);
-            }),
-        });
-        /**
-         * need to check for connected account again for wallets that disconnect on refresh
-         *  and only reconnect upon fetching public address above
-         */
-        const updatedConnectedAccounts = yield newPrimaryWallet.connector.getConnectedAccounts();
-        if (checkIfAccountChangeIsRequired(primaryWallet, newPrimaryWallet, updatedConnectedAccounts) &&
-            !isEmailWalletConnector(newPrimaryWallet.connector)) {
-            setMultiWalletWidgetState('awaiting_account_switch', 'switching_primary');
-            return;
-        }
-        if (publicAddress) {
-            setPrimaryWalletId(walletId);
-            setMultiWalletWidgetState('idle');
-        }
-        else {
-            logger.error('Failed to connect to wallet');
-        }
+        setPrimaryWalletId(walletId);
+        setMultiWalletWidgetState('idle');
     }), [
-        user,
-        checkIfAccountChangeIsRequired,
-        checkIfShowQrCodeModal,
-        primaryWallet,
         getSelectedWallet,
         primaryWalletId,
-        setDesktopUri,
         setMultiWalletWidgetState,
         setPrimaryWalletId,
-        setQrcodeUri,
     ]);
     return {
-        didConnectedStateLoad: didConnectedStateLoad.current,
         primaryWallet,
         secondaryWallets,
         setPrimaryWallet,

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

@@ -4,93 +4,10 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-require('../../../../constants/values.cjs');
-require('@dynamic-labs/utils');
-require('../../../../../../../_virtual/_tslib.cjs');
-require('@dynamic-labs/multi-wallet');
-require('../../../../../shared/logger.cjs');
-require('@dynamic-labs/iconic');
-require('react/jsx-runtime');
-require('../../../../../context/ViewContext/ViewContext.cjs');
-require('react');
-require('@dynamic-labs/wallet-book');
-require('../../../../constants/colors.cjs');
-require('../../../../../shared/utils/classes/storage/localStorage.cjs');
-require('../../../../../shared/utils/classes/storage/sessionStorage.cjs');
-require('../../../../../shared/consts/index.cjs');
-require('react-international-phone');
-require('../../../../../config/ApiEndpoint.cjs');
-require('@dynamic-labs/store');
-require('../../../../../locale/locale.cjs');
+var findWalletOptionFor = require('../../../../functions/findWalletOptionFor/findWalletOptionFor.cjs');
 var shouldManuallyReconnectOnRefresh = require('../../../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.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('../../../../../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 smartWallet = require('../smartWallet/smartWallet.cjs');
 
 const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, primaryWalletId, }) => {
     // wallet state should be null while loading all the wallets or when there is no user
@@ -101,7 +18,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
         .map(convertLegacyPhantomLedger)
         .map((account) => {
         var _a;
-        const wallet = findWallet.findWallet(account, walletConnectorOptions);
+        const wallet = findWalletOptionFor.findWalletOptionFor(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
         // supports wallet W
@@ -124,14 +41,13 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
                     walletConnectorOptions,
                 });
             }
-            return new walletConnectorCore.Wallet({
+            return wallet.walletConnector.createWallet({
                 additionalAddresses: account.walletAdditionalAddresses,
                 address: account.address,
-                chain: account.chain,
+                chain: wallet.walletConnector.connectedChain,
                 connector: wallet.walletConnector,
                 id: account.id,
                 isAuthenticated: true,
-                isPrimary: account.id === primaryWalletId,
                 key: (_a = account.walletName) !== null && _a !== void 0 ? _a : wallet.walletConnector.key,
             });
         }

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

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

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

@@ -1,92 +1,9 @@
 'use client'
 import { WalletProviderEnum } from '@dynamic-labs/sdk-api-core';
-import { Wallet } from '@dynamic-labs/wallet-connector-core';
-import '../../../../constants/values.js';
-import '@dynamic-labs/utils';
-import '../../../../../../../_virtual/_tslib.js';
-import '@dynamic-labs/multi-wallet';
-import '../../../../../shared/logger.js';
-import '@dynamic-labs/iconic';
-import 'react/jsx-runtime';
-import '../../../../../context/ViewContext/ViewContext.js';
-import 'react';
-import '@dynamic-labs/wallet-book';
-import '../../../../constants/colors.js';
-import '../../../../../shared/utils/classes/storage/localStorage.js';
-import '../../../../../shared/utils/classes/storage/sessionStorage.js';
-import '../../../../../shared/consts/index.js';
-import 'react-international-phone';
-import '../../../../../config/ApiEndpoint.js';
-import '@dynamic-labs/store';
-import '../../../../../locale/locale.js';
+import { findWalletOptionFor } from '../../../../functions/findWalletOptionFor/findWalletOptionFor.js';
 import { shouldManuallyReconnectOnRefresh } from '../../../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.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 '../../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
-import '../../../../../context/FooterAnimationContext/index.js';
-import '../../../../../context/WalletGroupContext/WalletGroupContext.js';
-import '../../../../../context/IpConfigurationContext/IpConfigurationContext.js';
-import '../../../../../context/PasskeyContext/PasskeyContext.js';
-import '@dynamic-labs/ethereum-core';
-import '../../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.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 { isOwnerOfASmartWallet, initializeSmartWallet } from '../smartWallet/smartWallet.js';
 
 const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, primaryWalletId, }) => {
     // wallet state should be null while loading all the wallets or when there is no user
@@ -97,7 +14,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
         .map(convertLegacyPhantomLedger)
         .map((account) => {
         var _a;
-        const wallet = findWallet(account, walletConnectorOptions);
+        const wallet = findWalletOptionFor(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
         // supports wallet W
@@ -120,14 +37,13 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
                     walletConnectorOptions,
                 });
             }
-            return new Wallet({
+            return wallet.walletConnector.createWallet({
                 additionalAddresses: account.walletAdditionalAddresses,
                 address: account.address,
-                chain: account.chain,
+                chain: wallet.walletConnector.connectedChain,
                 connector: wallet.walletConnector,
                 id: account.id,
                 isAuthenticated: true,
-                isPrimary: account.id === primaryWalletId,
                 key: (_a = account.walletName) !== null && _a !== void 0 ? _a : wallet.walletConnector.key,
             });
         }

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../../../_virtual/_tslib.cjs');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var findWallet = require('../findWallet/findWallet.cjs');
+var findWalletOptionFor = require('../../../../functions/findWalletOptionFor/findWalletOptionFor.cjs');
 
 // assumes `account` input is a smart wallet (has a signerRefId) and attempts to find
 // the associated eoa account
@@ -17,16 +17,16 @@ const initializeSmartWallet = (_a) => _tslib.__awaiter(void 0, [_a], void 0, fun
     if (!owner) {
         throw new Error('could not find associated eoa account for smart wallet');
     }
-    const ownerWallet = findWallet.findWallet(owner, walletConnectorOptions);
+    const ownerWallet = findWalletOptionFor.findWalletOptionFor(owner, walletConnectorOptions);
     if (!ownerWallet) {
         throw new Error('could not find owner wallet from wallet options');
     }
-    const smartWallet = findWallet.findWallet(account, walletConnectorOptions);
+    const smartWallet = findWalletOptionFor.findWalletOptionFor(account, walletConnectorOptions);
     if (!smartWallet) {
         throw new Error('could not find smart wallet from wallet options');
     }
     const connector = smartWallet.walletConnector;
-    if (!walletConnectorCore.isSmartWalletConnector(connector)) {
+    if (!walletConnectorCore.isAccountAbstractionConnector(connector)) {
         throw new Error('could not initialize smart wallet');
     }
     yield connector.setEoaConnector(ownerWallet.walletConnector);

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

@@ -1,7 +1,7 @@
 'use client'
 import { __awaiter } from '../../../../../../../_virtual/_tslib.js';
-import { isSmartWalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { findWallet } from '../findWallet/findWallet.js';
+import { isAccountAbstractionConnector } from '@dynamic-labs/wallet-connector-core';
+import { findWalletOptionFor } from '../../../../functions/findWalletOptionFor/findWalletOptionFor.js';
 
 // assumes `account` input is a smart wallet (has a signerRefId) and attempts to find
 // the associated eoa account
@@ -13,16 +13,16 @@ const initializeSmartWallet = (_a) => __awaiter(void 0, [_a], void 0, function*
     if (!owner) {
         throw new Error('could not find associated eoa account for smart wallet');
     }
-    const ownerWallet = findWallet(owner, walletConnectorOptions);
+    const ownerWallet = findWalletOptionFor(owner, walletConnectorOptions);
     if (!ownerWallet) {
         throw new Error('could not find owner wallet from wallet options');
     }
-    const smartWallet = findWallet(account, walletConnectorOptions);
+    const smartWallet = findWalletOptionFor(account, walletConnectorOptions);
     if (!smartWallet) {
         throw new Error('could not find smart wallet from wallet options');
     }
     const connector = smartWallet.walletConnector;
-    if (!isSmartWalletConnector(connector)) {
+    if (!isAccountAbstractionConnector(connector)) {
         throw new Error('could not initialize smart wallet');
     }
     yield connector.setEoaConnector(ownerWallet.walletConnector);

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

@@ -91,11 +91,7 @@ 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', () => {
-        logger.logger.debug('primary wallet disconnect');
-        handleLogOut();
-    });
+const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, detectNewWalletsForLinking, }) => {
     useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'chainChange', ({ chain }) => {
         logger.logger.debug('primary wallet chain change', { chain });
         if (!primaryWallet) {
@@ -149,41 +145,37 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
             return;
         const [newAddress] = accounts;
         const changedAddress = !walletConnectorCore.isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain);
-        if (changedAddress && authMode === 'connect-only') {
-            refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
-            return;
-        }
-        const newWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
         if (!changedAddress) {
             setMultiWalletWidgetState('idle');
-        }
-        else if (!multiWallet) {
-            setSelectedWalletWithAction({
-                action: 'select',
-                wallet: primaryWallet,
-            });
-            setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
             return;
         }
-        else if (multiWalletWidgetState === 'awaiting_account_switch') {
-            handleAccountChangeWhenAwaitingAccountSwitch(true, newAddress);
+        if (authMode === 'connect-only') {
+            refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
+            return;
         }
-        else if (multiWalletWidgetState === 'idle' && newWallet) {
-            setPrimaryWalletId(newWallet.id);
+        if (!multiWallet) {
+            return;
         }
-        else if (multiWalletWidgetState === 'idle' && !newWallet) {
-            if (user) {
-                setMultiWalletWidgetState('detected_new_wallet');
-                setSelectedWalletConnectorKey(primaryWallet.connector.key);
-                return;
-            }
+        if (multiWalletWidgetState === 'awaiting_account_switch') {
+            handleAccountChangeWhenAwaitingAccountSwitch(true, newAddress);
+            return;
         }
-        else {
+        if (multiWalletWidgetState !== 'idle') {
             logger.logger.error(`Unexpected multiWalletWidgetState (${multiWalletWidgetState}) and onAccountChange combination. Resetting state to idle.`);
             setMultiWalletWidgetState('idle');
         }
+        const newWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
+        if (newWallet) {
+            setPrimaryWalletId(newWallet.id);
+            return;
+        }
+        if (user && detectNewWalletsForLinking) {
+            setMultiWalletWidgetState('detected_new_wallet');
+            setSelectedWalletConnectorKey(primaryWallet.connector.key);
+        }
     }, [
         authMode,
+        detectNewWalletsForLinking,
         handleAccountChangeWhenAwaitingAccountSwitch,
         multiWallet,
         multiWalletWidgetState,
@@ -193,7 +185,6 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
         setMultiWalletWidgetState,
         setPrimaryWalletId,
         setSelectedWalletConnectorKey,
-        setSelectedWalletWithAction,
         user,
     ]);
     useDynamicEvents.useInternalDynamicEvents('triggerComputePrimaryWalletMultiWalletStateFromAccounts', calculatePrimaryWalletMultiWalletStateFromAccounts);
@@ -235,6 +226,12 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
         for (const wallet of affectedWallets)
             refreshConnectedWallet(wallet.id, wallet.connector);
     }));
+    useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'disconnect', () => {
+        logger.logger.debug('primary wallet disconnect');
+        if (authMode === 'connect-only') {
+            handleLogOut();
+        }
+    });
     useWalletConnectorEvent.useWalletConnectorEvent(uniqueNonPrimaryWallets, 'disconnect', (affectedConnector) => {
         logger.logger.debug('secondary wallet disconnect');
         if (authMode === 'connect-only') {

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

@@ -19,5 +19,6 @@ export type UseWalletEventListenersArgs = {
     user: UserProfile | undefined;
     authMode: AuthModeType;
     refreshConnectedWallet: (walletId: string, walletConnector: WalletConnector, shouldCallCallback?: boolean) => Promise<void>;
+    detectNewWalletsForLinking: boolean;
 };
-export declare const useWalletEventListeners: ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }: UseWalletEventListenersArgs) => void;
+export declare const useWalletEventListeners: ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, detectNewWalletsForLinking, }: UseWalletEventListenersArgs) => void;