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

package/src/lib/utils/functions/isAccountAbstractionWallet/isAccountAbstractionWallet.js

@@ -0,0 +1,14 @@
+import { isAccountAbstractionConnector } from '@dynamic-labs/wallet-connector-core';
+
+const isAccountAbstractionWallet = (wallet) => {
+    if (!wallet ||
+        wallet === undefined ||
+        wallet === null ||
+        typeof wallet !== 'object' ||
+        !('connector' in wallet)) {
+        return false;
+    }
+    return isAccountAbstractionConnector(wallet.connector);
+};
+
+export { isAccountAbstractionWallet };

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs

@@ -88,15 +88,22 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             }
             const { address, id } = connectionResult;
             const walletNetwork = yield walletConnector.getNetwork();
+            // When we switch networks on MM/walletconnect, it breaks the flow and doesn't always display the sign message
+            // Since it the network doesn't matter for the sign, we don't need to force the user to switch to the supported
+            // network at this stage and they can switch when doing a transaction
+            // Note: not checking specifically for MM since user can choose walletconnect connector to use with MM
+            const shouldForceSupportedNetwork = !walletConnector.isWalletConnect;
             const usesSupportedNetwork = isSupportedNetwork.isSupportedNetwork({
                 network: walletNetwork,
                 walletConnector,
             });
             if (!usesSupportedNetwork) {
-                if (isProgrammableNetworkSwitchSupported.isProgrammableNetworkSwitchSupported(walletConnector)) {
+                if (!isProgrammableNetworkSwitchSupported.isProgrammableNetworkSwitchSupported(walletConnector)) {
+                    return setView('network-not-supported-manual');
+                }
+                if (shouldForceSupportedNetwork) {
                     return setView('network-not-supported');
                 }
-                return setView('network-not-supported-manual');
             }
             setCallback('connectSuccess', {
                 walletId: id,

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js

@@ -84,15 +84,22 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             }
             const { address, id } = connectionResult;
             const walletNetwork = yield walletConnector.getNetwork();
+            // When we switch networks on MM/walletconnect, it breaks the flow and doesn't always display the sign message
+            // Since it the network doesn't matter for the sign, we don't need to force the user to switch to the supported
+            // network at this stage and they can switch when doing a transaction
+            // Note: not checking specifically for MM since user can choose walletconnect connector to use with MM
+            const shouldForceSupportedNetwork = !walletConnector.isWalletConnect;
             const usesSupportedNetwork = isSupportedNetwork({
                 network: walletNetwork,
                 walletConnector,
             });
             if (!usesSupportedNetwork) {
-                if (isProgrammableNetworkSwitchSupported(walletConnector)) {
+                if (!isProgrammableNetworkSwitchSupported(walletConnector)) {
+                    return setView('network-not-supported-manual');
+                }
+                if (shouldForceSupportedNetwork) {
                     return setView('network-not-supported');
                 }
-                return setView('network-not-supported-manual');
             }
             setCallback('connectSuccess', {
                 walletId: id,

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

@@ -1,44 +1,44 @@
-export { useFetchProjectSettings } from './useFetchProjectSettings';
-export { useFetchNonce } from './useFetchNonce';
-export { useWallets } from './useWallets';
-export { useWalletConnectors } from './useWalletConnectors';
-export { useVerifyWallet } from './useVerifyWallet';
-export { useKeyboardHeight } from './useKeyboardHeight';
-export { useElementById } from './useElementById';
-export { useResizeObserver } from './useResizeObserver';
-export { useIsFirstRender } from './useIsFirstRender';
-export { useUpdateEffect } from './useUpdateEffect';
-export { useTransition } from './useTransition';
-export { usePrevious } from './usePrevious';
+export { useAuthenticateConnectedUser } from './useAuthenticateConnectedUser';
+export { useColorSchemePreference } from './useColorSchemePreference';
 export { useConfirmationModal } from './useConfirmationModal';
-export { useWalletUiUtils } from './useWalletUiUtils';
-export { useForceUpdate } from './useForceUpdate';
-export { useKYCFlag } from './useKYCFlag';
+export { useCountdown } from './useCountdown/useCountdown';
+export * from './useCreateDynamicEmbeddedWalletMutation';
 export { useDefaultQrCode } from './useDefaultQrCode';
-export { useWalletItemActions } from './useWalletItemActions';
-export { usePromise } from './usePromise';
-export { useMutation } from './useMutation';
-export { useColorSchemePreference } from './useColorSchemePreference';
+export { useDynamicScopes } from './useDynamicScopes';
+export { useElementById } from './useElementById';
+export { useEmbeddedWallet } from './useEmbeddedWallet';
+export { useEventListener } from './useEventListener';
+export { useFetchNonce } from './useFetchNonce';
+export { useFetchProjectSettings } from './useFetchProjectSettings';
 export { useFindSocialIcon } from './useFindSocialIcon';
+export { useForceUpdate } from './useForceUpdate';
 export { useIconThemeVariant } from './useIconThemeVariant';
 export type { IconThemeVariant } from './useIconThemeVariant';
+export { useInterval } from './useInterval/useInterval';
+export { useIsFirstRender } from './useIsFirstRender';
+export * from './useIsLoggedIn';
 export { useIsomorphicLayoutEffect } from './useIsomorphicLayoutEffect/useIsomorphicLayoutEffect';
+export { useKYCFlag } from './useKYCFlag';
+export { useKeyboardHeight } from './useKeyboardHeight';
+export { useMutation } from './useMutation';
+export * from './useOnUnmount';
+export { usePasskeyRecovery } from './usePasskeyRecovery';
+export { usePrevious } from './usePrevious';
+export { usePromise } from './usePromise';
+export { useResizeObserver } from './useResizeObserver';
+export { useSetWalletConnectorVerifiedCredentials } from './useSetWalletConnectorVerifiedCredentials';
+export { useSocialAccounts } from './useSocialAccounts';
 export { useTimeout } from './useTimeout/useTimeout';
-export { useInterval } from './useInterval/useInterval';
-export { useCountdown } from './useCountdown/useCountdown';
-export { useValidateSession } from './useValidateSession';
-export { useEventListener } from './useEventListener';
-export { useWalletConnectorEvent } from './useWalletConnectorEvent';
-export { useTransactionWithGasPrice } from './useTransactionWithGasPrice';
 export { useTransactionEstimatedGas } from './useTransactionEstimatedGas';
-export { useDynamicScopes } from './useDynamicScopes';
-export { useAuthenticateConnectedUser } from './useAuthenticateConnectedUser';
-export { useSocialAccounts } from './useSocialAccounts';
-export * from './useUserUpdateRequest';
+export { useTransactionWithGasPrice } from './useTransactionWithGasPrice';
+export { useTransition } from './useTransition';
+export { useUpdateEffect } from './useUpdateEffect';
 export * from './useUserDataForm';
-export * from './useOnUnmount';
-export { useSetWalletConnectorVerifiedCredentials } from './useSetWalletConnectorVerifiedCredentials';
-export { useEmbeddedWallet } from './useEmbeddedWallet';
-export * from './useIsLoggedIn';
-export { usePasskeyRecovery } from './usePasskeyRecovery';
-export * from './useCreateDynamicEmbeddedWalletMutation';
+export * from './useUserUpdateRequest';
+export { useValidateSession } from './useValidateSession';
+export { useVerifyWallet } from './useVerifyWallet';
+export { useWalletConnectorEvent } from './useWalletConnectorEvent';
+export { useWalletConnectorOptions } from './useWalletConnectorOptions';
+export { useWalletConnectors } from './useWalletConnectors';
+export { useWalletItemActions } from './useWalletItemActions';
+export { useWalletUiUtils } from './useWalletUiUtils';

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

@@ -28,21 +28,22 @@ require('../../../context/EmailVerificationContext/EmailVerificationContext.cjs'
 
 const useAuthenticateConnectedUser = () => {
     const signConnectOnlyUser = useSignConnectOnlyUser.useSignConnectOnlyUser();
-    const { connectedWallet, user } = useInternalDynamicContext.useInternalDynamicContext();
+    const { connectedWallets, user } = useInternalDynamicContext.useInternalDynamicContext();
     const [isAuthenticating, setIsAuthenticating] = React.useState(false);
     const authenticateUser = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         if (user) {
             throw new utils.DynamicError('User is already authenticated');
         }
-        if (!connectedWallet) {
+        if (connectedWallets.length === 0) {
             throw new utils.DynamicError('No connected wallet');
         }
+        const connectedWallet = connectedWallets[0];
         setIsAuthenticating(true);
         yield signConnectOnlyUser({
             walletConnector: connectedWallet.connector,
         });
         setIsAuthenticating(false);
-    }), [connectedWallet === null || connectedWallet === void 0 ? void 0 : connectedWallet.address, connectedWallet === null || connectedWallet === void 0 ? void 0 : connectedWallet.chain]);
+    }), [connectedWallets, signConnectOnlyUser, user]);
     return { authenticateUser, isAuthenticating };
 };
 

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

@@ -24,21 +24,22 @@ import '../../../context/EmailVerificationContext/EmailVerificationContext.js';
 
 const useAuthenticateConnectedUser = () => {
     const signConnectOnlyUser = useSignConnectOnlyUser();
-    const { connectedWallet, user } = useInternalDynamicContext();
+    const { connectedWallets, user } = useInternalDynamicContext();
     const [isAuthenticating, setIsAuthenticating] = useState(false);
     const authenticateUser = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
         if (user) {
             throw new DynamicError('User is already authenticated');
         }
-        if (!connectedWallet) {
+        if (connectedWallets.length === 0) {
             throw new DynamicError('No connected wallet');
         }
+        const connectedWallet = connectedWallets[0];
         setIsAuthenticating(true);
         yield signConnectOnlyUser({
             walletConnector: connectedWallet.connector,
         });
         setIsAuthenticating(false);
-    }), [connectedWallet === null || connectedWallet === void 0 ? void 0 : connectedWallet.address, connectedWallet === null || connectedWallet === void 0 ? void 0 : connectedWallet.chain]);
+    }), [connectedWallets, signConnectOnlyUser, user]);
     return { authenticateUser, isAuthenticating };
 };
 

