@dynamic-labs/sdk-react-core 1.0.0-alpha.1 → 1.0.0-alpha.11

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

@@ -22,6 +22,8 @@ import { usePromise } from '../usePromise/usePromise.js';
 const useTransactionEstimatedGas = (provider, transaction) => usePromise(() => __awaiter(void 0, void 0, void 0, function* () {
     const { from } = transaction, transactionWithoutFrom = __rest(transaction, ["from"]);
     return provider.estimateGas(Object.assign(Object.assign({}, transactionWithoutFrom), { account: from }));
-}), { deps: [transaction, provider] });
+}), {
+    deps: [transaction, provider],
+});
 
 export { useTransactionEstimatedGas };

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs

@@ -21,12 +21,12 @@ require('viem');
 require('@dynamic-labs/utils');
 require('../../../../shared/consts/index.cjs');
 var isEmailVerificationRequired = require('../../../functions/authenication/isEmailVerificationRequired/isEmailVerificationRequired.cjs');
+require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('@dynamic-labs/sdk-api');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
-require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 var useEmailVerificationRequest = require('../../authenticationHooks/useEmailVerificationRequest/useEmailVerificationRequest.cjs');
 var useUpdateUserProfileByJWTCallback = require('../../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.cjs');
 

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js

@@ -17,12 +17,12 @@ import 'viem';
 import '@dynamic-labs/utils';
 import '../../../../shared/consts/index.js';
 import { isEmailVerificationRequired } from '../../../functions/authenication/isEmailVerificationRequired/isEmailVerificationRequired.js';
+import '../../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import '@dynamic-labs/sdk-api';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
-import '../../../../context/CaptchaContext/CaptchaContext.js';
 import { useEmailVerificationRequest } from '../../authenticationHooks/useEmailVerificationRequest/useEmailVerificationRequest.js';
 import { useUpdateUserProfileByJWTCallback } from '../../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.js';
 

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

@@ -3,15 +3,17 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var AccessDeniedContext = require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+var AccountExistsContext = require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
+var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
+var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
+var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 var api = require('../../../data/api.cjs');
-var index = require('../../functions/storeAuthToken/index.cjs');
-require('@dynamic-labs/multi-wallet');
 var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
-var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 require('react');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
@@ -20,15 +22,13 @@ require('../../constants/colors.cjs');
 var localStorage = require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../../shared/consts/index.cjs');
-var getVerifyArgs = require('../../functions/getVerifyArgs/getVerifyArgs.cjs');
 var createUserProfile = require('../../functions/createUserProfile/createUserProfile.cjs');
+require('@dynamic-labs/multi-wallet');
 require('@dynamic-labs/sdk-api');
-var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
-var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
+var getVerifyArgs = require('../../functions/getVerifyArgs/getVerifyArgs.cjs');
+var index = require('../../functions/storeAuthToken/index.cjs');
 var getSiweStatement = require('../../functions/getSiweStatement/getSiweStatement.cjs');
 var getWalletProvider = require('../../functions/getWalletProvider/getWalletProvider.cjs');
-var AccessDeniedContext = require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
-var AccountExistsContext = require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 
 // This logic is used to both verify or link a wallet
 // Since we are re-using the different screens to authenticate or link the wallet.
@@ -38,7 +38,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
     const { setExistentAccountData } = AccountExistsContext.useAccountExistsContext();
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage, setError } = ErrorContext.useErrorContext();
-    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallets, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, } = useInternalDynamicContext.useInternalDynamicContext();
     // If the user is not already logged it means that we only need to verify
     // We need this boolean for the part of the logic where we already persisted a new authToken,
     // and need to distinguish between logic for verify or linking.
@@ -136,7 +136,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             setView('account-exists');
             return;
         }
