@dynamic-labs/sdk-react-core 4.18.4 → 4.18.6

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

@@ -5,7 +5,7 @@ import { createContext, useEffect, useState, useMemo, useCallback } from 'react'
 import { I18nextProvider } from 'react-i18next';
 import { getIconicSpriteUrl } from '@dynamic-labs/iconic';
 import { Logger } from '@dynamic-labs/logger';
-import { MissingEnvironmentIdError, getEnvVarWithFallback, StorageService } from '@dynamic-labs/utils';
+import { MissingEnvironmentIdError, getEnvVarWithFallback, StorageService, tracing } from '@dynamic-labs/utils';
 import { useWalletBookCdn, getWalletBookCdnUrl, WalletBookContextProvider } from '@dynamic-labs/wallet-book';
 import { setChainInfoOverrides, logger as logger$1, isSessionKeyCompatibleWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { VERSION } from '../../../version.js';
@@ -37,10 +37,11 @@ import { sendDynamicProps } from '../../data/api/settings/settings.js';
 import { Locale } from '../../locale/locale.js';
 import { useSyncDynamicContextProps } from '../../store/state/dynamicContextProps/dynamicContextProps.js';
 import { usePrimaryWalletId } from '../../store/state/primaryWalletId/primaryWalletId.js';
+import { resetConnectedWalletsInfo } from '../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
+import { getMissingChains } from '../../utils/functions/getMissingChains/getMissingChains.js';
 import { AccessDeniedContextProvider } from '../AccessDeniedContext/AccessDeniedContext.js';
 import { AccountExistsContextProvider } from '../AccountExistsContext/AccountExistsContext.js';
 import { UserWalletsProvider } from '../UserWalletsContext/UserWalletsContext.js';
-import { resetConnectedWalletsInfo } from '../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import { VerificationProvider } from '../VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../utils/functions/compareChains/compareChains.js';
@@ -109,7 +110,6 @@ import { WalletConnectorEvents } from '../../components/WalletConnectorEvents/Wa
 import { shouldFetchNonce } from '../../shared/utils/functions/shouldFetchNonce/shouldFetchNonce.js';
 import { initializeStore } from '../../store/internalImplementation/store.js';
 import { defaultDynamicSettings } from '../../store/state/dynamicContextProps/defaultDynamicSettings.js';
-import { getMissingChains } from '../../utils/functions/getMissingChains/getMissingChains.js';
 import { parseTheme } from '../../utils/functions/parseTheme/parseTheme.js';
 import { useMultiWalletWidgetState } from '../../utils/hooks/multiWallet/useMultiWalletWidgetState/useMultiWalletWidgetState.js';
 import { useClearWalletConnectSessions } from '../../utils/hooks/useClearWalletConnectSessions/useClearWalletConnectSessions.js';
@@ -208,6 +208,12 @@ const InnerDynamicContextProvider = (props) => {
     const [showBridgeWidget, setShowBridgeWidget] = useState(false);
     const [isSingleWalletAccount, setIsSingleWalletAccount] = useState(false);
     const { user, userWithMissingInfo } = useUser();
+    if (user) {
+        Logger.globalMetaData.set('user', user);
+    }
+    else {
+        Logger.globalMetaData.set('user', undefined);
+    }
     // Calculates and stores a device fingerprint
     useDeviceFingerprint();
     const isAuthenticated = Boolean(user);
@@ -286,13 +292,8 @@ const InnerDynamicContextProvider = (props) => {
     useCreateWalletGroups({ walletConnectorOptions });
     const primaryWalletId = usePrimaryWalletId();
     const authMode = useAuthMode();
-    // this is a state because it's set based on primaryWallet and bridgeChainsToConnect,
-    // which are only available further down and have would have circular dependencies
-    const [requiredWalletsConnected, setRequiredWalletsConnected] = useState(false);
-    const isUserAuthenticated = Boolean(authMode === 'connect-and-sign' ? user : requiredWalletsConnected);
     const [isRenderingEmbeddedAuthFlow, setIsRenderingEmbeddedAuthFlow] = useState(false);
     const [showAuthFlow, setShowAuthFlow] = useShowAuthFlow({
-        isAuthenticated: isUserAuthenticated,
         isMultiWalletEnabled: multiWallet,
         isRenderingEmbeddedAuthFlow,
         setShowDynamicUserProfile,
@@ -322,9 +323,6 @@ const InnerDynamicContextProvider = (props) => {
         walletConnectorOptions,
     });
     useAutoselectPrimaryWallet(isBridgeFlow);
-    useEffect(() => {
-        setRequiredWalletsConnected(!(bridgeChainsToConnect === null || bridgeChainsToConnect === void 0 ? void 0 : bridgeChainsToConnect.length) && Boolean(primaryWallet));
-    }, [bridgeChainsToConnect, primaryWallet]);
     const walletConnectors = useMemo(() => linkedOrConnectedWallets.map((wallet) => wallet.connector), [linkedOrConnectedWallets]);
     const { refetchProjectSettings } = useFetchProjectSettings();
     useFetchNonce({
@@ -338,6 +336,7 @@ const InnerDynamicContextProvider = (props) => {
         connectors: walletConnectors,
     });
     const removeSessionStorageSessionKeys = () => {
+        tracing.logEvent('session-key', 'removeSessionStorageSessionKeys');
         StorageService.removeItem(SECURE_ENCLAVE_WALLET_SESSION_KEYS, SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS);
         walletConnectors.forEach((connector) => {
             if (isSessionKeyCompatibleWalletConnector(connector) &&

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

@@ -22,6 +22,8 @@ require('../../../../shared/consts/index.cjs');
 require('../../../../store/state/nonce/nonce.cjs');
 require('../../../../store/state/projectSettings/projectSettings.cjs');
 var updatePrimaryWalletId = require('../../../../utils/functions/updatePrimaryWalletId/updatePrimaryWalletId.cjs');
+require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
+require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 var useDynamicEvents = require('../../../../utils/hooks/events/useDynamicEvents/useDynamicEvents.cjs');
 require('../../DynamicContext.cjs');
 require('../../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
@@ -35,7 +37,6 @@ require('../../../../config/ApiEndpoint.cjs');
 require('../../../../store/state/user/user.cjs');
 require('../../../../locale/locale.cjs');
 require('../../../../events/dynamicEvents.cjs');
-require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../../utils/functions/compareChains/compareChains.cjs');
@@ -54,7 +55,6 @@ require('../../../../views/CollectUserDataView/useFields.cjs');
 require('../../../FieldsStateContext/FieldsStateContext.cjs');
 require('../../../UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
-require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');

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

@@ -18,6 +18,8 @@ import '../../../../shared/consts/index.js';
 import '../../../../store/state/nonce/nonce.js';
 import '../../../../store/state/projectSettings/projectSettings.js';
 import { updatePrimaryWalletId } from '../../../../utils/functions/updatePrimaryWalletId/updatePrimaryWalletId.js';
+import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
+import '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import { useInternalDynamicEvents } from '../../../../utils/hooks/events/useDynamicEvents/useDynamicEvents.js';
 import '../../DynamicContext.js';
 import '../../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
@@ -31,7 +33,6 @@ import '../../../../config/ApiEndpoint.js';
 import '../../../../store/state/user/user.js';
 import '../../../../locale/locale.js';
 import '../../../../events/dynamicEvents.js';
-import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../../utils/functions/compareChains/compareChains.js';
@@ -50,7 +51,6 @@ import '../../../../views/CollectUserDataView/useFields.js';
 import '../../../FieldsStateContext/FieldsStateContext.js';
 import '../../../UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
-import '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../../components/Accordion/components/AccordionItem/AccordionItem.js';

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

@@ -26,6 +26,7 @@ require('../../../../store/state/user/user.cjs');
 require('../../../../locale/locale.cjs');
 require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
+require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 
 const useEmailLoginState = (providers, user) => {
     const [loginWithEmail, _setLoginWithEmail] = React.useState(null);

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

@@ -22,6 +22,7 @@ import '../../../../store/state/user/user.js';
 import '../../../../locale/locale.js';
 import '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../../store/state/primaryWalletId/primaryWalletId.js';
+import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 
 const useEmailLoginState = (providers, user) => {
     const [loginWithEmail, _setLoginWithEmail] = useState(null);

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

@@ -25,6 +25,7 @@ require('../../../../store/state/nonce/nonce.cjs');
 require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 var primaryWalletId = require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
 var user = require('../../../../store/state/user/user.cjs');
+var connectedWalletsInfo = require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 var session = require('../../../../data/api/session/session.cjs');
 require('../../../../locale/locale.cjs');
 var dynamicEvents = require('../../../../events/dynamicEvents.cjs');
@@ -37,7 +38,6 @@ require('../../../ErrorContext/ErrorContext.cjs');
 require('../../../AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../AccountExistsContext/AccountExistsContext.cjs');
 require('../../../UserWalletsContext/UserWalletsContext.cjs');
-var connectedWalletsInfo = require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../../utils/functions/compareChains/compareChains.cjs');
@@ -105,6 +105,7 @@ const useHandleLogout = (params) => {
         logger.logger.logVerboseTroubleshootingMessage('useHandleLogout called', {
             params: paramsRef.current,
         });
+        utils.tracing.logEvent('logout', 'useHandleLogout called');
         const p = paramsRef.current;
         p.setSelectedWalletConnectorKey(null);
         p.clearAllWalletConnectSessions();

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

@@ -1,7 +1,7 @@
 'use client'
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { useRef, useCallback, useEffect } from 'react';
-import { StorageService } from '@dynamic-labs/utils';
+import { tracing, StorageService } from '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api-core';
 import '../../../../config/ApiEndpoint.js';
 import '../../../../store/state/projectSettings/projectSettings.js';
@@ -21,6 +21,7 @@ import '../../../../store/state/nonce/nonce.js';
 import '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import { resetPrimaryWalletId } from '../../../../store/state/primaryWalletId/primaryWalletId.js';
 import { setUser } from '../../../../store/state/user/user.js';
+import { resetConnectedWalletsInfo } from '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import { revokeSession } from '../../../../data/api/session/session.js';
 import '../../../../locale/locale.js';
 import { dynamicEvents } from '../../../../events/dynamicEvents.js';
@@ -33,7 +34,6 @@ import '../../../ErrorContext/ErrorContext.js';
 import '../../../AccessDeniedContext/AccessDeniedContext.js';
 import '../../../AccountExistsContext/AccountExistsContext.js';
 import '../../../UserWalletsContext/UserWalletsContext.js';
-import { resetConnectedWalletsInfo } from '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../../utils/functions/compareChains/compareChains.js';
@@ -101,6 +101,7 @@ const useHandleLogout = (params) => {
         logger.logVerboseTroubleshootingMessage('useHandleLogout called', {
             params: paramsRef.current,
         });
+        tracing.logEvent('logout', 'useHandleLogout called');
         const p = paramsRef.current;
         p.setSelectedWalletConnectorKey(null);
         p.clearAllWalletConnectSessions();

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

@@ -24,9 +24,9 @@ require('../../../../store/state/nonce/nonce.cjs');
 var dynamicContextProps = require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 var primaryWalletId = require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
 var user = require('../../../../store/state/user/user.cjs');
+var connectedWalletsInfo = require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../../locale/locale.cjs');
 var wallets = require('../../../../data/api/wallets/wallets.cjs');
-var connectedWalletsInfo = require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 var UserWalletsContext = require('../../../UserWalletsContext/UserWalletsContext.cjs');
 var authMode = require('../../../../store/state/authMode/authMode.cjs');
 

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

@@ -20,9 +20,9 @@ import '../../../../store/state/nonce/nonce.js';
 import { getEnvironmentId } from '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import { getPrimaryWalletId } from '../../../../store/state/primaryWalletId/primaryWalletId.js';
 import { getUser } from '../../../../store/state/user/user.js';
+import { useConnectedWalletsInfo, setConnectedWalletsInfo } from '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../../locale/locale.js';
 import { unlinkWallet } from '../../../../data/api/wallets/wallets.js';
-import { useConnectedWalletsInfo, setConnectedWalletsInfo } from '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import { useInternalUserWallets } from '../../../UserWalletsContext/UserWalletsContext.js';
 import { getAuthMode } from '../../../../store/state/authMode/authMode.js';
 

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

@@ -17,6 +17,17 @@ require('../../../../utils/constants/colors.cjs');
 require('../../../../utils/constants/values.cjs');
 require('../../../../shared/consts/index.cjs');
 var ErrorContext = require('../../../ErrorContext/ErrorContext.cjs');
+require('../../../../../../_virtual/_tslib.cjs');
+require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
+require('../../../../store/state/nonce/nonce.cjs');
+require('../../../../store/state/projectSettings/projectSettings.cjs');
+require('../../../../config/ApiEndpoint.cjs');
+require('../../../../store/state/user/user.cjs');
+require('../../../../locale/locale.cjs');
+require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
+require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
+var hasAllRequiredWalletsConnected = require('../../../../utils/functions/hasAllRequiredWalletsConnected/hasAllRequiredWalletsConnected.cjs');
 
 /**
  * There are a multitude of scenarios where we want to ignore or insert functionality to calls
@@ -24,12 +35,14 @@ var ErrorContext = require('../../../ErrorContext/ErrorContext.cjs');
  * different scenarios and makes it especially easy to customize exactly which version of this method
  * is being passed to useDynamicContext.
  */
-const useShowAuthFlow = ({ isAuthenticated, isRenderingEmbeddedAuthFlow, isMultiWalletEnabled, setShowDynamicUserProfile, }) => {
+const useShowAuthFlow = ({ isRenderingEmbeddedAuthFlow, isMultiWalletEnabled, setShowDynamicUserProfile, }) => {
     const [showAuthFlow, _setShowAuthFlow] = React.useState(false);
     const { setError } = ErrorContext.useErrorContext();
     const setShowAuthFlow = React.useCallback((value, options = {}) => {
         const { emitCancelAuth, ignoreIfIsEmbeddedWidget, initializeWalletConnect, performMultiWalletChecks, clearErrors, } = Object.assign({ clearErrors: true, emitCancelAuth: false, ignoreIfIsEmbeddedWidget: true, initializeWalletConnect: true, performMultiWalletChecks: false }, options);
+        const areAllRequiredWalletsConnected = hasAllRequiredWalletsConnected.hasAllRequiredWalletsConnected();
         logger.logger.logVerboseTroubleshootingMessage('setShowAuthFlow', {
+            areAllRequiredWalletsConnected,
             clearErrors,
             emitCancelAuth,
             ignoreIfIsEmbeddedWidget,
@@ -45,7 +58,7 @@ const useShowAuthFlow = ({ isAuthenticated, isRenderingEmbeddedAuthFlow, isMulti
         if (value) {
             if (ignoreIfIsEmbeddedWidget && isRenderingEmbeddedAuthFlow)
                 return;
-            if (performMultiWalletChecks && isAuthenticated) {
+            if (performMultiWalletChecks && areAllRequiredWalletsConnected) {
                 if (!isMultiWalletEnabled) {
                     return setShowDynamicUserProfile(true);
                 }
@@ -59,7 +72,6 @@ const useShowAuthFlow = ({ isAuthenticated, isRenderingEmbeddedAuthFlow, isMulti
             setError(undefined);
         _setShowAuthFlow(value);
     }, [
-        isAuthenticated,
         isMultiWalletEnabled,
         isRenderingEmbeddedAuthFlow,
         setError,

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

@@ -27,7 +27,6 @@ export type SetShowAuthFlow = (value: SetStateAction<boolean>, options?: SetShow
 export type UseShowAuthFlowParams = {
     isMultiWalletEnabled: boolean;
     isRenderingEmbeddedAuthFlow: IDynamicContext['isRenderingEmbeddedAuthFlow'];
-    isAuthenticated: boolean;
     setShowDynamicUserProfile: IDynamicContext['setShowDynamicUserProfile'];
 };
 /**
@@ -36,4 +35,4 @@ export type UseShowAuthFlowParams = {
  * different scenarios and makes it especially easy to customize exactly which version of this method
  * is being passed to useDynamicContext.
  */
-export declare const useShowAuthFlow: ({ isAuthenticated, isRenderingEmbeddedAuthFlow, isMultiWalletEnabled, setShowDynamicUserProfile, }: UseShowAuthFlowParams) => [boolean, SetShowAuthFlow];
+export declare const useShowAuthFlow: ({ isRenderingEmbeddedAuthFlow, isMultiWalletEnabled, setShowDynamicUserProfile, }: UseShowAuthFlowParams) => [boolean, SetShowAuthFlow];

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

@@ -13,6 +13,17 @@ import '../../../../utils/constants/colors.js';
 import '../../../../utils/constants/values.js';
 import '../../../../shared/consts/index.js';
 import { useErrorContext } from '../../../ErrorContext/ErrorContext.js';
+import '../../../../../../_virtual/_tslib.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import '../../../../store/state/nonce/nonce.js';
+import '../../../../store/state/projectSettings/projectSettings.js';
+import '../../../../config/ApiEndpoint.js';
+import '../../../../store/state/user/user.js';
+import '../../../../locale/locale.js';
+import '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
+import '../../../../store/state/primaryWalletId/primaryWalletId.js';
+import { hasAllRequiredWalletsConnected } from '../../../../utils/functions/hasAllRequiredWalletsConnected/hasAllRequiredWalletsConnected.js';
 
 /**
  * There are a multitude of scenarios where we want to ignore or insert functionality to calls
@@ -20,12 +31,14 @@ import { useErrorContext } from '../../../ErrorContext/ErrorContext.js';
  * different scenarios and makes it especially easy to customize exactly which version of this method
  * is being passed to useDynamicContext.
  */
-const useShowAuthFlow = ({ isAuthenticated, isRenderingEmbeddedAuthFlow, isMultiWalletEnabled, setShowDynamicUserProfile, }) => {
+const useShowAuthFlow = ({ isRenderingEmbeddedAuthFlow, isMultiWalletEnabled, setShowDynamicUserProfile, }) => {
     const [showAuthFlow, _setShowAuthFlow] = useState(false);
     const { setError } = useErrorContext();
     const setShowAuthFlow = useCallback((value, options = {}) => {
         const { emitCancelAuth, ignoreIfIsEmbeddedWidget, initializeWalletConnect, performMultiWalletChecks, clearErrors, } = Object.assign({ clearErrors: true, emitCancelAuth: false, ignoreIfIsEmbeddedWidget: true, initializeWalletConnect: true, performMultiWalletChecks: false }, options);
+        const areAllRequiredWalletsConnected = hasAllRequiredWalletsConnected();
         logger.logVerboseTroubleshootingMessage('setShowAuthFlow', {
+            areAllRequiredWalletsConnected,
             clearErrors,
             emitCancelAuth,
             ignoreIfIsEmbeddedWidget,
@@ -41,7 +54,7 @@ const useShowAuthFlow = ({ isAuthenticated, isRenderingEmbeddedAuthFlow, isMulti
         if (value) {
             if (ignoreIfIsEmbeddedWidget && isRenderingEmbeddedAuthFlow)
                 return;
-            if (performMultiWalletChecks && isAuthenticated) {
+            if (performMultiWalletChecks && areAllRequiredWalletsConnected) {
                 if (!isMultiWalletEnabled) {
                     return setShowDynamicUserProfile(true);
                 }
@@ -55,7 +68,6 @@ const useShowAuthFlow = ({ isAuthenticated, isRenderingEmbeddedAuthFlow, isMulti
             setError(undefined);
         _setShowAuthFlow(value);
     }, [
-        isAuthenticated,
         isMultiWalletEnabled,
         isRenderingEmbeddedAuthFlow,
         setError,

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

@@ -31,11 +31,11 @@ require('../../../../store/state/user/user.cjs');
 require('../../../../locale/locale.cjs');
 require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
+require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../AccountExistsContext/AccountExistsContext.cjs');
 require('../../../UserWalletsContext/UserWalletsContext.cjs');
 require('../../../../events/dynamicEvents.cjs');
-require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../../utils/functions/compareChains/compareChains.cjs');

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

@@ -27,11 +27,11 @@ import '../../../../store/state/user/user.js';
 import '../../../../locale/locale.js';
 import '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../../store/state/primaryWalletId/primaryWalletId.js';
+import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../AccessDeniedContext/AccessDeniedContext.js';
 import '../../../AccountExistsContext/AccountExistsContext.js';
 import '../../../UserWalletsContext/UserWalletsContext.js';
 import '../../../../events/dynamicEvents.js';
-import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../../utils/functions/compareChains/compareChains.js';

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

@@ -31,10 +31,10 @@ require('../../../../store/state/user/user.cjs');
 require('../../../../locale/locale.cjs');
 require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
+require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../AccountExistsContext/AccountExistsContext.cjs');
 require('../../../UserWalletsContext/UserWalletsContext.cjs');
-require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../../utils/functions/compareChains/compareChains.cjs');

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

@@ -27,10 +27,10 @@ import '../../../../store/state/user/user.js';
 import '../../../../locale/locale.js';
 import '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../../store/state/primaryWalletId/primaryWalletId.js';
+import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../AccessDeniedContext/AccessDeniedContext.js';
 import '../../../AccountExistsContext/AccountExistsContext.js';
 import '../../../UserWalletsContext/UserWalletsContext.js';
-import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../../utils/functions/compareChains/compareChains.js';

package/src/lib/context/LoadingContext/LoadingContext.cjs

@@ -31,11 +31,11 @@ require('../../store/state/user/user.cjs');
 require('../../locale/locale.cjs');
 require('../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../store/state/primaryWalletId/primaryWalletId.cjs');
+require('../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../AccessDeniedContext/AccessDeniedContext.cjs');
 require('../AccountExistsContext/AccountExistsContext.cjs');
 require('../UserWalletsContext/UserWalletsContext.cjs');
 require('../../events/dynamicEvents.cjs');
-require('../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../utils/functions/compareChains/compareChains.cjs');

package/src/lib/context/LoadingContext/LoadingContext.js

@@ -27,11 +27,11 @@ import '../../store/state/user/user.js';
 import '../../locale/locale.js';
 import '../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../store/state/primaryWalletId/primaryWalletId.js';
+import '../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../AccessDeniedContext/AccessDeniedContext.js';
 import '../AccountExistsContext/AccountExistsContext.js';
 import '../UserWalletsContext/UserWalletsContext.js';
 import '../../events/dynamicEvents.js';
-import '../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../utils/functions/compareChains/compareChains.js';

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

@@ -35,10 +35,10 @@ require('../../store/state/user/user.cjs');
 require('../../locale/locale.cjs');
 require('../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../store/state/primaryWalletId/primaryWalletId.cjs');
+require('../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../AccessDeniedContext/AccessDeniedContext.cjs');
 require('../AccountExistsContext/AccountExistsContext.cjs');
 require('../UserWalletsContext/UserWalletsContext.cjs');
-require('../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../utils/functions/compareChains/compareChains.cjs');

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

@@ -31,10 +31,10 @@ import '../../store/state/user/user.js';
 import '../../locale/locale.js';
 import '../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../store/state/primaryWalletId/primaryWalletId.js';
+import '../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../AccessDeniedContext/AccessDeniedContext.js';
 import '../AccountExistsContext/AccountExistsContext.js';
 import '../UserWalletsContext/UserWalletsContext.js';
-import '../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../utils/functions/compareChains/compareChains.js';

package/src/lib/context/OnrampContext/OnrampContext.cjs

@@ -30,10 +30,10 @@ require('../../store/state/user/user.cjs');
 require('../../locale/locale.cjs');
 require('../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../store/state/primaryWalletId/primaryWalletId.cjs');
+require('../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../AccessDeniedContext/AccessDeniedContext.cjs');
 require('../AccountExistsContext/AccountExistsContext.cjs');
 require('../UserWalletsContext/UserWalletsContext.cjs');
-require('../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../store/state/authMode/authMode.cjs');
 require('../VerificationContext/VerificationContext.cjs');
 require('react-dom');
@@ -150,20 +150,19 @@ const OnrampContextProvider = ({ children, }) => {
         onrampOverrides.length,
         overrides === null || overrides === void 0 ? void 0 : overrides.onrampOptions,
     ]);
-    const openOnramp = React.useCallback((_f) => _tslib.__awaiter(void 0, [_f], void 0, function* ({ onrampProvider, address, token }) {
-        if (!onrampEnabled) {
-            throw new Error('Onramp is not enabled');
-        }
-        if (promiseRef.current) {
-            return promiseRef.current.promise;
+    const hasPrimaryWallet = React.useMemo(() => Boolean(primaryWallet), [primaryWallet]);
+    const setSelectedAndShowOnramp = React.useCallback((provider, wallet) => {
+        var _a;
+        if (hasPrimaryWallet) {
+            setSelectedOnrampProvider(provider.id);
         }
-        promiseRef.current = new utils.DeferredPromise();
-        if (address || token)
-            setEnabledOnrampProvidersTarget({ address, token });
-        setSelectedOnrampProvider(onrampProvider);
         setShowOnramp(true);
-        return promiseRef.current.promise;
-    }), [onrampEnabled, setShowOnramp]);
+        const shouldOpenPopup = provider.openMode === 'popup' && provider.url && setShowOnramp;
+        if (!shouldOpenPopup) {
+            return;
+        }
+        return openOnrampPopup.openOnrampPopup((_a = provider.url) !== null && _a !== void 0 ? _a : '', wallet, setShowOnramp, provider.id);
+    }, [hasPrimaryWallet, setShowOnramp]);
     const enabledOnrampProviders = React.useMemo(() => {
         // If we have explicit overrides (even empty array), use them
         if ((overrides === null || overrides === void 0 ? void 0 : overrides.onrampOptions) !== undefined) {
@@ -176,26 +175,33 @@ const OnrampContextProvider = ({ children, }) => {
         onrampOverrides,
         overrides === null || overrides === void 0 ? void 0 : overrides.onrampOptions,
     ]);
+    const openOnramp = React.useCallback((_f) => _tslib.__awaiter(void 0, [_f], void 0, function* ({ onrampProvider, address, token }) {
+        if (!onrampEnabled) {
+            throw new Error('Onramp is not enabled');
+        }
+        if (promiseRef.current) {
+            return promiseRef.current.promise;
+        }
+        promiseRef.current = new utils.DeferredPromise();
+        if (address || token)
+            setEnabledOnrampProvidersTarget({ address, token });
+        const onrampOption = enabledOnrampProviders.find((p) => p.id === onrampProvider);
+        if (!onrampOption) {
+            throw new Error('Onramp provider not found');
+        }
+        setSelectedAndShowOnramp(onrampOption);
+        return promiseRef.current.promise;
+    }), [enabledOnrampProviders, onrampEnabled, setSelectedAndShowOnramp]);
     const selectedOnramp = React.useMemo(() => enabledOnrampProviders.length
         ? enabledOnrampProviders.find((p) => p.id === selectedOnrampProvider)
         : undefined, [enabledOnrampProviders, selectedOnrampProvider]);
-    const hasPrimaryWallet = React.useMemo(() => Boolean(primaryWallet), [primaryWallet]);
     const selectOnrampProvider = React.useCallback(({ provider, wallet }) => {
-        var _a;
         if (provider.onClick) {
             provider.onClick({ wallet });
             return;
         }
-        if (hasPrimaryWallet) {
-            setSelectedOnrampProvider(provider.id);
-        }
-        setShowOnramp(true);
-        const shouldOpenPopup = provider.openMode === 'popup' && provider.url && setShowOnramp;
-        if (!shouldOpenPopup) {
-            return;
-        }
-        return openOnrampPopup.openOnrampPopup((_a = provider.url) !== null && _a !== void 0 ? _a : '', wallet, setShowOnramp, provider.id);
-    }, [hasPrimaryWallet, setShowOnramp]);
+        setSelectedAndShowOnramp(provider, wallet);
+    }, [setSelectedAndShowOnramp]);
     const value = React.useMemo(() => ({
         enabledOnrampProviders,
         onrampEnabled,

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

@@ -1,6 +1,6 @@
 import { type ReactNode } from 'react';
 import type { OnrampProviders } from '@dynamic-labs/sdk-api-core';
-import { Wallet } from '@dynamic-labs/wallet-connector-core';
+import type { Wallet } from '@dynamic-labs/wallet-connector-core';
 import type { OnrampOption } from '../DynamicContext';
 type OpenOnrampProps = {
     address?: string;