package/src/lib/utils/hooks/useConnectWallet/updateUserWalletsFromConnectedWallets/index.d.ts

@@ -0,0 +1 @@
+export * from './updateUserWalletsFromConnectedWallets';

package/src/lib/utils/hooks/useConnectWallet/updateUserWalletsFromConnectedWallets/updateUserWalletsFromConnectedWallets.cjs

@@ -0,0 +1,37 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+/**
+ * This takes a userWallets and connectedWallets array, and returns a new userWallets array
+ * updated to match the connectedWallets array.
+ * It will add any missing wallets, update properties that don't match, and remove wallets that aren't
+ * in the connectedWallets and is not linked to the user.
+ */
+const updateUserWalletsFromConnectedWallets = (userWallets, connectedWallets) => {
+    const userWalletsCopy = [...userWallets];
+    /** We will use this to find wallets addresses that were removed */
+    const newWalletsAddresses = new Set();
+    // First pass: add missing wallets and update changed properties
+    for (const connectedWallet of connectedWallets) {
+        newWalletsAddresses.add(connectedWallet.address);
+        const userWallet = userWalletsCopy.find((wallet) => wallet.address === connectedWallet.address);
+        // Catch new wallets
+        if (!userWallet) {
+            userWalletsCopy.push(connectedWallet);
+            continue;
+        }
+        // If already present, just update properties that might have changed
+        userWallet.connected = connectedWallet.connected;
+        userWallet.network = connectedWallet.network;
+    }
+    // This filter is to remove a wallet that was previously added to userWallets but is not present
+    // among the connected wallets (it should not be removed if it's authenticated to the suer tho)
+    return userWalletsCopy.filter((userWallet) => 
+    // Keep wallets that are still in the new list
+    newWalletsAddresses.has(userWallet.address) ||
+        // Or are linked to the current user
+        userWallet.authenticated);
+};
+
+exports.updateUserWalletsFromConnectedWallets = updateUserWalletsFromConnectedWallets;

