@dynamic-labs/sdk-react-core 1.1.0-alpha.24 → 1.1.0-alpha.26

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

@@ -13,11 +13,11 @@ import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/sdk-api';
 import '../../../shared/consts/index.js';
 import { createUserProfile } from '../createUserProfile/createUserProfile.js';
 import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../getAuthToken/getAuthToken.js';
-import '@dynamic-labs/sdk-api';
 import { storeAuthToken } from '../storeAuthToken/index.js';
 import 'viem/chains';
 

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

@@ -45,7 +45,6 @@ export * from './pixelToRem';
 export * from './randomString';
 export * from './removeElementById';
 export * from './requiresTwoStepAuthentication';
-export * from './sendTransactionWithAutoNonce';
 export * from './shouldManuallyReconnectOnRefresh';
 export * from './storeAuthToken';
 export * from './stringifyURIQuery';

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

@@ -79,7 +79,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { engageCaptcha, getCaptchaToken } = CaptchaContext.useCaptchaContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
-    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setIsVerificationInProgress, } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
@@ -129,11 +129,14 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                     setView('wait-for-email-confirmation-view');
                 }
             }
-            const connectionResult = yield connectWallet(walletConnector, fetchPublicAddressOpts, shouldCallCallback);
+            const connectionResult = yield connectWallet(walletConnector, fetchPublicAddressOpts, {
+                applyOnBeforeConnectSuccessConfirmation: shouldCallCallback,
+                raiseOnConnect: true,
+            });
             if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;
             }
-            const { address, id } = connectionResult;
+            const { address } = 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
@@ -152,9 +155,6 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                     return setView('network-not-supported');
                 }
             }
-            setCallback('connectSuccess', {
-                walletId: id,
-            });
             if (isConnectOnly.isConnectOnly(user, authMode)) {
                 localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.key);
                 if (shouldUpdateWallets) {

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

@@ -75,7 +75,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
     const { setView, goToInitialView } = useViewContext();
     const { engageCaptcha, getCaptchaToken } = useCaptchaContext();
     const { setErrorMessage } = useErrorContext();
-    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, } = useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setIsVerificationInProgress, } = useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
@@ -125,11 +125,14 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                     setView('wait-for-email-confirmation-view');
                 }
             }
-            const connectionResult = yield connectWallet(walletConnector, fetchPublicAddressOpts, shouldCallCallback);
+            const connectionResult = yield connectWallet(walletConnector, fetchPublicAddressOpts, {
+                applyOnBeforeConnectSuccessConfirmation: shouldCallCallback,
+                raiseOnConnect: true,
+            });
             if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;
             }
-            const { address, id } = connectionResult;
+            const { address } = 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
@@ -148,9 +151,6 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                     return setView('network-not-supported');
                 }
             }
