@dynamic-labs/sdk-react-core 1.1.0-phantom.0 → 1.1.0

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

@@ -8,11 +8,13 @@ import 'react/jsx-runtime';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
+import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
+import '../../../../../_virtual/_tslib.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
@@ -46,6 +48,7 @@ import 'formik';
 import 'i18next';
 import '../../../components/OverlayCard/OverlayCard.context.js';
 import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
+import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../views/WalletList/WalletList.js';
 import 'qrcode';
 import '@hcaptcha/react-hcaptcha';
@@ -56,7 +59,6 @@ import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/Second
 import { isUserLinkingWallet } from '../../../shared/utils/functions/isUserLinkingWallet/isUserLinkingWallet.js';
 import { useDynamicLayoutData } from '../useDynamicLayoutData/useDynamicLayoutData.js';
 import { useFooterAnimationContext } from '../../../context/FooterAnimationContext/index.js';
-import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.js';
@@ -90,6 +92,7 @@ const useAuthLayoutChecks = () => {
             view.type === 'chainalysis-blocked-wallet' ||
             view.type === 'wallet-sign' ||
             view.type === 'collect-user-data' ||
+            view.type === 'passkey-new-domain-detected' ||
             isUserLinkingWallet(user, view.type, mockedSDK)));
     const showHeader = view.type !== 'collect-user-data' &&
         view.type !== 'no-access' &&