package/src/lib/utils/hooks/useConnectWallet/updateUserWalletsFromConnectedWallets/updateUserWalletsFromConnectedWallets.d.ts

@@ -0,0 +1,8 @@
+import { Wallet } from '../../../../shared';
+/**
+ * This takes a userWallets and connectedWallets array, and returns a new userWallets array
+ * updated to match the connectedWallets array.
+ * It will add any missing wallets, update properties that don't match, and remove wallets that aren't
+ * in the connectedWallets and is not linked to the user.
+ */
+export declare const updateUserWalletsFromConnectedWallets: (userWallets: Wallet[], connectedWallets: Wallet[]) => Wallet[];

package/src/lib/utils/hooks/useConnectWallet/updateUserWalletsFromConnectedWallets/updateUserWalletsFromConnectedWallets.js

@@ -0,0 +1,33 @@
+/**
+ * This takes a userWallets and connectedWallets array, and returns a new userWallets array
+ * updated to match the connectedWallets array.
+ * It will add any missing wallets, update properties that don't match, and remove wallets that aren't
+ * in the connectedWallets and is not linked to the user.
+ */
+const updateUserWalletsFromConnectedWallets = (userWallets, connectedWallets) => {
+    const userWalletsCopy = [...userWallets];
+    /** We will use this to find wallets addresses that were removed */
+    const newWalletsAddresses = new Set();
+    // First pass: add missing wallets and update changed properties
+    for (const connectedWallet of connectedWallets) {
+        newWalletsAddresses.add(connectedWallet.address);
+        const userWallet = userWalletsCopy.find((wallet) => wallet.address === connectedWallet.address);
+        // Catch new wallets
+        if (!userWallet) {
+            userWalletsCopy.push(connectedWallet);
+            continue;
+        }
+        // If already present, just update properties that might have changed
+        userWallet.connected = connectedWallet.connected;
+        userWallet.network = connectedWallet.network;
+    }
+    // This filter is to remove a wallet that was previously added to userWallets but is not present
+    // among the connected wallets (it should not be removed if it's authenticated to the suer tho)
+    return userWalletsCopy.filter((userWallet) => 
+    // Keep wallets that are still in the new list
+    newWalletsAddresses.has(userWallet.address) ||
+        // Or are linked to the current user
+        userWallet.authenticated);
+};
+
+export { updateUserWalletsFromConnectedWallets };

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

