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

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

@@ -1,77 +1,7 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
-import '@dynamic-labs/sdk-api-core';
-import '../../constants/values.js';
-import '@dynamic-labs/utils';
-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 { getReferencedAccount } from '../../functions/getReferencedAccount/getReferencedAccount.js';
-import '../../../config/ApiEndpoint.js';
-import '@dynamic-labs/store';
-import '../../../locale/locale.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 '../../../context/WalletContext/WalletContext.js';
-import '../../../context/ThemeContext/ThemeContext.js';
-import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
-import '@dynamic-labs/types';
-import '../../../context/LoadingContext/LoadingContext.js';
-import 'yup';
-import '../../../context/MockContext/MockContext.js';
-import '../../../views/CollectUserDataView/useFields.js';
-import '../../../context/FieldsStateContext/FieldsStateContext.js';
-import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
-import '@dynamic-labs/rpc-providers';
-import '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 { isSocialWalletConnector, isSameAddress } from '@dynamic-labs/wallet-connector-core';
+import { JwtVerifiedCredentialFormatEnum } from '@dynamic-labs/sdk-api-core';
 
 /**
  * This function will use a referenced account to kick off the social wallet
@@ -79,16 +9,18 @@ import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCar
  * wants to set their disconnected social wallet as their primary wallet, in
  * which case the wallet needs to be reconnected
  */
-const reconnectSocialWallet = (user, wallet) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!isSocialWalletConnector(wallet.connector)) {
+const reconnectSocialWallet = (user, connector, walletAddress, walletChain) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!isSocialWalletConnector(connector)) {
         return;
     }
-    const socialAccountDataForWallet = getReferencedAccount(user, wallet.id);
+    const socialAccountDataForWallet = user === null || user === void 0 ? void 0 : user.verifiedCredentials.find((account) => account.format === JwtVerifiedCredentialFormatEnum.Oauth &&
+        account.address &&
+        isSameAddress(account.address, walletAddress, walletChain));
     if (!socialAccountDataForWallet ||
         !socialAccountDataForWallet.oauthProvider) {
         return;
     }
-    yield wallet.connector.connect(socialAccountDataForWallet.oauthProvider);
+    yield connector.connect(socialAccountDataForWallet.oauthProvider);
 });
 
 export { reconnectSocialWallet };

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

@@ -16,73 +16,12 @@ require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
-require('../../../shared/utils/classes/storage/localStorage.cjs');
-require('../../../shared/utils/classes/storage/sessionStorage.cjs');
+require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../shared/consts/index.cjs');
-require('@dynamic-labs/multi-wallet');
-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');
-require('../../../context/ErrorContext/ErrorContext.cjs');
-require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
-require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
-require('../../../context/VerificationContext/VerificationContext.cjs');
-require('react-dom');
-require('../../../context/WalletContext/WalletContext.cjs');
-require('../../../context/ThemeContext/ThemeContext.cjs');
-require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
-require('@dynamic-labs/types');
-require('../../../context/LoadingContext/LoadingContext.cjs');
-require('yup');
-require('../../../context/MockContext/MockContext.cjs');
-require('../../../views/CollectUserDataView/useFields.cjs');
-require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
-require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
-require('@dynamic-labs/rpc-providers');
-var useWalletsConnectionState = require('../useWalletsConnectionState/useWalletsConnectionState.cjs');
-var reconnectSocialWallet = require('./reconnectSocialWallet.cjs');
 var createLinkedWalletsFromWalletOptions = require('./utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs');
 var updateUserWalletsFromLinkedWallets = require('./utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.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');
-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, setMultiWalletWidgetState, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = React.useState(false);
     const linkedWallets = React.useMemo(() => {
         if (!user) {
@@ -94,8 +33,8 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
             walletConnectorOptions,
         });
     }, [user, primaryWalletId, walletConnectorOptions]);
-    logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('linkedWallets', linkedWallets);
-    const walletsBasedOnAuthMode = React.useMemo(() => {
+    logger.logger.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.
@@ -114,7 +53,7 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
         }
         return connectedWallets !== null && connectedWallets !== void 0 ? connectedWallets : [];
     }, [authMode, connectedWallets, linkedWallets, user]);