-            setCallback('connectSuccess', {
-                walletId: id,
-            });
             if (isConnectOnly(user, authMode)) {
                 LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.key);
                 if (shouldUpdateWallets) {

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
+var CaptchaContext = require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('react');
 require('../../../../context/DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/sdk-api');
@@ -20,7 +21,6 @@ var localStorage = require('../../../../shared/utils/classes/storage/localStorag
 require('viem');
 require('../../../../shared/consts/index.cjs');
 require('../../../../events/dynamicEvents.cjs');
-var CaptchaContext = require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 var ErrorContext = require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('viem/chains');
@@ -77,7 +77,7 @@ const useConnectAndSignSplitSteps = () => {
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { getCaptchaToken, engageCaptcha } = CaptchaContext.useCaptchaContext();
-    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, setCallback, setIsVerificationInProgress, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, setIsVerificationInProgress, } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
@@ -109,9 +109,8 @@ const useConnectAndSignSplitSteps = () => {
         setIsVerificationInProgress(true);
         yield showPendingConnectView.showPendingConnectView(walletConnector, setView);
         try {
-            const connectionResult = yield connectWallet(walletConnector, fetchPublicAddressOpts);
-            setCallback('connectSuccess', {
-                walletId: connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.id,
+            yield connectWallet(walletConnector, fetchPublicAddressOpts, {
+                raiseOnConnect: true,
             });
             if (isConnectOnly.isConnectOnly(user, authMode)) {
                 localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.key);

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

@@ -1,5 +1,6 @@
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { MissingPublicAddressError, isMobile } from '@dynamic-labs/utils';
+import { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';
 import 'react';
 import '../../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api';
@@ -16,7 +17,6 @@ import { LocalStorage } from '../../../../shared/utils/classes/storage/localStor
 import 'viem';
 import '../../../../shared/consts/index.js';
 import '../../../../events/dynamicEvents.js';
-import { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';
 import { useErrorContext } from '../../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import 'viem/chains';
@@ -73,7 +73,7 @@ const useConnectAndSignSplitSteps = () => {
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
     const { getCaptchaToken, engageCaptcha } = useCaptchaContext();
-    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, setCallback, setIsVerificationInProgress, } = useInternalDynamicContext();
+    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, setIsVerificationInProgress, } = useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
@@ -105,9 +105,8 @@ const useConnectAndSignSplitSteps = () => {
         setIsVerificationInProgress(true);
         yield showPendingConnectView(walletConnector, setView);
         try {
-            const connectionResult = yield connectWallet(walletConnector, fetchPublicAddressOpts);
-            setCallback('connectSuccess', {
-                walletId: connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.id,
+            yield connectWallet(walletConnector, fetchPublicAddressOpts, {
+                raiseOnConnect: true,
             });
             if (isConnectOnly(user, authMode)) {
                 LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.key);

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

@@ -43,3 +43,4 @@ export { useWalletUiUtils } from './useWalletUiUtils';
 export { useEmbeddedReveal } from './useEmbeddedReveal';
 export { useWalletConnectorNetwork } from './useWalletConnectorNetwork';
 export { useInitEmbeddedWalletAuthMethod } from './useInitEmbeddedWalletAuthMethod';
+export { useEmbeddedWalletAuthenticator } from './useEmbeddedWalletAuthenticator';

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

@@ -4,8 +4,8 @@ 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');
 var api = require('../../../data/api.cjs');
 require('@dynamic-labs/sdk-api');
@@ -22,14 +22,24 @@ require('viem');
 var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
+var getWalletIdentifier = require('../../functions/getWalletIdentifier/getWalletIdentifier.cjs');
 var shouldManuallyReconnectOnRefresh = require('../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
 require('viem/chains');
 var getWalletProvider = require('../../functions/getWalletProvider/getWalletProvider.cjs');
+var isConnectOnly = require('../authenticationHooks/helpers/isConnectOnly.cjs');
+var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 var updateUserWalletsFromConnectedWallets = require('./updateUserWalletsFromConnectedWallets/updateUserWalletsFromConnectedWallets.cjs');
 
-const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, walletConnectorOptions, onDisconnect, onBeforeConnectSuccessConfirmation, removeIsFullyConnected, setShowAuthFlow, isBridgeFlow, }) => {
+const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, walletConnectorOptions, onDisconnect, onBeforeConnectSuccessConfirmation, removeIsFullyConnected, setShowAuthFlow, isBridgeFlow, setIsVerificationInProgress, user, }) => {
     const [connectedWalletsInfo, setConnectedWalletsInfo, removeConnectedWalletsInfo,] = useLocalStorage.useLocalStorage(localStorage.CONNECTED_WALLETS_INFO, []);
     const [connectedWallets, _setConnectedWallets] = React.useState([]);
+    /**
+     * When a new wallet is connected with the onConnect callback enabled,
+     * this new wallet's id will hang in this array until we attest that the corresponding wallet object
+     * has been successfully built — at which point we raise the callback and pop the id from this array.
+     * Should be removed with QNTM-1082 refactor
+     */
+    const onConnectWaitList = React.useRef(new Set());
     const { setUserWallets } = UserWalletsContext.useInternalUserWallets();
     /** This wrapper is to ensure userWallets is always properly updated alongside connectedWallets */
     const setConnectedWallets = (newWallets) => {
@@ -107,7 +117,21 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             return walletObject;
         })))).filter((wallet) => Boolean(wallet));
         setConnectedWallets(updatedConnectedWallets);
-    }), [connectedWalletsInfo, disconnectWallet, walletConnectorOptions]);
+        // Raise any onConnect callbacks in wait list
+        for (const walletId of [...onConnectWaitList.current]) {
+            const wallet = updatedConnectedWallets.find((wallet) => getWalletIdentifier.getWalletIdentifier(wallet) === walletId);
+            if (!wallet)
+                continue;
+            onConnectWaitList.current.delete(walletId);
+            dynamicEvents.dynamicEvents.emit('walletConnected', wallet);
+            setIsVerificationInProgress(false);
+        }
+    }), [
+        connectedWalletsInfo,
+        setIsVerificationInProgress,
+        disconnectWallet,
+        walletConnectorOptions,
+    ]);
     // Generate the connectedWallets list when connectedWalletsInfo (localStorage) or memoized wallet connector updates
     React.useEffect(() => {
         updateConnectedWalletsList();
@@ -178,12 +202,14 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         });
     });
     const shouldSkipCreatingVisit = authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly;
