@dynamic-labs/sdk-react-core 4.4.2-preview.1 → 4.4.3

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

@@ -46,7 +46,6 @@ import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
 import '../../../store/state/walletOptions/walletOptions.js';
-import '@dynamic-labs/ethereum-aa';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../components/Alert/Alert.js';
@@ -91,49 +90,49 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 const useMfaModals = () => {
     var _a;
     const { setShowAuthFlow, projectSettings } = useInternalDynamicContext();
-    const { setView } = useViewContext();
+    const { pushView } = useViewContext();
     const isMfaEnabled = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.mfa) === null || _a === void 0 ? void 0 : _a.enabled;
     const setShowMfaChooseType = useCallback((value) => {
         if (value) {
             if (!isMfaEnabled)
                 return;
-            setView('mfa-choose-device');
+            pushView('mfa-choose-device');
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
-    }, [isMfaEnabled, setShowAuthFlow, setView]);
+    }, [isMfaEnabled, setShowAuthFlow, pushView]);
     const setShowMfaQRCode = useCallback((value) => {
         if (value) {
             if (!isMfaEnabled)
                 return;
             // If MFA is enabled, show the MFA setup view and set it as the initial setup
-            setView('mfa-secure-device', { isInitialSetup: true });
+            pushView('mfa-secure-device', { isInitialSetup: true });
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
-    }, [isMfaEnabled, setShowAuthFlow, setView]);
+    }, [isMfaEnabled, setShowAuthFlow, pushView]);
     const setShowOTPVerification = useCallback((value) => {
         if (value) {
             if (!isMfaEnabled)
                 return;
-            setView('mfa-verification');
+            pushView('mfa-verification');
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
-    }, [isMfaEnabled, setShowAuthFlow, setView]);
+    }, [isMfaEnabled, setShowAuthFlow, pushView]);
     const setShowMfaViewBackupCodes = useCallback((value) => {
         if (value) {
             if (!isMfaEnabled)
                 return;
-            setView('mfa-display-backup-codes');
+            pushView('mfa-display-backup-codes');
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
-    }, [isMfaEnabled, setShowAuthFlow, setView]);
+    }, [isMfaEnabled, setShowAuthFlow, pushView]);
     const setShowMfaEnterBackupCodes = useCallback((value) => {
         if (value) {
             if (!isMfaEnabled)
                 return;
-            setView('mfa-recovery');
+            pushView('mfa-recovery');
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
-    }, [isMfaEnabled, setShowAuthFlow, setView]);
+    }, [isMfaEnabled, setShowAuthFlow, pushView]);
     return {
         setShowMfaChooseType,
         setShowMfaEnterBackupCodes,

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

@@ -51,7 +51,6 @@ require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../store/state/walletOptions/walletOptions.cjs');
-require('@dynamic-labs/ethereum-aa');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../components/Alert/Alert.cjs');

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

@@ -47,7 +47,6 @@ import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
 import '../../../store/state/walletOptions/walletOptions.js';
-import '@dynamic-labs/ethereum-aa';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../components/Alert/Alert.js';

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

@@ -52,7 +52,6 @@ require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../store/state/walletOptions/walletOptions.cjs');
-require('@dynamic-labs/ethereum-aa');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../components/Alert/Alert.cjs');

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

@@ -48,7 +48,6 @@ import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
 import '../../../store/state/walletOptions/walletOptions.js';
-import '@dynamic-labs/ethereum-aa';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../components/Alert/Alert.js';

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

@@ -50,7 +50,6 @@ require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../store/state/walletOptions/walletOptions.cjs');
-require('@dynamic-labs/ethereum-aa');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../components/Alert/Alert.cjs');

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

@@ -46,7 +46,6 @@ import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
 import '../../../store/state/walletOptions/walletOptions.js';
-import '@dynamic-labs/ethereum-aa';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../components/Alert/Alert.js';

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

@@ -62,7 +62,6 @@ require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../store/state/walletOptions/walletOptions.cjs');
-require('@dynamic-labs/ethereum-aa');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../components/Alert/Alert.cjs');
@@ -114,7 +113,7 @@ const usePasskeyRecovery = () => {
     const { initAuthMethod } = useInitEmbeddedWalletAuthMethod.useInitEmbeddedWalletAuthMethod();
     const { setDisplayedDestination: setEmailForVerification, setVerificationUUID, } = VerificationContext.useVerification();
     const { getEOAWallet } = useSmartWallets.useSmartWallets();
-    const { setView } = ViewContext.useViewContext();
+    const { pushView } = ViewContext.useViewContext();
     const wallet = (_a = (primaryWallet && getEOAWallet(primaryWallet))) !== null && _a !== void 0 ? _a : primaryWallet;
     const isSessionRestored = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _d, _e;
@@ -191,7 +190,7 @@ const usePasskeyRecovery = () => {
             ? Object.keys(supportedAuthenticators)
             : [];
         if (!hasRecoveryEmail) {
-            setView('passkey-recovery-add-email', { shouldInitRecovery: true });
+            pushView('passkey-recovery-add-email', { shouldInitRecovery: true });
             setShowAuthFlow(true, {
                 ignoreIfIsEmbeddedWidget: false,
                 performMultiWalletChecks: false,
@@ -199,9 +198,7 @@ const usePasskeyRecovery = () => {
         }
         else if (!authenticatorType &&
             supportedAuthenticatorMethods.length > 1) {
-            setView('embedded-wallet-auth-choice', {
-                currentAction,
-            });
+            pushView('embedded-wallet-auth-choice', { currentAction });
             setShowAuthFlow(true, {
                 ignoreIfIsEmbeddedWidget: false,
                 performMultiWalletChecks: false,
@@ -233,7 +230,7 @@ const usePasskeyRecovery = () => {
         environmentId,
         user$1,
         setShowAuthFlow,
-        setView,
+        pushView,
         initAuthMethod,
         iframeContainerRef,
     ]);
@@ -265,7 +262,7 @@ const usePasskeyRecovery = () => {
             if (nextView === sdkApiCore.NextViewEnum.Done) {
                 return userProfile;
             }
-            setView('verify-email', { isEmailRecoveryFlow: true });
+            pushView('verify-email', { isEmailRecoveryFlow: true });
             setEmailForVerification(emailInput);
             setVerificationUUID(emailVerification === null || emailVerification === void 0 ? void 0 : emailVerification.verificationUUID);
             return new Promise((resolve, reject) => {

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

@@ -58,7 +58,6 @@ import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
 import '../../../store/state/walletOptions/walletOptions.js';
-import '@dynamic-labs/ethereum-aa';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../components/Alert/Alert.js';
@@ -110,7 +109,7 @@ const usePasskeyRecovery = () => {
     const { initAuthMethod } = useInitEmbeddedWalletAuthMethod();
     const { setDisplayedDestination: setEmailForVerification, setVerificationUUID, } = useVerification();
     const { getEOAWallet } = useSmartWallets();
-    const { setView } = useViewContext();
+    const { pushView } = useViewContext();
     const wallet = (_a = (primaryWallet && getEOAWallet(primaryWallet))) !== null && _a !== void 0 ? _a : primaryWallet;
     const isSessionRestored = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
         var _d, _e;
@@ -187,7 +186,7 @@ const usePasskeyRecovery = () => {
             ? Object.keys(supportedAuthenticators)
             : [];
         if (!hasRecoveryEmail) {
-            setView('passkey-recovery-add-email', { shouldInitRecovery: true });
+            pushView('passkey-recovery-add-email', { shouldInitRecovery: true });
             setShowAuthFlow(true, {
                 ignoreIfIsEmbeddedWidget: false,
                 performMultiWalletChecks: false,
@@ -195,9 +194,7 @@ const usePasskeyRecovery = () => {
         }
         else if (!authenticatorType &&
             supportedAuthenticatorMethods.length > 1) {
-            setView('embedded-wallet-auth-choice', {
-                currentAction,
-            });
+            pushView('embedded-wallet-auth-choice', { currentAction });
             setShowAuthFlow(true, {
                 ignoreIfIsEmbeddedWidget: false,
                 performMultiWalletChecks: false,
@@ -229,7 +226,7 @@ const usePasskeyRecovery = () => {
         environmentId,
         user,
         setShowAuthFlow,
-        setView,
+        pushView,
         initAuthMethod,
         iframeContainerRef,
     ]);
@@ -261,7 +258,7 @@ const usePasskeyRecovery = () => {
             if (nextView === NextViewEnum.Done) {
                 return userProfile;
             }
-            setView('verify-email', { isEmailRecoveryFlow: true });
+            pushView('verify-email', { isEmailRecoveryFlow: true });
             setEmailForVerification(emailInput);
             setVerificationUUID(emailVerification === null || emailVerification === void 0 ? void 0 : emailVerification.verificationUUID);
             return new Promise((resolve, reject) => {

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

@@ -51,7 +51,6 @@ require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../store/state/walletOptions/walletOptions.cjs');
-require('@dynamic-labs/ethereum-aa');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../components/Alert/Alert.cjs');

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

@@ -47,7 +47,6 @@ import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
 import '../../../store/state/walletOptions/walletOptions.js';
-import '@dynamic-labs/ethereum-aa';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../components/Alert/Alert.js';

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

@@ -50,7 +50,6 @@ require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../store/state/walletOptions/walletOptions.cjs');
-require('@dynamic-labs/ethereum-aa');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../components/Alert/Alert.cjs');

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

@@ -46,7 +46,6 @@ import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '../../../store/state/loadingAndLifecycle.js';
 import '../../../store/state/walletOptions/walletOptions.js';
-import '@dynamic-labs/ethereum-aa';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../components/Alert/Alert.js';

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

@@ -52,7 +52,6 @@ require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../store/state/walletOptions/walletOptions.cjs');
-require('@dynamic-labs/ethereum-aa');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../components/Alert/Alert.cjs');

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

@@ -48,7 +48,6 @@ import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
 import '../../../store/state/walletOptions/walletOptions.js';
-import '@dynamic-labs/ethereum-aa';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../components/Alert/Alert.js';

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

@@ -50,7 +50,6 @@ require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../store/state/walletOptions/walletOptions.cjs');
-require('@dynamic-labs/ethereum-aa');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../components/Alert/Alert.cjs');

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

@@ -46,7 +46,6 @@ import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
 import '../../../store/state/walletOptions/walletOptions.js';
-import '@dynamic-labs/ethereum-aa';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../components/Alert/Alert.js';

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

@@ -52,7 +52,6 @@ require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../store/state/walletOptions/walletOptions.cjs');
-require('@dynamic-labs/ethereum-aa');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../components/Alert/Alert.cjs');
@@ -101,10 +100,10 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 const useSocialAccounts = () => {
     var _a;
     const { environmentId, user, projectSettings } = useInternalDynamicContext.useInternalDynamicContext();
-    const { setView } = ViewContext.useViewContext();
+    const { pushView } = ViewContext.useViewContext();
     const { setSocialProvider } = SocialRedirectContext.useSocialRedirectContext();
     const { handleError, setError, setIsProcessing, checkValidProvider, error, isProcessing, connectSocialAccount, } = useSocialAuth.useSocialAuth({
-        onFarcasterUrl: (url) => setView('farcaster-connect-view', { url }, {
+        onFarcasterUrl: (url) => pushView('farcaster-connect-view', { url }, {
             onBackClick: () => {
                 setSocialProvider(undefined);
                 dynamicEvents.dynamicEvents.emit('farcasterConnectCancelled');
@@ -119,32 +118,28 @@ const useSocialAccounts = () => {
     const verifiedOAuthCredentialsMap = React.useMemo(() => {
         var _a, _b;
         const verifiedOAuthCredential = (_b = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.filter((credential) => credential.format === 'oauth')) !== null && _b !== void 0 ? _b : [];
-        return Object.fromEntries(new Map(verifiedOAuthCredential.map((credential) => {
-            var _a;
-            return [
-                (_a = credential.oauthProvider) !== null && _a !== void 0 ? _a : credential.id,
-                credential,
-            ];
-        })));
+        const credentialMap = new Map();
+        verifiedOAuthCredential.forEach((credential) => {
+            var _a, _b;
+            const key = (_a = credential.oauthProvider) !== null && _a !== void 0 ? _a : credential.id;
+            const existing = (_b = credentialMap.get(key)) !== null && _b !== void 0 ? _b : [];
+            credentialMap.set(key, [...existing, credential]);
+        });
+        return Object.fromEntries(credentialMap);
     }, [user === null || user === void 0 ? void 0 : user.verifiedCredentials]);
     const checkValidOAuthLinking = React.useCallback((provider) => {
         if (!isSocialKycEnabled.isSocialKycEnabled(projectSettings)) {
             handleError(provider, types.SocialOAuthErrorCode.SOCIAL_LINKING_NOT_ENABLED, 'Social linking is not enabled in Information Capture on the dashboard', { raiseAuthFailure: false });
             return false;
         }
-        const verifiedCredential = verifiedOAuthCredentialsMap[provider];
-        if (verifiedCredential) {
-            handleError(provider, types.SocialOAuthErrorCode.ACCOUNT_ALREADY_LINKED, `Account already linked for provider: ${provider}`, { raiseAuthFailure: false });
-            return false;
-        }
         const oauthProviders = index.getEnabledOAuthProviders(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers);
-        const oauthProvider = oauthProviders.find((p) => p.provider === provider);
+        const oauthProvider = oauthProviders === null || oauthProviders === void 0 ? void 0 : oauthProviders.find((p) => p.provider === provider);
         if (!oauthProvider) {
             handleError(provider, types.SocialOAuthErrorCode.PROVIDER_NOT_ENABLED, `Social linking provider is not enabled in Information Capture on the dashboard: ${provider}`, { raiseAuthFailure: false });
             return false;
         }
         return true;
-    }, [handleError, projectSettings, verifiedOAuthCredentialsMap]);
+    }, [handleError, projectSettings]);
     const linkSocialAccount = React.useCallback((provider_1, ...args_1) => _tslib.__awaiter(void 0, [provider_1, ...args_1], void 0, function* (provider, { redirectUrl } = { redirectUrl: undefined }) {
         connectSocialAccount({
             authMode: 'link',
@@ -153,14 +148,22 @@ const useSocialAccounts = () => {
             validator: checkValidOAuthLinking,
         });
     }), [checkValidOAuthLinking, connectSocialAccount]);
-    const unlinkSocialAccount = React.useCallback((provider) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const findVerifiedCredentialById = (provider, verifiedCredentialId) => {
+        var _a;
+        const verifiedCredentials = (_a = verifiedOAuthCredentialsMap[provider]) !== null && _a !== void 0 ? _a : [];
+        const verifiedCredential = verifiedCredentialId
+            ? verifiedCredentials.find((cred) => cred.id === verifiedCredentialId)
+            : verifiedCredentials[0];
+        return verifiedCredential;
+    };
+    const unlinkSocialAccount = React.useCallback((provider, verifiedCredentialId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _b;
         setError(undefined);
         setIsProcessing(true);
         if (!checkValidProvider(provider, 'unlink')) {
             return;
         }
-        const verifiedCredential = verifiedOAuthCredentialsMap[provider];
+        const verifiedCredential = findVerifiedCredentialById(provider, verifiedCredentialId);
         if (!verifiedCredential) {
             handleError(provider, types.SocialOAuthErrorCode.NO_ACCOUNT_LINKED, `No account linked for provider: ${provider}`, { raiseAuthFailure: false });
             return;
@@ -189,12 +192,8 @@ const useSocialAccounts = () => {
         setIsProcessing,
         verifiedOAuthCredentialsMap,
     ]);
-    const isLinked = React.useCallback((provider) => Boolean(verifiedOAuthCredentialsMap[provider]), [verifiedOAuthCredentialsMap]);
-    const getLinkedAccountInformation = React.useCallback((provider) => {
-        const verifiedCredential = verifiedOAuthCredentialsMap[provider];
-        if (!verifiedCredential) {
-            return;
-        }
+    const isLinked = React.useCallback((provider) => { var _a; return Boolean((_a = verifiedOAuthCredentialsMap[provider]) === null || _a === void 0 ? void 0 : _a.length); }, [verifiedOAuthCredentialsMap]);
+    const getAccountInformation = (verifiedCredential) => {
         const { id, oauthAccountId, oauthAccountPhotos, oauthDisplayName, oauthEmails, oauthProvider, oauthUsername, publicIdentifier, } = verifiedCredential;
         return {
             accountId: oauthAccountId !== null && oauthAccountId !== void 0 ? oauthAccountId : undefined,
@@ -206,6 +205,18 @@ const useSocialAccounts = () => {
             publicIdentifier,
             username: oauthUsername,
         };
+    };
+    const getLinkedAccountInformation = React.useCallback((provider, verifiedCredentialId) => {
+        const verifiedCredential = findVerifiedCredentialById(provider, verifiedCredentialId);
+        if (!verifiedCredential) {
+            return;
+        }
+        return getAccountInformation(verifiedCredential);
+    }, [verifiedOAuthCredentialsMap]);
+    const getLinkedAccounts = React.useCallback((provider) => {
+        var _a;
+        const verifiedCredentials = (_a = verifiedOAuthCredentialsMap[provider]) !== null && _a !== void 0 ? _a : [];
+        return verifiedCredentials.map((credential) => getAccountInformation(credential));
     }, [verifiedOAuthCredentialsMap]);
     const checkValidOAuthSignIn = React.useCallback((provider) => {
         var _a;
@@ -227,6 +238,7 @@ const useSocialAccounts = () => {
     return React.useMemo(() => ({
         error,
         getLinkedAccountInformation,
+        getLinkedAccounts,
         isLinked,
         isProcessing,
         linkSocialAccount,
@@ -235,6 +247,7 @@ const useSocialAccounts = () => {
     }), [
         error,
         getLinkedAccountInformation,
+        getLinkedAccounts,
         isLinked,
         isProcessing,
         linkSocialAccount,

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

@@ -8,11 +8,12 @@ type ConnectSocialProps = {
 };
 export declare const useSocialAccounts: () => {
     readonly error: import("@dynamic-labs/types").SocialOAuthError | undefined;
-    readonly getLinkedAccountInformation: (provider: ProviderEnum) => SocialAccountInformation | undefined;
+    readonly getLinkedAccountInformation: (provider: ProviderEnum, verifiedCredentialId?: string) => SocialAccountInformation | undefined;
+    readonly getLinkedAccounts: (provider: ProviderEnum) => SocialAccountInformation[];
     readonly isLinked: (provider: ProviderEnum) => boolean;
     readonly isProcessing: boolean;
     readonly linkSocialAccount: (provider: ProviderEnum, { redirectUrl }?: ConnectSocialProps) => Promise<void>;
     readonly signInWithSocialAccount: (provider: ProviderEnum, { redirectUrl }?: ConnectSocialProps) => Promise<void>;
-    readonly unlinkSocialAccount: (provider: ProviderEnum) => Promise<void>;
+    readonly unlinkSocialAccount: (provider: ProviderEnum, verifiedCredentialId?: string) => Promise<void>;
 };
 export {};

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

@@ -48,7 +48,6 @@ import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
 import '../../../store/state/walletOptions/walletOptions.js';
-import '@dynamic-labs/ethereum-aa';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../components/Alert/Alert.js';
@@ -97,10 +96,10 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 const useSocialAccounts = () => {
     var _a;
     const { environmentId, user, projectSettings } = useInternalDynamicContext();
-    const { setView } = useViewContext();
+    const { pushView } = useViewContext();
     const { setSocialProvider } = useSocialRedirectContext();
     const { handleError, setError, setIsProcessing, checkValidProvider, error, isProcessing, connectSocialAccount, } = useSocialAuth({
-        onFarcasterUrl: (url) => setView('farcaster-connect-view', { url }, {
+        onFarcasterUrl: (url) => pushView('farcaster-connect-view', { url }, {
             onBackClick: () => {
                 setSocialProvider(undefined);
                 dynamicEvents.emit('farcasterConnectCancelled');
@@ -115,32 +114,28 @@ const useSocialAccounts = () => {
     const verifiedOAuthCredentialsMap = useMemo(() => {
         var _a, _b;
         const verifiedOAuthCredential = (_b = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.filter((credential) => credential.format === 'oauth')) !== null && _b !== void 0 ? _b : [];
-        return Object.fromEntries(new Map(verifiedOAuthCredential.map((credential) => {
-            var _a;
-            return [
-                (_a = credential.oauthProvider) !== null && _a !== void 0 ? _a : credential.id,
-                credential,
-            ];
-        })));
+        const credentialMap = new Map();
+        verifiedOAuthCredential.forEach((credential) => {
+            var _a, _b;
+            const key = (_a = credential.oauthProvider) !== null && _a !== void 0 ? _a : credential.id;
+            const existing = (_b = credentialMap.get(key)) !== null && _b !== void 0 ? _b : [];
+            credentialMap.set(key, [...existing, credential]);
+        });
+        return Object.fromEntries(credentialMap);
     }, [user === null || user === void 0 ? void 0 : user.verifiedCredentials]);
     const checkValidOAuthLinking = useCallback((provider) => {
         if (!isSocialKycEnabled(projectSettings)) {
             handleError(provider, SocialOAuthErrorCode.SOCIAL_LINKING_NOT_ENABLED, 'Social linking is not enabled in Information Capture on the dashboard', { raiseAuthFailure: false });
             return false;
         }
-        const verifiedCredential = verifiedOAuthCredentialsMap[provider];
-        if (verifiedCredential) {
-            handleError(provider, SocialOAuthErrorCode.ACCOUNT_ALREADY_LINKED, `Account already linked for provider: ${provider}`, { raiseAuthFailure: false });
-            return false;
-        }
         const oauthProviders = getEnabledOAuthProviders(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers);
-        const oauthProvider = oauthProviders.find((p) => p.provider === provider);
+        const oauthProvider = oauthProviders === null || oauthProviders === void 0 ? void 0 : oauthProviders.find((p) => p.provider === provider);
         if (!oauthProvider) {
             handleError(provider, SocialOAuthErrorCode.PROVIDER_NOT_ENABLED, `Social linking provider is not enabled in Information Capture on the dashboard: ${provider}`, { raiseAuthFailure: false });
             return false;
         }
         return true;
-    }, [handleError, projectSettings, verifiedOAuthCredentialsMap]);
+    }, [handleError, projectSettings]);
     const linkSocialAccount = useCallback((provider_1, ...args_1) => __awaiter(void 0, [provider_1, ...args_1], void 0, function* (provider, { redirectUrl } = { redirectUrl: undefined }) {
         connectSocialAccount({
             authMode: 'link',
@@ -149,14 +144,22 @@ const useSocialAccounts = () => {
             validator: checkValidOAuthLinking,
         });
     }), [checkValidOAuthLinking, connectSocialAccount]);
-    const unlinkSocialAccount = useCallback((provider) => __awaiter(void 0, void 0, void 0, function* () {
+    const findVerifiedCredentialById = (provider, verifiedCredentialId) => {
+        var _a;
+        const verifiedCredentials = (_a = verifiedOAuthCredentialsMap[provider]) !== null && _a !== void 0 ? _a : [];
+        const verifiedCredential = verifiedCredentialId
+            ? verifiedCredentials.find((cred) => cred.id === verifiedCredentialId)
+            : verifiedCredentials[0];
+        return verifiedCredential;
+    };
+    const unlinkSocialAccount = useCallback((provider, verifiedCredentialId) => __awaiter(void 0, void 0, void 0, function* () {
         var _b;
         setError(undefined);
         setIsProcessing(true);
         if (!checkValidProvider(provider, 'unlink')) {
             return;
         }
-        const verifiedCredential = verifiedOAuthCredentialsMap[provider];
+        const verifiedCredential = findVerifiedCredentialById(provider, verifiedCredentialId);
         if (!verifiedCredential) {
             handleError(provider, SocialOAuthErrorCode.NO_ACCOUNT_LINKED, `No account linked for provider: ${provider}`, { raiseAuthFailure: false });
             return;
@@ -185,12 +188,8 @@ const useSocialAccounts = () => {
         setIsProcessing,
         verifiedOAuthCredentialsMap,
     ]);
-    const isLinked = useCallback((provider) => Boolean(verifiedOAuthCredentialsMap[provider]), [verifiedOAuthCredentialsMap]);
-    const getLinkedAccountInformation = useCallback((provider) => {
-        const verifiedCredential = verifiedOAuthCredentialsMap[provider];
-        if (!verifiedCredential) {
-            return;
-        }
+    const isLinked = useCallback((provider) => { var _a; return Boolean((_a = verifiedOAuthCredentialsMap[provider]) === null || _a === void 0 ? void 0 : _a.length); }, [verifiedOAuthCredentialsMap]);
+    const getAccountInformation = (verifiedCredential) => {
         const { id, oauthAccountId, oauthAccountPhotos, oauthDisplayName, oauthEmails, oauthProvider, oauthUsername, publicIdentifier, } = verifiedCredential;
         return {
             accountId: oauthAccountId !== null && oauthAccountId !== void 0 ? oauthAccountId : undefined,
@@ -202,6 +201,18 @@ const useSocialAccounts = () => {
             publicIdentifier,
             username: oauthUsername,
         };
+    };
+    const getLinkedAccountInformation = useCallback((provider, verifiedCredentialId) => {
+        const verifiedCredential = findVerifiedCredentialById(provider, verifiedCredentialId);
+        if (!verifiedCredential) {
+            return;
+        }
+        return getAccountInformation(verifiedCredential);
+    }, [verifiedOAuthCredentialsMap]);
+    const getLinkedAccounts = useCallback((provider) => {
+        var _a;
+        const verifiedCredentials = (_a = verifiedOAuthCredentialsMap[provider]) !== null && _a !== void 0 ? _a : [];
+        return verifiedCredentials.map((credential) => getAccountInformation(credential));
     }, [verifiedOAuthCredentialsMap]);
     const checkValidOAuthSignIn = useCallback((provider) => {
         var _a;
@@ -223,6 +234,7 @@ const useSocialAccounts = () => {
     return useMemo(() => ({
         error,
         getLinkedAccountInformation,
+        getLinkedAccounts,
         isLinked,
         isProcessing,
         linkSocialAccount,
@@ -231,6 +243,7 @@ const useSocialAccounts = () => {
     }), [
         error,
         getLinkedAccountInformation,
+        getLinkedAccounts,
         isLinked,
         isProcessing,
         linkSocialAccount,

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

@@ -57,7 +57,6 @@ require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../store/state/walletOptions/walletOptions.cjs');
-require('@dynamic-labs/ethereum-aa');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../components/Alert/Alert.cjs');

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

@@ -53,7 +53,6 @@ import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../store/state/loadingAndLifecycle.js';
 import '../../../store/state/walletOptions/walletOptions.js';
-import '@dynamic-labs/ethereum-aa';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../components/Alert/Alert.js';

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

@@ -51,7 +51,6 @@ require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../store/state/walletOptions/walletOptions.cjs');
-require('@dynamic-labs/ethereum-aa');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../components/Alert/Alert.cjs');