@dynamic-labs/sdk-react-core 0.19.0-alpha.7 → 0.19.0-alpha.8

package/src/lib/components/UserProfile/parts/UserProfileSocialAccount/UserProfileSocialAccount.js

@@ -14,7 +14,7 @@ import '../../../../utils/constants/colors.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import '../../../../shared/consts/index.js';
-import '../../../../context/DynamicContext/DynamicContext.js';
+import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
 import '@dynamic-labs/multi-wallet';
 import '../../../ShadowDOM/ShadowDOM.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
@@ -53,22 +53,24 @@ import { ConnectedAccountAvatar } from './components/ConnectedAccountAvatar/Conn
 
 const UserProfileSocialAccount = ({ provider, }) => {
     var _a;
+    const { user, primaryWallet } = useInternalDynamicContext();
     const { linkSocialAccount, unlinkSocialAccount, isProcessing, isLinked, getLinkedAccountInformation, } = useSocialAccounts();
     const isProviderLinked = isLinked(provider);
     const connectedAccountInfo = getLinkedAccountInformation(provider);
     const iconThemeVariant = useIconThemeVariant();
-    return (jsxs("div", Object.assign({ className: 'user-profile-social-account', "data-testid": `social-account-${provider}` }, { children: [jsx("div", Object.assign({ className: 'user-profile-social-account__icon' }, { children: isProviderLinked ? (jsx(ConnectedAccountAvatar, { provider: provider, avatarUrl: connectedAccountInfo === null || connectedAccountInfo === void 0 ? void 0 : connectedAccountInfo.avatar })) : (jsx(SocialIcon, { name: provider, variant: iconThemeVariant })) })), jsx("div", Object.assign({ className: 'user-profile-social-account__label' }, { children: jsx(Typography, Object.assign({ weight: 'medium', variant: 'body_normal', color: 'primary' }, { children: (_a = connectedAccountInfo === null || connectedAccountInfo === void 0 ? void 0 : connectedAccountInfo.publicIdentifier) !== null && _a !== void 0 ? _a : capitalize(provider) })) })), isProviderLinked ? (jsx(Button, { buttonClassName: 'user-profile-social-account__button', buttonVariant: 'secondary', buttonRounded: 'small', buttonPadding: 'none', onClick: () => unlinkSocialAccount(provider), loading: isProcessing, dataTestId: 'social-account-disconnect-button', typographyProps: {
-                    color: 'secondary',
-                    variant: 'button_tertiary',
-                }, startSlot: 
-                // eslint-disable-next-line react/jsx-wrap-multilines
-                jsx(Icon, Object.assign({ color: 'text-tertiary', size: 'small' }, { children: jsx(SvgUnlink, {}) })) })) : (jsx(Button, Object.assign({ buttonClassName: 'user-profile-social-account__button', buttonVariant: 'secondary', buttonRounded: 'small', buttonPadding: 'none', onClick: () => linkSocialAccount(provider), loading: isProcessing, dataTestId: 'social-account-connect-button', typographyProps: {
-                    color: 'secondary',
-                    variant: 'button_tertiary',
-                    weight: 'medium',
-                }, startSlot: 
-                // eslint-disable-next-line react/jsx-wrap-multilines
-                jsx(Icon, Object.assign({ color: 'text-tertiary', size: 'small' }, { children: jsx(SvgAdd, {}) })) }, { children: "Connect" })))] })));
+    const isActiveCredential = !primaryWallet &&
+        connectedAccountInfo &&
+        (connectedAccountInfo === null || connectedAccountInfo === void 0 ? void 0 : connectedAccountInfo.id) === (user === null || user === void 0 ? void 0 : user.lastVerifiedCredentialId);
+    const renderButton = () => (jsx(Button, Object.assign({ buttonClassName: 'user-profile-social-account__button', buttonVariant: 'secondary', buttonRounded: 'small', buttonPadding: 'none', onClick: () => isProviderLinked
+            ? unlinkSocialAccount(provider)
+            : linkSocialAccount(provider), loading: isProcessing, dataTestId: `social-account-${isProviderLinked ? 'disconnect' : 'connect'}-button`, typographyProps: {
+            color: 'secondary',
+            variant: 'button_tertiary',
+            // weight: 'medium',
+        }, startSlot: 
+        // eslint-disable-next-line react/jsx-wrap-multilines
+        jsx(Icon, Object.assign({ color: 'text-tertiary', size: 'small' }, { children: isProviderLinked ? jsx(SvgUnlink, {}) : jsx(SvgAdd, {}) })) }, { children: isProviderLinked ? null : 'Connect' })));
+    return (jsxs("div", Object.assign({ className: 'user-profile-social-account', "data-testid": `social-account-${provider}` }, { children: [jsx("div", Object.assign({ className: 'user-profile-social-account__icon' }, { children: isProviderLinked ? (jsx(ConnectedAccountAvatar, { provider: provider, avatarUrl: connectedAccountInfo === null || connectedAccountInfo === void 0 ? void 0 : connectedAccountInfo.avatar })) : (jsx(SocialIcon, { name: provider, variant: iconThemeVariant })) })), jsx("div", Object.assign({ className: 'user-profile-social-account__label' }, { children: jsx(Typography, Object.assign({ weight: 'medium', variant: 'body_normal', color: 'primary' }, { children: (_a = connectedAccountInfo === null || connectedAccountInfo === void 0 ? void 0 : connectedAccountInfo.publicIdentifier) !== null && _a !== void 0 ? _a : capitalize(provider) })) })), !isActiveCredential ? renderButton() : null] })));
 };
 
 export { UserProfileSocialAccount };