@@ -101,13 +104,16 @@ const useAuthLayoutChecks = () => {
         view.type !== 'bridge-summary' &&
         view.type !== 'bridge-next-wallet-connection' &&
         view.type !== 'passkey-intro' &&
+        view.type !== 'passkey-new-domain-detected' &&
         view.type !== 'social-redirect-view' &&
         view.type !== 'update-email' &&
         view.type !== 'collect-user-data-login-with-email' &&
+        view.type !== 'passkey-recovery-bundle' &&
         view.type !== 'passkey-recovery-start' &&
-        view.type !== 'rename-passkey' &&
         view.type !== 'embedded-reveal-view' &&
-        view.type !== 'embedded-reveal-account-view';
+        view.type !== 'embedded-reveal-account-view' &&
+        view.type !== 'rename-passkey' &&
+        view.type !== 'embedded-wallet-auth-choice';
     const showConnectedWalletProgress = isBridgeFlow &&
         (view.type === 'wallet-list' ||
             view.type === 'qr-code' ||
@@ -133,6 +139,8 @@ const useAuthLayoutChecks = () => {
         view.type === 'verify-email' ||
         view.type === 'pending-connect' ||
         view.type === 'wallet-group' ||
+        view.type === 'select-wallet-in-wallet-group' ||
+        view.type === 'select-hardware-wallet' ||
         view.type === 'pending-signature' ||
         view.type === 'qr-code' ||
         view.type === 'wallet-used' ||
@@ -142,6 +150,7 @@ const useAuthLayoutChecks = () => {
         view.type !== 'network-not-supported' &&
         view.type !== 'passkey-recovery-complete' &&
         view.type !== 'passkey-recovery-start' &&
+        view.type !== 'passkey-recovery-bundle' &&
         view.type !== 'rename-passkey' &&
         view.type !== 'qr-code';
     const showBackButton = view.type === 'pending-signature' ||
@@ -150,6 +159,8 @@ const useAuthLayoutChecks = () => {
         view.type === 'login-with-email-verification' ||
         view.type === 'login-with-email-or-wallet-full-wallet-list' ||
         view.type === 'wallet-group' ||
+        view.type === 'select-wallet-in-wallet-group' ||
+        view.type === 'select-hardware-wallet' ||
         view.type === 'pending-connect' ||
         view.type === 'account-exists' ||
         view.type === 'passkey-intro' ||

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

@@ -14,6 +14,7 @@ require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
+require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../../shared/consts/index.cjs');
@@ -52,6 +53,7 @@ require('formik');
 require('i18next');
 require('../../../components/OverlayCard/OverlayCard.context.cjs');
 require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
+require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../views/WalletList/WalletList.cjs');
 require('qrcode');
 require('@hcaptcha/react-hcaptcha');
@@ -60,7 +62,6 @@ require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
-require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.cjs');

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

@@ -10,6 +10,7 @@ import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
+import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../../shared/consts/index.js';
@@ -48,6 +49,7 @@ import 'formik';
 import 'i18next';
 import '../../../components/OverlayCard/OverlayCard.context.js';
 import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
+import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../views/WalletList/WalletList.js';
 import 'qrcode';
 import '@hcaptcha/react-hcaptcha';
@@ -56,7 +58,6 @@ import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '../../../context/FooterAnimationContext/index.js';
-import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.js';

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

@@ -10,7 +10,9 @@ require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
+var localStorage$2 = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
+require('../../constants/values.cjs');
 var localStorage$1 = require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('@dynamic-labs/utils');
@@ -27,6 +29,16 @@ const useClearWalletConnectSessions = ({ connectors }) => {
                 localStorage.removeItem(key);
             }
         }
+        // remove embedded wallet session iframe
+        connectors === null || connectors === void 0 ? void 0 : connectors.forEach((connector) => {
+            var _a, _b, _c;
+            if ((_b = (_a = connector === null || connector === void 0 ? void 0 : connector.name) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === null || _b === void 0 ? void 0 : _b.startsWith('turnkey')) {
+                (_c = connector
+                    .getAuthenticatorHandler()) === null || _c === void 0 ? void 0 : _c.clear();
+                localStorage$1.LocalStorage.removeFromLS(localStorage$2.EMBEDDED_WALLET_SESSION_SETTINGS);
+                localStorage$1.LocalStorage.removeFromLS(localStorage$2.EMBEDDED_WALLET_SECURE_BANNER);
+            }
+        });
     };
     // Clears orphaned wallet connect sessions
     React.useEffect(() => {

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

@@ -6,7 +6,9 @@ import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
+import { EMBEDDED_WALLET_SESSION_SETTINGS, EMBEDDED_WALLET_SECURE_BANNER } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
+import '../../constants/values.js';
 import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '@dynamic-labs/utils';
@@ -23,6 +25,16 @@ const useClearWalletConnectSessions = ({ connectors }) => {
                 localStorage.removeItem(key);
             }
         }
+        // remove embedded wallet session iframe
+        connectors === null || connectors === void 0 ? void 0 : connectors.forEach((connector) => {
+            var _a, _b, _c;
+            if ((_b = (_a = connector === null || connector === void 0 ? void 0 : connector.name) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === null || _b === void 0 ? void 0 : _b.startsWith('turnkey')) {
+                (_c = connector
+                    .getAuthenticatorHandler()) === null || _c === void 0 ? void 0 : _c.clear();
+                LocalStorage.removeFromLS(EMBEDDED_WALLET_SESSION_SETTINGS);
+                LocalStorage.removeFromLS(EMBEDDED_WALLET_SECURE_BANNER);
+            }
+        });
     };
     // Clears orphaned wallet connect sessions
     useEffect(() => {

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

@@ -11,10 +11,11 @@ require('../../../context/ViewContext/ViewContext.cjs');
 require('react');
 require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
+require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
-require('@dynamic-labs/utils');
 var useMediaQuery = require('../../../shared/utils/hooks/useMediaQuery/useMediaQuery.cjs');
+require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 
 const useColorSchemePreference = () => {

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

@@ -7,10 +7,11 @@ import '../../../context/ViewContext/ViewContext.js';
 import 'react';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
+import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
-import '@dynamic-labs/utils';
 import { useMediaQuery } from '../../../shared/utils/hooks/useMediaQuery/useMediaQuery.js';
+import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 
 const useColorSchemePreference = () => {

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');
@@ -16,19 +16,30 @@ require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 var localStorage = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
+require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 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, 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) => {
@@ -40,6 +51,9 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         yield (walletToDisconnect === null || walletToDisconnect === void 0 ? void 0 : walletToDisconnect.connector.endSession());
         const updatedConnectedWalletsInfo = connectedWalletsInfo.filter((wallet) => wallet.id !== walletId);
         setConnectedWalletsInfo(updatedConnectedWalletsInfo);
+        if (updatedConnectedWalletsInfo.length === 0) {
+            removeIsFullyConnected();
+        }
         onDisconnect(updatedConnectedWalletsInfo, walletToDisconnect);
         if (walletId !== primaryWalletId) {
             return;
@@ -58,6 +72,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         isBridgeFlow,
         onDisconnect,
         primaryWalletId,
+        removeIsFullyConnected,
         setConnectedWalletsInfo,
         setPrimaryWalletId,
     ]);
@@ -102,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();
@@ -124,7 +153,15 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         const clonedConnectedWalletsList = [...connectedWallets];
         const connectedWalletIndex = clonedConnectedWalletsList.findIndex((connectedWallet) => connectedWallet.id === walletId);
         if (connectedWalletIndex > -1) {
-            clonedConnectedWalletsList[connectedWalletIndex] = Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), walletObject);
+            if (walletObject.address && walletObject.network) {
+                clonedConnectedWalletsList[connectedWalletIndex] = Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), { address: walletObject.address, network: walletObject.network });
+            }
+            else if (walletObject.address) {
+                clonedConnectedWalletsList[connectedWalletIndex] = Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), { address: walletObject.address });
+            }
+            else {
+                clonedConnectedWalletsList[connectedWalletIndex] = Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), { network: walletObject.network });
+            }
             setConnectedWallets(clonedConnectedWalletsList);
         }
     }, [connectedWallets]);