@@ -5,6 +5,7 @@ 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 UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 var api = require('../../../data/api.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
@@ -22,10 +23,17 @@ require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var shouldManuallyReconnectOnRefresh = require('../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
 var getWalletProvider = require('../../functions/getWalletProvider/getWalletProvider.cjs');
+var updateUserWalletsFromConnectedWallets = require('./updateUserWalletsFromConnectedWallets/updateUserWalletsFromConnectedWallets.cjs');
 
-const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onDisconnect, onBeforeConnectSuccessConfirmation, setShowAuthFlow, isBridgeFlow, }) => {
+const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, walletConnectorOptions, onDisconnect, onBeforeConnectSuccessConfirmation, setShowAuthFlow, isBridgeFlow, }) => {
     const [connectedWalletsInfo, setConnectedWalletsInfo, removeConnectedWalletsInfo,] = useLocalStorage.useLocalStorage(localStorage.CONNECTED_WALLETS_INFO, []);
-    const [connectedWallets, setConnectedWallets] = React.useState([]);
+    const [connectedWallets, _setConnectedWallets] = React.useState([]);
+    const { setUserWallets } = UserWalletsContext.useInternalUserWallets();
+    /** This wrapper is to ensure userWallets is always properly updated alongside connectedWallets */
+    const setConnectedWallets = (newWallets) => {
+        _setConnectedWallets(newWallets);
+        setUserWallets((userWallets) => updateUserWalletsFromConnectedWallets.updateUserWalletsFromConnectedWallets(userWallets, newWallets));
+    };
     const disconnectWallet = React.useCallback((walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const walletToDisconnect = connectedWallets.find((wallet) => wallet.id === walletId);
         yield (walletToDisconnect === null || walletToDisconnect === void 0 ? void 0 : walletToDisconnect.connector.endSession());
@@ -58,7 +66,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
     // The event listeners are updating `connectedWallets` list.
     // It should be called on the first render and when connectedWalletsInfo updates
     const updateConnectedWalletsList = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const walletConnectors = wallets.map((wallet) => wallet.walletConnector);
+        const walletConnectors = walletConnectorOptions.map((wallet) => wallet.walletConnector);
         if (!walletConnectors.length) {
             return;
         }
@@ -79,6 +87,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             const walletChain = walletConnector.connectedChain;
             const walletObject = {
                 address: walletAddress || '',
+                authenticated: false,
                 chain: walletChain || '',
                 connected: true,
                 connector: walletConnector,
@@ -88,12 +97,12 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             return walletObject;
         })))).filter((wallet) => Boolean(wallet));
         setConnectedWallets(updatedConnectedWallets);