-        if (connectedWallet && authMode === 'connect-only') {
+        if (connectedWallets.length && authMode === 'connect-only') {
             throw new utils.DynamicError(e.message);
         }
         goToInitialView();
@@ -187,7 +187,9 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             }
             else {
                 setView('wallet-list');
-                setCallback('linkSuccess', { walletConnector });
+                setCallback('linkSuccess', {
+                    walletId: decodedJwt.lastVerifiedCredentialId,
+                });
             }
         }
         catch (e) {

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

@@ -1,5 +1,5 @@
 import { Dispatch, SetStateAction } from 'react';
-import { ProjectSettingsProps, VerifyProps, VerifyCallbackArgs } from '../../../shared/types';
+import { ProjectSettingsProps, VerifyCallbackArgs, VerifyProps } from '../../../shared/types';
 type UseVerifyWalletArgs = VerifyProps & ProjectSettingsProps & {
     consumeNonce: () => string | undefined;
     displaySiweStatement: boolean;

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

@@ -1,13 +1,15 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { DynamicError, WalletUsedError, ChainalysisError, GateBlockedError, NoAccessError, AccountExistsError } from '@dynamic-labs/utils';
+import { isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { useAccessDeniedContext } from '../../../context/AccessDeniedContext/AccessDeniedContext.js';
+import { useAccountExistsContext } from '../../../context/AccountExistsContext/AccountExistsContext.js';
+import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
+import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
+import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import { verifyWallet, linkWallet } from '../../../data/api.js';
-import { storeAuthToken } from '../../functions/storeAuthToken/index.js';
-import '@dynamic-labs/multi-wallet';
 import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
-import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import 'react';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
@@ -16,15 +18,13 @@ import '../../constants/colors.js';
 import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../../shared/consts/index.js';
-import { getVerifyArgs } from '../../functions/getVerifyArgs/getVerifyArgs.js';
 import { createUserProfile } from '../../functions/createUserProfile/createUserProfile.js';
+import '@dynamic-labs/multi-wallet';
 import '@dynamic-labs/sdk-api';
-import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
-import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
+import { getVerifyArgs } from '../../functions/getVerifyArgs/getVerifyArgs.js';
+import { storeAuthToken } from '../../functions/storeAuthToken/index.js';
 import { getSiweStatement } from '../../functions/getSiweStatement/getSiweStatement.js';
 import { getWalletProvider } from '../../functions/getWalletProvider/getWalletProvider.js';
-import { useAccessDeniedContext } from '../../../context/AccessDeniedContext/AccessDeniedContext.js';
-import { useAccountExistsContext } from '../../../context/AccountExistsContext/AccountExistsContext.js';
 
 // This logic is used to both verify or link a wallet
 // Since we are re-using the different screens to authenticate or link the wallet.
@@ -34,7 +34,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
     const { setExistentAccountData } = useAccountExistsContext();
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage, setError } = useErrorContext();
-    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, } = useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallets, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, } = useInternalDynamicContext();
     // If the user is not already logged it means that we only need to verify
     // We need this boolean for the part of the logic where we already persisted a new authToken,
     // and need to distinguish between logic for verify or linking.
@@ -132,7 +132,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             setView('account-exists');
             return;
         }
-        if (connectedWallet && authMode === 'connect-only') {
+        if (connectedWallets.length && authMode === 'connect-only') {
             throw new DynamicError(e.message);
         }
         goToInitialView();
@@ -183,7 +183,9 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             }
             else {
                 setView('wallet-list');
-                setCallback('linkSuccess', { walletConnector });
+                setCallback('linkSuccess', {
+                    walletId: decodedJwt.lastVerifiedCredentialId,
+                });
             }
         }
         catch (e) {

package/src/lib/utils/hooks/useWalletConnectorOptions/index.d.ts

@@ -0,0 +1 @@
+export { useWalletConnectorOptions } from './useWalletConnectorOptions';

package/src/lib/utils/hooks/{useWallets/useWallets.cjs → useWalletConnectorOptions/useWalletConnectorOptions.cjs}

@@ -6,8 +6,8 @@ var React = require('react');
 var data = require('../../../views/WalletList/data.cjs');
 var verifyMagicIsSetup = require('./utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
 
-const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
-    const wallets = React.useMemo(() => {
+const useWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
+    const walletConnectorOptions = React.useMemo(() => {
         if (!projectSettings ||
             !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length ||
             !networkConfigurations)
@@ -42,11 +42,11 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference,
         networkConfigurations,
     ]);
     React.useEffect(() => {
-        if (!projectSettings || wallets.length === 0)
+        if (!projectSettings || walletConnectorOptions.length === 0)
             return;
-        verifyMagicIsSetup.verifyMagicIsSetup(projectSettings, wallets.map(({ walletConnector }) => walletConnector));
-    }, [wallets, projectSettings]);
-    return { wallets };
+        verifyMagicIsSetup.verifyMagicIsSetup(projectSettings, walletConnectorOptions.map(({ walletConnector }) => walletConnector));
+    }, [walletConnectorOptions, projectSettings]);
+    return { walletConnectorOptions };
 };
 
-exports.useWallets = useWallets;
+exports.useWalletConnectorOptions = useWalletConnectorOptions;

package/src/lib/utils/hooks/{useWallets/useWallets.d.ts → useWalletConnectorOptions/useWalletConnectorOptions.d.ts}

@@ -16,7 +16,7 @@ type Props = {
     walletUiUtils: WalletUiUtils<WalletConnector>;
     walletConnectorExtensions?: WalletConnectorExtension[];
 };
-export declare const useWallets: ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }: Props) => {
-    wallets: import("../../../shared").WalletOption[];
+export declare const useWalletConnectorOptions: ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }: Props) => {
+    walletConnectorOptions: import("../../../shared").WalletOption[];
 };
 export {};

