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

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

@@ -1,26 +1,69 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useCallback } from 'react';
 import { DynamicError } from '@dynamic-labs/utils';
-import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
-import '@dynamic-labs/wallet-connector-core';
-import '../../../context/CaptchaContext/CaptchaContext.js';
-import '../../../context/ErrorContext/ErrorContext.js';
-import '../../../context/ViewContext/ViewContext.js';
+import '../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
 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';
+import '../../../events/dynamicEvents.js';
+import '../../../context/CaptchaContext/CaptchaContext.js';
+import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
+import 'viem/chains';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../config/ApiEndpoint.js';
 import { useSignConnectOnlyUser } from '../authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.js';
 import '../../../context/EmailVerificationContext/EmailVerificationContext.js';
+import 'react-dom';
+import '../../../context/ThemeContext/ThemeContext.js';
+import '@dynamic-labs/types';
+import 'yup';
+import 'react-i18next';
+import '../../../context/MockContext/MockContext.js';
+import '../useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
+import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import '@dynamic-labs/rpc-providers';
+import '../../../context/UserWalletsContext/UserWalletsContext.js';
+import '../../../components/Alert/Alert.js';
+import '../../../components/ShadowDOM/ShadowDOM.js';
+import '../../../components/IconButton/IconButton.js';
+import '../../../components/InlineWidget/InlineWidget.js';
+import '../../../components/MenuList/Dropdown/Dropdown.js';
+import '../../../components/Transition/ZoomTransition/ZoomTransition.js';
+import '../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
+import '../../../components/Transition/OpacityTransition/OpacityTransition.js';
+import '../../../components/Popper/Popper/Popper.js';
+import '../../../components/Popper/PopperContext/PopperContext.js';
+import 'react-focus-lock';
+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';
+import '../../../context/LoadingContext/LoadingContext.js';
+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 '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
+import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
+import '../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.js';
+import '@dynamic-labs/viem-utils';
+import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useAuthenticateConnectedUser = () => {
     const signConnectOnlyUser = useSignConnectOnlyUser();

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

@@ -10,38 +10,51 @@ 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');
 require('../../../shared/consts/index.cjs');
 
 const useClearWalletConnectSessions = ({ connectors }) => {
-    const clearOphanedWalletConnectSessions = React.useCallback(() => {
+    const clearAllWalletConnectSessions = () => {
         if (typeof window === 'undefined')
             return;
-        if (connectors.length === 0)
-            return;
-        const keys = new Set(connectors.map((connector) => connector.key));
         for (const key of localStorage$1.LocalStorage.getKeys()) {
-            if (key.startsWith('walletconnect') &&
-                !keys.has(key.replace('walletconnect-', ''))) {
+            if (key.startsWith('walletconnect') ||
+                key.startsWith('walletlink') ||
+                key.startsWith('wc@2')) {
                 localStorage.removeItem(key);
             }
         }
-    }, [connectors]);
-    const clearAllWalletConnectSessions = () => {
+        // 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(() => {
         if (typeof window === 'undefined')
             return;
+        if (connectors.length === 0)
+            return;
+        const keys = new Set(connectors.map((connector) => connector.key));
         for (const key of localStorage$1.LocalStorage.getKeys()) {
-            if (key.startsWith('walletconnect') ||
-                key.startsWith('walletlink') ||
-                key.startsWith('wc@2')) {
+            if (key.startsWith('walletconnect') &&
+                !keys.has(key.replace('walletconnect-', ''))) {
                 localStorage.removeItem(key);
             }
         }
-    };
-    return { clearAllWalletConnectSessions, clearOphanedWalletConnectSessions };
+    }, [connectors]);
+    return { clearAllWalletConnectSessions };
 };
 
 exports.useClearWalletConnectSessions = useClearWalletConnectSessions;

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

@@ -4,6 +4,5 @@ type Args = {
 };
 export declare const useClearWalletConnectSessions: ({ connectors }: Args) => {
     clearAllWalletConnectSessions: () => void;
-    clearOphanedWalletConnectSessions: () => void;
 };
 export {};

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

@@ -1,4 +1,4 @@
-import { useCallback } from 'react';
+import { useEffect } from 'react';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -6,38 +6,51 @@ 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';
 import '../../../shared/consts/index.js';
 
 const useClearWalletConnectSessions = ({ connectors }) => {
-    const clearOphanedWalletConnectSessions = useCallback(() => {
+    const clearAllWalletConnectSessions = () => {
         if (typeof window === 'undefined')
             return;
-        if (connectors.length === 0)
-            return;
-        const keys = new Set(connectors.map((connector) => connector.key));
         for (const key of LocalStorage.getKeys()) {
-            if (key.startsWith('walletconnect') &&
-                !keys.has(key.replace('walletconnect-', ''))) {
+            if (key.startsWith('walletconnect') ||
+                key.startsWith('walletlink') ||
+                key.startsWith('wc@2')) {
                 localStorage.removeItem(key);
             }
         }
-    }, [connectors]);
-    const clearAllWalletConnectSessions = () => {
+        // 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(() => {
         if (typeof window === 'undefined')
             return;
+        if (connectors.length === 0)
+            return;
+        const keys = new Set(connectors.map((connector) => connector.key));
         for (const key of LocalStorage.getKeys()) {
-            if (key.startsWith('walletconnect') ||
-                key.startsWith('walletlink') ||
-                key.startsWith('wc@2')) {
+            if (key.startsWith('walletconnect') &&
+                !keys.has(key.replace('walletconnect-', ''))) {
                 localStorage.removeItem(key);
             }
         }
-    };
-    return { clearAllWalletConnectSessions, clearOphanedWalletConnectSessions };
+    }, [connectors]);
+    return { clearAllWalletConnectSessions };
 };
 
 export { useClearWalletConnectSessions };

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,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
+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');
@@ -15,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('@dynamic-labs/utils');
 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) => {
@@ -39,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;
@@ -57,6 +72,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         isBridgeFlow,
         onDisconnect,
         primaryWalletId,
+        removeIsFullyConnected,
         setConnectedWalletsInfo,
         setPrimaryWalletId,
     ]);
@@ -83,9 +99,13 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 yield disconnectWallet(storedConnectedWalletInfo.id);
                 return null;
             }