@@ -145,10 +182,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             yield walletConnector.connect();
         }
         const currentWalletConnectorAddress = yield walletConnector.fetchPublicAddress();
-        if (!currentWalletConnectorAddress) {
-            return;
-        }
-        if (onBeforeConnectSuccessConfirmation) {
+        if (currentWalletConnectorAddress && onBeforeConnectSuccessConfirmation) {
             const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({
                 address: currentWalletConnectorAddress,
                 chain: walletConnector.connectedChain,
@@ -168,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,
@@ -186,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;
@@ -18,11 +18,23 @@ type Props = {
     walletConnectorOptions: WalletOption[];
     onDisconnect: (connectedWalletsInfo: ConnectedWalletConnectorType[], wallet?: Wallet) => void;
     onBeforeConnectSuccessConfirmation: OnBeforeConnectSuccessConfirmation | undefined;
+    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;
@@ -30,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, 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';
@@ -12,19 +12,30 @@ import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import { CONNECTED_WALLETS_INFO } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
+import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 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, 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) => {
@@ -36,6 +47,9 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         yield (walletToDisconnect === null || walletToDisconnect === void 0 ? void 0 : walletToDisconnect.connector.endSession());
         const updatedConnectedWalletsInfo = connectedWalletsInfo.filter((wallet) => wallet.id !== walletId);
         setConnectedWalletsInfo(updatedConnectedWalletsInfo);
+        if (updatedConnectedWalletsInfo.length === 0) {
+            removeIsFullyConnected();
+        }
         onDisconnect(updatedConnectedWalletsInfo, walletToDisconnect);
         if (walletId !== primaryWalletId) {
             return;
@@ -54,6 +68,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         isBridgeFlow,
         onDisconnect,
         primaryWalletId,
+        removeIsFullyConnected,
         setConnectedWalletsInfo,
         setPrimaryWalletId,
     ]);
@@ -98,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();
@@ -120,7 +149,15 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         const clonedConnectedWalletsList = [...connectedWallets];
         const connectedWalletIndex = clonedConnectedWalletsList.findIndex((connectedWallet) => connectedWallet.id === walletId);
         if (connectedWalletIndex > -1) {
-            clonedConnectedWalletsList[connectedWalletIndex] = Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), walletObject);
+            if (walletObject.address && walletObject.network) {
+                clonedConnectedWalletsList[connectedWalletIndex] = Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), { address: walletObject.address, network: walletObject.network });
+            }
+            else if (walletObject.address) {
+                clonedConnectedWalletsList[connectedWalletIndex] = Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), { address: walletObject.address });
+            }
+            else {
+                clonedConnectedWalletsList[connectedWalletIndex] = Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), { network: walletObject.network });
+            }
             setConnectedWallets(clonedConnectedWalletsList);
         }
     }, [connectedWallets]);
@@ -141,10 +178,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             yield walletConnector.connect();
         }
         const currentWalletConnectorAddress = yield walletConnector.fetchPublicAddress();
-        if (!currentWalletConnectorAddress) {
-            return;
-        }
-        if (onBeforeConnectSuccessConfirmation) {
+        if (currentWalletConnectorAddress && onBeforeConnectSuccessConfirmation) {
             const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({
                 address: currentWalletConnectorAddress,
                 chain: walletConnector.connectedChain,
@@ -164,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,
@@ -182,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/useConnectWithEmail/useConnectWithEmail.cjs

@@ -12,6 +12,7 @@ require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
+require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('@dynamic-labs/utils');
@@ -51,6 +52,7 @@ require('formik');
 require('i18next');
 require('../../../components/OverlayCard/OverlayCard.context.cjs');
 require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
+require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../views/WalletList/WalletList.cjs');
 require('qrcode');
 require('@hcaptcha/react-hcaptcha');
@@ -59,7 +61,6 @@ require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
-require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.cjs');

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

@@ -8,6 +8,7 @@ import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
+import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '@dynamic-labs/utils';
@@ -47,6 +48,7 @@ import 'formik';
 import 'i18next';
 import '../../../components/OverlayCard/OverlayCard.context.js';
 import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
+import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../views/WalletList/WalletList.js';
 import 'qrcode';
 import '@hcaptcha/react-hcaptcha';
@@ -55,7 +57,6 @@ import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '../../../context/FooterAnimationContext/index.js';
-import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.js';

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

@@ -12,11 +12,13 @@ require('react/jsx-runtime');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
+require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
+require('../../../../../_virtual/_tslib.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
@@ -53,6 +55,7 @@ require('formik');
 require('i18next');
 require('../../../components/OverlayCard/OverlayCard.context.cjs');
 require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
+require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../views/WalletList/WalletList.cjs');
 require('qrcode');
 require('@hcaptcha/react-hcaptcha');
@@ -61,7 +64,6 @@ require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
-require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.cjs');