-    }), [connectedWalletsInfo, disconnectWallet, wallets]);
+    }), [connectedWalletsInfo, disconnectWallet, walletConnectorOptions]);
     // Generate the connectedWallets list when connectedWalletsInfo (localStorage) or memoized wallet connector updates
     React.useEffect(() => {
         updateConnectedWalletsList();
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [connectedWalletsInfo, wallets]);
+    }, [connectedWalletsInfo, walletConnectorOptions]);
     const getNextIdAvailable = React.useCallback((currentWallets) => {
         const existingIds = currentWallets.map(({ id }) => id);
         const sortedIds = existingIds
@@ -114,7 +123,6 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             setConnectedWallets(clonedConnectedWalletsList);
         }
     }, [connectedWallets]);
-    const connectedWallet = connectedWallets[0] || null;
     // Keeps connected wallet data inside localStorage
     const applyConnectedWalletToStore = ({ walletId, walletConnectorKey, walletChain, provider, }) => {
         const updatedConnectedWalletsInfo = [...connectedWalletsInfo];
@@ -210,7 +218,6 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
     const getConnectedWalletById = React.useCallback((walletId) => connectedWallets.find((wallet) => wallet.id === walletId), [connectedWallets]);
     return {
         connectWallet,
-        connectedWallet,
         connectedWallets,
         connectedWalletsInfo,
         disconnectWallet,

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

@@ -15,7 +15,7 @@ type Props = {
     environmentId: string;
     primaryWalletId: string | undefined;
     setPrimaryWalletId: (walletId: string) => void;
-    wallets: WalletOption[];
+    walletConnectorOptions: WalletOption[];
     onDisconnect: (connectedWalletsInfo: ConnectedWalletConnectorType[], wallet?: Wallet) => void;
     onBeforeConnectSuccessConfirmation: OnBeforeConnectSuccessConfirmation | undefined;
     setShowAuthFlow: Dispatch<SetStateAction<boolean>>;
@@ -23,7 +23,6 @@ type Props = {
 };
 type UseConnectWalletValue = {
     connectWallet: (walletConnector: WalletConnector, fetchPublicAddressOpts?: FetchPublicAddressOpts, shouldCallCallback?: boolean) => Promise<ConnectWalletResult | undefined>;
-    connectedWallet: Wallet | null;
     connectedWallets: Wallet[];
     connectedWalletsInfo: ConnectedWalletConnectorType[];
     getConnectedWalletById: (walletId: string) => Wallet | undefined;
@@ -31,5 +30,5 @@ type UseConnectWalletValue = {
     removeConnectedWalletsInfo: () => void;
     disconnectWallet: (walletId: string) => Promise<void>;
 };
-export declare const useConnectWallet: ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onDisconnect, onBeforeConnectSuccessConfirmation, setShowAuthFlow, isBridgeFlow, }: Props) => UseConnectWalletValue;
+export declare const useConnectWallet: ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, walletConnectorOptions, onDisconnect, onBeforeConnectSuccessConfirmation, setShowAuthFlow, isBridgeFlow, }: Props) => UseConnectWalletValue;
 export {};

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

@@ -1,6 +1,7 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useCallback, useEffect } from 'react';
 import { getWalletConnectorByKey, logger } from '@dynamic-labs/wallet-connector-core';
+import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
 import { createVisit } from '../../../data/api.js';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
@@ -18,10 +19,17 @@ import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { shouldManuallyReconnectOnRefresh } from '../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
 import { getWalletProvider } from '../../functions/getWalletProvider/getWalletProvider.js';