-            const walletNetwork = yield walletConnector.getNetwork();
+            const [walletNetwork, additionalAddresses] = yield Promise.all([
+                walletConnector.getNetwork(),
+                walletConnector.getAdditionalAddresses(walletAddress),
+            ]);
             const walletChain = walletConnector.connectedChain;
             const walletObject = {
+                additionalAddresses,
                 address: walletAddress || '',
                 authenticated: false,
                 chain: walletChain || '',
@@ -97,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();
@@ -119,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]);
@@ -140,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,
@@ -163,14 +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) {
-            const error = new Error();
-            error.code = 'missing-public-address';
-            throw error;
+            throw new utils.MissingPublicAddressError();
         }
-        if (onBeforeConnectSuccessConfirmation && shouldCallCallback) {
+        if (onBeforeConnectSuccessConfirmation &&
+            applyOnBeforeConnectSuccessConfirmation) {
             const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({
                 address: walletAddress,
                 chain: walletConnector.connectedChain,
@@ -183,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);
         }
@@ -208,7 +254,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                     chain: walletChain || '',
                     environmentId,
                     publicWalletAddress: walletAddress,
-                    walletName: walletConnector.name,
+                    walletName: walletConnector.key,
                     walletProvider: getWalletProvider.getWalletProvider(walletConnector),
                 });
             }

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,5 +1,6 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useState, useCallback, useEffect } from 'react';
+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';
@@ -11,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 '@dynamic-labs/utils';
 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) => {
@@ -35,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;
@@ -53,6 +68,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         isBridgeFlow,
         onDisconnect,
         primaryWalletId,
+        removeIsFullyConnected,
         setConnectedWalletsInfo,
         setPrimaryWalletId,
     ]);
@@ -79,9 +95,13 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 yield disconnectWallet(storedConnectedWalletInfo.id);
                 return null;
             }
-            const walletNetwork = yield walletConnector.getNetwork();
+            const [walletNetwork, additionalAddresses] = yield Promise.all([
+                walletConnector.getNetwork(),
+                walletConnector.getAdditionalAddresses(walletAddress),
+            ]);
             const walletChain = walletConnector.connectedChain;
             const walletObject = {
+                additionalAddresses,
                 address: walletAddress || '',
                 authenticated: false,
                 chain: walletChain || '',
@@ -93,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();
@@ -115,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]);
@@ -136,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,
@@ -159,14 +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) {
-            const error = new Error();
-            error.code = 'missing-public-address';
-            throw error;
+            throw new MissingPublicAddressError();
         }
-        if (onBeforeConnectSuccessConfirmation && shouldCallCallback) {
+        if (onBeforeConnectSuccessConfirmation &&
+            applyOnBeforeConnectSuccessConfirmation) {
             const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({
                 address: walletAddress,
                 chain: walletConnector.connectedChain,
@@ -179,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);
         }
@@ -204,7 +250,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                     chain: walletChain || '',
                     environmentId,
                     publicWalletAddress: walletAddress,
-                    walletName: walletConnector.name,
+                    walletName: walletConnector.key,
                     walletProvider: getWalletProvider(walletConnector),
                 });
             }