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

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/DynamicContext/hooks/useEmailLoginState/useEmailLoginState.cjs

@@ -17,6 +17,7 @@ require('ethers');
 require('../../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var isEmailProviderEnabled = require('../../../../utils/functions/isEmailProviderEnabled/isEmailProviderEnabled.cjs');
+require('../../../../config/ApiEndpoint.cjs');
 
 const useEmailLoginState = (providers, user) => {
     const [loginWithEmail, setLoginWithEmail] = React.useState(isEmailProviderEnabled.isEmailProviderEnabled(providers));

package/src/lib/context/DynamicContext/hooks/useEmailLoginState/useEmailLoginState.js

@@ -13,6 +13,7 @@ import 'ethers';
 import '../../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { isEmailProviderEnabled } from '../../../../utils/functions/isEmailProviderEnabled/isEmailProviderEnabled.js';
+import '../../../../config/ApiEndpoint.js';
 
 const useEmailLoginState = (providers, user) => {
     const [loginWithEmail, setLoginWithEmail] = useState(isEmailProviderEnabled(providers));

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

@@ -17,6 +17,7 @@ require('ethers');
 require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var getAuthToken = require('../../../utils/functions/getAuthToken/getAuthToken.cjs');
+require('../../../config/ApiEndpoint.cjs');
 var isConnectOnly = require('../../../utils/hooks/authenticationHooks/helpers/isConnectOnly.cjs');
 
 const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onConnectSuccess, onBeforeConnectSuccessConfirmation, onEmailVerificationFailure, onEmailVerificationSuccess, }, handleLogOut, primaryWallet, selectedWalletConnector, user, isAuthenticated, authMode, setIsVerificationInProgress, }) => {

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

@@ -13,6 +13,7 @@ import 'ethers';
 import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../../../utils/functions/getAuthToken/getAuthToken.js';
+import '../../../config/ApiEndpoint.js';
 import { isConnectOnly } from '../../../utils/hooks/authenticationHooks/helpers/isConnectOnly.js';
 
 const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onConnectSuccess, onBeforeConnectSuccessConfirmation, onEmailVerificationFailure, onEmailVerificationSuccess, }, handleLogOut, primaryWallet, selectedWalletConnector, user, isAuthenticated, authMode, setIsVerificationInProgress, }) => {

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/FundingContext/FundingContext.cjs

@@ -20,6 +20,7 @@ require('ethers');
 require('../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var isOnrampProvider = require('../../utils/functions/isOnrampProvider/isOnrampProvider.cjs');
+require('../../config/ApiEndpoint.cjs');
 
 const FundingContext = React.createContext(undefined);
 const FundingContextProvider = ({ children, }) => {

package/src/lib/context/FundingContext/FundingContext.js

@@ -16,6 +16,7 @@ import 'ethers';
 import '../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { isOnrampProvider } from '../../utils/functions/isOnrampProvider/isOnrampProvider.js';
+import '../../config/ApiEndpoint.js';
 
 const FundingContext = createContext(undefined);
 const FundingContextProvider = ({ children, }) => {

package/src/lib/context/MockContext/MockContext.cjs

@@ -21,13 +21,13 @@ require('ethers');
 require('../../shared/consts/index.cjs');
 require('../DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/multi-wallet');
+require('../../config/ApiEndpoint.cjs');
 require('../../components/ShadowDOM/ShadowDOM.cjs');
 require('react-dom');
 require('react-focus-lock');
 require('../../components/Transition/ZoomTransition/ZoomTransition.cjs');
 require('../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
 require('../../components/Transition/OpacityTransition/OpacityTransition.cjs');
-require('../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
 require('../AccessDeniedContext/AccessDeniedContext.cjs');

package/src/lib/context/MockContext/MockContext.js

@@ -17,13 +17,13 @@ import 'ethers';
 import '../../shared/consts/index.js';
 import '../DynamicContext/DynamicContext.js';
 import '@dynamic-labs/multi-wallet';
+import '../../config/ApiEndpoint.js';
 import '../../components/ShadowDOM/ShadowDOM.js';
 import 'react-dom';
 import 'react-focus-lock';
 import '../../components/Transition/ZoomTransition/ZoomTransition.js';
 import '../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
 import '../../components/Transition/OpacityTransition/OpacityTransition.js';
-import '../../config/ApiEndpoint.js';
 import '@dynamic-labs/rpc-providers';
 import '../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
 import '../AccessDeniedContext/AccessDeniedContext.js';

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/context/ViewContext/ViewContext.cjs

@@ -4,32 +4,17 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
-var usePrevious = require('../../utils/hooks/usePrevious/usePrevious.cjs');
 
 const ViewContext = React.createContext(undefined);
 const ViewContextProvider = ({ children, initialView = 'wallet-list' }) => {
-    const [view, setView] = React.useState(initialView);
-    const previousInitialView = usePrevious.usePrevious(initialView);
+    const [_view, setView] = React.useState(null);
+    const view = _view || initialView;
     const goToInitialView = React.useCallback(() => {
-        setView(initialView);
+        setView(null);
     }, [initialView]);
-    React.useEffect(() => {
-        if (!initialView)
-            return;
-        const isInInitialView = view === previousInitialView || !previousInitialView;
-        if (!isInInitialView)
-            return;
-        setView((currentView) => {
-            const wasViewSetDuringRender = currentView !== previousInitialView;
-            if (wasViewSetDuringRender) {
-                return currentView;
-            }
-            return initialView;
-        });
-    }, [initialView, view]);
     const value = React.useMemo(() => ({
         goToInitialView,
-        setView,
+        setView: setView,
         view,
     }), [view, goToInitialView]);
     return jsxRuntime.jsx(ViewContext.Provider, Object.assign({ value: value }, { children: children }));

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

@@ -1,5 +1,5 @@
 import { SetStateAction, Dispatch, PropsWithChildren, FC } from 'react';
-export type ViewType = 'captcha' | 'chainalysis-blocked-wallet' | 'collect-user-data' | 'collect-user-data-login-with-email' | 'login-with-email-or-wallet-full-wallet-list' | 'login-with-email-or-wallet' | 'login-with-wallet-only' | 'login-with-email-verification' | 'network-not-supported' | 'network-not-supported-manual' | 'no-access' | 'no-qr-not-installed' | 'pending-connect' | 'pending-signature-without-back-button' | 'pending-signature' | 'qr-code' | 'update-email' | 'verify-email' | 'wallet-connect-mobile-wallets-list' | 'wallet-list' | 'multi-wallet-wallet-list' | 'wallet-sign' | 'wallet-used' | 'wallet-group' | 'wait-for-email-confirmation-view' | 'email-wallet-otp-verification-view' | 'social-redirect-view' | 'wallet-locked-view' | 'social-wrong-account' | 'gate-blocked-wallet' | 'bridge-welcome' | 'bridge-summary' | 'bridge-next-wallet-connection' | 'account-exists' | 'merge-user-accounts' | 'wallet-cannot-be-transferred';
+export type ViewType = 'captcha' | 'chainalysis-blocked-wallet' | 'collect-user-data' | 'collect-user-data-login-with-email' | 'login-with-email-or-wallet-full-wallet-list' | 'login-with-email-or-wallet' | 'login-with-wallet-only' | 'login-with-email-verification' | 'network-not-supported' | 'network-not-supported-manual' | 'no-access' | 'no-qr-not-installed' | 'pending-connect' | 'pending-signature-without-back-button' | 'pending-signature' | 'qr-code' | 'update-email' | 'verify-email' | 'wallet-connect-mobile-wallets-list' | 'wallet-list' | 'multi-wallet-wallet-list' | 'wallet-sign' | 'wallet-used' | 'wallet-group' | 'wait-for-email-confirmation-view' | 'email-wallet-otp-verification-view' | 'social-redirect-view' | 'wallet-locked-view' | 'social-wrong-account' | 'gate-blocked-wallet' | 'bridge-welcome' | 'bridge-summary' | 'bridge-next-wallet-connection' | 'account-exists' | 'merge-user-accounts' | 'wallet-cannot-be-transferred' | 'passkey-intro' | 'passkey-success';
 export type ViewContextProps = {
     setView: Dispatch<SetStateAction<ViewType>>;
     view: ViewType;

package/src/lib/context/ViewContext/ViewContext.js

@@ -1,31 +1,16 @@
 import { jsx } from 'react/jsx-runtime';
-import { createContext, useState, useCallback, useEffect, useMemo, useContext } from 'react';
-import { usePrevious } from '../../utils/hooks/usePrevious/usePrevious.js';
+import { createContext, useState, useCallback, useMemo, useContext } from 'react';
 
 const ViewContext = createContext(undefined);
 const ViewContextProvider = ({ children, initialView = 'wallet-list' }) => {
-    const [view, setView] = useState(initialView);
-    const previousInitialView = usePrevious(initialView);
+    const [_view, setView] = useState(null);
+    const view = _view || initialView;
     const goToInitialView = useCallback(() => {
-        setView(initialView);
+        setView(null);
     }, [initialView]);
-    useEffect(() => {
-        if (!initialView)
-            return;
-        const isInInitialView = view === previousInitialView || !previousInitialView;
-        if (!isInInitialView)
-            return;
-        setView((currentView) => {
-            const wasViewSetDuringRender = currentView !== previousInitialView;
-            if (wasViewSetDuringRender) {
-                return currentView;
-            }
-            return initialView;
-        });
-    }, [initialView, view]);
     const value = useMemo(() => ({
         goToInitialView,
-        setView,
+        setView: setView,
         view,
     }), [view, goToInitialView]);
     return jsx(ViewContext.Provider, Object.assign({ value: value }, { children: children }));

package/src/lib/context/WalletContext/WalletContext.cjs

@@ -17,8 +17,8 @@ require('../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 require('../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
-require('../ErrorContext/ErrorContext.cjs');
 require('../../config/ApiEndpoint.cjs');
+require('../ErrorContext/ErrorContext.cjs');
 require('../AccessDeniedContext/AccessDeniedContext.cjs');
 require('../AccountExistsContext/AccountExistsContext.cjs');
 require('../CaptchaContext/CaptchaContext.cjs');

package/src/lib/context/WalletContext/WalletContext.js

@@ -13,8 +13,8 @@ import '../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import '../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
-import '../ErrorContext/ErrorContext.js';
 import '../../config/ApiEndpoint.js';
+import '../ErrorContext/ErrorContext.js';
 import '../AccessDeniedContext/AccessDeniedContext.js';
 import '../AccountExistsContext/AccountExistsContext.js';
 import '../CaptchaContext/CaptchaContext.js';

package/src/lib/data/api.cjs

@@ -188,11 +188,12 @@ const unlinkWallet = ({ environmentId, primaryWalletId, walletId, }, userJwt) =>
         return undefined;
     }
 });
-const transferWallet = (environmentId, { messageToSign, signedMessage, publicWalletAddress, chain, walletName, walletProvider, skipEmptyAccountCheck = false, }, userJwt) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const transferWallet = (environmentId, { network, messageToSign, signedMessage, publicWalletAddress, chain, walletName, walletProvider, skipEmptyAccountCheck = false, }, userJwt) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     // We should find a better way to do this than force type casting
     const verifyRequest = {
         chain,
         messageToSign,
+        network,
         publicWalletAddress,
         signedMessage,
         skipEmptyAccountCheck,
@@ -340,27 +341,52 @@ const updateUserProfileFields = (jwt, environmentId, fields) => _tslib.__awaiter
         throw e;
     }
 });
-const getOauthLoginUrl = (environmentId, providerType, userJwt) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const verifyOAuth = (environmentId, providerType, { code, codeVerifier, state }, userJwt) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const oauthRequest = {
+        code,
+        codeVerifier,
+        state,
+    };
     try {
-        const { url } = yield sdkApi(userJwt).oauthLoginUrl({
+        const { jwt } = yield sdkApi(userJwt).oauthVerify({
             environmentId,
+            oauthRequest,
             providerType,
         });
-        return url;
+        return jwt;
     }
     catch (e) {
         logger.logger.error(e);
+        const data = yield e.json();
+        if (data.code === 'social_account_already_exists') {
+            throw new utils.SocialAccountAlreadyExistsError();
+        }
         return undefined;
     }
 });
-const verifyOAuth = (environmentId, providerType, { code, codeVerifier, state }, userJwt) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const unlinkOAuth = ({ environmentId, primaryWalletId, verifiedCrentialId, }, userJwt) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const { jwt } = yield sdkApi(userJwt).verifyUnlink({
+            environmentId,
+            verifyUnlinkRequest: {
+                primaryWalletId,
+                verifiedCrentialId,
+            },
+        });
+        return jwt;
+    }
+    catch (e) {
+        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(userJwt).oauthVerify({
+        const { jwt } = yield sdkApi().oauthSignIn({
             environmentId,
             oauthRequest,
             providerType,
@@ -369,20 +395,32 @@ const verifyOAuth = (environmentId, providerType, { code, codeVerifier, state },
     }
     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 unlinkOAuth = ({ environmentId, verifiedCrentialId, }, userJwt) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const getOAuthResult = (environmentId, providerType, { state }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const oauthResultRequest = {
+        state,
+    };
     try {
-        const { jwt } = yield sdkApi(userJwt).verifyUnlink({
+        const result = yield sdkApi().oauthResult({
             environmentId,
-            verifyUnlinkRequest: {
-                verifiedCrentialId,
-            },
+            oauthResultRequest,
+            providerType,
         });
-        return jwt;
+        return result;
     }
     catch (e) {
+        logger.logger.error(e);
         return undefined;
     }
 });
@@ -401,26 +439,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 {
@@ -441,7 +478,7 @@ exports.fetchNetworkSettings = fetchNetworkSettings;
 exports.fetchNonce = fetchNonce;
 exports.fetchProjectSettings = fetchProjectSettings;
 exports.getEmailProvider = getEmailProvider;
-exports.getOauthLoginUrl = getOauthLoginUrl;
+exports.getOAuthResult = getOAuthResult;
 exports.getOnrampProviders = getOnrampProviders;
 exports.linkWallet = linkWallet;
 exports.mapAuthModeTypeToEnum = mapAuthModeTypeToEnum;
@@ -451,6 +488,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;