+import { updateUserWalletsFromConnectedWallets } from './updateUserWalletsFromConnectedWallets/updateUserWalletsFromConnectedWallets.js';
 
-const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onDisconnect, onBeforeConnectSuccessConfirmation, setShowAuthFlow, isBridgeFlow, }) => {
+const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, walletConnectorOptions, onDisconnect, onBeforeConnectSuccessConfirmation, setShowAuthFlow, isBridgeFlow, }) => {
     const [connectedWalletsInfo, setConnectedWalletsInfo, removeConnectedWalletsInfo,] = useLocalStorage(CONNECTED_WALLETS_INFO, []);
-    const [connectedWallets, setConnectedWallets] = useState([]);
+    const [connectedWallets, _setConnectedWallets] = useState([]);
+    const { setUserWallets } = useInternalUserWallets();
+    /** This wrapper is to ensure userWallets is always properly updated alongside connectedWallets */
+    const setConnectedWallets = (newWallets) => {
+        _setConnectedWallets(newWallets);
+        setUserWallets((userWallets) => updateUserWalletsFromConnectedWallets(userWallets, newWallets));
+    };
     const disconnectWallet = useCallback((walletId) => __awaiter(void 0, void 0, void 0, function* () {
         const walletToDisconnect = connectedWallets.find((wallet) => wallet.id === walletId);
         yield (walletToDisconnect === null || walletToDisconnect === void 0 ? void 0 : walletToDisconnect.connector.endSession());
@@ -54,7 +62,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
     // The event listeners are updating `connectedWallets` list.
     // It should be called on the first render and when connectedWalletsInfo updates
     const updateConnectedWalletsList = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        const walletConnectors = wallets.map((wallet) => wallet.walletConnector);
+        const walletConnectors = walletConnectorOptions.map((wallet) => wallet.walletConnector);
         if (!walletConnectors.length) {
             return;
         }
@@ -75,6 +83,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             const walletChain = walletConnector.connectedChain;
             const walletObject = {
                 address: walletAddress || '',
+                authenticated: false,
                 chain: walletChain || '',
                 connected: true,
                 connector: walletConnector,
@@ -84,12 +93,12 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             return walletObject;
         })))).filter((wallet) => Boolean(wallet));
         setConnectedWallets(updatedConnectedWallets);
-    }), [connectedWalletsInfo, disconnectWallet, wallets]);
+    }), [connectedWalletsInfo, disconnectWallet, walletConnectorOptions]);
     // Generate the connectedWallets list when connectedWalletsInfo (localStorage) or memoized wallet connector updates
     useEffect(() => {
         updateConnectedWalletsList();
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [connectedWalletsInfo, wallets]);
+    }, [connectedWalletsInfo, walletConnectorOptions]);
     const getNextIdAvailable = useCallback((currentWallets) => {
         const existingIds = currentWallets.map(({ id }) => id);
         const sortedIds = existingIds
@@ -110,7 +119,6 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             setConnectedWallets(clonedConnectedWalletsList);
         }
     }, [connectedWallets]);
