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

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

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useState } from 'react';
+import { useMemo, useState } from 'react';
 import { ProviderEnum } from '@dynamic-labs/sdk-api-core';
 import { SocialOAuthErrorCode } from '@dynamic-labs/types';
 import { isMobile, Oauth2Service, PlatformService, SocialAccountAlreadyExistsError } from '@dynamic-labs/utils';
@@ -112,7 +112,11 @@ const socialProviders = [
 const providersRequiringPkce = ['twitter', 'github'];
 // Hook to handle common social auth logic (for social linking and social sign in)
 const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, }) => {
-    const { environmentId, setShowAuthFlow, projectSettings, consumeNonce, redirectUrl: defaultRedirectUrl, } = useInternalDynamicContext();
+    const { environmentId, setShowAuthFlow, socialSettings, projectSettings, consumeNonce, redirectUrl: defaultRedirectUrl, } = useInternalDynamicContext();
+    /**
+     * Represents if the SDK will use a popup or redirect for social auth
+     */
+    const strategy = useMemo(() => (socialSettings === null || socialSettings === void 0 ? void 0 : socialSettings.strategy) || 'redirect', [socialSettings]);
     const { setErrorMessage, setError: setContextError } = useErrorContext();
     const { initAuth: initAuth$1 } = useUserAuth({
         authMethod: 'social',
@@ -244,6 +248,7 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
                 sessionTimeout,
                 setIsProcessing,
                 state,
+                strategy,
             });
             yield completeConnection({
                 authCode,

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

@@ -115,7 +115,7 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
  * }
  */
 const useSwitchWallet = () => {
-    const { setShowWidgetStatePopup, setSelectedWalletWithAction, setPrimaryWallet, setSelectedWalletConnectorKey, user, primaryWallet, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setPrimaryWallet, user, primaryWallet } = useInternalDynamicContext.useInternalDynamicContext();
     const userWallets = UserWalletsContext.useUserWallets();
     return (walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _a, _b;
@@ -135,10 +135,7 @@ const useSwitchWallet = () => {
             connector.connectedChain === 'FLOW') {
             yield connector.endSession();
         }
-        setShowWidgetStatePopup(true);
-        setSelectedWalletWithAction({ action: 'select', wallet });
         setPrimaryWallet(walletId);
-        setSelectedWalletConnectorKey(connector.key);
     });
 };
 

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

@@ -111,7 +111,7 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
  * }
  */
 const useSwitchWallet = () => {
-    const { setShowWidgetStatePopup, setSelectedWalletWithAction, setPrimaryWallet, setSelectedWalletConnectorKey, user, primaryWallet, } = useInternalDynamicContext();
+    const { setPrimaryWallet, user, primaryWallet } = useInternalDynamicContext();
     const userWallets = useUserWallets();
     return (walletId) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b;
@@ -131,10 +131,7 @@ const useSwitchWallet = () => {
             connector.connectedChain === 'FLOW') {
             yield connector.endSession();
         }
-        setShowWidgetStatePopup(true);
-        setSelectedWalletWithAction({ action: 'select', wallet });
         setPrimaryWallet(walletId);
-        setSelectedWalletConnectorKey(connector.key);
     });
 };
 

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

@@ -144,6 +144,9 @@ const useTokenBalances = ({ accountAddress, networkId, chainName = sdkApiCore.Ch
                 tokenBalancesActions.setTokenBalances({ isLoading: false });
             });
         }
+        else {
+            tokenBalancesActions.setTokenBalances({ tokenBalances: undefined });
+        }
     }), [
         user,
         requestChainName,

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

@@ -140,6 +140,9 @@ const useTokenBalances = ({ accountAddress, networkId, chainName = ChainEnum.Evm
                 setTokenBalances({ isLoading: false });
             });
         }
