@dynamic-labs/sdk-react-core 0.18.100-viem.3 → 0.18.100-viem.31

package/src/lib/context/DynamicContext/hooks/useSetShowAuthFlowWithInit/useSetShowAuthFlowWithInit.cjs

@@ -12,15 +12,18 @@ var React = require('react');
  * "Connect" button in the WalletConnect modal, there is a uri ready to go
  * to immediately trigger the deep link on mobile
  */
-const useSetShowAuthFlowWithInit = ({ setShowAuthFlow, wallets, }) => {
+const useSetShowAuthFlowWithInit = ({ setShowAuthFlow, wallets, user, isMultiWalletEnabled, }) => {
     const setShowAuthFlowWithInit = React.useCallback((value) => {
         var _a;
         if (value) {
+            // if the uer is already signed in but multiwallet is not enabled, do not change state
+            if (user && !isMultiWalletEnabled)
+                return;
             (_a = wallets
                 .find((wallet) => wallet.walletConnector.key === 'walletconnect')) === null || _a === void 0 ? void 0 : _a.walletConnector.init();
         }
         setShowAuthFlow(value);
-    }, [setShowAuthFlow, wallets]);
+    }, [setShowAuthFlow, wallets, user, isMultiWalletEnabled]);
     return setShowAuthFlowWithInit;
 };
 

package/src/lib/context/DynamicContext/hooks/useSetShowAuthFlowWithInit/useSetShowAuthFlowWithInit.d.ts

@@ -1,5 +1,5 @@
 import { Dispatch, SetStateAction } from 'react';
-import { WalletOption } from '../../../../shared';
+import { UserProfile, WalletOption } from '../../../../shared';
 /**
  * this hook wraps `setShowAuthFlow`. WalletConnect requires initialization
  * before we can connect a wallet. The goal here is that when a user clicks
@@ -8,7 +8,9 @@ import { WalletOption } from '../../../../shared';
  * "Connect" button in the WalletConnect modal, there is a uri ready to go
  * to immediately trigger the deep link on mobile
  */