-    const connectWallet = (walletConnector, fetchPublicAddressOpts, shouldCallCallback = true) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const connectWallet = (walletConnector, fetchPublicAddressOpts, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const { applyOnBeforeConnectSuccessConfirmation = true, raiseOnConnect = false, } = options !== null && options !== void 0 ? options : {};
         const walletAddress = yield walletConnector.fetchPublicAddress(fetchPublicAddressOpts);
         if (!walletAddress) {
             throw new utils.MissingPublicAddressError();
         }
-        if (onBeforeConnectSuccessConfirmation && shouldCallCallback) {
+        if (onBeforeConnectSuccessConfirmation &&
+            applyOnBeforeConnectSuccessConfirmation) {
             const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({
                 address: walletAddress,
                 chain: walletConnector.connectedChain,
@@ -196,6 +222,13 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             }
         }
         const walletId = `connect-wallet-${getNextIdAvailable(connectedWalletsInfo)}`;
+        // We are already using the new syntax for wallet ids for this.
+        // Eventually the connect-wallet-X syntax will be dropped
+        if (raiseOnConnect && isConnectOnly.isConnectOnly(user, authMode))
+            onConnectWaitList.current.add(getWalletIdentifier.getWalletIdentifier({
+                address: walletAddress,
+                connector: walletConnector,
+            }));
         if (!primaryWalletId) {
             setPrimaryWalletId(walletId);
         }

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

@@ -1,14 +1,14 @@
 import { Chain, FetchPublicAddressOpts, WalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { ConnectWalletResult } from '../../../context/DynamicContext/types';
-import { AuthModeType, OnBeforeConnectSuccessConfirmation, Wallet, WalletOption } from '../../../shared';
 import { SetShowAuthFlow } from '../../../context/DynamicContext/hooks';
+import { ConnectWalletResult } from '../../../context/DynamicContext/types';
+import { AuthModeType, OnBeforeConnectSuccessConfirmation, UserProfile, Wallet, WalletOption } from '../../../shared';
 export type ConnectedWalletConnectorType = {
     id: string;
     walletChain?: Chain;
     walletConnectorKey: string;
     provider: string;
 };
-type Props = {
+export type UseConnectWalletProps = {
     authMode: AuthModeType;
     clearPrimaryWalletId: () => void;
     enableVisitTrackingOnConnectOnly: boolean;
@@ -21,9 +21,20 @@ type Props = {
     removeIsFullyConnected: () => void;
     setShowAuthFlow: SetShowAuthFlow;
     isBridgeFlow: boolean;
+    setIsVerificationInProgress: (newValue: boolean, checkWasSetOnDisable?: boolean | undefined) => void;
+    user: UserProfile | undefined;
+};
+export type ConnectWalletOptions = {
+    /** Whether to call onBeforeConnectSuccessConfirmation */
+    applyOnBeforeConnectSuccessConfirmation?: boolean;
+    /**
+     * Whether to raise onConnected callback after the connected wallet is built
+     * Should be removed after the userWallets refactor (QNTM-1082)
+     */
+    raiseOnConnect?: boolean;
 };
 type UseConnectWalletValue = {
-    connectWallet: (walletConnector: WalletConnector, fetchPublicAddressOpts?: FetchPublicAddressOpts, shouldCallCallback?: boolean) => Promise<ConnectWalletResult | undefined>;
+    connectWallet: (walletConnector: WalletConnector, fetchPublicAddressOpts?: FetchPublicAddressOpts, options?: ConnectWalletOptions) => Promise<ConnectWalletResult | undefined>;
     connectedWallets: Wallet[];
     connectedWalletsInfo: ConnectedWalletConnectorType[];
     getConnectedWalletById: (walletId: string) => Wallet | undefined;
@@ -31,5 +42,5 @@ type UseConnectWalletValue = {
     removeConnectedWalletsInfo: () => void;
     disconnectWallet: (walletId: string) => Promise<void>;
 };
-export declare const useConnectWallet: ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, walletConnectorOptions, onDisconnect, onBeforeConnectSuccessConfirmation, removeIsFullyConnected, setShowAuthFlow, isBridgeFlow, }: Props) => UseConnectWalletValue;
+export declare const useConnectWallet: ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, walletConnectorOptions, onDisconnect, onBeforeConnectSuccessConfirmation, removeIsFullyConnected, setShowAuthFlow, isBridgeFlow, setIsVerificationInProgress, user, }: UseConnectWalletProps) => UseConnectWalletValue;
 export {};

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

@@ -1,7 +1,7 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useState, useCallback, useEffect } from 'react';
-import { getWalletConnectorByKey, logger } from '@dynamic-labs/wallet-connector-core';
+import { useState, useRef, useCallback, useEffect } from 'react';
 import { MissingPublicAddressError } from '@dynamic-labs/utils';
+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';
@@ -18,14 +18,24 @@ import 'viem';
 import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
+import { getWalletIdentifier } from '../../functions/getWalletIdentifier/getWalletIdentifier.js';
 import { shouldManuallyReconnectOnRefresh } from '../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
 import 'viem/chains';
 import { getWalletProvider } from '../../functions/getWalletProvider/getWalletProvider.js';
+import { isConnectOnly } from '../authenticationHooks/helpers/isConnectOnly.js';
+import { dynamicEvents } from '../../../events/dynamicEvents.js';
 import { updateUserWalletsFromConnectedWallets } from './updateUserWalletsFromConnectedWallets/updateUserWalletsFromConnectedWallets.js';
 
-const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, walletConnectorOptions, onDisconnect, onBeforeConnectSuccessConfirmation, removeIsFullyConnected, setShowAuthFlow, isBridgeFlow, }) => {
+const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, walletConnectorOptions, onDisconnect, onBeforeConnectSuccessConfirmation, removeIsFullyConnected, setShowAuthFlow, isBridgeFlow, setIsVerificationInProgress, user, }) => {
     const [connectedWalletsInfo, setConnectedWalletsInfo, removeConnectedWalletsInfo,] = useLocalStorage(CONNECTED_WALLETS_INFO, []);
     const [connectedWallets, _setConnectedWallets] = useState([]);
+    /**
+     * When a new wallet is connected with the onConnect callback enabled,
+     * this new wallet's id will hang in this array until we attest that the corresponding wallet object
+     * has been successfully built — at which point we raise the callback and pop the id from this array.
+     * Should be removed with QNTM-1082 refactor
+     */
+    const onConnectWaitList = useRef(new Set());
     const { setUserWallets } = useInternalUserWallets();
     /** This wrapper is to ensure userWallets is always properly updated alongside connectedWallets */
     const setConnectedWallets = (newWallets) => {
@@ -103,7 +113,21 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             return walletObject;
         })))).filter((wallet) => Boolean(wallet));
         setConnectedWallets(updatedConnectedWallets);