+        else {
+            setTokenBalances({ tokenBalances: undefined });
+        }
     }), [
         user,
         requestChainName,

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
 var data = require('../../../views/WalletList/data.cjs');
-require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api-core');
 require('../../constants/values.cjs');
 require('@dynamic-labs/utils');
@@ -13,6 +12,7 @@ require('../../../../../_virtual/_tslib.cjs');
 require('@dynamic-labs/multi-wallet');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');

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

@@ -1,6 +1,6 @@
 import { ProjectSettings } from '@dynamic-labs/sdk-api-core';
 import { type MobileExperience, type CoinbaseWalletPreference, type NetworkConfigurationMap, type WalletUiUtils } from '@dynamic-labs/types';
-import { DeepLinkVariant, WalletConnector, WalletConnectorExtension, WalletConnectorsMethod } from '@dynamic-labs/wallet-connector-core';
+import { DeepLinkVariant, InternalWalletConnector, WalletConnectorExtension, WalletConnectorsMethod } from '@dynamic-labs/wallet-connector-core';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 type Props = {
     appLogoUrl?: string;
@@ -14,7 +14,7 @@ type Props = {
     walletBook: WalletBookSchema;
     walletConnectPreferredChains?: `eip155:${number}`[];
     walletConnectorsProp?: WalletConnectorsMethod[];
-    walletUiUtils: WalletUiUtils<WalletConnector>;
+    walletUiUtils: WalletUiUtils<InternalWalletConnector>;
     walletConnectorExtensions?: WalletConnectorExtension[];
 };
 export declare const useWalletConnectorOptions: ({ projectSettings, appLogoUrl, appName, coinbaseWalletPreference, deepLinkPreference, flowNetwork, mobileExperience, networkConfigurations, walletBook, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }: Props) => {

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

@@ -1,7 +1,6 @@
 'use client'
 import { useMemo, useEffect } from 'react';
 import { getWallets } from '../../../views/WalletList/data.js';
-import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api-core';
 import '../../constants/values.js';
 import '@dynamic-labs/utils';
@@ -9,6 +8,7 @@ import '../../../../../_virtual/_tslib.js';
 import '@dynamic-labs/multi-wallet';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs

@@ -4,13 +4,13 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
-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('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../../../context/ViewContext/ViewContext.cjs');
 require('react');

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyMagicIsSetup/verifyMagicIsSetup.js

@@ -1,12 +1,12 @@
 'use client'
 import { ProviderEnum } from '@dynamic-labs/sdk-api-core';
-import '@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 '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../../../context/ViewContext/ViewContext.js';
 import 'react';

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyZeroDevIsSetup/verifyZeroDevIsSetup.cjs

@@ -4,13 +4,13 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
-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('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../../../context/ViewContext/ViewContext.cjs');
 require('react');

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyZeroDevIsSetup/verifyZeroDevIsSetup.js

@@ -1,12 +1,12 @@
 'use client'
 import { ProviderEnum } from '@dynamic-labs/sdk-api-core';
-import '@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 '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../../../context/ViewContext/ViewContext.js';
 import 'react';

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

@@ -5,89 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-require('@dynamic-labs/sdk-api-core');
-require('../../constants/values.cjs');
-require('@dynamic-labs/utils');
-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');
-var getReferencedAccount = require('../../functions/getReferencedAccount/getReferencedAccount.cjs');
-require('../../../config/ApiEndpoint.cjs');
-require('@dynamic-labs/store');
-require('../../../locale/locale.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');
-require('../../../context/WalletContext/WalletContext.cjs');
-require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
-require('../../../context/ThemeContext/ThemeContext.cjs');
-require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
-require('@dynamic-labs/types');
-require('../../../context/LoadingContext/LoadingContext.cjs');
-require('yup');
-require('../../../context/MockContext/MockContext.cjs');
-require('../../../views/CollectUserDataView/useFields.cjs');
-require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
-require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
-require('@dynamic-labs/rpc-providers');
-require('react-i18next');
-require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
-require('../../../components/Alert/Alert.cjs');
-require('../../../components/ShadowDOM/ShadowDOM.cjs');
-require('../../../components/IconButton/IconButton.cjs');
-require('../../../components/InlineWidget/InlineWidget.cjs');
-require('../../../components/Input/Input.cjs');
-require('../../../components/IsBrowser/IsBrowser.cjs');
-require('../../../components/MenuList/Dropdown/Dropdown.cjs');
-require('../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
-require('../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
-require('../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
-require('../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.cjs');
-require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
-require('../../../components/Popper/Popper/Popper.cjs');
-require('../../../components/Popper/PopperContext/PopperContext.cjs');
-require('react-focus-lock');
-require('qrcode');
-require('formik');
-require('../../../views/WalletList/WalletList.cjs');
-require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
-require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
-require('@hcaptcha/react-hcaptcha');
-require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
-require('../../../context/FooterAnimationContext/index.cjs');
-require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
-require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
-require('../../../context/PasskeyContext/PasskeyContext.cjs');
-require('@dynamic-labs/ethereum-core');
-require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
-require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
-require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
-require('../../../../polyfills.cjs');
-require('../../../context/ErrorBoundary/ErrorBoundaryBase.cjs');
-require('../../../context/ErrorBoundary/ErrorBoundaryContext.cjs');
-require('../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
-require('../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.cjs');
-require('../../../context/WidgetRegistry/WidgetRegistryContextProvider.cjs');
-require('../../../context/FundingContext/FundingContext.cjs');
-require('../../../context/SendBalanceContext/SendBalanceContext.cjs');
-require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
-require('../../../context/ConnectWithOtpContext/constants.cjs');
-require('../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
+var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 
 /**
  * This function will use a referenced account to kick off the social wallet
@@ -95,16 +13,18 @@ require('../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
  * wants to set their disconnected social wallet as their primary wallet, in
  * which case the wallet needs to be reconnected
  */
-const reconnectSocialWallet = (user, wallet) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-    if (!walletConnectorCore.isSocialWalletConnector(wallet.connector)) {
+const reconnectSocialWallet = (user, connector, walletAddress, walletChain) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    if (!walletConnectorCore.isSocialWalletConnector(connector)) {
         return;
     }
-    const socialAccountDataForWallet = getReferencedAccount.getReferencedAccount(user, wallet.id);
+    const socialAccountDataForWallet = user === null || user === void 0 ? void 0 : user.verifiedCredentials.find((account) => account.format === sdkApiCore.JwtVerifiedCredentialFormatEnum.Oauth &&
+        account.address &&
+        walletConnectorCore.isSameAddress(account.address, walletAddress, walletChain));
     if (!socialAccountDataForWallet ||
         !socialAccountDataForWallet.oauthProvider) {
         return;
     }
-    yield wallet.connector.connect(socialAccountDataForWallet.oauthProvider);
+    yield connector.connect(socialAccountDataForWallet.oauthProvider);
 });
 
 exports.reconnectSocialWallet = reconnectSocialWallet;

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

@@ -1,4 +1,4 @@
-import { Wallet } from '../../../shared';
+import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { UserProfile } from '../../../..';
 /**
  * This function will use a referenced account to kick off the social wallet
@@ -6,4 +6,4 @@ import { UserProfile } from '../../../..';
  * wants to set their disconnected social wallet as their primary wallet, in
  * which case the wallet needs to be reconnected
  */
-export declare const reconnectSocialWallet: (user: UserProfile | undefined, wallet: Wallet) => Promise<void>;
+export declare const reconnectSocialWallet: (user: UserProfile | undefined, connector: WalletConnector, walletAddress: string, walletChain: string) => Promise<void>;

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

@@ -1,89 +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 '../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 '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 { 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
@@ -91,16 +9,18 @@ import '../../../context/ReinitializeContext/ReinitializeContextProvider.js';
  * 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

@@ -9,17 +9,17 @@ var utils = require('@dynamic-labs/utils');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('@dynamic-labs/sdk-api-core');
-var logger = require('../../../shared/logger.cjs');
+require('../../constants/values.cjs');
+require('@dynamic-labs/multi-wallet');
+require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 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('../../../shared/consts/index.cjs');
-require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
@@ -44,8 +44,6 @@ 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');
@@ -93,7 +91,7 @@ require('../../../context/ConnectWithOtpContext/constants.cjs');
 require('../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
 var logVerboseTroubleshootingMessage = require('../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.cjs');
 
-const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, walletBook, }) => {
+const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = React.useState(false);
     const linkedWallets = React.useMemo(() => {
         if (!user) {
@@ -136,8 +134,6 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
     React.useEffect(() => wallets.forEach((wallet) => {
         wallet.connector.initEventListener();
     }), [wallets]);
-    const { didConnectedStateLoad } = useWalletsConnectionState.useWalletsConnectionState(wallets, walletBook, primaryWalletId, authMode);
-    logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('didConnectedStateLoad', didConnectedStateLoad);
     const { setUserWallets } = UserWalletsContext.useInternalUserWallets();
     // Keep userWallets in sync whenever linkedWallets changes
     React.useEffect(() => {
@@ -153,46 +149,17 @@ 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);
-        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 (walletConnectorCore.isEmailWalletConnector(newPrimaryWallet.connector)) {
             const emailConnector = newPrimaryWallet.connector;
             const email = localStorage.getItem('magic-link-email');
@@ -200,52 +167,15 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
                 emailConnector.setEmail(email);
             }
         }
-        const shouldReconnectSocialWallet = walletConnectorCore.isSocialWalletConnector(newPrimaryWallet.connector) &&
-            !(yield newPrimaryWallet.connector.getConnectedAccounts()).length;
-        if (shouldReconnectSocialWallet) {
-            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,