-export declare const useSetShowAuthFlowWithInit: ({ setShowAuthFlow, wallets, }: {
+export declare const useSetShowAuthFlowWithInit: ({ setShowAuthFlow, wallets, user, isMultiWalletEnabled, }: {
     setShowAuthFlow: Dispatch<SetStateAction<boolean>>;
     wallets: WalletOption[];
+    user?: UserProfile | undefined;
+    isMultiWalletEnabled?: boolean | undefined;
 }) => Dispatch<SetStateAction<boolean>>;

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

@@ -8,15 +8,18 @@ import { useCallback } from 'react';
  * "Connect" button in the WalletConnect modal, there is a uri ready to go
  * to immediately trigger the deep link on mobile
  */
-const useSetShowAuthFlowWithInit = ({ setShowAuthFlow, wallets, }) => {
+const useSetShowAuthFlowWithInit = ({ setShowAuthFlow, wallets, user, isMultiWalletEnabled, }) => {
     const setShowAuthFlowWithInit = useCallback((value) => {
         var _a;
         if (value) {
+            // if the uer is already signed in but multiwallet is not enabled, do not change state
+            if (user && !isMultiWalletEnabled)
+                return;
             (_a = wallets
                 .find((wallet) => wallet.walletConnector.key === 'walletconnect')) === null || _a === void 0 ? void 0 : _a.walletConnector.init();
         }
         setShowAuthFlow(value);
-    }, [setShowAuthFlow, wallets]);
+    }, [setShowAuthFlow, wallets, user, isMultiWalletEnabled]);
     return setShowAuthFlowWithInit;
 };
 

package/src/lib/context/DynamicContext/internalEvents/index.d.ts

@@ -0,0 +1,2 @@
+export { getInternalEvents } from './internalEvents';
+export type { InternalEventEmitter } from './internalEvents';

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

@@ -0,0 +1,14 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var EventEmitter = require('eventemitter3');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var EventEmitter__default = /*#__PURE__*/_interopDefaultLegacy(EventEmitter);
+
+// This file is temporary and should be removed after QNTM-180 is done
+const getInternalEvents = () => new EventEmitter__default["default"]();
+
+exports.getInternalEvents = getInternalEvents;

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

@@ -0,0 +1,8 @@
+import EventEmitter from 'eventemitter3';
+/** Maps internal event names to their listeners */
+export type InternalEventMap = {
+    emailVerificationResult: (param: boolean) => void;
+    clearPrimaryWallet: () => void;
+};
+export type InternalEventEmitter = EventEmitter<InternalEventMap>;
+export declare const getInternalEvents: () => InternalEventEmitter;

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

@@ -0,0 +1,6 @@
+import EventEmitter from 'eventemitter3';
+
+// This file is temporary and should be removed after QNTM-180 is done
+const getInternalEvents = () => new EventEmitter();
+
+export { getInternalEvents };

package/src/lib/context/DynamicContext/types/index.d.ts

@@ -1,4 +1,4 @@
-import { Dispatch, ReactNode, SetStateAction } from 'react';
+import { Dispatch, MutableRefObject, ReactNode, SetStateAction } from 'react';
 import { DynamicJwt, NameServiceData, ProjectSettings } from '@dynamic-labs/sdk-api';
 import { NetworkConfigurationMap, SocialProviderFilter, WalletUiUtils } from '@dynamic-labs/types';
 import { Chain, FetchPublicAddressOpts, WalletConnector } from '@dynamic-labs/wallet-connector-core';
@@ -8,6 +8,7 @@ import { MultiWalletWidgetStateSetter } from '../../../utils/hooks/multiWallet';
 import { ThemeData, ThemeSetting } from '../../ThemeContext';
 import { DisplayOrder, SetDisplayOrderPriority } from '../hooks';
 import { Callback } from '../useCustomerCallbacks';
+import { InternalEventEmitter } from '../internalEvents';
 export type ChainsToConnect = {
     chain: Chain;
     numberOfWallets: number;
@@ -97,6 +98,8 @@ export interface IDynamicContext {
     setSelectedWalletConnector: (connector: WalletConnector | null) => void;
     setSelectedWalletWithAction: (walletWithAction: WalletWithAction | null) => void;
     setShowAuthFlow: Dispatch<SetStateAction<boolean>>;
+    /** The unwrapped version of setShowAuthFlow. See useSetShowAuthFlowWithInit.ts for context */
+    internalSetShowAuthFlow: Dispatch<SetStateAction<boolean>>;
     setShowDynamicUserProfile: Dispatch<SetStateAction<boolean>>;
     setShowQrcodeModal: Dispatch<SetStateAction<boolean>>;
     setShowWidgetStatePopup: Dispatch<SetStateAction<boolean>>;
@@ -112,6 +115,7 @@ export interface IDynamicContext {
      * The boolean value representing the state of displaying the bridge widget
      */
     showBridgeWidget: boolean;
+    showLockedWalletView?: boolean;
     showQrcodeModal: boolean;
     showWidgetStatePopup: boolean;
     signWithEmailWalletName?: string;
@@ -143,4 +147,6 @@ export interface IDynamicContext {
     legacyIsVerifying: boolean;
     /** Legacy setter for legacyIsVerifying */
     setLegacyIsVerifying: Dispatch<SetStateAction<boolean>>;
+    /** Temporary workaround, until QNTM-180 is complete */
+    internalEvents: MutableRefObject<InternalEventEmitter>;
 }

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

@@ -11,7 +11,7 @@ const useDynamicContext = () => {
     if (context === undefined) {
         throw new Error('useDynamicContext must be used within a DynamicContextProvider');
     }
-    const { accountSwitchState, authMode, authToken, awaitingSignatureState, connectedWallets, getNameService, handleLogOut, handleUnlinkWallet, isAuthenticated, isFullyConnected, isVerificationInProgress, linkedWallets, loadingNetwork, loginWithEmail, multiWalletWidgetState, network, networkConfigurations, qrcodeUri, rpcProviders, sdkHasLoaded, secondaryWallets, setLogInWithEmail, setMultiWalletWidgetState, setNetwork, setPrimaryWallet, setShowAuthFlow, setShowDynamicUserProfile, setShowQrcodeModal, shadowDOMEnabled, showAuthFlow, showQrcodeModal, user, walletConnector, wallets, walletsByChain, walletsToConnectByChain, primaryWallet, setShowBridgeWidget, sendWagmiSettings, } = context;
+    const { accountSwitchState, authMode, authToken, awaitingSignatureState, connectedWallets, getNameService, handleLogOut, handleUnlinkWallet, isAuthenticated, isFullyConnected, isVerificationInProgress, linkedWallets, loadingNetwork, loginWithEmail, multiWalletWidgetState, network, networkConfigurations, qrcodeUri, rpcProviders, sdkHasLoaded, secondaryWallets, setLogInWithEmail, setMultiWalletWidgetState, setNetwork, setPrimaryWallet, setShowAuthFlow, setShowDynamicUserProfile, setShowQrcodeModal, shadowDOMEnabled, showAuthFlow, showQrcodeModal, user, walletConnector, wallets, walletsByChain, walletsToConnectByChain, primaryWallet, setShowBridgeWidget, sendWagmiSettings, internalEvents, } = context;
     return {
         accountSwitchState,
         authMode,
@@ -21,6 +21,7 @@ const useDynamicContext = () => {
         getNameService,
         handleLogOut,
         handleUnlinkWallet,
+        internalEvents,
         isAuthenticated,
         isFullyConnected,
         isVerificationInProgress,

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

@@ -1,3 +1,3 @@
 import { IDynamicContext } from './types';
-export type UseDynamicContext = Pick<IDynamicContext, 'accountSwitchState' | 'authMode' | 'authToken' | 'awaitingSignatureState' | 'connectedWallets' | 'getNameService' | 'handleLogOut' | 'handleUnlinkWallet' | 'isAuthenticated' | 'isFullyConnected' | 'isVerificationInProgress' | 'linkedWallets' | 'loadingNetwork' | 'loginWithEmail' | 'multiWalletWidgetState' | 'network' | 'networkConfigurations' | 'primaryWallet' | 'qrcodeUri' | 'rpcProviders' | 'sdkHasLoaded' | 'secondaryWallets' | 'setLogInWithEmail' | 'setMultiWalletWidgetState' | 'setNetwork' | 'setPrimaryWallet' | 'setShowAuthFlow' | 'setShowDynamicUserProfile' | 'setShowQrcodeModal' | 'shadowDOMEnabled' | 'showAuthFlow' | 'showQrcodeModal' | 'user' | 'walletConnector' | 'wallets' | 'walletsByChain' | 'walletsToConnectByChain' | 'setShowBridgeWidget' | 'sendWagmiSettings'>;
+export type UseDynamicContext = Pick<IDynamicContext, 'accountSwitchState' | 'authMode' | 'authToken' | 'awaitingSignatureState' | 'connectedWallets' | 'getNameService' | 'handleLogOut' | 'handleUnlinkWallet' | 'isAuthenticated' | 'isFullyConnected' | 'isVerificationInProgress' | 'linkedWallets' | 'loadingNetwork' | 'loginWithEmail' | 'multiWalletWidgetState' | 'network' | 'networkConfigurations' | 'primaryWallet' | 'qrcodeUri' | 'rpcProviders' | 'sdkHasLoaded' | 'secondaryWallets' | 'setLogInWithEmail' | 'setMultiWalletWidgetState' | 'setNetwork' | 'setPrimaryWallet' | 'setShowAuthFlow' | 'setShowDynamicUserProfile' | 'setShowQrcodeModal' | 'shadowDOMEnabled' | 'showAuthFlow' | 'showQrcodeModal' | 'user' | 'walletConnector' | 'wallets' | 'walletsByChain' | 'walletsToConnectByChain' | 'setShowBridgeWidget' | 'sendWagmiSettings' | 'internalEvents'>;
 export declare const useDynamicContext: () => UseDynamicContext;

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

@@ -7,7 +7,7 @@ const useDynamicContext = () => {
     if (context === undefined) {
         throw new Error('useDynamicContext must be used within a DynamicContextProvider');
     }
-    const { accountSwitchState, authMode, authToken, awaitingSignatureState, connectedWallets, getNameService, handleLogOut, handleUnlinkWallet, isAuthenticated, isFullyConnected, isVerificationInProgress, linkedWallets, loadingNetwork, loginWithEmail, multiWalletWidgetState, network, networkConfigurations, qrcodeUri, rpcProviders, sdkHasLoaded, secondaryWallets, setLogInWithEmail, setMultiWalletWidgetState, setNetwork, setPrimaryWallet, setShowAuthFlow, setShowDynamicUserProfile, setShowQrcodeModal, shadowDOMEnabled, showAuthFlow, showQrcodeModal, user, walletConnector, wallets, walletsByChain, walletsToConnectByChain, primaryWallet, setShowBridgeWidget, sendWagmiSettings, } = context;
+    const { accountSwitchState, authMode, authToken, awaitingSignatureState, connectedWallets, getNameService, handleLogOut, handleUnlinkWallet, isAuthenticated, isFullyConnected, isVerificationInProgress, linkedWallets, loadingNetwork, loginWithEmail, multiWalletWidgetState, network, networkConfigurations, qrcodeUri, rpcProviders, sdkHasLoaded, secondaryWallets, setLogInWithEmail, setMultiWalletWidgetState, setNetwork, setPrimaryWallet, setShowAuthFlow, setShowDynamicUserProfile, setShowQrcodeModal, shadowDOMEnabled, showAuthFlow, showQrcodeModal, user, walletConnector, wallets, walletsByChain, walletsToConnectByChain, primaryWallet, setShowBridgeWidget, sendWagmiSettings, internalEvents, } = context;
     return {
         accountSwitchState,
         authMode,
@@ -17,6 +17,7 @@ const useDynamicContext = () => {
         getNameService,
         handleLogOut,
         handleUnlinkWallet,
+        internalEvents,
         isAuthenticated,
         isFullyConnected,
         isVerificationInProgress,

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

@@ -20,6 +20,7 @@ const errorMessageMap = {
     'missing-nonce': 'Something went wrong. Please try again.',
     'missing-public-address': 'Connection cancelled. 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.',
     wrong_email_verification_token: 'The code you entered is incorrect. Please try again.',
 };

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

@@ -16,6 +16,7 @@ const errorMessageMap = {
     'missing-nonce': 'Something went wrong. Please try again.',
     'missing-public-address': 'Connection cancelled. 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.',
     wrong_email_verification_token: 'The code you entered is incorrect. Please try again.',
 };

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

@@ -46,7 +46,7 @@ require('../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');
 const SocialRedirectContext = React.createContext(undefined);
 const SocialRedirectContextProvider = ({ children, }) => {
     var _a, _b;
-    const { setShowAuthFlow, wallets, setSelectedWalletConnector, walletUiUtils, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, setShowDynamicUserProfile, isAuthenticated, setPrimaryWalletId, secondaryWallets, sdkHasLoaded, authToken, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setShowAuthFlow, wallets, setSelectedWalletConnector, walletUiUtils, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, setShowDynamicUserProfile, isAuthenticated, setPrimaryWalletId, secondaryWallets, sdkHasLoaded, authToken, connectWallet, primaryWallet, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { setView } = ViewContext.useViewContext();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
@@ -65,7 +65,10 @@ const SocialRedirectContextProvider = ({ children, }) => {
         .find(walletConnectorCore.isSocialWalletConnector);
     const [redirectStatus, setRedirectStatus] = React.useState('idle');
     const [socialProvider, setSocialProvider] = React.useState();
-    const wallet = secondaryWallets.find((wallet) => wallet.connector.key === (socialWalletConnector === null || socialWalletConnector === void 0 ? void 0 : socialWalletConnector.key));
+    const userWallets = primaryWallet
+        ? [primaryWallet, ...secondaryWallets]
+        : secondaryWallets;
+    const wallet = userWallets.find((wallet) => wallet.connector.key === (socialWalletConnector === null || socialWalletConnector === void 0 ? void 0 : socialWalletConnector.key));
     const socialAccount = React.useMemo(() => (wallet ? getReferencedAccount.getReferencedAccount(authToken, wallet.id) : undefined), [authToken, wallet]);
     const handleError = React.useCallback((message) => {
         logger.logger.error(message);
@@ -126,12 +129,32 @@ const SocialRedirectContextProvider = ({ children, }) => {
                     if (!socialAccount) {
                         throw new Error('Social account not found');
                     }
+                    /**
+                     * consider google: a user may have multiple google accounts.
+                     * we need to make sure they connected with the same google account
+                     * that they originally used to authenticate
+                     *
+                     * there are two known scenarios that we enter this branch:
+                     * 1. the user is reconnected a social wallet:
+                     *   a. the user signed in with social
+                     *   b. the user then linked another wallet (for ex: metamask)
+                     *   c. the user signed out
+                     *   d. the user signed in with metamask
+                     *   e. the user selects their social wallet as their primary wallet
+                     *   f. we need to reconnect the social wallet and put the user in the social oauth redirect flow
+                     *
+                     * 2. for an unknown reason, the magic search params get put back into the url and this component rerenders,
+                     *    causing us to think the user is reconnecting.
+                     *    see: https://dynamiclabsgroup.slack.com/archives/C0473MNEP0T/p1697503460754999
+                     */
                     if (socialAccount.oauthAccountId === session.oauthId) {
-                        // justification: socialAccount is defined if and only if wallet is also defined
-                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                        setPrimaryWalletId(wallet.id);
-                        setShowAuthFlow(false);
-                        setShowDynamicUserProfile(true);
+                        if ((wallet === null || wallet === void 0 ? void 0 : wallet.id) !== (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id)) {
+                            // justification: socialAccount is defined if and only if wallet is also defined
+                            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                            setPrimaryWalletId(wallet.id);
+                            setShowAuthFlow(false);
+                            setShowDynamicUserProfile(true);
+                        }
                     }
                     else {
                         yield socialWalletConnector.endSession();
@@ -139,6 +162,7 @@ const SocialRedirectContextProvider = ({ children, }) => {
                     }
                 }
                 else {
+                    yield connectWallet(socialWalletConnector);
                     const address = yield socialWalletConnector.fetchPublicAddress();
                     walletUiUtils.disabledConfirmationOnce();
                     yield verifyWallet({
@@ -181,6 +205,8 @@ const SocialRedirectContextProvider = ({ children, }) => {
         walletUiUtils,
         wallet,
         handleError,
+        connectWallet,
+        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id,
     ]);
     return (jsxRuntime.jsx(SocialRedirectContext.Provider, { value: {
             enabledSocialProviders,

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

@@ -42,7 +42,7 @@ import '../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
 const SocialRedirectContext = createContext(undefined);
 const SocialRedirectContextProvider = ({ children, }) => {
     var _a, _b;
-    const { setShowAuthFlow, wallets, setSelectedWalletConnector, walletUiUtils, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, setShowDynamicUserProfile, isAuthenticated, setPrimaryWalletId, secondaryWallets, sdkHasLoaded, authToken, } = useInternalDynamicContext();
+    const { setShowAuthFlow, wallets, setSelectedWalletConnector, walletUiUtils, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, setShowDynamicUserProfile, isAuthenticated, setPrimaryWalletId, secondaryWallets, sdkHasLoaded, authToken, connectWallet, primaryWallet, } = useInternalDynamicContext();
     const { setErrorMessage } = useErrorContext();
     const { setView } = useViewContext();
     const verifyWallet = useVerifyWallet({
@@ -61,7 +61,10 @@ const SocialRedirectContextProvider = ({ children, }) => {
         .find(isSocialWalletConnector);
     const [redirectStatus, setRedirectStatus] = useState('idle');
     const [socialProvider, setSocialProvider] = useState();
-    const wallet = secondaryWallets.find((wallet) => wallet.connector.key === (socialWalletConnector === null || socialWalletConnector === void 0 ? void 0 : socialWalletConnector.key));
+    const userWallets = primaryWallet
+        ? [primaryWallet, ...secondaryWallets]
+        : secondaryWallets;
+    const wallet = userWallets.find((wallet) => wallet.connector.key === (socialWalletConnector === null || socialWalletConnector === void 0 ? void 0 : socialWalletConnector.key));
     const socialAccount = useMemo(() => (wallet ? getReferencedAccount(authToken, wallet.id) : undefined), [authToken, wallet]);
     const handleError = useCallback((message) => {
         logger.error(message);
@@ -122,12 +125,32 @@ const SocialRedirectContextProvider = ({ children, }) => {
                     if (!socialAccount) {
                         throw new Error('Social account not found');
                     }
+                    /**
+                     * consider google: a user may have multiple google accounts.
+                     * we need to make sure they connected with the same google account
+                     * that they originally used to authenticate
+                     *
+                     * there are two known scenarios that we enter this branch:
+                     * 1. the user is reconnected a social wallet:
+                     *   a. the user signed in with social
+                     *   b. the user then linked another wallet (for ex: metamask)
+                     *   c. the user signed out
+                     *   d. the user signed in with metamask
+                     *   e. the user selects their social wallet as their primary wallet
+                     *   f. we need to reconnect the social wallet and put the user in the social oauth redirect flow
+                     *
+                     * 2. for an unknown reason, the magic search params get put back into the url and this component rerenders,
+                     *    causing us to think the user is reconnecting.
+                     *    see: https://dynamiclabsgroup.slack.com/archives/C0473MNEP0T/p1697503460754999
+                     */
                     if (socialAccount.oauthAccountId === session.oauthId) {
-                        // justification: socialAccount is defined if and only if wallet is also defined
-                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                        setPrimaryWalletId(wallet.id);
-                        setShowAuthFlow(false);
-                        setShowDynamicUserProfile(true);
+                        if ((wallet === null || wallet === void 0 ? void 0 : wallet.id) !== (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id)) {
+                            // justification: socialAccount is defined if and only if wallet is also defined
+                            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                            setPrimaryWalletId(wallet.id);
+                            setShowAuthFlow(false);
+                            setShowDynamicUserProfile(true);
+                        }
                     }
                     else {
                         yield socialWalletConnector.endSession();
@@ -135,6 +158,7 @@ const SocialRedirectContextProvider = ({ children, }) => {
                     }
                 }
                 else {
+                    yield connectWallet(socialWalletConnector);
                     const address = yield socialWalletConnector.fetchPublicAddress();
                     walletUiUtils.disabledConfirmationOnce();
                     yield verifyWallet({
@@ -177,6 +201,8 @@ const SocialRedirectContextProvider = ({ children, }) => {
         walletUiUtils,
         wallet,
         handleError,
+        connectWallet,
+        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id,
     ]);
     return (jsx(SocialRedirectContext.Provider, { value: {
             enabledSocialProviders,

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-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' | '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';
+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-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';
 export type ViewContextProps = {
     setView: Dispatch<SetStateAction<ViewType>>;
     view: ViewType;

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
-var useInternalDynamicContext = require('../DynamicContext/useInternalDynamicContext.cjs');
+require('../DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
@@ -26,21 +26,7 @@ var useSyncPrimaryWallet = require('../../utils/hooks/multiWallet/useSyncPrimary
 
 const WalletContext = React.createContext(undefined);
 const WalletContextProvider = ({ children, canSync, }) => {
-    const { computeConnectedStateForWallets, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showWidgetStatePopup, authMode, connectWallet, } = useInternalDynamicContext.useInternalDynamicContext();
-    useSyncPrimaryWallet.useSyncPrimaryWallet({
-        authMode,
-        canSync,
-        computeConnectedStateForWallets,
-        connectWallet,
-        handleLogOut,
-        multiWalletWidgetState,
-        primaryWallet,
-        secondaryWallets,
-        setMultiWalletWidgetState,
-        setPrimaryWallet,
-        setShowWidgetStatePopup,
-        showWidgetStatePopup,
-    });
+    useSyncPrimaryWallet.useSyncPrimaryWallet(canSync);
     const value = undefined;
     return (jsxRuntime.jsx(WalletContext.Provider, { value: value, children: children }));
 };

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

@@ -1,6 +1,6 @@
 import { jsx } from 'react/jsx-runtime';
 import { createContext } from 'react';
-import { useInternalDynamicContext } from '../DynamicContext/useInternalDynamicContext.js';
+import '../DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api';
 import '../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -22,21 +22,7 @@ import { useSyncPrimaryWallet } from '../../utils/hooks/multiWallet/useSyncPrima
 
 const WalletContext = createContext(undefined);
 const WalletContextProvider = ({ children, canSync, }) => {
-    const { computeConnectedStateForWallets, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showWidgetStatePopup, authMode, connectWallet, } = useInternalDynamicContext();
-    useSyncPrimaryWallet({
-        authMode,
-        canSync,
-        computeConnectedStateForWallets,
-        connectWallet,
-        handleLogOut,
-        multiWalletWidgetState,
-        primaryWallet,
-        secondaryWallets,
-        setMultiWalletWidgetState,
-        setPrimaryWallet,
-        setShowWidgetStatePopup,
-        showWidgetStatePopup,
-    });
+    useSyncPrimaryWallet(canSync);
     const value = undefined;
     return (jsx(WalletContext.Provider, { value: value, children: children }));
 };

package/src/lib/data/api.cjs

@@ -18,6 +18,7 @@ require('../utils/constants/colors.cjs');
 require('../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../shared/consts/index.cjs');
+var helpers = require('../context/DynamicContext/helpers.cjs');
 
 const sdkApi = (jwt) => {
     const settings = {
@@ -187,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,
@@ -371,11 +373,12 @@ const verifyOAuth = (environmentId, providerType, { code, codeVerifier, state },
         return undefined;
     }
 });
-const unlinkOAuth = ({ environmentId, verifiedCrentialId, }, 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,
             },
         });
@@ -401,19 +404,24 @@ const getOnrampProviders = ({ chain, environmentId, networkId, token, walletAddr
 const sendDynamicProps = (environmentId, settingsToSend) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     try {
         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);
         }
     }
-    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 {

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

@@ -34,7 +34,7 @@ export declare const unlinkWallet: ({ environmentId, primaryWalletId, walletId,
     primaryWalletId: string | undefined;
     walletId: string;
 }, userJwt: string) => Promise<string | undefined>;
-export declare const transferWallet: (environmentId: string, { messageToSign, signedMessage, publicWalletAddress, chain, walletName, walletProvider, skipEmptyAccountCheck, }: VerifyWallet, userJwt: string) => Promise<string | undefined>;
+export declare const transferWallet: (environmentId: string, { network, messageToSign, signedMessage, publicWalletAddress, chain, walletName, walletProvider, skipEmptyAccountCheck, }: VerifyWallet, userJwt: string) => Promise<string | undefined>;
 export declare const mapChainToChainEnum: (chain: string) => ChainEnum;
 export declare const mapProviderToProviderEnum: (provider: string) => WalletProviderEnum;
 export declare const mapAuthModeTypeToEnum: (authMode: string) => AuthModeEnum;
@@ -52,8 +52,9 @@ export declare const fetchProjectSettings: (environmentId: string) => Promise<Pr
 export declare const updateUserProfileFields: (jwt: string | undefined, environmentId: string, fields: UserFields) => Promise<UpdateSelfResponse>;
 export declare const getOauthLoginUrl: (environmentId: string, providerType: ProviderEnum, userJwt: string) => Promise<string | undefined>;
 export declare const verifyOAuth: (environmentId: string, providerType: ProviderEnum, { code, codeVerifier, state }: OauthRequest, userJwt: string) => Promise<string | undefined>;
-export declare const unlinkOAuth: ({ environmentId, verifiedCrentialId, }: {
+export declare const unlinkOAuth: ({ environmentId, primaryWalletId, verifiedCrentialId, }: {
     environmentId: string;
+    primaryWalletId: string | undefined;
     verifiedCrentialId: string;
 }, userJwt: string) => Promise<string | undefined>;
 export declare const getOnrampProviders: ({ chain, environmentId, networkId, token, walletAddress, }: {

package/src/lib/data/api.js

@@ -14,6 +14,7 @@ import '../utils/constants/colors.js';
 import '../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../shared/consts/index.js';
+import { isDynamicContextSessionSettingExpired, setDynamicContextSessionSettings, isWagmiSessionSettingExpired, setWagmiSessionSettings } from '../context/DynamicContext/helpers.js';
 
 const sdkApi = (jwt) => {
     const settings = {
@@ -183,11 +184,12 @@ const unlinkWallet = ({ environmentId, primaryWalletId, walletId, }, userJwt) =>
         return undefined;
     }
 });
-const transferWallet = (environmentId, { messageToSign, signedMessage, publicWalletAddress, chain, walletName, walletProvider, skipEmptyAccountCheck = false, }, userJwt) => __awaiter(void 0, void 0, void 0, function* () {
+const transferWallet = (environmentId, { network, messageToSign, signedMessage, publicWalletAddress, chain, walletName, walletProvider, skipEmptyAccountCheck = false, }, userJwt) => __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,
@@ -367,11 +369,12 @@ const verifyOAuth = (environmentId, providerType, { code, codeVerifier, state },
         return undefined;
     }
 });
-const unlinkOAuth = ({ environmentId, verifiedCrentialId, }, userJwt) => __awaiter(void 0, void 0, void 0, function* () {
+const unlinkOAuth = ({ environmentId, primaryWalletId, verifiedCrentialId, }, userJwt) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const { jwt } = yield sdkApi(userJwt).verifyUnlink({
             environmentId,
             verifyUnlinkRequest: {
+                primaryWalletId,
                 verifiedCrentialId,
             },
         });
@@ -397,19 +400,24 @@ const getOnrampProviders = ({ chain, environmentId, networkId, token, walletAddr
 const sendDynamicProps = (environmentId, settingsToSend) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         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);
         }
     }
-    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 {