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

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

@@ -0,0 +1,274 @@
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { useState, useRef } from 'react';
+import { SocialOAuthErrorCode } from '@dynamic-labs/types';
+import { SocialAccountAlreadyExistsError, NoAccessError } from '@dynamic-labs/utils';
+import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
+import { getOauthLoginUrl, verifyOAuth, signInOAuth } from '../../../data/api.js';
+import { useUpdateUserProfileByJWTCallback } from '../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.js';
+import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
+import { logger } from '../../../shared/logger.js';
+import '@dynamic-labs/wallet-book';
+import '../../constants/colors.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
+import 'ethers';
+import '../../../shared/consts/index.js';
+import '@dynamic-labs/multi-wallet';
+import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
+import '@dynamic-labs/sdk-api';
+import { randomString } from '../../functions/randomString/randomString.js';
+import { stringifyURIQuery } from '../../functions/stringifyURIQuery/stringifyURIQuery.js';
+import { digestSHA256 } from '../../functions/digestSHA256/digestSHA256.js';
+import { encodeBase64URL } from '../../functions/encodeBase64URL/encodeBase64URL.js';
+import { getRedirectURIOrigin } from '../../functions/getRedirectURIOrigin/getRedirectURIOrigin.js';
+import { useCreateUserProfileByJWTCallback } from '../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.js';
+import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
+
+const socialProviders = [
+    'discord',
+    'facebook',
+    'github',
+    'google',
+    'instagram',
+    'twitch',
+    'twitter',
+];
+// pkce params are only required for twitter and break if added for other providers, like google
+// so we should only add provider that support pkce to this list
+const providersRequiringPkce = ['twitter', 'github'];
+const providersWithoutWindowOpenerRefence = ['twitter'];
+// Hook to handle common social auth logic (for social linking and social sign in)
+const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
+    var _a;
+    const { environmentId, onboardingOnlyJwt, setOnboardingOnlyJwt, setCallback, setShowAuthFlow, setIsVerificationInProgress, } = useInternalDynamicContext();
+    const { setView } = useViewContext();
+    const { setErrorMessage, setError: setContextError } = useErrorContext();
+    const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback();
+    const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback();
+    const [isProcessing, setIsProcessing] = useState(false);
+    const [error, setError] = useState();
+    const providersWaitingOauthMessages = useRef({});
+    const authWindowInterval = useRef();
+    const userJwt = (_a = getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
+    const clearError = () => {
+        setError(undefined);
+        setContextError(undefined);
+    };
+    const handleError = (code, message) => {
+        logger.error(message);
+        setIsProcessing(false);
+        setError({ code, message });
+        setErrorMessage(code);
+        onError === null || onError === void 0 ? void 0 : onError();
+        onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+    };
+    const addOAuthIFrame = (url) => {
+        const container = document.getElementById('oauth-iframe-container');
+        let oauthIFrame = document.getElementById('oauth-iframe');
+        if (!container || oauthIFrame) {
+            return;
+        }
+        oauthIFrame = document.createElement('iframe');
+        oauthIFrame.setAttribute('id', 'oauth-iframe');
+        oauthIFrame.setAttribute('src', url);
+        container.appendChild(oauthIFrame);
+    };
+    const removeOAuthIFrame = () => {
+        const oauthIFrame = document.getElementById('oauth-iframe');
+        if (oauthIFrame) {
+            oauthIFrame.remove();
+        }
+    };
+    const checkValidProvider = (provider) => {
+        if (!provider) {
+            handleError(SocialOAuthErrorCode.NO_PROVIDER, 'Provider is required');
+            return false;
+        }
+        if (!socialProviders.includes(provider)) {
+            handleError(SocialOAuthErrorCode.INVALID_PROVIDER, `Invalid social provider. Valid providers are: ${socialProviders.join(', ')}`);
+            return false;
+        }
+        return true;
+    };
+    const linkAccount = (provider, code, verifier, state) => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            const jwt = yield verifyOAuth(environmentId, provider, {
+                code,
+                codeVerifier: verifier,
+                state,
+            }, String(userJwt));
+            if (!jwt) {
+                handleError(SocialOAuthErrorCode.VERIFICATION_ERROR, `Failed to link social account: ${provider}`);
+                return;
+            }
+            yield updateUserProfileByJWT(jwt);
+            onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+        }
+        catch (error) {
+            if (error instanceof SocialAccountAlreadyExistsError) {
+                handleError(SocialOAuthErrorCode.ACCOUNT_ALREADY_LINKED_TO_DIFFERENT_PROFILE, `Social account already linked to a different profile: ${provider}`);
+            }
+        }
+    });
+    const signInAccount = (provider, code, verifier, state) => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            const jwt = yield signInOAuth(environmentId, provider, {
+                code,
+                codeVerifier: verifier,
+                state,
+            });
+            if (!jwt) {
+                handleError(SocialOAuthErrorCode.SIGNIN_ERROR, `Failed to sign-in with social account: ${provider}`);
+                return;
+            }
+            setIsVerificationInProgress(true);
+            const decodedJwt = decodeJwt(jwt);
+            if (decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields.length) {
+                setOnboardingOnlyJwt(jwt);
+                setView('collect-user-data-login-with-email');
+                onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+                return;
+            }
+            setCallback('authSuccess');
+            yield createUserProfileByJWT(jwt);
+            setShowAuthFlow(false);
+            onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+        }
+        catch (error) {
+            if (error instanceof NoAccessError) {
+                setView('no-access');
+            }
+            handleError(SocialOAuthErrorCode.GENERAL_ERROR, error);
+        }
+    });
+    const connectSocialAccount = (provider, validator) => __awaiter(void 0, void 0, void 0, function* () {
+        var _b;
+        clearInterval(authWindowInterval.current);
+        clearError();
+        setIsProcessing(true);
+        if (!checkValidProvider(provider)) {
+            return;
+        }
+        // invalid connect request
+        if (validator && !validator(provider)) {
+            return;
+        }
+        const state = randomString(8);
+        const verifier = randomString(43);
+        const clearListeners = () => {
+            removeOAuthIFrame();
+            window.removeEventListener('message', handleAuthWindowMessage);
+            providersWaitingOauthMessages.current = Object.assign(Object.assign({}, providersWaitingOauthMessages.current), { [provider]: false });
+        };
+        const handleAuthWindowMessage = (event) => __awaiter(void 0, void 0, void 0, function* () {
+            var _c;
+            const message = event.data;
+            const isAuthorizationMessage = (message === null || message === void 0 ? void 0 : message.type) === 'authorization_response';
+            if (isAuthorizationMessage) {
+                logger.debug('Message received', { data: message });
+            }
+            const isValidMessage = isAuthorizationMessage && (message === null || message === void 0 ? void 0 : message.provider) === provider;
+            // don't process invalid messages for provider
+            if (!isValidMessage) {
+                return;
+            }
+            setIsProcessing(true);
+            if (!((_c = providersWaitingOauthMessages.current) === null || _c === void 0 ? void 0 : _c[provider])) {
+                handleError(SocialOAuthErrorCode.SESSION_TIMEOUT, `Connecting ${provider} account session timeout.`);
+                return;
+            }
+            clearListeners();
+            const { code, error } = message;
+            if (error && error !== 'undefined') {
+                handleError(SocialOAuthErrorCode.OAUTH_ERROR, `Failed to connect ${provider} social account: ${error}`);
+                return;
+            }
+            if (!code) {
+                handleError(SocialOAuthErrorCode.NO_AUTH_CODE, `Failed to connect ${provider} social account: no authorization code`);
+                return;
+            }
+            if (authMode === 'signin') {
+                yield signInAccount(provider, code, verifier, state);
+            }
+            else {
+                yield linkAccount(provider, code, verifier, state);
+            }
+            setIsProcessing(false);
+        });
+        const loginUrl = yield getOauthLoginUrl(environmentId, provider, String(userJwt));
+        if (!loginUrl) {
+            handleError(SocialOAuthErrorCode.NO_OAUTH_URL, `Failed to get login url to connect social account: ${provider}`);
+            return;
+        }
+        // we need to use an iframe to be the intermediary in communications between the popup and the sdk
+        // because of twitter limitations with accessing the window.opener and BroadcastChannel not working between
+        // different origins (our api redirect page and the app where the sdk is running)
+        const oauthIFrameUrl = `${getRedirectURIOrigin(loginUrl)}/sdkoauth`;
+        addOAuthIFrame(oauthIFrameUrl);
+        let oauthLoginUrl = loginUrl;
+        if (providersRequiringPkce.includes(provider)) {
+            const digest = yield digestSHA256(verifier);
+            const pkceParams = stringifyURIQuery({
+                code_challenge: encodeBase64URL(digest),
+                code_challenge_method: 'S256',
+                state: state,
+            });
+            oauthLoginUrl = `${loginUrl}&${pkceParams}`;
+        }
+        if (!((_b = providersWaitingOauthMessages.current) === null || _b === void 0 ? void 0 : _b[provider])) {
+            window.addEventListener('message', handleAuthWindowMessage);
+            providersWaitingOauthMessages.current = Object.assign(Object.assign({}, providersWaitingOauthMessages.current), { [provider]: true });
+        }
+        const authWindow = window.open(oauthLoginUrl, '_blank', 'width=500,height=600');
+        if (authWindow === null || typeof authWindow === 'undefined') {
+            // Pop-ups are blocked
+            handleError(SocialOAuthErrorCode.OAUTH_WINDOW_BLOCKED, 'Please allow popups and try again.');
+            return;
+        }
+        if (!providersWithoutWindowOpenerRefence.includes(provider)) {
+            // For provider that support window.opener, we need to clear all states/listeners when the window is closed
+            authWindowInterval.current = setInterval(() => {
+                var _a;
+                if (!(authWindow === null || authWindow === void 0 ? void 0 : authWindow.closed)) {
+                    return;
+                }
+                clearInterval(authWindowInterval.current);
+                setIsProcessing(false);
+                // user didn't complete oauth
+                if ((_a = providersWaitingOauthMessages.current) === null || _a === void 0 ? void 0 : _a[provider]) {
+                    onError === null || onError === void 0 ? void 0 : onError();
+                    onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+                }
+            }, 2000);
+        }
+        else {
+            // For provider that don't support window.opener, we need to use a timeout to try to detect when the
+            // window is closed
+            authWindowInterval.current = setInterval(() => {
+                var _a;
+                // user didn't complete oauth
+                if ((_a = providersWaitingOauthMessages.current) === null || _a === void 0 ? void 0 : _a[provider]) {
+                    clearListeners();
+                    handleError(SocialOAuthErrorCode.OAUTH_WINDOW_TIMEOUT, `Connecting ${provider} account window timeout.`);
+                }
+                clearInterval(authWindowInterval.current);
+                setIsProcessing(false);
+                onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+            }, sessionTimeout);
+        }
+    });
+    return {
+        checkValidProvider,
+        connectSocialAccount,
+        error,
+        handleError,
+        isProcessing,
+        setError,
+        setIsProcessing,
+    };
+};
+
+export { useSocialAuth };

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

