@dynamic-labs/sdk-react-core 2.0.0-alpha.25 → 2.0.0-alpha.27

package/src/lib/utils/hooks/authenticationHooks/helpers/showPendingConnectView.cjs

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var getWalletProvider = require('../../../functions/getWalletProvider/getWalletProvider.cjs');
 
-const specialCareWallets = ['myalgo', 'bloctoevm', 'perawallet'];
+const specialCareWallets = ['bloctoevm', 'perawallet'];
 const showPendingConnectView = (walletConnector, setView) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     const walletProvider = getWalletProvider.getWalletProvider(walletConnector);
     // We don't want to show the pending connect view for qrCode and walletConnect
@@ -15,7 +15,7 @@ const showPendingConnectView = (walletConnector, setView) => _tslib.__awaiter(vo
     }
     specialCareWallets.forEach((wallet) => {
         if (walletConnector.key === wallet) {
-            // myalgo and some other wallets works different as Justin mentioned in this commit:
+            // bloctoevm and some other wallets works different as Justin mentioned in this commit:
             // https://github.com/dynamic-labs/DynamicAuth/commit/57233d3620611bc91439f3d4587b8516f8d16f99
             // It needs to show the connect view before getting connected accounts
             setView('pending-connect');

package/src/lib/utils/hooks/authenticationHooks/helpers/showPendingConnectView.js

@@ -1,7 +1,7 @@
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { getWalletProvider } from '../../../functions/getWalletProvider/getWalletProvider.js';
 
-const specialCareWallets = ['myalgo', 'bloctoevm', 'perawallet'];
+const specialCareWallets = ['bloctoevm', 'perawallet'];
 const showPendingConnectView = (walletConnector, setView) => __awaiter(void 0, void 0, void 0, function* () {
     const walletProvider = getWalletProvider(walletConnector);
     // We don't want to show the pending connect view for qrCode and walletConnect
@@ -11,7 +11,7 @@ const showPendingConnectView = (walletConnector, setView) => __awaiter(void 0, v
     }
     specialCareWallets.forEach((wallet) => {
         if (walletConnector.key === wallet) {
-            // myalgo and some other wallets works different as Justin mentioned in this commit:
+            // bloctoevm and some other wallets works different as Justin mentioned in this commit:
             // https://github.com/dynamic-labs/DynamicAuth/commit/57233d3620611bc91439f3d4587b8516f8d16f99
             // It needs to show the connect view before getting connected accounts
             setView('pending-connect');

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

@@ -128,8 +128,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 }
             }
             const connectionResult = yield connectWallet(walletConnector, getAddressOpts, {
-                applyOnBeforeConnectSuccessConfirmation: shouldCallCallback,
-                raiseOnConnect: true,
+                applyHandleConnectedWallet: shouldCallCallback,
             });
             if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;

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

@@ -124,8 +124,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 }
             }
             const connectionResult = yield connectWallet(walletConnector, getAddressOpts, {
-                applyOnBeforeConnectSuccessConfirmation: shouldCallCallback,
-                raiseOnConnect: true,
+                applyHandleConnectedWallet: shouldCallCallback,
             });
             if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;

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

@@ -114,9 +114,7 @@ const useConnectAndSignSplitSteps = () => {
         var _a;
         yield showPendingConnectView.showPendingConnectView(walletConnector, setView);
         try {
-            yield connectWallet(walletConnector, getAddressOpts, {
-                raiseOnConnect: true,
-            });
+            yield connectWallet(walletConnector, getAddressOpts);
             if (isConnectOnly.isConnectOnly(user, authMode)) {
                 localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.key);
                 handleWalletsToConnect({ walletConnector });

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

@@ -110,9 +110,7 @@ const useConnectAndSignSplitSteps = () => {
         var _a;
         yield showPendingConnectView(walletConnector, setView);
         try {
-            yield connectWallet(walletConnector, getAddressOpts, {
-                raiseOnConnect: true,
-            });
+            yield connectWallet(walletConnector, getAddressOpts);
             if (isConnectOnly(user, authMode)) {
                 LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.key);
                 handleWalletsToConnect({ walletConnector });

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

@@ -29,6 +29,7 @@ require('viem/chains');
 var api = require('../../../../data/api.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 var VerificationContext = require('../../../../context/VerificationContext/VerificationContext.cjs');
 var useUpdateUserProfileByJWTCallback = require('../../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.cjs');
 require('react-dom');
@@ -43,7 +44,6 @@ require('../../../../context/MockContext/MockContext.cjs');
 var useUpdateUser = require('../../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
-require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../../components/Alert/Alert.cjs');
 require('../../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../../components/IconButton/IconButton.cjs');

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

@@ -25,6 +25,7 @@ import 'viem/chains';
 import { verifyEmail, verifySms } from '../../../../data/api.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
+import '../../../../context/UserWalletsContext/UserWalletsContext.js';
 import { useVerification } from '../../../../context/VerificationContext/VerificationContext.js';
 import { useUpdateUserProfileByJWTCallback } from '../../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.js';
 import 'react-dom';
@@ -39,7 +40,6 @@ import '../../../../context/MockContext/MockContext.js';
 import { useUpdateUser } from '../../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';

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

@@ -50,4 +50,4 @@ export { useNetworkDataFromWallet } from './useNetworkDataFromWallet';
 export { useDynamicModals } from './useDynamicModals';
 export { useSendDynamicProps } from './useSendDynamicProps';
 export { useNetworkNotSupported } from './useNetworkNotSupported';
-export { useHandleBeforeAuthHandler } from './useHandleBeforeAuthHandler';
+export { useHandleVerifiedUser } from './useHandleVerifiedUser';

package/src/lib/utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.cjs

@@ -28,6 +28,7 @@ require('i18next');
 require('../../../../config/ApiEndpoint.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../../context/WalletContext/WalletContext.cjs');
@@ -40,7 +41,6 @@ require('../../../../context/MockContext/MockContext.cjs');
 require('../../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
-require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../../components/Alert/Alert.cjs');
 require('../../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../../components/IconButton/IconButton.cjs');

package/src/lib/utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.js

@@ -24,6 +24,7 @@ import 'i18next';
 import '../../../../config/ApiEndpoint.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
+import '../../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../../context/WalletContext/WalletContext.js';
@@ -36,7 +37,6 @@ 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';

package/src/lib/utils/hooks/multiWallet/useVerifyOnAwaitingSignature/useVerifyOnAwaitingSignature.cjs

@@ -29,6 +29,7 @@ require('react-international-phone');
 var requiresTwoStepAuthentication = require('../../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.cjs');
 require('viem');
 require('viem/chains');
+require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
@@ -42,7 +43,6 @@ require('../../../../context/MockContext/MockContext.cjs');
 require('../../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
-require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../../components/Alert/Alert.cjs');
 require('../../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../../components/IconButton/IconButton.cjs');

package/src/lib/utils/hooks/multiWallet/useVerifyOnAwaitingSignature/useVerifyOnAwaitingSignature.js

@@ -25,6 +25,7 @@ import 'react-international-phone';
 import { requiresTwoStepAuthentication } from '../../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.js';
 import 'viem';
 import 'viem/chains';
+import '../../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
@@ -38,7 +39,6 @@ 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';

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

@@ -28,6 +28,7 @@ require('i18next');
 require('../../../config/ApiEndpoint.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../context/WalletContext/WalletContext.cjs');
@@ -40,7 +41,6 @@ var MockContext = require('../../../context/MockContext/MockContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
-require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../components/Alert/Alert.cjs');
 require('../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../components/IconButton/IconButton.cjs');

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

@@ -24,6 +24,7 @@ import 'i18next';
 import '../../../config/ApiEndpoint.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
+import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../context/WalletContext/WalletContext.js';
@@ -36,7 +37,6 @@ import { useMockContext } from '../../../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';

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

@@ -28,6 +28,7 @@ require('i18next');
 require('../../../config/ApiEndpoint.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 var useSignConnectOnlyUser = require('../authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
@@ -41,7 +42,6 @@ require('../../../context/MockContext/MockContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
-require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../components/Alert/Alert.cjs');
 require('../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../components/IconButton/IconButton.cjs');

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

@@ -24,6 +24,7 @@ import 'i18next';
 import '../../../config/ApiEndpoint.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
+import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import { useSignConnectOnlyUser } from '../authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
@@ -37,7 +38,6 @@ 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';

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

@@ -22,26 +22,17 @@ var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLo
 require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
-var getWalletIdentifier = require('../../functions/getWalletIdentifier/getWalletIdentifier.cjs');
 var shouldManuallyReconnectOnRefresh = require('../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
 require('viem');
 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, user, }) => {
+const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, walletConnectorOptions, handleConnectedWallet, setShowAuthFlow, isBridgeFlow, 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();
+    const { setUserWallets, addedWalletsIds, removedWalletsIds } = UserWalletsContext.useInternalUserWallets();
     /** This wrapper is to ensure userWallets is always properly updated alongside connectedWallets */
     const setConnectedWallets = React.useCallback((newWallets) => {
         _setConnectedWallets(newWallets);
@@ -52,7 +43,7 @@ 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);
-        onDisconnect(walletToDisconnect);
+        removedWalletsIds.current.push(walletId);
         if (walletId !== primaryWalletId) {
             return;
         }
@@ -68,7 +59,6 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         connectedWallets,
         connectedWalletsInfo,
         isBridgeFlow,
-        onDisconnect,
         primaryWalletId,
         setConnectedWalletsInfo,
         setPrimaryWalletId,
@@ -114,14 +104,6 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             return walletObject;
         })))).filter((wallet) => Boolean(wallet));
         setConnectedWallets(updatedConnectedWallets);
-        // 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);
-        }
     }), [
         connectedWalletsInfo,
         disconnectWallet,
@@ -178,14 +160,14 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             yield walletConnector.connect();
         }
         const currentWalletConnectorAddress = yield walletConnector.getAddress();
-        if (currentWalletConnectorAddress && onBeforeConnectSuccessConfirmation) {
-            const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({
+        if (currentWalletConnectorAddress && handleConnectedWallet) {
+            const shouldProceedWithConnection = yield handleConnectedWallet({
                 address: currentWalletConnectorAddress,
                 chain: walletConnector.connectedChain,
                 connector: walletConnector,
             });
             if (!shouldProceedWithConnection) {
-                walletConnectorCore.logger.info('Connection was not established because onBeforeConnectSuccessConfirmation returned false');
+                walletConnectorCore.logger.info('Connection was not established because handleConnectedWallet returned false');
                 disconnectWallet(walletId);
                 setShowAuthFlow(false, { emitCancelAuth: true });
                 return;
@@ -199,20 +181,19 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
     });
     const shouldSkipCreatingVisit = authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly;
     const connectWallet = (walletConnector, getAddressOpts, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const { applyOnBeforeConnectSuccessConfirmation = true, raiseOnConnect = false, } = options !== null && options !== void 0 ? options : {};
+        const { applyHandleConnectedWallet = true } = options !== null && options !== void 0 ? options : {};
         const walletAddress = yield walletConnector.getAddress(getAddressOpts);
         if (!walletAddress) {
             throw new utils.MissingPublicAddressError();
         }
-        if (onBeforeConnectSuccessConfirmation &&
-            applyOnBeforeConnectSuccessConfirmation) {
-            const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({
+        if (handleConnectedWallet && applyHandleConnectedWallet) {
+            const shouldProceedWithConnection = yield handleConnectedWallet({
                 address: walletAddress,
                 chain: walletConnector.connectedChain,
                 connector: walletConnector,
             });
             if (!shouldProceedWithConnection) {
-                walletConnectorCore.logger.info('Connection was not established because onBeforeConnectSuccessConfirmation returned false');
+                walletConnectorCore.logger.info('Connection was not established because handleConnectedWallet returned false');
                 setShowAuthFlow(false);
                 return;
             }
@@ -226,16 +207,10 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         if (!isConnectOnly.isConnectOnly(user, authMode))
             return { address: walletAddress, id: '' };
         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)
-            onConnectWaitList.current.add(getWalletIdentifier.getWalletIdentifier({
-                address: walletAddress,
-                connector: walletConnector,
-            }));
         if (!primaryWalletId) {
             setPrimaryWalletId(walletId);
         }
+        addedWalletsIds.current.push(walletId);
         const walletChain = walletConnector.connectedChain;
         const isWalletStored = connectedWalletsInfo.some(({ walletConnectorKey: storedWalletConnectorKey }) => storedWalletConnectorKey === walletConnector.key);
         if (isWalletStored) {

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

@@ -1,7 +1,7 @@
 import { Chain, GetAddressOpts, WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { SetShowAuthFlow } from '../../../context/DynamicContext/hooks';
 import { ConnectWalletResult } from '../../../context/DynamicContext/types';
-import { AuthModeType, OnBeforeConnectSuccessConfirmation, UserProfile, Wallet, WalletOption } from '../../../shared';
+import { AuthModeType, HandleConnectedWallet, UserProfile, Wallet, WalletOption } from '../../../shared';
 export type ConnectedWalletConnectorType = {
     id: string;
     walletChain?: Chain;
@@ -16,20 +16,14 @@ export type UseConnectWalletProps = {
     primaryWalletId: string | undefined;
     setPrimaryWalletId: (walletId: string) => void;
     walletConnectorOptions: WalletOption[];
-    onDisconnect: (wallet?: Wallet) => void;
-    onBeforeConnectSuccessConfirmation: OnBeforeConnectSuccessConfirmation | undefined;
+    handleConnectedWallet: HandleConnectedWallet | undefined;
     setShowAuthFlow: SetShowAuthFlow;
     isBridgeFlow: boolean;
     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;
+    /** Whether to call handleConnectedWallet */
+    applyHandleConnectedWallet?: boolean;
 };
 type UseConnectWalletValue = {
     connectWallet: (walletConnector: WalletConnector, getAddressOpts?: GetAddressOpts, options?: ConnectWalletOptions) => Promise<ConnectWalletResult | undefined>;
@@ -40,5 +34,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, user, }: UseConnectWalletProps) => UseConnectWalletValue;
+export declare const useConnectWallet: ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, walletConnectorOptions, handleConnectedWallet, setShowAuthFlow, isBridgeFlow, user, }: UseConnectWalletProps) => UseConnectWalletValue;
 export {};

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

@@ -1,5 +1,5 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useState, useRef, useCallback, useEffect } from 'react';
+import { useState, 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';
@@ -18,26 +18,17 @@ import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/use
 import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
-import { getWalletIdentifier } from '../../functions/getWalletIdentifier/getWalletIdentifier.js';
 import { shouldManuallyReconnectOnRefresh } from '../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
 import 'viem';
 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, user, }) => {
+const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, walletConnectorOptions, handleConnectedWallet, setShowAuthFlow, isBridgeFlow, 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();
+    const { setUserWallets, addedWalletsIds, removedWalletsIds } = useInternalUserWallets();
     /** This wrapper is to ensure userWallets is always properly updated alongside connectedWallets */
     const setConnectedWallets = useCallback((newWallets) => {
         _setConnectedWallets(newWallets);
@@ -48,7 +39,7 @@ 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);
-        onDisconnect(walletToDisconnect);
+        removedWalletsIds.current.push(walletId);
         if (walletId !== primaryWalletId) {
             return;
         }
@@ -64,7 +55,6 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         connectedWallets,
         connectedWalletsInfo,
         isBridgeFlow,
-        onDisconnect,
         primaryWalletId,
         setConnectedWalletsInfo,
         setPrimaryWalletId,
@@ -110,14 +100,6 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             return walletObject;
         })))).filter((wallet) => Boolean(wallet));
         setConnectedWallets(updatedConnectedWallets);
-        // 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);
-        }
     }), [
         connectedWalletsInfo,
         disconnectWallet,
@@ -174,14 +156,14 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             yield walletConnector.connect();
         }
         const currentWalletConnectorAddress = yield walletConnector.getAddress();
-        if (currentWalletConnectorAddress && onBeforeConnectSuccessConfirmation) {
-            const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({
+        if (currentWalletConnectorAddress && handleConnectedWallet) {
+            const shouldProceedWithConnection = yield handleConnectedWallet({
                 address: currentWalletConnectorAddress,
                 chain: walletConnector.connectedChain,
                 connector: walletConnector,
             });
             if (!shouldProceedWithConnection) {
-                logger.info('Connection was not established because onBeforeConnectSuccessConfirmation returned false');
+                logger.info('Connection was not established because handleConnectedWallet returned false');
                 disconnectWallet(walletId);
                 setShowAuthFlow(false, { emitCancelAuth: true });
                 return;
@@ -195,20 +177,19 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
     });
     const shouldSkipCreatingVisit = authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly;
     const connectWallet = (walletConnector, getAddressOpts, options) => __awaiter(void 0, void 0, void 0, function* () {
-        const { applyOnBeforeConnectSuccessConfirmation = true, raiseOnConnect = false, } = options !== null && options !== void 0 ? options : {};
+        const { applyHandleConnectedWallet = true } = options !== null && options !== void 0 ? options : {};
         const walletAddress = yield walletConnector.getAddress(getAddressOpts);
         if (!walletAddress) {
             throw new MissingPublicAddressError();
         }
-        if (onBeforeConnectSuccessConfirmation &&
-            applyOnBeforeConnectSuccessConfirmation) {
-            const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({
+        if (handleConnectedWallet && applyHandleConnectedWallet) {
+            const shouldProceedWithConnection = yield handleConnectedWallet({
                 address: walletAddress,
                 chain: walletConnector.connectedChain,
                 connector: walletConnector,
             });
             if (!shouldProceedWithConnection) {
-                logger.info('Connection was not established because onBeforeConnectSuccessConfirmation returned false');
+                logger.info('Connection was not established because handleConnectedWallet returned false');
                 setShowAuthFlow(false);
                 return;
             }
@@ -222,16 +203,10 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         if (!isConnectOnly(user, authMode))
             return { address: walletAddress, id: '' };
         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)
-            onConnectWaitList.current.add(getWalletIdentifier({
-                address: walletAddress,
-                connector: walletConnector,
-            }));
         if (!primaryWalletId) {
             setPrimaryWalletId(walletId);
         }
+        addedWalletsIds.current.push(walletId);
         const walletChain = walletConnector.connectedChain;
         const isWalletStored = connectedWalletsInfo.some(({ walletConnectorKey: storedWalletConnectorKey }) => storedWalletConnectorKey === walletConnector.key);
         if (isWalletStored) {

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

@@ -30,6 +30,7 @@ require('i18next');
 require('../../../config/ApiEndpoint.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../context/WalletContext/WalletContext.cjs');
@@ -43,7 +44,6 @@ require('../../../context/MockContext/MockContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
-require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../components/Alert/Alert.cjs');
 require('../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../components/IconButton/IconButton.cjs');

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

@@ -26,6 +26,7 @@ import 'i18next';
 import '../../../config/ApiEndpoint.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
+import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../context/WalletContext/WalletContext.js';
@@ -39,7 +40,6 @@ 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';

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

@@ -30,6 +30,7 @@ require('../../../config/ApiEndpoint.cjs');
 var updateJWTAndCreateUserProfile = require('../../functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 var createEmbeddedWalletWithPasskey = require('../../../views/Passkey/utils/createEmbeddedWalletWithPasskey/createEmbeddedWalletWithPasskey.cjs');
@@ -46,7 +47,6 @@ require('../../../context/MockContext/MockContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
-require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../components/Alert/Alert.cjs');
 require('../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../components/IconButton/IconButton.cjs');