package/src/lib/context/DynamicContext/helpers.cjs

@@ -18,7 +18,8 @@ require('ethers');
 var getAuthToken = require('../../utils/functions/getAuthToken/getAuthToken.cjs');
 
 let logoutTimer;
-let sdkSettingsTimer;
+let dynamicContextSettingsTimer;
+let wagmiSettingsTimer;
 const sdkSettingsTimeout = 24 * 60 * 60 * 1000; // 24 hours
 const isAuthTokenExpired = (token) => {
     const decoded = decodeJwt.decodeJwt(token);
@@ -68,13 +69,22 @@ const getInitialView = ({ connectedWallets, isBridgeFlow, isFullyConnected, isAu
     }
     return 'login-with-email-or-wallet';
 };
-const setSDKSessionSettings = () => {
+const setDynamicContextSessionSettings = () => {
+    setSessionSettings(localStorage$1.DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS);
+    dynamicContextSettingsTimer = setTimeout(isDynamicContextSessionSettingExpired, sdkSettingsTimeout);
+};
+const setWagmiSessionSettings = () => {
+    setSessionSettings(localStorage$1.WAGMI_LAST_SESSION_SETTINGS);
+    wagmiSettingsTimer = setTimeout(isWagmiSessionSettingExpired, sdkSettingsTimeout);
+};
+const setSessionSettings = (lsKey) => {
     const timestamp = new Date().getTime();
-    localStorage.LocalStorage.setToLS(localStorage$1.SDK_LAST_SESSION_SETTINGS, timestamp.toString());
-    sdkSettingsTimer = setTimeout(isSDKSessionSettingExpired, sdkSettingsTimeout);
+    localStorage.LocalStorage.setToLS(lsKey, timestamp.toString());
 };
-const isSDKSessionSettingExpired = () => {
-    const lastSentTime = localStorage.LocalStorage.getFromLS(localStorage$1.SDK_LAST_SESSION_SETTINGS);
+const isDynamicContextSessionSettingExpired = () => isSettingExpired(localStorage$1.DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS, dynamicContextSettingsTimer);
+const isWagmiSessionSettingExpired = () => isSettingExpired(localStorage$1.WAGMI_LAST_SESSION_SETTINGS, wagmiSettingsTimer);
+const isSettingExpired = (lsKey, timer) => {
+    const lastSentTime = localStorage.LocalStorage.getFromLS(lsKey);
     // should set new time
     if (!lastSentTime) {
         return true;
@@ -83,8 +93,8 @@ const isSDKSessionSettingExpired = () => {
     const currentTime = new Date().getTime();
     if (currentTime - lastSentTimestamp > sdkSettingsTimeout) {
         // Reset session-related data here
-        clearTimeout(sdkSettingsTimer);
-        localStorage.LocalStorage.removeFromLS(localStorage$1.SDK_LAST_SESSION_SETTINGS);
+        clearTimeout(timer);
+        localStorage.LocalStorage.removeFromLS(lsKey);
         return true;
     }
     return false;
@@ -93,6 +103,8 @@ const isSDKSessionSettingExpired = () => {
 exports.getInitialView = getInitialView;
 exports.initExpirationTime = initExpirationTime;
 exports.isAuthTokenExpired = isAuthTokenExpired;
-exports.isSDKSessionSettingExpired = isSDKSessionSettingExpired;
+exports.isDynamicContextSessionSettingExpired = isDynamicContextSessionSettingExpired;
+exports.isWagmiSessionSettingExpired = isWagmiSessionSettingExpired;
 exports.sdkSettingsTimeout = sdkSettingsTimeout;
-exports.setSDKSessionSettings = setSDKSessionSettings;
+exports.setDynamicContextSessionSettings = setDynamicContextSessionSettings;
+exports.setWagmiSessionSettings = setWagmiSessionSettings;

package/src/lib/context/DynamicContext/helpers.d.ts

@@ -10,5 +10,7 @@ export declare const getInitialView: ({ connectedWallets, isBridgeFlow, isFullyC
     isFullyConnected: boolean;
     isMultiWalletEnabled: boolean;
 }) => ViewType;
-export declare const setSDKSessionSettings: () => void;
-export declare const isSDKSessionSettingExpired: () => boolean;
+export declare const setDynamicContextSessionSettings: () => void;
+export declare const setWagmiSessionSettings: () => void;
+export declare const isDynamicContextSessionSettingExpired: () => boolean;
+export declare const isWagmiSessionSettingExpired: () => boolean;

package/src/lib/context/DynamicContext/helpers.js

@@ -7,14 +7,15 @@ import 'react';
 import '../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
-import { SDK_LAST_SESSION_SETTINGS } from '../../utils/constants/localStorage.js';
+import { DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS, WAGMI_LAST_SESSION_SETTINGS } from '../../utils/constants/localStorage.js';
 import '../../utils/constants/colors.js';
 import { LocalStorage } from '../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import { getAuthToken } from '../../utils/functions/getAuthToken/getAuthToken.js';
 
 let logoutTimer;
-let sdkSettingsTimer;
+let dynamicContextSettingsTimer;
+let wagmiSettingsTimer;
 const sdkSettingsTimeout = 24 * 60 * 60 * 1000; // 24 hours
 const isAuthTokenExpired = (token) => {
     const decoded = decodeJwt(token);
@@ -64,13 +65,22 @@ const getInitialView = ({ connectedWallets, isBridgeFlow, isFullyConnected, isAu
     }
     return 'login-with-email-or-wallet';
 };
-const setSDKSessionSettings = () => {
+const setDynamicContextSessionSettings = () => {
+    setSessionSettings(DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS);
+    dynamicContextSettingsTimer = setTimeout(isDynamicContextSessionSettingExpired, sdkSettingsTimeout);
+};
+const setWagmiSessionSettings = () => {
+    setSessionSettings(WAGMI_LAST_SESSION_SETTINGS);
+    wagmiSettingsTimer = setTimeout(isWagmiSessionSettingExpired, sdkSettingsTimeout);
+};
+const setSessionSettings = (lsKey) => {
     const timestamp = new Date().getTime();
-    LocalStorage.setToLS(SDK_LAST_SESSION_SETTINGS, timestamp.toString());
-    sdkSettingsTimer = setTimeout(isSDKSessionSettingExpired, sdkSettingsTimeout);
+    LocalStorage.setToLS(lsKey, timestamp.toString());
 };
-const isSDKSessionSettingExpired = () => {
-    const lastSentTime = LocalStorage.getFromLS(SDK_LAST_SESSION_SETTINGS);
+const isDynamicContextSessionSettingExpired = () => isSettingExpired(DYNAMIC_CONTEXT_LAST_SESSION_SETTINGS, dynamicContextSettingsTimer);
+const isWagmiSessionSettingExpired = () => isSettingExpired(WAGMI_LAST_SESSION_SETTINGS, wagmiSettingsTimer);
+const isSettingExpired = (lsKey, timer) => {
+    const lastSentTime = LocalStorage.getFromLS(lsKey);
     // should set new time
     if (!lastSentTime) {
         return true;
@@ -79,11 +89,11 @@ const isSDKSessionSettingExpired = () => {
     const currentTime = new Date().getTime();
     if (currentTime - lastSentTimestamp > sdkSettingsTimeout) {
         // Reset session-related data here
-        clearTimeout(sdkSettingsTimer);
-        LocalStorage.removeFromLS(SDK_LAST_SESSION_SETTINGS);
+        clearTimeout(timer);
+        LocalStorage.removeFromLS(lsKey);
         return true;
     }
     return false;
 };
 
-export { getInitialView, initExpirationTime, isAuthTokenExpired, isSDKSessionSettingExpired, sdkSettingsTimeout, setSDKSessionSettings };
+export { getInitialView, initExpirationTime, isAuthTokenExpired, isDynamicContextSessionSettingExpired, isWagmiSessionSettingExpired, sdkSettingsTimeout, setDynamicContextSessionSettings, setWagmiSessionSettings };

package/src/lib/context/ErrorContext/ErrorContext.cjs

@@ -15,10 +15,13 @@ const errorMessageMap = {
     4001: 'Message signature denied.',
     5001: 'Message signature denied.',
     5002: 'Message signature denied.',
+    account_already_linked_to_different_profile: 'This social account is already linked to a different profile.',
     connection_rejected: 'Connection rejected. Please try again.',
-    metamask_timeout: 'Please change your wallet chain to Ethereum Main Network and try again',
+    metamask_timeout: 'Whoops. Looks like something went wrong. Please try again.',
     'missing-nonce': 'Something went wrong. Please try again.',
     'missing-public-address': 'Connection cancelled. Please try again',
+    oauth_window_blocked: 'To connect to your social account, enable popups in your browser and then try again.',
+    oauth_window_timeout: 'Session time out. Please try again.',
     too_many_email_verification_attempts: 'Too many email verification attempts, please try again later',
     'user-cancelled': '',
     wallet_not_deployed: 'Your smart wallet has not been deployed.',

package/src/lib/context/ErrorContext/ErrorContext.js

@@ -11,10 +11,13 @@ const errorMessageMap = {
     4001: 'Message signature denied.',
     5001: 'Message signature denied.',
     5002: 'Message signature denied.',
+    account_already_linked_to_different_profile: 'This social account is already linked to a different profile.',
     connection_rejected: 'Connection rejected. Please try again.',
-    metamask_timeout: 'Please change your wallet chain to Ethereum Main Network and try again',
+    metamask_timeout: 'Whoops. Looks like something went wrong. Please try again.',
     'missing-nonce': 'Something went wrong. Please try again.',
     'missing-public-address': 'Connection cancelled. Please try again',
+    oauth_window_blocked: 'To connect to your social account, enable popups in your browser and then try again.',
+    oauth_window_timeout: 'Session time out. Please try again.',
     too_many_email_verification_attempts: 'Too many email verification attempts, please try again later',
     'user-cancelled': '',
     wallet_not_deployed: 'Your smart wallet has not been deployed.',

package/src/lib/context/SocialRedirectContext/SocialRedirectContext.cjs

@@ -50,7 +50,7 @@ require('../UserFieldEditorContext/UserFieldEditorContext.cjs');
 
 const SocialRedirectContext = React.createContext(undefined);
 const SocialRedirectContextProvider = ({ children, }) => {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const { setShowAuthFlow, wallets, setSelectedWalletConnector, walletUiUtils, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, setShowDynamicUserProfile, isAuthenticated, setPrimaryWalletId, secondaryWallets, sdkHasLoaded, authToken, connectWallet, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { setView } = ViewContext.useViewContext();
@@ -61,10 +61,11 @@ const SocialRedirectContextProvider = ({ children, }) => {
         projectSettings,
         setIsSingleWalletAccount,
     });
-    const enabledSocialProvidersInDb = (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.socialSignIn) === null || _a === void 0 ? void 0 : _a.providers) !== null && _b !== void 0 ? _b : [];
-    const enabledSocialProviders = enabledSocialProvidersInDb
+    const signInProvider = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.socialSignIn) === null || _a === void 0 ? void 0 : _a.signInProvider;
+    const enabledSocialProvidersInDb = (_c = (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.socialSignIn) === null || _b === void 0 ? void 0 : _b.providers) !== null && _c !== void 0 ? _c : [];
+    const enabledSocialProviders = (_d = enabledSocialProvidersInDb
         .filter((provider) => provider.enabled)
-        .map((provider) => provider.provider);
+        .map((provider) => provider.provider)) !== null && _d !== void 0 ? _d : [];
     const socialWalletConnector = wallets
         .map(({ walletConnector }) => walletConnector)
         .find(walletConnectorCore.isSocialWalletConnector);
@@ -187,11 +188,13 @@ const SocialRedirectContextProvider = ({ children, }) => {
         walletUiUtils,
         wallet,
         handleError,
+        connectWallet,
     ]);
     return (jsxRuntime.jsx(SocialRedirectContext.Provider, Object.assign({ value: {
             enabledSocialProviders,
             redirectStatus,
             setSocialProvider,
+            signInProvider,
             socialAccount,
             socialProvider,
             socialWalletConnector,

package/src/lib/context/SocialRedirectContext/SocialRedirectContext.d.ts

@@ -1,15 +1,15 @@
 import { ReactNode } from 'react';
-import { SocialOAuthProvider } from '@dynamic-labs/types';
-import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api';
+import { JwtVerifiedCredential, SignInProviderEnum, SocialSignInProviderEnum } from '@dynamic-labs/sdk-api';
 import { WalletConnector } from '../../..';
 type SocialRedirectStatus = 'idle' | 'loading' | 'success' | 'error';
 export type SocialContextReturnType = {
-    enabledSocialProviders: SocialOAuthProvider[];
+    enabledSocialProviders: SocialSignInProviderEnum[];
     redirectStatus: SocialRedirectStatus;
-    setSocialProvider: (val: SocialOAuthProvider) => void;
+    setSocialProvider: (val?: SocialSignInProviderEnum) => void;
     socialAccount: JwtVerifiedCredential | undefined;
-    socialProvider: SocialOAuthProvider | undefined;
+    socialProvider: SocialSignInProviderEnum | undefined;
     socialWalletConnector: WalletConnector | undefined;
+    signInProvider: SignInProviderEnum | undefined;
 };
 export declare const SocialRedirectContext: import("react").Context<SocialContextReturnType | undefined>;
 export declare const SocialRedirectContextProvider: ({ children, }: {

package/src/lib/context/SocialRedirectContext/SocialRedirectContext.js

@@ -46,7 +46,7 @@ import '../UserFieldEditorContext/UserFieldEditorContext.js';
 
 const SocialRedirectContext = createContext(undefined);
 const SocialRedirectContextProvider = ({ children, }) => {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const { setShowAuthFlow, wallets, setSelectedWalletConnector, walletUiUtils, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, setShowDynamicUserProfile, isAuthenticated, setPrimaryWalletId, secondaryWallets, sdkHasLoaded, authToken, connectWallet, } = useInternalDynamicContext();
     const { setErrorMessage } = useErrorContext();
     const { setView } = useViewContext();
@@ -57,10 +57,11 @@ const SocialRedirectContextProvider = ({ children, }) => {
         projectSettings,
         setIsSingleWalletAccount,
     });
-    const enabledSocialProvidersInDb = (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.socialSignIn) === null || _a === void 0 ? void 0 : _a.providers) !== null && _b !== void 0 ? _b : [];
-    const enabledSocialProviders = enabledSocialProvidersInDb
+    const signInProvider = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.socialSignIn) === null || _a === void 0 ? void 0 : _a.signInProvider;
+    const enabledSocialProvidersInDb = (_c = (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.socialSignIn) === null || _b === void 0 ? void 0 : _b.providers) !== null && _c !== void 0 ? _c : [];
+    const enabledSocialProviders = (_d = enabledSocialProvidersInDb
         .filter((provider) => provider.enabled)
-        .map((provider) => provider.provider);
+        .map((provider) => provider.provider)) !== null && _d !== void 0 ? _d : [];
     const socialWalletConnector = wallets
         .map(({ walletConnector }) => walletConnector)
         .find(isSocialWalletConnector);
@@ -183,11 +184,13 @@ const SocialRedirectContextProvider = ({ children, }) => {
         walletUiUtils,
         wallet,
         handleError,
+        connectWallet,
     ]);
     return (jsx(SocialRedirectContext.Provider, Object.assign({ value: {
             enabledSocialProviders,
             redirectStatus,
             setSocialProvider,
+            signInProvider,
             socialAccount,
             socialProvider,
             socialWalletConnector,

package/src/lib/data/api.cjs

@@ -369,6 +369,10 @@ const verifyOAuth = (environmentId, providerType, { code, codeVerifier, state },
     }
     catch (e) {
         logger.logger.error(e);
+        const data = yield e.json();
+        if (data.code === 'social_account_already_exists') {
+            throw new utils.SocialAccountAlreadyExistsError();
+        }
         return undefined;
     }
 });
@@ -386,6 +390,34 @@ const unlinkOAuth = ({ environmentId, verifiedCrentialId, }, userJwt) => _tslib.
         return undefined;
     }
 });
+const signInOAuth = (environmentId, providerType, { code, codeVerifier, state }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const oauthRequest = {
+        code,
+        codeVerifier,
+        state,
+    };
+    try {
+        const { jwt } = yield sdkApi().oauthSignIn({
+            environmentId,
+            oauthRequest,
+            providerType,
+        });
+        return jwt;
+    }
+    catch (e) {
+        logger.logger.error(e);
+        const data = yield e.json();
+        if (data.error.code === 'gate_blocked') {
+            throw new utils.GateBlockedError(data.payload.walletPublicKey);
+        }
+        if (data.error.code === 'missing_from_list') {
+            throw new utils.NoAccessError({
+                walletPublicKey: data.payload.walletPublicKey,
+            });
+        }
+        return undefined;
+    }
+});
 const getOnrampProviders = ({ chain, environmentId, networkId, token, walletAddress, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     const { onramps } = yield sdkApi().getSupportedOnramps({
         chain,
@@ -401,26 +433,25 @@ const getOnrampProviders = ({ chain, environmentId, networkId, token, walletAddr
 });
 const sendDynamicProps = (environmentId, settingsToSend) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     try {
-        const isSettingsExpired = helpers.isSDKSessionSettingExpired();
-        // sent once. no need to send again
-        if (!isSettingsExpired) {
-            return;
-        }
         const { dynamicContextProps, dynamicWagmiSettings } = settingsToSend;
-        if (dynamicContextProps || dynamicWagmiSettings) {
-            yield sdkApi().logDynamicSdkSettings({
-                environmentId,
-                sdkSettingsRequest: {
-                    dynamicContextProps,
-                    dynamicWagmiSettings,
-                },
-            });
+        if (dynamicContextProps) {
+            yield sendDynamicContextSettings(environmentId, { dynamicContextProps }, helpers.isDynamicContextSessionSettingExpired, helpers.setDynamicContextSessionSettings);
+        }
+        if (dynamicWagmiSettings) {
+            yield sendDynamicContextSettings(environmentId, { dynamicWagmiSettings }, helpers.isWagmiSessionSettingExpired, helpers.setWagmiSessionSettings);
         }
-        helpers.setSDKSessionSettings();
     }
-    catch (e) {
-        logger.logger.error(e);
+    catch (error) {
+        logger.logger.warn('Error caught when sending sdkSettings to api. Please notify Dynamic, and send the DynamicContextProvider settings you currently have configured', { error });
+    }
+});
+const sendDynamicContextSettings = (environmentId, sdkSettingsRequest, isSdkSettingExpired, setSDKSessionSettings) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    // sent once. no need to send again
+    if (!isSdkSettingExpired()) {
+        return;
     }
+    yield sdkApi().logDynamicSdkSettings({ environmentId, sdkSettingsRequest });
+    setSDKSessionSettings();
 });
 const mergeUserAccounts = (userJwt, environmentId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     try {
@@ -451,6 +482,7 @@ exports.mergeUserAccounts = mergeUserAccounts;
 exports.retryEmailVerification = retryEmailVerification;
 exports.revokeSession = revokeSession;
 exports.sendDynamicProps = sendDynamicProps;
+exports.signInOAuth = signInOAuth;
 exports.signInWithEmailVerification = signInWithEmailVerification;
 exports.transferWallet = transferWallet;
 exports.unlinkOAuth = unlinkOAuth;

package/src/lib/data/api.d.ts

@@ -56,6 +56,7 @@ export declare const unlinkOAuth: ({ environmentId, verifiedCrentialId, }: {
     environmentId: string;
     verifiedCrentialId: string;
 }, userJwt: string) => Promise<string | undefined>;
+export declare const signInOAuth: (environmentId: string, providerType: ProviderEnum, { code, codeVerifier, state }: OauthRequest) => Promise<string | undefined>;
 export declare const getOnrampProviders: ({ chain, environmentId, networkId, token, walletAddress, }: {
     chain: string;
     environmentId: string;

package/src/lib/data/api.js

@@ -1,5 +1,5 @@
 import { __awaiter } from '../../../_virtual/_tslib.js';
-import { NoAccessError, AccountExistsError, EmailVerificationError, UserHasAccountWithEmailError, DynamicError, EmailAlreadyExistsError, UsernameAlreadyExistsError, EmailProviderError, WalletUsedError, WalletNotDeployedError, ChainalysisError, GateBlockedError } from '@dynamic-labs/utils';
+import { NoAccessError, AccountExistsError, EmailVerificationError, UserHasAccountWithEmailError, DynamicError, EmailAlreadyExistsError, UsernameAlreadyExistsError, EmailProviderError, WalletUsedError, WalletNotDeployedError, ChainalysisError, GateBlockedError, SocialAccountAlreadyExistsError } from '@dynamic-labs/utils';
 import { UnprocessableEntityErrorCode, SDKApi, Configuration, VerifyRequestFromJSON, ChainEnum, WalletProviderEnum, AuthModeEnum } from '@dynamic-labs/sdk-api';
 import { VERSION, API_VERSION } from '../../version.js';
 import ApiEndpoint from '../config/ApiEndpoint.js';
@@ -14,7 +14,7 @@ import '../utils/constants/colors.js';
 import '../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import '../shared/consts/index.js';
-import { isSDKSessionSettingExpired, setSDKSessionSettings } from '../context/DynamicContext/helpers.js';
+import { isDynamicContextSessionSettingExpired, setDynamicContextSessionSettings, isWagmiSessionSettingExpired, setWagmiSessionSettings } from '../context/DynamicContext/helpers.js';
 
 const sdkApi = (jwt) => {
     const settings = {
@@ -365,6 +365,10 @@ const verifyOAuth = (environmentId, providerType, { code, codeVerifier, state },
     }
     catch (e) {
         logger.error(e);
+        const data = yield e.json();
+        if (data.code === 'social_account_already_exists') {
+            throw new SocialAccountAlreadyExistsError();
+        }
         return undefined;
     }
 });
@@ -382,6 +386,34 @@ const unlinkOAuth = ({ environmentId, verifiedCrentialId, }, userJwt) => __await
         return undefined;
     }
 });
+const signInOAuth = (environmentId, providerType, { code, codeVerifier, state }) => __awaiter(void 0, void 0, void 0, function* () {
+    const oauthRequest = {
+        code,
+        codeVerifier,
+        state,
+    };
+    try {
+        const { jwt } = yield sdkApi().oauthSignIn({
+            environmentId,
+            oauthRequest,
+            providerType,
+        });
+        return jwt;
+    }
+    catch (e) {
+        logger.error(e);
+        const data = yield e.json();
+        if (data.error.code === 'gate_blocked') {
+            throw new GateBlockedError(data.payload.walletPublicKey);
+        }
+        if (data.error.code === 'missing_from_list') {
+            throw new NoAccessError({
+                walletPublicKey: data.payload.walletPublicKey,
+            });
+        }
+        return undefined;
+    }
+});
 const getOnrampProviders = ({ chain, environmentId, networkId, token, walletAddress, }) => __awaiter(void 0, void 0, void 0, function* () {
     const { onramps } = yield sdkApi().getSupportedOnramps({
         chain,
@@ -397,26 +429,25 @@ const getOnrampProviders = ({ chain, environmentId, networkId, token, walletAddr
 });
 const sendDynamicProps = (environmentId, settingsToSend) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const isSettingsExpired = isSDKSessionSettingExpired();
-        // sent once. no need to send again
-        if (!isSettingsExpired) {
-            return;
-        }
         const { dynamicContextProps, dynamicWagmiSettings } = settingsToSend;
-        if (dynamicContextProps || dynamicWagmiSettings) {
-            yield sdkApi().logDynamicSdkSettings({
-                environmentId,
-                sdkSettingsRequest: {
-                    dynamicContextProps,
-                    dynamicWagmiSettings,
-                },
-            });
+        if (dynamicContextProps) {
+            yield sendDynamicContextSettings(environmentId, { dynamicContextProps }, isDynamicContextSessionSettingExpired, setDynamicContextSessionSettings);
+        }
+        if (dynamicWagmiSettings) {
+            yield sendDynamicContextSettings(environmentId, { dynamicWagmiSettings }, isWagmiSessionSettingExpired, setWagmiSessionSettings);
         }
-        setSDKSessionSettings();
     }
-    catch (e) {
-        logger.error(e);
+    catch (error) {
+        logger.warn('Error caught when sending sdkSettings to api. Please notify Dynamic, and send the DynamicContextProvider settings you currently have configured', { error });
+    }
+});
+const sendDynamicContextSettings = (environmentId, sdkSettingsRequest, isSdkSettingExpired, setSDKSessionSettings) => __awaiter(void 0, void 0, void 0, function* () {
+    // sent once. no need to send again
+    if (!isSdkSettingExpired()) {
+        return;
     }
+    yield sdkApi().logDynamicSdkSettings({ environmentId, sdkSettingsRequest });
+    setSDKSessionSettings();
 });
 const mergeUserAccounts = (userJwt, environmentId) => __awaiter(void 0, void 0, void 0, function* () {
     try {
@@ -431,4 +462,4 @@ const mergeUserAccounts = (userJwt, environmentId) => __awaiter(void 0, void 0,
     }
 });
 
-export { createEmailVerification, createVisit, fetchNetworkSettings, fetchNonce, fetchProjectSettings, getEmailProvider, getOauthLoginUrl, getOnrampProviders, linkWallet, mapAuthModeTypeToEnum, mapChainToChainEnum, mapProviderToProviderEnum, mergeUserAccounts, retryEmailVerification, revokeSession, sendDynamicProps, signInWithEmailVerification, transferWallet, unlinkOAuth, unlinkWallet, updateUserProfileFields, verifyEmail, verifyOAuth, verifyWallet };
+export { createEmailVerification, createVisit, fetchNetworkSettings, fetchNonce, fetchProjectSettings, getEmailProvider, getOauthLoginUrl, getOnrampProviders, linkWallet, mapAuthModeTypeToEnum, mapChainToChainEnum, mapProviderToProviderEnum, mergeUserAccounts, retryEmailVerification, revokeSession, sendDynamicProps, signInOAuth, signInWithEmailVerification, transferWallet, unlinkOAuth, unlinkWallet, updateUserProfileFields, verifyEmail, verifyOAuth, verifyWallet };

package/src/lib/layout/DynamicAuthLayout/HelpContent/WalletListHelpContent/WalletListHelpContent.cjs

@@ -91,7 +91,7 @@ const WalletListHelpContent = ({ chains, newToWeb3WalletChainMap, }) => {
     if (!Object.keys((_b = walletBook$1 === null || walletBook$1 === void 0 ? void 0 : walletBook$1.wallets) !== null && _b !== void 0 ? _b : {}).length) {
         return jsxRuntime.jsx(Skeleton.Skeleton, { className: 'walletlist-footer-content__container' });
     }
-    return (jsxRuntime.jsx("div", Object.assign({ className: 'walletlist-help-content__container' }, { children: jsxRuntime.jsxs(EnterTileAnimation.EnterTileAnimation, Object.assign({ delay: '300ms' }, { children: [jsxRuntime.jsx("div", Object.assign({ className: 'walletlist-help-content__icon' }, { children: jsxRuntime.jsx(walletBook.WalletIcon, { walletName: walletName, style: { height: pixelToRem.pixelToRem(56), width: pixelToRem.pixelToRem(56) } }) })), jsxRuntime.jsxs("div", Object.assign({ className: 'walletlist-help-content__typography-wrapper' }, { children: [jsxRuntime.jsxs(Typography.Typography, Object.assign({ as: 'p', variant: 'title', weight: 'medium' }, { children: ["We recommend installing", ' ', walletBook.getWalletBookWallet(walletBook$1, walletName).name] })), jsxRuntime.jsx(Typography.Typography, Object.assign({ as: 'label', variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'walletlist-help-content__typography--label' }, { children: "Select your preferred option below:" }))] })), jsxRuntime.jsx("div", Object.assign({ className: 'walletlist-help-content__buttons-wrapper' }, { children: walletLinksElements.map((element, i) => element.isEnabled ? (jsxRuntime.jsx("button", Object.assign({ onClick: () => setSelectedUrl(element.url) }, { children: jsxRuntime.jsx(Item.Item, { StartIcon: element.icon, heading: element.content, url: element.url }) }), i)) : undefined) })), isCustodialServiceWallet && (jsxRuntime.jsxs("div", Object.assign({ className: 'walletlist-help-content__custodial-wallet-area' }, { children: [jsxRuntime.jsx(Typography.Typography, Object.assign({ className: 'walletlist-help-content__custodial-wallet-area--title', as: 'p', color: 'secondary', variant: 'body_normal', weight: 'regular' }, { children: "If you don't want to install a wallet, then use:" })), jsxRuntime.jsx(NewToWeb3WalletItem.NewToWeb3WalletItem, { wallet: newToWeb3Wallet })] }))), jsxRuntime.jsx(WalletExtensionOrAppContinueButton.WalletExtensionOrAppContinueButton, { selectedUrl: selectedUrl, wallet: newToWeb3Wallet })] })) })));
+    return (jsxRuntime.jsx("div", Object.assign({ className: 'walletlist-help-content__container' }, { children: jsxRuntime.jsxs(EnterTileAnimation.EnterTileAnimation, Object.assign({ delay: '300ms' }, { children: [jsxRuntime.jsx("div", Object.assign({ className: 'walletlist-help-content__icon' }, { children: jsxRuntime.jsx(walletBook.WalletIcon, { walletKey: walletName, style: { height: pixelToRem.pixelToRem(56), width: pixelToRem.pixelToRem(56) } }) })), jsxRuntime.jsxs("div", Object.assign({ className: 'walletlist-help-content__typography-wrapper' }, { children: [jsxRuntime.jsxs(Typography.Typography, Object.assign({ as: 'p', variant: 'title', weight: 'medium' }, { children: ["We recommend installing", ' ', walletBook.getWalletBookWallet(walletBook$1, walletName).name] })), jsxRuntime.jsx(Typography.Typography, Object.assign({ as: 'label', variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'walletlist-help-content__typography--label' }, { children: "Select your preferred option below:" }))] })), jsxRuntime.jsx("div", Object.assign({ className: 'walletlist-help-content__buttons-wrapper' }, { children: walletLinksElements.map((element, i) => element.isEnabled ? (jsxRuntime.jsx("button", Object.assign({ onClick: () => setSelectedUrl(element.url) }, { children: jsxRuntime.jsx(Item.Item, { StartIcon: element.icon, heading: element.content, url: element.url }) }), i)) : undefined) })), isCustodialServiceWallet && (jsxRuntime.jsxs("div", Object.assign({ className: 'walletlist-help-content__custodial-wallet-area' }, { children: [jsxRuntime.jsx(Typography.Typography, Object.assign({ className: 'walletlist-help-content__custodial-wallet-area--title', as: 'p', color: 'secondary', variant: 'body_normal', weight: 'regular' }, { children: "If you don't want to install a wallet, then use:" })), jsxRuntime.jsx(NewToWeb3WalletItem.NewToWeb3WalletItem, { wallet: newToWeb3Wallet })] }))), jsxRuntime.jsx(WalletExtensionOrAppContinueButton.WalletExtensionOrAppContinueButton, { selectedUrl: selectedUrl, wallet: newToWeb3Wallet })] })) })));
 };
 
 exports.WalletListHelpContent = WalletListHelpContent;

package/src/lib/layout/DynamicAuthLayout/HelpContent/WalletListHelpContent/WalletListHelpContent.js

@@ -87,7 +87,7 @@ const WalletListHelpContent = ({ chains, newToWeb3WalletChainMap, }) => {
     if (!Object.keys((_b = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _b !== void 0 ? _b : {}).length) {
         return jsx(Skeleton, { className: 'walletlist-footer-content__container' });
     }
-    return (jsx("div", Object.assign({ className: 'walletlist-help-content__container' }, { children: jsxs(EnterTileAnimation, Object.assign({ delay: '300ms' }, { children: [jsx("div", Object.assign({ className: 'walletlist-help-content__icon' }, { children: jsx(WalletIcon, { walletName: walletName, style: { height: pixelToRem(56), width: pixelToRem(56) } }) })), jsxs("div", Object.assign({ className: 'walletlist-help-content__typography-wrapper' }, { children: [jsxs(Typography, Object.assign({ as: 'p', variant: 'title', weight: 'medium' }, { children: ["We recommend installing", ' ', getWalletBookWallet(walletBook, walletName).name] })), jsx(Typography, Object.assign({ as: 'label', variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'walletlist-help-content__typography--label' }, { children: "Select your preferred option below:" }))] })), jsx("div", Object.assign({ className: 'walletlist-help-content__buttons-wrapper' }, { children: walletLinksElements.map((element, i) => element.isEnabled ? (jsx("button", Object.assign({ onClick: () => setSelectedUrl(element.url) }, { children: jsx(Item, { StartIcon: element.icon, heading: element.content, url: element.url }) }), i)) : undefined) })), isCustodialServiceWallet && (jsxs("div", Object.assign({ className: 'walletlist-help-content__custodial-wallet-area' }, { children: [jsx(Typography, Object.assign({ className: 'walletlist-help-content__custodial-wallet-area--title', as: 'p', color: 'secondary', variant: 'body_normal', weight: 'regular' }, { children: "If you don't want to install a wallet, then use:" })), jsx(NewToWeb3WalletItem, { wallet: newToWeb3Wallet })] }))), jsx(WalletExtensionOrAppContinueButton, { selectedUrl: selectedUrl, wallet: newToWeb3Wallet })] })) })));
+    return (jsx("div", Object.assign({ className: 'walletlist-help-content__container' }, { children: jsxs(EnterTileAnimation, Object.assign({ delay: '300ms' }, { children: [jsx("div", Object.assign({ className: 'walletlist-help-content__icon' }, { children: jsx(WalletIcon, { walletKey: walletName, style: { height: pixelToRem(56), width: pixelToRem(56) } }) })), jsxs("div", Object.assign({ className: 'walletlist-help-content__typography-wrapper' }, { children: [jsxs(Typography, Object.assign({ as: 'p', variant: 'title', weight: 'medium' }, { children: ["We recommend installing", ' ', getWalletBookWallet(walletBook, walletName).name] })), jsx(Typography, Object.assign({ as: 'label', variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'walletlist-help-content__typography--label' }, { children: "Select your preferred option below:" }))] })), jsx("div", Object.assign({ className: 'walletlist-help-content__buttons-wrapper' }, { children: walletLinksElements.map((element, i) => element.isEnabled ? (jsx("button", Object.assign({ onClick: () => setSelectedUrl(element.url) }, { children: jsx(Item, { StartIcon: element.icon, heading: element.content, url: element.url }) }), i)) : undefined) })), isCustodialServiceWallet && (jsxs("div", Object.assign({ className: 'walletlist-help-content__custodial-wallet-area' }, { children: [jsx(Typography, Object.assign({ className: 'walletlist-help-content__custodial-wallet-area--title', as: 'p', color: 'secondary', variant: 'body_normal', weight: 'regular' }, { children: "If you don't want to install a wallet, then use:" })), jsx(NewToWeb3WalletItem, { wallet: newToWeb3Wallet })] }))), jsx(WalletExtensionOrAppContinueButton, { selectedUrl: selectedUrl, wallet: newToWeb3Wallet })] })) })));
 };
 
 export { WalletListHelpContent };

package/src/lib/locale/en/translation.cjs

@@ -27,9 +27,7 @@ var dyn_login = {
 		wallet_only: "Get your first wallet"
 	},
 	separators: {
-		email_or_social: "Or",
-		email_or_wallets: "Or continue with a wallet",
-		wallets_or_email: "Or continue with"
+		"default": "Or"
 	},
 	title: {
 		all: "Log in or Sign up",
@@ -37,7 +35,7 @@ var dyn_login = {
 		wallet_only: "Select your wallet"
 	},
 	wallet_list: {
-		button_only: "Connect with Wallet"
+		button_only: "Continue with a wallet"
 	}
 };
 var dyn_no_access = {

package/src/lib/locale/en/translation.js

@@ -23,9 +23,7 @@ var dyn_login = {
 		wallet_only: "Get your first wallet"
 	},
 	separators: {
-		email_or_social: "Or",
-		email_or_wallets: "Or continue with a wallet",
-		wallets_or_email: "Or continue with"
+		"default": "Or"
 	},
 	title: {
 		all: "Log in or Sign up",
@@ -33,7 +31,7 @@ var dyn_login = {
 		wallet_only: "Select your wallet"
 	},
 	wallet_list: {
-		button_only: "Connect with Wallet"
+		button_only: "Continue with a wallet"
 	}
 };
 var dyn_no_access = {

package/src/lib/shared/types/index.d.ts

@@ -144,6 +144,10 @@ export type DynamicRPCProviders = {
     solanaProviders: SolanaRpcProvider[] | undefined;
 };
 export type DynamicEventsCallbacks = {
+    onSignedMessage?: (params: {
+        messageToSign: string;
+        signedMessage: string;
+    }) => void;
     onAuthFlowClose?: () => void;
     onAuthFlowOpen?: () => void;
     onAuthSuccess?: OnAuthSuccess;

package/src/lib/shared/utils/functions/wallet/createWallet.cjs

@@ -7,7 +7,7 @@ var walletBook = require('@dynamic-labs/wallet-book');
 const createWallet = (walletBook$1, wallet) => {
     var _a, _b;
     return ({
-        group: (_a = walletBook.findWalletBookWallet(walletBook$1, wallet.name)) === null || _a === void 0 ? void 0 : _a.group,
+        group: (_a = walletBook.findWalletBookWallet(walletBook$1, wallet.key)) === null || _a === void 0 ? void 0 : _a.group,
         isInstalledOnBrowser: (_b = wallet.isInstalledOnBrowser()) !== null && _b !== void 0 ? _b : false,
         key: wallet.key,
         name: wallet.name,