@@ -11,17 +11,19 @@ var ViewContext = require('../../../../context/ViewContext/ViewContext.cjs');
 var validateUpdateRequest = require('./validateUpdateRequest/validateUpdateRequest.cjs');
 
 /** Saves the values updated by the user */
-const saveUserValues = ({ fields: newValues, updateUserResult: { isEmailVerificationRequired }, }, internalEvents, setShowAuthFlow, setView, resolve, reject) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const saveUserValues = ({ fields: newValues, updateUserResult: { isEmailVerificationRequired }, }, internalEvents, internalSetShowAuthFlow, setView, resolve, reject) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     // If no verification is needed, we are done
     if (!isEmailVerificationRequired) {
         resolve(newValues);
         return;
     }
     // Show email verification view
-    setShowAuthFlow(true);
+    internalSetShowAuthFlow(true);
     setView('verify-email');
     // Subscribe to email verification result
-    internalEvents.current.once('emailVerificationResult', (wasSuccessful) => {
+    internalEvents.current.once('emailVerificationResult', (wasSuccessful, newEmail) => {
+        // Make sure we're using the correct, updated email. User might have changed it mid-OTP
+        newValues.email = newEmail;
         wasSuccessful
             ? resolve(newValues)
             : reject('Failed to verify email, no fields were updated');
@@ -32,7 +34,7 @@ const saveUserValues = ({ fields: newValues, updateUserResult: { isEmailVerifica
  * The fields must have been previously enabled in the dashboard
  */
 const useUpdateUserWithModal = (updateUser) => {
-    const { user, projectSettings, setShowAuthFlow, internalEvents } = useInternalDynamicContext.useInternalDynamicContext();
+    const { user, projectSettings, internalSetShowAuthFlow, internalEvents } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const editorContext = React.useContext(UserFieldEditorContext.UserFieldEditorContext);
     if (!editorContext)
@@ -52,7 +54,7 @@ const useUpdateUserWithModal = (updateUser) => {
             subtitle: options === null || options === void 0 ? void 0 : options.subtitle,
             title: options === null || options === void 0 ? void 0 : options.title,
         }, updateUser)
-            .then((updateValues) => saveUserValues(updateValues, internalEvents, setShowAuthFlow, setView, resolve, reject))
+            .then((updateValues) => saveUserValues(updateValues, internalEvents, internalSetShowAuthFlow, setView, resolve, reject))
             .catch((error) => {
             if (/email already exists/gi.test(error))
                 throw error;
@@ -63,7 +65,7 @@ const useUpdateUserWithModal = (updateUser) => {
         projectSettings,
         promptUserForValues,
         updateUser,
-        setShowAuthFlow,
+        internalSetShowAuthFlow,
         setView,
         internalEvents,
     ]);

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUserWithModal/useUpdateUserWithModal.js

@@ -7,17 +7,19 @@ import { useViewContext } from '../../../../context/ViewContext/ViewContext.js';
 import { validateUpdateRequest } from './validateUpdateRequest/validateUpdateRequest.js';
 
 /** Saves the values updated by the user */
-const saveUserValues = ({ fields: newValues, updateUserResult: { isEmailVerificationRequired }, }, internalEvents, setShowAuthFlow, setView, resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
+const saveUserValues = ({ fields: newValues, updateUserResult: { isEmailVerificationRequired }, }, internalEvents, internalSetShowAuthFlow, setView, resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
     // If no verification is needed, we are done
     if (!isEmailVerificationRequired) {
         resolve(newValues);
         return;
     }
     // Show email verification view
-    setShowAuthFlow(true);
+    internalSetShowAuthFlow(true);
     setView('verify-email');
     // Subscribe to email verification result
-    internalEvents.current.once('emailVerificationResult', (wasSuccessful) => {
+    internalEvents.current.once('emailVerificationResult', (wasSuccessful, newEmail) => {
+        // Make sure we're using the correct, updated email. User might have changed it mid-OTP
+        newValues.email = newEmail;
         wasSuccessful
             ? resolve(newValues)
             : reject('Failed to verify email, no fields were updated');
@@ -28,7 +30,7 @@ const saveUserValues = ({ fields: newValues, updateUserResult: { isEmailVerifica
  * The fields must have been previously enabled in the dashboard
  */
 const useUpdateUserWithModal = (updateUser) => {
-    const { user, projectSettings, setShowAuthFlow, internalEvents } = useInternalDynamicContext();
+    const { user, projectSettings, internalSetShowAuthFlow, internalEvents } = useInternalDynamicContext();
     const { setView } = useViewContext();
     const editorContext = useContext(UserFieldEditorContext);
     if (!editorContext)
@@ -48,7 +50,7 @@ const useUpdateUserWithModal = (updateUser) => {
             subtitle: options === null || options === void 0 ? void 0 : options.subtitle,
             title: options === null || options === void 0 ? void 0 : options.title,
         }, updateUser)
-            .then((updateValues) => saveUserValues(updateValues, internalEvents, setShowAuthFlow, setView, resolve, reject))
+            .then((updateValues) => saveUserValues(updateValues, internalEvents, internalSetShowAuthFlow, setView, resolve, reject))
             .catch((error) => {
             if (/email already exists/gi.test(error))
                 throw error;
@@ -59,7 +61,7 @@ const useUpdateUserWithModal = (updateUser) => {
         projectSettings,
         promptUserForValues,
         updateUser,
-        setShowAuthFlow,
+        internalSetShowAuthFlow,
         setView,
         internalEvents,
     ]);

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

@@ -38,7 +38,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
     const { setExistentAccountData } = AccountExistsContext.useAccountExistsContext();
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage, setError } = ErrorContext.useErrorContext();
-    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, } = useInternalDynamicContext.useInternalDynamicContext();
     // If the user is not already logged it means that we only need to verify
     // We need this boolean for the part of the logic where we already persisted a new authToken,
     // and need to distinguish between logic for verify or linking.
@@ -68,7 +68,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
         if (Jwt === undefined)
             throw new utils.DynamicError('Could not obtain a valid JWT');
         // TODO DYN-523: add verification here that the JWT is valid with the publicKey
-        return Jwt;
+        return { Jwt, verifyArgs };
     });
     // Overrides the stored primary wallet id when the
     // user logs in for the first time.
@@ -149,13 +149,23 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
         }
     };
     return ({ walletConnector, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        var _a;
         const walletProvider = getWalletProvider.getWalletProvider(walletConnector);
         try {
             setIsVerificationInProgress(true);
-            const Jwt = yield generateJWT(walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth);
+            const { Jwt, verifyArgs } = yield generateJWT(walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth);
             const decodedJwt = decodeJwt.decodeJwt(Jwt);
             if (decodedJwt === undefined)
                 throw new utils.DynamicError('Invalid token!');
+            try {
+                (_a = eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onSignedMessage) === null || _a === void 0 ? void 0 : _a.call(eventsCallbacks, {
+                    messageToSign: verifyArgs.messageToSign,
+                    signedMessage: verifyArgs.signedMessage,
+                });
+            }
+            catch (_b) {
+                logger.logger.warn('Error calling onSignedMessage callback');
+            }
             const user = yield createUserProfile.createUserProfile(decodedJwt);
             const isKycRequired = decodedJwt.missingFields.length;
             setOnboardingOnlyJwt(Jwt);

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

@@ -34,7 +34,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
     const { setExistentAccountData } = useAccountExistsContext();
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage, setError } = useErrorContext();
-    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, } = useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, } = useInternalDynamicContext();
     // If the user is not already logged it means that we only need to verify
     // We need this boolean for the part of the logic where we already persisted a new authToken,
     // and need to distinguish between logic for verify or linking.
@@ -64,7 +64,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
         if (Jwt === undefined)
             throw new DynamicError('Could not obtain a valid JWT');
         // TODO DYN-523: add verification here that the JWT is valid with the publicKey
-        return Jwt;
+        return { Jwt, verifyArgs };
     });
     // Overrides the stored primary wallet id when the
     // user logs in for the first time.
@@ -145,13 +145,23 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
         }
     };
     return ({ walletConnector, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth, }) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
         const walletProvider = getWalletProvider(walletConnector);
         try {
             setIsVerificationInProgress(true);
-            const Jwt = yield generateJWT(walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth);
+            const { Jwt, verifyArgs } = yield generateJWT(walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth);
             const decodedJwt = decodeJwt(Jwt);
             if (decodedJwt === undefined)
                 throw new DynamicError('Invalid token!');
+            try {
+                (_a = eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onSignedMessage) === null || _a === void 0 ? void 0 : _a.call(eventsCallbacks, {
+                    messageToSign: verifyArgs.messageToSign,
+                    signedMessage: verifyArgs.signedMessage,
+                });
+            }
+            catch (_b) {
+                logger.warn('Error calling onSignedMessage callback');
+            }
             const user = yield createUserProfile(decodedJwt);
             const isKycRequired = decodedJwt.missingFields.length;
             setOnboardingOnlyJwt(Jwt);

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

@@ -19,11 +19,6 @@ const useWalletConnectorEvent = (eventEmitters, eventName, handler) => {
         /**
          * Initialize the event listeners for the wallet connectors
          * to ensure they were initialized before listening to events
-         *
-         * This will be removed when all wallets are migrated to
-         * use the event emitter "emit" method
-         *
-         * Ticket todo - QNTM-88
          */
         eventEmittersArray.forEach((connector) => connector.initEventListener());
         const uniqueEventEmitters = Array.from(new Set(eventEmittersArray));

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

@@ -15,11 +15,6 @@ const useWalletConnectorEvent = (eventEmitters, eventName, handler) => {
         /**
          * Initialize the event listeners for the wallet connectors
          * to ensure they were initialized before listening to events
-         *
-         * This will be removed when all wallets are migrated to
-         * use the event emitter "emit" method
-         *
-         * Ticket todo - QNTM-88
          */
         eventEmittersArray.forEach((connector) => connector.initEventListener());
         const uniqueEventEmitters = Array.from(new Set(eventEmittersArray));

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

@@ -50,8 +50,6 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
      * initialize the bridge between the old event listeners and the new event emitter.
      * When the wallet connectors are migrated to the new event emitter, there will be no
      * need to initialize or teardown event listeners, then we can remove this useEffect.
-     * @todo remove this useEffect
-     * Ticket todo - QNTM-88
      */
     React.useEffect(() => walletsBasedOnAuthMode.forEach((wallet) => {
         wallet.connector.initEventListener();

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

@@ -46,8 +46,6 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
      * initialize the bridge between the old event listeners and the new event emitter.
      * When the wallet connectors are migrated to the new event emitter, there will be no
      * need to initialize or teardown event listeners, then we can remove this useEffect.
-     * @todo remove this useEffect
-     * Ticket todo - QNTM-88
      */
     useEffect(() => walletsBasedOnAuthMode.forEach((wallet) => {
         wallet.connector.initEventListener();

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

@@ -131,6 +131,13 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
     }));
     useWalletConnectorEvent.useWalletConnectorEvent(uniqueNonPrimaryWallets, 'disconnect', () => {
         logger.logger.debug('secondary wallet disconnect');
+        // argent sends a disconnect event when the user adds a new account
+        if (authMode === 'connect-only' &&
+            secondaryWallets.length &&
+            secondaryWallets[0].connector.key === 'argentx') {
+            refreshConnectedWallet(secondaryWallets[0].id, secondaryWallets[0].connector);
+            return;
+        }
         computeConnectedStateForWallets();
     });
     const handleAccountChangeWhenAwaitingAccountSwitch = React.useCallback((isPrimaryWallet, newAddress) => {

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

@@ -127,6 +127,13 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
     }));
     useWalletConnectorEvent(uniqueNonPrimaryWallets, 'disconnect', () => {
         logger.debug('secondary wallet disconnect');
+        // argent sends a disconnect event when the user adds a new account
+        if (authMode === 'connect-only' &&
+            secondaryWallets.length &&
+            secondaryWallets[0].connector.key === 'argentx') {
+            refreshConnectedWallet(secondaryWallets[0].id, secondaryWallets[0].connector);
+            return;
+        }
         computeConnectedStateForWallets();
     });
     const handleAccountChangeWhenAwaitingAccountSwitch = useCallback((isPrimaryWallet, newAddress) => {

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

@@ -49,6 +49,7 @@ require('../../../components/Popper/PopperContext/PopperContext.cjs');
 require('formik');
 require('../../../components/InlineWidget/InlineWidget.cjs');
 require('../../../components/MenuList/Dropdown/Dropdown.cjs');
+require('../../../components/OverlayCard/OverlayCard.context.cjs');
 
 const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, }) => {
     const confirmationStateRef = React.useRef('enabled');

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

@@ -45,6 +45,7 @@ import '../../../components/Popper/PopperContext/PopperContext.js';
 import 'formik';
 import '../../../components/InlineWidget/InlineWidget.js';
 import '../../../components/MenuList/Dropdown/Dropdown.js';
+import '../../../components/OverlayCard/OverlayCard.context.js';
 
 const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, }) => {
     const confirmationStateRef = useRef('enabled');

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

@@ -6,7 +6,7 @@ var React = require('react');
 var data = require('../../../views/WalletList/data.cjs');
 var verifyMagicIsSetup = require('./utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
 
-const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, }) => {
+const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, }) => {
     const wallets = React.useMemo(() => {
         if (!projectSettings || !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length)
             return [];
@@ -14,6 +14,7 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, network
             appLogoUrl,
             appName,
             customerApiProviders: projectSettings.providers || [],
+            deepLinkPreference,
             flowNetwork,
             networkConfigurations,
             skipMemo: true,
@@ -26,6 +27,7 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, network
             appLogoUrl,
             appName,
             customerApiProviders: projectSettings.providers || [],
+            deepLinkPreference,
             flowNetwork,
             networkConfigurations,
             skipMemo: true,

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

@@ -1,10 +1,11 @@
 import { ProjectSettings } from '@dynamic-labs/sdk-api';
 import { NetworkConfigurationMap, WalletUiUtils } from '@dynamic-labs/types';
-import { WalletConnector, WalletConnectorsMethod } from '@dynamic-labs/wallet-connector-core';
+import { DeepLinkVariant, WalletConnector, WalletConnectorsMethod } from '@dynamic-labs/wallet-connector-core';
 import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 type Props = {
     appLogoUrl?: string;
     appName?: string;
+    deepLinkPreference?: DeepLinkVariant;
     flowNetwork?: 'mainnet' | 'testnet';
     networkConfigurations: NetworkConfigurationMap | undefined;
     projectSettings: ProjectSettings | undefined;
@@ -13,7 +14,7 @@ type Props = {
     walletConnectorsProp?: WalletConnectorsMethod[];
     walletUiUtils: WalletUiUtils<WalletConnector>;
 };
-export declare const useWallets: ({ projectSettings, appLogoUrl, appName, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, }: Props) => {
+export declare const useWallets: ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, }: Props) => {
     wallets: import("../../../shared").WalletOption[];
 };
 export {};

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

@@ -2,7 +2,7 @@ import { useMemo, useEffect } from 'react';
 import { getInstalledWallets, getNotInstalledWallets } from '../../../views/WalletList/data.js';
 import { verifyMagicIsSetup } from './utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
 
-const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, }) => {
+const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, }) => {
     const wallets = useMemo(() => {
         if (!projectSettings || !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length)
             return [];
@@ -10,6 +10,7 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, network
             appLogoUrl,
             appName,
             customerApiProviders: projectSettings.providers || [],
+            deepLinkPreference,
             flowNetwork,
             networkConfigurations,
             skipMemo: true,
@@ -22,6 +23,7 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, network
             appLogoUrl,
             appName,
             customerApiProviders: projectSettings.providers || [],
+            deepLinkPreference,
             flowNetwork,
             networkConfigurations,
             skipMemo: true,