package/src/lib/utils/hooks/{useWallets/useWallets.js → useWalletConnectorOptions/useWalletConnectorOptions.js}

@@ -2,8 +2,8 @@ import { useMemo, useEffect } from 'react';
 import { getWallets } from '../../../views/WalletList/data.js';
 import { verifyMagicIsSetup } from './utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
 
-const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
-    const wallets = useMemo(() => {
+const useWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
+    const walletConnectorOptions = useMemo(() => {
         if (!projectSettings ||
             !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length ||
             !networkConfigurations)
@@ -38,11 +38,11 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference,
         networkConfigurations,
     ]);
     useEffect(() => {
-        if (!projectSettings || wallets.length === 0)
+        if (!projectSettings || walletConnectorOptions.length === 0)
             return;
-        verifyMagicIsSetup(projectSettings, wallets.map(({ walletConnector }) => walletConnector));
-    }, [wallets, projectSettings]);
-    return { wallets };
+        verifyMagicIsSetup(projectSettings, walletConnectorOptions.map(({ walletConnector }) => walletConnector));
+    }, [walletConnectorOptions, projectSettings]);
+    return { walletConnectorOptions };
 };
 
-export { useWallets };
+export { useWalletConnectorOptions };

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

@@ -4,8 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('@dynamic-labs/sdk-api');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
@@ -18,10 +19,11 @@ require('viem');
 require('../../../shared/consts/index.cjs');
 var isSameWalletName = require('../../functions/isSameWalletName/isSameWalletName.cjs');
 var useWalletsConnectionState = require('../useWalletsConnectionState/useWalletsConnectionState.cjs');
-var createLinkedWalletsFromWalletOptions = require('./utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs');
 var reconnectSocialWallet = require('./reconnectSocialWallet.cjs');
+var createLinkedWalletsFromWalletOptions = require('./utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs');
+var updateUserWalletsFromLinkedWallets = require('./utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.cjs');
 