-    const connectedWallet = connectedWallets[0] || null;
     // Keeps connected wallet data inside localStorage
     const applyConnectedWalletToStore = ({ walletId, walletConnectorKey, walletChain, provider, }) => {
         const updatedConnectedWalletsInfo = [...connectedWalletsInfo];
@@ -206,7 +214,6 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
     const getConnectedWalletById = useCallback((walletId) => connectedWallets.find((wallet) => wallet.id === walletId), [connectedWallets]);
     return {
         connectWallet,
-        connectedWallet,
         connectedWallets,
         connectedWalletsInfo,
         disconnectWallet,

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

@@ -28,8 +28,8 @@ var useMutation = require('../useMutation/useMutation.cjs');
 
 const useCreateDynamicEmbeddedWalletMutation = () => {
     const { setPrimaryWalletId, internalEvents, setCallback, setUser, user, setShowAuthFlow, } = useInternalDynamicContext.useInternalDynamicContext();
-    const { mutate: createDynamicEmbeddedWalletMutation, isLoading, error, } = useMutation.useMutation(({ authToken, decodedJwt, environmentId, wallets, withAuthenticator, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _a;
+    const { mutate: createDynamicEmbeddedWalletMutation, isLoading, error, } = useMutation.useMutation(({ authToken, decodedJwt, environmentId, walletConnectorOptions, withAuthenticator, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b;
         const createEmbeddedWalletMethodToUse = withAuthenticator
             ? createEmbeddedWalletWithPasskey.createEmbeddedWalletWithPasskey
             : createPregeneratedWallet.createPregeneratedWallet;
@@ -37,10 +37,14 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
             authToken,
             environmentId,
             user: user !== null && user !== void 0 ? user : createUserProfile.createUserProfile(decodedJwt),
-            walletConnector: findPasskeyEmailWalletConnector.findPasskeyEmailWalletConnector(wallets),
+            walletConnector: findPasskeyEmailWalletConnector.findPasskeyEmailWalletConnector(walletConnectorOptions),
         });
+        const turnkeyVerifiedCredentials = (_a = updatedDecodedJwt === null || updatedDecodedJwt === void 0 ? void 0 : updatedDecodedJwt.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'));
+        /** It's not authenticated if it's a turnkey wallet that still hasn't created a passkey */
+        const authenticated = Boolean((_b = turnkeyVerifiedCredentials === null || turnkeyVerifiedCredentials === void 0 ? void 0 : turnkeyVerifiedCredentials.walletProperties) === null || _b === void 0 ? void 0 : _b.isAuthenticatorAttached);
         const passkeyWallet = {
             address: (yield walletConnector.fetchPublicAddress()) || '',
+            authenticated,
             chain: walletConnector.connectedChain || '',
             connected: true,
             connector: walletConnector,
@@ -52,7 +56,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
             yield smartWallet.initializeSmartWallet({
                 account: smartWallet$1,
                 verifiedCredentials: updatedDecodedJwt.verifiedCredentials,
-                walletOptions: wallets,
+                walletConnectorOptions,
             });
             setPrimaryWalletId(smartWallet$1.id);
         }
@@ -62,7 +66,6 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
         index.storeAuthToken(jwt);
         setUser(createUserProfile.createUserProfile(updatedDecodedJwt));
         setShowAuthFlow(false);
-        const turnkeyVerifiedCredentials = (_a = updatedDecodedJwt === null || updatedDecodedJwt === void 0 ? void 0 : updatedDecodedJwt.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'));
         setCallback('embeddedWalletCreated', {
             email: (turnkeyVerifiedCredentials === null || turnkeyVerifiedCredentials === void 0 ? void 0 : turnkeyVerifiedCredentials.email) || '',
             verifiedCredential: turnkeyVerifiedCredentials,

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

@@ -3,7 +3,7 @@ import { WalletOption } from '../../../shared';
 type MutationProps = {
     authToken: string | undefined;
     environmentId: string;
-    wallets: WalletOption[];
+    walletConnectorOptions: WalletOption[];
     decodedJwt: DynamicJwt;
     withAuthenticator: boolean;
 };

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

@@ -24,8 +24,8 @@ import { useMutation } from '../useMutation/useMutation.js';
 
 const useCreateDynamicEmbeddedWalletMutation = () => {
     const { setPrimaryWalletId, internalEvents, setCallback, setUser, user, setShowAuthFlow, } = useInternalDynamicContext();
-    const { mutate: createDynamicEmbeddedWalletMutation, isLoading, error, } = useMutation(({ authToken, decodedJwt, environmentId, wallets, withAuthenticator, }) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a;
+    const { mutate: createDynamicEmbeddedWalletMutation, isLoading, error, } = useMutation(({ authToken, decodedJwt, environmentId, walletConnectorOptions, withAuthenticator, }) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a, _b;
         const createEmbeddedWalletMethodToUse = withAuthenticator
             ? createEmbeddedWalletWithPasskey
             : createPregeneratedWallet;
@@ -33,10 +33,14 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
             authToken,
             environmentId,
             user: user !== null && user !== void 0 ? user : createUserProfile(decodedJwt),
-            walletConnector: findPasskeyEmailWalletConnector(wallets),
+            walletConnector: findPasskeyEmailWalletConnector(walletConnectorOptions),
         });
+        const turnkeyVerifiedCredentials = (_a = updatedDecodedJwt === null || updatedDecodedJwt === void 0 ? void 0 : updatedDecodedJwt.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'));
+        /** It's not authenticated if it's a turnkey wallet that still hasn't created a passkey */
+        const authenticated = Boolean((_b = turnkeyVerifiedCredentials === null || turnkeyVerifiedCredentials === void 0 ? void 0 : turnkeyVerifiedCredentials.walletProperties) === null || _b === void 0 ? void 0 : _b.isAuthenticatorAttached);
         const passkeyWallet = {
             address: (yield walletConnector.fetchPublicAddress()) || '',
+            authenticated,
             chain: walletConnector.connectedChain || '',
             connected: true,
             connector: walletConnector,
@@ -48,7 +52,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
             yield initializeSmartWallet({
                 account: smartWallet,
                 verifiedCredentials: updatedDecodedJwt.verifiedCredentials,
-                walletOptions: wallets,
+                walletConnectorOptions,
             });
             setPrimaryWalletId(smartWallet.id);
         }
@@ -58,7 +62,6 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
         storeAuthToken(jwt);
         setUser(createUserProfile(updatedDecodedJwt));
         setShowAuthFlow(false);
-        const turnkeyVerifiedCredentials = (_a = updatedDecodedJwt === null || updatedDecodedJwt === void 0 ? void 0 : updatedDecodedJwt.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'));
         setCallback('embeddedWalletCreated', {
             email: (turnkeyVerifiedCredentials === null || turnkeyVerifiedCredentials === void 0 ? void 0 : turnkeyVerifiedCredentials.email) || '',
             verifiedCredential: turnkeyVerifiedCredentials,

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

@@ -35,10 +35,13 @@ const useEmailProvider = ({ emailWalletConnector }) => {
     });
     const { providers } = projectSettings || {};
     const isInjectedWalletProviderEnabled = emailWalletConnector !== undefined;
+    // this is enabled in the sense that we could use the given provider in the email form
+    // for magic, as long as there are magic credentials available, then could have an email
+    // address that is a magic address, even if magic was previously turned off in dashboard
     const isMagicOrBloctoEnabled = isInjectedWalletProviderEnabled &&
-        Boolean(providers === null || providers === void 0 ? void 0 : providers.filter((provider) => provider.enabledAt &&
-            (provider.provider === sdkApi.ProviderEnum.MagicLink ||
-                provider.provider === sdkApi.ProviderEnum.Blocto)).length);
+        Boolean(providers === null || providers === void 0 ? void 0 : providers.filter((provider) => (provider.provider === sdkApi.ProviderEnum.MagicLink &&
+            Boolean(provider.providerProjectId)) ||
+            (provider.enabledAt && provider.provider === sdkApi.ProviderEnum.Blocto)).length);
     const handleEmailOnlyLoginSubmit = (emailInput, captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const { email, verificationUUID } = yield api.createEmailVerification({
             captchaToken,

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

@@ -31,10 +31,13 @@ const useEmailProvider = ({ emailWalletConnector }) => {
     });
     const { providers } = projectSettings || {};
     const isInjectedWalletProviderEnabled = emailWalletConnector !== undefined;
+    // this is enabled in the sense that we could use the given provider in the email form
+    // for magic, as long as there are magic credentials available, then could have an email
+    // address that is a magic address, even if magic was previously turned off in dashboard
     const isMagicOrBloctoEnabled = isInjectedWalletProviderEnabled &&
-        Boolean(providers === null || providers === void 0 ? void 0 : providers.filter((provider) => provider.enabledAt &&
-            (provider.provider === ProviderEnum.MagicLink ||
-                provider.provider === ProviderEnum.Blocto)).length);
+        Boolean(providers === null || providers === void 0 ? void 0 : providers.filter((provider) => (provider.provider === ProviderEnum.MagicLink &&
+            Boolean(provider.providerProjectId)) ||
+            (provider.enabledAt && provider.provider === ProviderEnum.Blocto)).length);
     const handleEmailOnlyLoginSubmit = (emailInput, captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
         const { email, verificationUUID } = yield createEmailVerification({
             captchaToken,