-    }), [connectedWalletsInfo, disconnectWallet, walletConnectorOptions]);
+        // Raise any onConnect callbacks in wait list
+        for (const walletId of [...onConnectWaitList.current]) {
+            const wallet = updatedConnectedWallets.find((wallet) => getWalletIdentifier(wallet) === walletId);
+            if (!wallet)
+                continue;
+            onConnectWaitList.current.delete(walletId);
+            dynamicEvents.emit('walletConnected', wallet);
+            setIsVerificationInProgress(false);
+        }
+    }), [
+        connectedWalletsInfo,
+        setIsVerificationInProgress,
+        disconnectWallet,
+        walletConnectorOptions,
+    ]);
     // Generate the connectedWallets list when connectedWalletsInfo (localStorage) or memoized wallet connector updates
     useEffect(() => {
         updateConnectedWalletsList();
@@ -174,12 +198,14 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         });
     });
     const shouldSkipCreatingVisit = authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly;
-    const connectWallet = (walletConnector, fetchPublicAddressOpts, shouldCallCallback = true) => __awaiter(void 0, void 0, void 0, function* () {
+    const connectWallet = (walletConnector, fetchPublicAddressOpts, options) => __awaiter(void 0, void 0, void 0, function* () {
+        const { applyOnBeforeConnectSuccessConfirmation = true, raiseOnConnect = false, } = options !== null && options !== void 0 ? options : {};
         const walletAddress = yield walletConnector.fetchPublicAddress(fetchPublicAddressOpts);
         if (!walletAddress) {
             throw new MissingPublicAddressError();
         }
-        if (onBeforeConnectSuccessConfirmation && shouldCallCallback) {
+        if (onBeforeConnectSuccessConfirmation &&
+            applyOnBeforeConnectSuccessConfirmation) {
             const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({
                 address: walletAddress,
                 chain: walletConnector.connectedChain,
@@ -192,6 +218,13 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             }
         }
         const walletId = `connect-wallet-${getNextIdAvailable(connectedWalletsInfo)}`;
+        // We are already using the new syntax for wallet ids for this.
+        // Eventually the connect-wallet-X syntax will be dropped
+        if (raiseOnConnect && isConnectOnly(user, authMode))
+            onConnectWaitList.current.add(getWalletIdentifier({
+                address: walletAddress,
+                connector: walletConnector,
+            }));
         if (!primaryWalletId) {
             setPrimaryWalletId(walletId);
         }

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

@@ -16,6 +16,7 @@ require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/sdk-api');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
@@ -23,7 +24,6 @@ require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 var createUserProfile = require('../../functions/createUserProfile/createUserProfile.cjs');
 require('@dynamic-labs/multi-wallet');
-require('@dynamic-labs/sdk-api');
 var index = require('../../functions/storeAuthToken/index.cjs');
 require('viem/chains');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');

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

@@ -12,6 +12,7 @@ import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/sdk-api';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
@@ -19,7 +20,6 @@ import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import { createUserProfile } from '../../functions/createUserProfile/createUserProfile.js';
 import '@dynamic-labs/multi-wallet';
-import '@dynamic-labs/sdk-api';
 import { storeAuthToken } from '../../functions/storeAuthToken/index.js';
 import 'viem/chains';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';

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

@@ -16,6 +16,7 @@ require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/sdk-api');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 var dynamicEvents = require('../../../events/dynamicEvents.cjs');
@@ -23,7 +24,6 @@ require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
-require('@dynamic-labs/sdk-api');
 var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
 require('viem/chains');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');

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

@@ -12,6 +12,7 @@ import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/sdk-api';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
@@ -19,7 +20,6 @@ import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
-import '@dynamic-labs/sdk-api';
 import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 import 'viem/chains';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';

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

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

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

@@ -0,0 +1,21 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../_virtual/_tslib.cjs');
+var usePasskeyRecovery = require('../usePasskeyRecovery/usePasskeyRecovery.cjs');
+
+const useEmbeddedWalletAuthenticator = () => {
+    const { initPasskeyRecoveryProcess, shouldInitRecovery } = usePasskeyRecovery.usePasskeyRecovery();
+    const createOrRefreshAuthenticatorSession = (authenticatorType) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        // user has passkey authenticator set up OR active session
+        // there is no need to create or refresh the authenticator
+        if (authenticatorType !== 'passkey' && !(yield shouldInitRecovery())) {
+            return;
+        }
+        return initPasskeyRecoveryProcess(authenticatorType);
+    });
+    return { createOrRefreshAuthenticatorSession };
+};
+
+exports.useEmbeddedWalletAuthenticator = useEmbeddedWalletAuthenticator;

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

@@ -0,0 +1,4 @@
+import { AuthenticatorType } from '@dynamic-labs/wallet-connector-core';
+export declare const useEmbeddedWalletAuthenticator: () => {
+    createOrRefreshAuthenticatorSession: (authenticatorType?: AuthenticatorType) => Promise<import("../../../shared").Wallet | undefined>;
+};

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

@@ -0,0 +1,17 @@
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { usePasskeyRecovery } from '../usePasskeyRecovery/usePasskeyRecovery.js';
+
+const useEmbeddedWalletAuthenticator = () => {
+    const { initPasskeyRecoveryProcess, shouldInitRecovery } = usePasskeyRecovery();
+    const createOrRefreshAuthenticatorSession = (authenticatorType) => __awaiter(void 0, void 0, void 0, function* () {
+        // user has passkey authenticator set up OR active session
+        // there is no need to create or refresh the authenticator
+        if (authenticatorType !== 'passkey' && !(yield shouldInitRecovery())) {
+            return;
+        }
+        return initPasskeyRecoveryProcess(authenticatorType);
+    });
+    return { createOrRefreshAuthenticatorSession };
+};
+
+export { useEmbeddedWalletAuthenticator };

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

@@ -70,6 +70,7 @@ require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCa
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useIsLoggedIn = () => {
+    var _a, _b;
     const { user, primaryWallet, authMode, projectSettings } = useInternalDynamicContext.useInternalDynamicContext();
     const isTurnkeyProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings);
     // a user is set even when on connect-only mode if signing in with social,
@@ -78,8 +79,8 @@ const useIsLoggedIn = () => {
     // if turnkey is enabled we need to check if the user that is logged/connected
     // has a primaryWallet to not show the widget without secure
     if (isTurnkeyProviderEnabled &&
-        (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.automaticEmbeddedWalletCreation) &&
-        ((projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWalletSecurityMethods) || []).length === 0) {
+        ((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation) &&
+        !(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets.forceAuthenticatorAtSignup)) {
         return Boolean(primaryWallet && isLoggedIn);
     }
     // return isLoggedIn;

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

@@ -66,6 +66,7 @@ import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCar
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useIsLoggedIn = () => {
+    var _a, _b;
     const { user, primaryWallet, authMode, projectSettings } = useInternalDynamicContext();
     const isTurnkeyProviderEnabled = isTurnkeyEnabled(projectSettings);
     // a user is set even when on connect-only mode if signing in with social,
@@ -74,8 +75,8 @@ const useIsLoggedIn = () => {
     // if turnkey is enabled we need to check if the user that is logged/connected
     // has a primaryWallet to not show the widget without secure
     if (isTurnkeyProviderEnabled &&
-        (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.automaticEmbeddedWalletCreation) &&
-        ((projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWalletSecurityMethods) || []).length === 0) {
+        ((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation) &&
+        !(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets.forceAuthenticatorAtSignup)) {
         return Boolean(primaryWallet && isLoggedIn);
     }
     // return isLoggedIn;

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

@@ -14,6 +14,7 @@ require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/sdk-api');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 

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

@@ -10,6 +10,7 @@ import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/sdk-api';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 

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

@@ -81,6 +81,7 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 
 const socialProviders = [
     'apple',
+    'coinbasesocial',
     'discord',
     'facebook',
     'github',

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

@@ -77,6 +77,7 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 
 const socialProviders = [
     'apple',
+    'coinbasesocial',
     'discord',
     'facebook',
     'github',

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

@@ -17,13 +17,13 @@ require('../../../constants/colors.cjs');
 require('../../../constants/values.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/sdk-api');
 require('@dynamic-labs/utils');
 require('../../../../shared/consts/index.cjs');
 require('../../../../events/dynamicEvents.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
-require('@dynamic-labs/sdk-api');
 require('viem/chains');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');