-const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }) => {
+const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = React.useState(false);
     const linkedWallets = React.useMemo(() => {
         if (!authToken) {
@@ -30,9 +32,14 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         return createLinkedWalletsFromWalletOptions.createLinkedWalletsFromWalletOptions({
             authToken,
             primaryWalletId,
-            walletOptions: availableWallets,
+            walletConnectorOptions,
         });
-    }, [authToken, primaryWalletId, availableWallets]);
+    }, [authToken, primaryWalletId, walletConnectorOptions]);
+    const { setUserWallets } = UserWalletsContext.useInternalUserWallets();
+    // Keep userWallets in sync whenever linkedWallets changes
+    React.useEffect(() => {
+        setUserWallets((userWallets) => updateUserWalletsFromLinkedWallets.updateUserWalletsFromLinkedWallets(userWallets, linkedWallets));
+    }, [linkedWallets, setUserWallets]);
     const walletsBasedOnAuthMode = React.useMemo(() => {
         // Before signing the first message we are using connected wallets list
         // This is because we want the first connected wallet to have events applied by useWalletEventListeners
@@ -42,6 +49,14 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         if (authMode === 'connect-and-sign' && (user || onboardingOnlyJwt)) {
             return linkedWallets;
         }
+        /**
+         * This is to handle users in connect-only who are signing in with social/email
+         * with an embedded wallet
+         */
+        if (authMode === 'connect-only' &&
+            linkedWallets.find((wallet) => walletConnectorCore.isEmbeddedConnector(wallet.connector))) {
+            return linkedWallets;
+        }
         return connectedWallets;
     }, [authMode, connectedWallets, linkedWallets, user, onboardingOnlyJwt]);
     /**
@@ -54,13 +69,10 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
     React.useEffect(() => walletsBasedOnAuthMode.forEach((wallet) => {
         wallet.connector.initEventListener();
     }), [walletsBasedOnAuthMode]);
-    const { connectedWalletMap, computeConnectedStateForWallets, didConnectedStateLoad, } = useWalletsConnectionState.useWalletsConnectionState(walletsBasedOnAuthMode);
+    const { connectedWalletMap, didConnectedStateLoad } = useWalletsConnectionState.useWalletsConnectionState(walletsBasedOnAuthMode);
     const wallets = React.useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[wallet.id]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
-    React.useEffect(() => {
-        computeConnectedStateForWallets();
-    }, [primaryWalletId, computeConnectedStateForWallets]);
-    const getPrimaryWallet = React.useCallback(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
-    const getSecondaryWallets = React.useCallback(() => canHaveMultipleWalletsConnected
+    const primaryWallet = React.useMemo(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
+    const secondaryWallets = React.useMemo(() => canHaveMultipleWalletsConnected
         ? wallets.filter((wallet) => wallet.id !== primaryWalletId)
         : [], [primaryWalletId, wallets, canHaveMultipleWalletsConnected]);
     const getSelectedWallet = React.useCallback((walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -97,7 +109,6 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         }
         if (primaryWalletId === walletId)
             return;
-        const primaryWallet = getPrimaryWallet();
         if (checkIfAccountChangeIsRequired(primaryWallet, newPrimaryWallet)) {
             yield newPrimaryWallet.connector.connect();
             setPrimaryWalletId(walletId);
@@ -149,7 +160,7 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         authToken,
         checkIfAccountChangeIsRequired,
         checkIfShowQrCodeModal,
-        getPrimaryWallet,
+        primaryWallet,
         getSelectedWallet,
         primaryWalletId,
         setDesktopUri,
@@ -157,18 +168,13 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         setPrimaryWalletId,
         setQrcodeUri,
     ]);
-    const walletConnectors = wallets.map((wallet) => wallet.connector);
     return {
-        computeConnectedStateForWallets,
         didConnectedStateLoad,
-        getPrimaryWallet,
-        getSecondaryWallets,
-        primaryWallet: getPrimaryWallet(),
-        secondaryWallets: getSecondaryWallets(),
+        primaryWallet,
+        secondaryWallets,
         setPrimaryWallet,
         setShowQrcodeModal,
         showQrcodeModal,
-        walletConnectors,
         wallets,
     };
 };

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

@@ -1,7 +1,6 @@
 import { Dispatch, SetStateAction } from 'react';
-import { WalletOption, Wallet, MultiWalletWidgetState, AuthModeType, UserProfile } from '../../../shared';
+import { AuthModeType, MultiWalletWidgetState, UserProfile, Wallet, WalletOption } from '../../../shared';
 import { MultiWalletWidgetStateSetter } from '../multiWallet';
-import { WalletConnector } from '../../../..';
 type Props = {
     authMode: AuthModeType;
     authToken: string | undefined;
@@ -10,7 +9,7 @@ type Props = {
     setDesktopUri: Dispatch<SetStateAction<string>>;
     setMultiWalletWidgetState: MultiWalletWidgetStateSetter;
     setQrcodeUri: Dispatch<SetStateAction<string>>;
-    wallets: WalletOption[];
+    walletConnectorOptions: WalletOption[];
     setPrimaryWalletId: (walletId: string) => void;
     primaryWalletId: string | undefined;
     user?: UserProfile;
@@ -18,17 +17,13 @@ type Props = {
     canHaveMultipleWalletsConnected?: boolean;
 };
 export interface UseWalletConnectors {
-    computeConnectedStateForWallets: () => Promise<void>;
     didConnectedStateLoad: boolean;
-    getPrimaryWallet: () => Wallet | null;
-    getSecondaryWallets: () => Wallet[];
     primaryWallet: Wallet | null;
     secondaryWallets: Wallet[];
     setPrimaryWallet: (walletId: string) => Promise<void>;
     setShowQrcodeModal: Dispatch<SetStateAction<boolean>>;
     showQrcodeModal: boolean;
-    walletConnectors: WalletConnector[];
     wallets: Wallet[];
 }
-export declare const useWalletConnectors: ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }: Props) => UseWalletConnectors;
+export declare const useWalletConnectors: ({ authMode, authToken, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }: Props) => UseWalletConnectors;
 export {};

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

@@ -1,7 +1,8 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useMemo, useEffect, useCallback } from 'react';
-import { isEmailWalletConnector, isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { DynamicError } from '@dynamic-labs/utils';
+import { isEmbeddedConnector, isEmailWalletConnector, isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -14,10 +15,11 @@ import 'viem';
 import '../../../shared/consts/index.js';
 import { isSameWalletName } from '../../functions/isSameWalletName/isSameWalletName.js';
 import { useWalletsConnectionState } from '../useWalletsConnectionState/useWalletsConnectionState.js';
-import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
 import { reconnectSocialWallet } from './reconnectSocialWallet.js';
+import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
+import { updateUserWalletsFromLinkedWallets } from './utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.js';
 
-const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }) => {
+const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = useState(false);
     const linkedWallets = useMemo(() => {
         if (!authToken) {
@@ -26,9 +28,14 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         return createLinkedWalletsFromWalletOptions({
             authToken,
             primaryWalletId,
-            walletOptions: availableWallets,
+            walletConnectorOptions,
         });
-    }, [authToken, primaryWalletId, availableWallets]);
+    }, [authToken, primaryWalletId, walletConnectorOptions]);
+    const { setUserWallets } = useInternalUserWallets();
+    // Keep userWallets in sync whenever linkedWallets changes
+    useEffect(() => {
+        setUserWallets((userWallets) => updateUserWalletsFromLinkedWallets(userWallets, linkedWallets));
+    }, [linkedWallets, setUserWallets]);
     const walletsBasedOnAuthMode = useMemo(() => {
         // Before signing the first message we are using connected wallets list
         // This is because we want the first connected wallet to have events applied by useWalletEventListeners
@@ -38,6 +45,14 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         if (authMode === 'connect-and-sign' && (user || onboardingOnlyJwt)) {
             return linkedWallets;
         }
+        /**
+         * This is to handle users in connect-only who are signing in with social/email
+         * with an embedded wallet
+         */
+        if (authMode === 'connect-only' &&
+            linkedWallets.find((wallet) => isEmbeddedConnector(wallet.connector))) {
+            return linkedWallets;
+        }
         return connectedWallets;
     }, [authMode, connectedWallets, linkedWallets, user, onboardingOnlyJwt]);
     /**
@@ -50,13 +65,10 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
     useEffect(() => walletsBasedOnAuthMode.forEach((wallet) => {
         wallet.connector.initEventListener();
     }), [walletsBasedOnAuthMode]);
-    const { connectedWalletMap, computeConnectedStateForWallets, didConnectedStateLoad, } = useWalletsConnectionState(walletsBasedOnAuthMode);
+    const { connectedWalletMap, didConnectedStateLoad } = useWalletsConnectionState(walletsBasedOnAuthMode);
     const wallets = useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[wallet.id]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
-    useEffect(() => {
-        computeConnectedStateForWallets();
-    }, [primaryWalletId, computeConnectedStateForWallets]);
-    const getPrimaryWallet = useCallback(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
-    const getSecondaryWallets = useCallback(() => canHaveMultipleWalletsConnected
+    const primaryWallet = useMemo(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
+    const secondaryWallets = useMemo(() => canHaveMultipleWalletsConnected
         ? wallets.filter((wallet) => wallet.id !== primaryWalletId)
         : [], [primaryWalletId, wallets, canHaveMultipleWalletsConnected]);
     const getSelectedWallet = useCallback((walletId) => __awaiter(void 0, void 0, void 0, function* () {
@@ -93,7 +105,6 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         }
         if (primaryWalletId === walletId)
             return;
-        const primaryWallet = getPrimaryWallet();
         if (checkIfAccountChangeIsRequired(primaryWallet, newPrimaryWallet)) {
             yield newPrimaryWallet.connector.connect();
             setPrimaryWalletId(walletId);
@@ -145,7 +156,7 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         authToken,
         checkIfAccountChangeIsRequired,
         checkIfShowQrCodeModal,
-        getPrimaryWallet,
+        primaryWallet,
         getSelectedWallet,
         primaryWalletId,
         setDesktopUri,
@@ -153,18 +164,13 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         setPrimaryWalletId,
         setQrcodeUri,
     ]);
-    const walletConnectors = wallets.map((wallet) => wallet.connector);
     return {
-        computeConnectedStateForWallets,
         didConnectedStateLoad,
-        getPrimaryWallet,
-        getSecondaryWallets,
-        primaryWallet: getPrimaryWallet(),
-        secondaryWallets: getSecondaryWallets(),
+        primaryWallet,
+        secondaryWallets,
         setPrimaryWallet,
         setShowQrcodeModal,
         showQrcodeModal,
-        walletConnectors,
         wallets,
     };
 };

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs

@@ -21,15 +21,15 @@ var shouldManuallyReconnectOnRefresh = require('../../../../functions/shouldManu
 var findWallet = require('../findWallet/findWallet.cjs');
 var smartWallet = require('../smartWallet/smartWallet.cjs');
 
-const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primaryWalletId, }) => {
+const createLinkedWalletsFromWalletOptions = ({ authToken, walletConnectorOptions, primaryWalletId, }) => {
     const decodedJwt = decodeJwt.decodeJwt(authToken);
     // wallet state should be null while loading all the wallets or when there is no user
-    if (!walletOptions || !decodedJwt) {
+    if (!walletConnectorOptions || !decodedJwt) {
         return [];
     }
     return decodedJwt.verifiedCredentials
         .map((account) => {
-        const wallet = findWallet.findWallet(account, walletOptions);
+        const wallet = findWallet.findWallet(account, walletConnectorOptions);
         // this probably shouldn't happen. this would mean that the user has an account linked
         // with wallet W, but the customer has toggled off wallet W or the chain that
         // supports wallet W
@@ -49,11 +49,12 @@ const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primar
                 smartWallet.initializeSmartWallet({
                     account,
                     verifiedCredentials: decodedJwt.verifiedCredentials,
-                    walletOptions,
+                    walletConnectorOptions,
                 });
             }
             return {
                 address: account.address,
+                authenticated: true,
                 chain: account.chain,
                 connected: false,
                 connector: wallet.walletConnector,

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.d.ts

@@ -2,7 +2,7 @@ import { Wallet, WalletOption } from '../../../../../shared';
 type CreateWalletsFromWalletOptionsProps = {
     authToken: string;
     primaryWalletId: string | undefined;
-    walletOptions: WalletOption[] | undefined;
+    walletConnectorOptions: WalletOption[] | undefined;
 };
-export declare const createLinkedWalletsFromWalletOptions: ({ authToken, walletOptions, primaryWalletId, }: CreateWalletsFromWalletOptionsProps) => Wallet[];
+export declare const createLinkedWalletsFromWalletOptions: ({ authToken, walletConnectorOptions, primaryWalletId, }: CreateWalletsFromWalletOptionsProps) => Wallet[];
 export {};

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js

@@ -17,15 +17,15 @@ import { shouldManuallyReconnectOnRefresh } from '../../../../functions/shouldMa
 import { findWallet } from '../findWallet/findWallet.js';
 import { isOwnerOfASmartWallet, initializeSmartWallet } from '../smartWallet/smartWallet.js';
 
-const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primaryWalletId, }) => {
+const createLinkedWalletsFromWalletOptions = ({ authToken, walletConnectorOptions, primaryWalletId, }) => {
     const decodedJwt = decodeJwt(authToken);
     // wallet state should be null while loading all the wallets or when there is no user
-    if (!walletOptions || !decodedJwt) {
+    if (!walletConnectorOptions || !decodedJwt) {
         return [];
     }
     return decodedJwt.verifiedCredentials
         .map((account) => {
-        const wallet = findWallet(account, walletOptions);
+        const wallet = findWallet(account, walletConnectorOptions);
         // this probably shouldn't happen. this would mean that the user has an account linked
         // with wallet W, but the customer has toggled off wallet W or the chain that
         // supports wallet W
@@ -45,11 +45,12 @@ const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primar
                 initializeSmartWallet({
                     account,
                     verifiedCredentials: decodedJwt.verifiedCredentials,
-                    walletOptions,
+                    walletConnectorOptions,
                 });
             }
             return {
                 address: account.address,
+                authenticated: true,
                 chain: account.chain,
                 connected: false,
                 connector: wallet.walletConnector,