-    logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('walletsBasedOnAuthMode', walletsBasedOnAuthMode);
+    logger.logger.logVerboseTroubleshootingMessage('wallets', wallets);
     /**
      * This useEffect is temporary.
      * While the wallet connectors don't use the event emitter, we need to manually
@@ -122,17 +61,13 @@ 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]);
-    logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('wallets', wallets);
-    logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('didConnectedStateLoad', didConnectedStateLoad);
+    }), [wallets]);
     const { setUserWallets } = UserWalletsContext.useInternalUserWallets();
     // Keep userWallets in sync whenever linkedWallets changes
     React.useEffect(() => {
-        logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('[useWalletConnectors] will call setUserWallets', wallets);
+        logger.logger.logVerboseTroubleshootingMessage('[useWalletConnectors] will call setUserWallets', wallets);
         setUserWallets((userWallets) => updateUserWalletsFromLinkedWallets.updateUserWalletsFromLinkedWallets(userWallets, 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]);
@@ -144,29 +79,10 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
         if (!newWallet) {
             throw new utils.DynamicError(`Wallet with id: ${walletId} not found`);
         }
-        const connectedAccounts = yield newWallet.connector.getConnectedAccounts();
-        return { connectedAccounts, newWallet };
+        return newWallet;
     }), [wallets]);
-    const checkIfAccountChangeIsRequired = React.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 = React.useCallback((wallet) => !wallet.connector.isInstalledOnBrowser() &&
-        !wallet.connector.canConnectViaCustodialService, []);
     const setPrimaryWallet = React.useCallback((walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const { newWallet: newPrimaryWallet, connectedAccounts } = yield getSelectedWallet(walletId);
+        const newPrimaryWallet = yield getSelectedWallet(walletId);
         if (!primaryWalletId) {
             yield newPrimaryWallet.connector.connect();
             setPrimaryWalletId(walletId);
@@ -174,15 +90,6 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
         }
         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 (walletConnectorCore.isEmailWalletConnector(newPrimaryWallet.connector)) {
             const emailConnector = newPrimaryWallet.connector;
             const email = localStorage.getItem('magic-link-email');
@@ -190,51 +97,15 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
                 emailConnector.setEmail(email);
             }
         }
-        if (walletConnectorCore.isSocialWalletConnector(newPrimaryWallet.connector) &&
-            !newPrimaryWallet.connected) {
-            reconnectSocialWallet.reconnectSocialWallet(user, newPrimaryWallet);
-            return;
-        }
-        /* istanbul ignore next */
-        const publicAddress = yield newPrimaryWallet.connector.getAddress({
-            onDesktopUri: (uri) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                setDesktopUri(uri);
-            }),
-            onDisplayUri: (uri) => _tslib.__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) &&
-            !walletConnectorCore.isEmailWalletConnector(newPrimaryWallet.connector)) {
-            setMultiWalletWidgetState('awaiting_account_switch', 'switching_primary');
-            return;
-        }
-        if (publicAddress) {
-            setPrimaryWalletId(walletId);
-            setMultiWalletWidgetState('idle');
-        }
-        else {
-            logger.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/useWalletConnectors.d.ts

@@ -1,22 +1,18 @@
 import { Dispatch, SetStateAction } from 'react';
 import { UserProfile } from '@dynamic-labs/types';
-import { AuthModeType, MultiWalletWidgetState, Wallet, WalletOption } from '../../../shared';
+import { AuthModeType, Wallet, WalletOption } from '../../../shared';
 import { MultiWalletWidgetStateSetter } from '../multiWallet';
 type Props = {
     authMode: AuthModeType;
     connectedWallets: Wallet[];
-    multiWalletWidgetState: MultiWalletWidgetState;
-    setDesktopUri: Dispatch<SetStateAction<string>>;
-    setMultiWalletWidgetState: MultiWalletWidgetStateSetter;
-    setQrcodeUri: Dispatch<SetStateAction<string>>;
     walletConnectorOptions: WalletOption[];
-    setPrimaryWalletId: (walletId: string) => void;
+    setMultiWalletWidgetState: MultiWalletWidgetStateSetter;
     primaryWalletId: string | undefined;
+    setPrimaryWalletId: (walletId: string) => void;
     user?: UserProfile;
     canHaveMultipleWalletsConnected?: boolean;
 };
 export interface UseWalletConnectors {
-    didConnectedStateLoad: boolean;
     primaryWallet: Wallet | null;
     secondaryWallets: Wallet[];
     setPrimaryWallet: (walletId: string) => Promise<void>;
@@ -24,5 +20,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, setMultiWalletWidgetState, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, }: Props) => UseWalletConnectors;
 export {};

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

@@ -2,7 +2,7 @@
 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';
@@ -12,73 +12,12 @@ 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 '../../../store/state/loadingAndLifecycle.js';
 import '../../../shared/consts/index.js';
-import '@dynamic-labs/multi-wallet';
-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';
-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 '../../../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 { logVerboseTroubleshootingMessage } from '../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.js';
 
-const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, }) => {
+const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = useState(false);
     const linkedWallets = useMemo(() => {
         if (!user) {
@@ -90,8 +29,8 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
             walletConnectorOptions,
         });
     }, [user, primaryWalletId, walletConnectorOptions]);
-    logVerboseTroubleshootingMessage('linkedWallets', linkedWallets);
-    const walletsBasedOnAuthMode = useMemo(() => {
+    logger.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.
@@ -110,7 +49,7 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
         }
         return connectedWallets !== null && connectedWallets !== void 0 ? connectedWallets : [];
     }, [authMode, connectedWallets, linkedWallets, user]);
-    logVerboseTroubleshootingMessage('walletsBasedOnAuthMode', walletsBasedOnAuthMode);
+    logger.logVerboseTroubleshootingMessage('wallets', wallets);
     /**
      * This useEffect is temporary.
      * While the wallet connectors don't use the event emitter, we need to manually
@@ -118,17 +57,13 @@ 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]);
-    logVerboseTroubleshootingMessage('wallets', wallets);
-    logVerboseTroubleshootingMessage('didConnectedStateLoad', didConnectedStateLoad);
+    }), [wallets]);
     const { setUserWallets } = useInternalUserWallets();
     // Keep userWallets in sync whenever linkedWallets changes
     useEffect(() => {
-        logVerboseTroubleshootingMessage('[useWalletConnectors] will call setUserWallets', wallets);
+        logger.logVerboseTroubleshootingMessage('[useWalletConnectors] will call setUserWallets', wallets);
         setUserWallets((userWallets) => updateUserWalletsFromLinkedWallets(userWallets, wallets));
     }, [setUserWallets, wallets]);
     const primaryWallet = useMemo(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
@@ -140,29 +75,10 @@ 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);
+        const newPrimaryWallet = yield getSelectedWallet(walletId);
         if (!primaryWalletId) {
             yield newPrimaryWallet.connector.connect();
             setPrimaryWalletId(walletId);
@@ -170,15 +86,6 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
         }
         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');
@@ -186,51 +93,15 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
                 emailConnector.setEmail(email);
             }
         }
-        if (isSocialWalletConnector(newPrimaryWallet.connector) &&
-            !newPrimaryWallet.connected) {
-            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,