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

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

@@ -0,0 +1,273 @@
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { useState, useRef } from 'react';
+import { OauthResultStatus } from '@dynamic-labs/sdk-api';
+import { SocialOAuthErrorCode } from '@dynamic-labs/types';
+import { SocialAccountAlreadyExistsError, NoAccessError } from '@dynamic-labs/utils';
+import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
+import { getOAuthResult, 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 { 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 { getOauthLoginUrl } from '../../functions/getOauthLoginUrl/getOauthLoginUrl.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, projectSettings, } = 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 providersWaitingOauthMessage = useRef({});
+    const authWindowInterval = useRef();
+    const shouldPool = useRef(false);
+    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 poolOauthResult = (provider, state) => __awaiter(void 0, void 0, void 0, function* () {
+        if (!shouldPool.current) {
+            return;
+        }
+        const result = yield getOAuthResult(environmentId, provider, {
+            state,
+        });
+        if ((result === null || result === void 0 ? void 0 : result.status) !== OauthResultStatus.Completed) {
+            setTimeout(() => poolOauthResult(provider, state), 1000);
+            return;
+        }
+        shouldPool.current = false;
+        const authMessage = {
+            code: result === null || result === void 0 ? void 0 : result.code,
+            error: result === null || result === void 0 ? void 0 : result.error,
+            provider,
+            type: 'authorization_response',
+        };
+        window.postMessage(authMessage, '*');
+    });
+    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, _c;
+        clearInterval(authWindowInterval.current);
+        clearError();
+        setIsProcessing(true);
+        if (!checkValidProvider(provider)) {
+            return;
+        }
+        // invalid connect request
+        if (validator && !validator(provider)) {
+            return;
+        }
+        const authWindow = window.open('', '_blank', 'width=500,height=600');
+        const state = randomString(8);
+        const verifier = randomString(43);
+        const clearListeners = () => {
+            window.removeEventListener('message', handleAuthWindowMessage);
+            providersWaitingOauthMessage.current = Object.assign(Object.assign({}, providersWaitingOauthMessage.current), { [provider]: false });
+        };
+        const handleAuthWindowMessage = (event) => __awaiter(void 0, void 0, void 0, function* () {
+            var _d;
+            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 (!((_d = providersWaitingOauthMessage.current) === null || _d === void 0 ? void 0 : _d[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 = getOauthLoginUrl((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _b !== void 0 ? _b : [], provider, environmentId);
+        if (!loginUrl) {
+            handleError(SocialOAuthErrorCode.NO_OAUTH_URL, `Failed to get login url to connect social account: ${provider}`);
+            return;
+        }
+        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 (!((_c = providersWaitingOauthMessage.current) === null || _c === void 0 ? void 0 : _c[provider])) {
+            window.addEventListener('message', handleAuthWindowMessage);
+            providersWaitingOauthMessage.current = Object.assign(Object.assign({}, providersWaitingOauthMessage.current), { [provider]: true });
+        }
+        authWindow === null || authWindow === void 0 ? void 0 : authWindow.location.assign(oauthLoginUrl);
+        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 = providersWaitingOauthMessage.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 pool the oauth result
+            // If we don't get a valid result in {async sessionTimeout} ms, we'll assume the user closed the window
+            // and we'll clear all states/listeners
+            // start pooling oauth result
+            shouldPool.current = true;
+            poolOauthResult(provider, state);
+            authWindowInterval.current = setInterval(() => __awaiter(void 0, void 0, void 0, function* () {
+                var _e;
+                shouldPool.current = false;
+                // clear all states/listeners, assuming user closed the window before completing oauth
+                if ((_e = providersWaitingOauthMessage.current) === null || _e === void 0 ? void 0 : _e[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/useUpdateUser/useUpdateUser.cjs

@@ -24,6 +24,7 @@ var isEmailVerificationRequired = require('../../../functions/authenication/isEm
 require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('@dynamic-labs/sdk-api');
+require('../../../../config/ApiEndpoint.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');

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

@@ -20,6 +20,7 @@ import { isEmailVerificationRequired } from '../../../functions/authenication/is
 import '../../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import '@dynamic-labs/sdk-api';
+import '../../../../config/ApiEndpoint.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';

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

@@ -23,6 +23,7 @@ require('../../../shared/consts/index.cjs');
 var getVerifyArgs = require('../../functions/getVerifyArgs/getVerifyArgs.cjs');
 var createUserProfile = require('../../functions/createUserProfile/createUserProfile.cjs');
 require('@dynamic-labs/sdk-api');
+require('../../../config/ApiEndpoint.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 var getSiweStatement = require('../../functions/getSiweStatement/getSiweStatement.cjs');
@@ -38,7 +39,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 +69,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 +150,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

@@ -19,6 +19,7 @@ import '../../../shared/consts/index.js';
 import { getVerifyArgs } from '../../functions/getVerifyArgs/getVerifyArgs.js';
 import { createUserProfile } from '../../functions/createUserProfile/createUserProfile.js';
 import '@dynamic-labs/sdk-api';
+import '../../../config/ApiEndpoint.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import { getSiweStatement } from '../../functions/getSiweStatement/getSiweStatement.js';
@@ -34,7 +35,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 +65,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 +146,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/useWalletConnectors/reconnectSocialWallet.cjs

@@ -18,6 +18,7 @@ require('ethers');
 require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var getReferencedAccount = require('../../functions/getReferencedAccount/getReferencedAccount.cjs');
+require('../../../config/ApiEndpoint.cjs');
 
 /**
  * This function will use a referenced account to kick off the social wallet

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

@@ -14,6 +14,7 @@ import 'ethers';
 import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { getReferencedAccount } from '../../functions/getReferencedAccount/getReferencedAccount.js';
+import '../../../config/ApiEndpoint.js';
 
 /**
  * This function will use a referenced account to kick off the social wallet

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

@@ -19,6 +19,7 @@ var isSameWalletName = require('../../../../functions/isSameWalletName/isSameWal
 require('@dynamic-labs/multi-wallet');
 require('@dynamic-labs/sdk-api');
 var shouldManuallyReconnectOnRefresh = require('../../../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
+require('../../../../../config/ApiEndpoint.cjs');
 
 const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primaryWalletId, }) => {
     const decodedJwt = decodeJwt.decodeJwt(authToken);

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

@@ -15,6 +15,7 @@ import { isSameWalletName } from '../../../../functions/isSameWalletName/isSameW
 import '@dynamic-labs/multi-wallet';
 import '@dynamic-labs/sdk-api';
 import { shouldManuallyReconnectOnRefresh } from '../../../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
+import '../../../../../config/ApiEndpoint.js';
 
 const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primaryWalletId, }) => {
     const decodedJwt = decodeJwt(authToken);

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

@@ -21,9 +21,9 @@ require('ethers');
 require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var requiresTwoStepAuthentication = require('../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.cjs');
+require('../../../config/ApiEndpoint.cjs');
 var isSelectedWalletAlreadyConnected = require('../../functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.cjs');
 var useConnectAndSign = require('../authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
-require('../../../config/ApiEndpoint.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 var useConnectAndSignSplitSteps = require('../authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.cjs');

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

@@ -17,9 +17,9 @@ import 'ethers';
 import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { requiresTwoStepAuthentication } from '../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.js';
+import '../../../config/ApiEndpoint.js';
 import { isSelectedWalletAlreadyConnected } from '../../functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.js';
 import { useConnectAndSign } from '../authenticationHooks/useConnectAndSign/useConnectAndSign.js';
-import '../../../config/ApiEndpoint.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import { useConnectAndSignSplitSteps } from '../authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.js';

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

@@ -20,6 +20,7 @@ require('ethers');
 require('../../../shared/consts/index.cjs');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/multi-wallet');
+require('../../../config/ApiEndpoint.cjs');
 require('../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('react-dom');
@@ -27,7 +28,6 @@ require('react-focus-lock');
 require('../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
 require('../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
 require('../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
-require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');

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

@@ -16,6 +16,7 @@ import 'ethers';
 import '../../../shared/consts/index.js';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/multi-wallet';
+import '../../../config/ApiEndpoint.js';
 import '../../../components/ShadowDOM/ShadowDOM.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import 'react-dom';
@@ -23,7 +24,6 @@ import 'react-focus-lock';
 import '../../../components/Transition/ZoomTransition/ZoomTransition.js';
 import '../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
 import '../../../components/Transition/OpacityTransition/OpacityTransition.js';
-import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/rpc-providers';
 import '../useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
 import '../../../context/ErrorContext/ErrorContext.js';

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

@@ -10,33 +10,22 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference,
     const wallets = React.useMemo(() => {
         if (!projectSettings || !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length)
             return [];
-        const installedWallets = data.getInstalledWallets(projectSettings, {
-            appLogoUrl,
-            appName,
-            customerApiProviders: projectSettings.providers || [],
-            deepLinkPreference,
-            flowNetwork,
-            networkConfigurations,
-            skipMemo: true,
-            walletBook,
-            walletConnectV1Bridge,
-            walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [],
-            walletUiUtils,
+        return data.getWallets({
+            getSupportedWalletOpts: {
+                appLogoUrl,
+                appName,
+                customerApiProviders: projectSettings.providers || [],
+                deepLinkPreference,
+                flowNetwork,
+                networkConfigurations,
+                skipMemo: true,
+                walletBook,
+                walletConnectV1Bridge,
+                walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [],
+                walletUiUtils,
+            },
+            settings: projectSettings,
         });
-        const notInstalledWallets = data.getNotInstalledWallets(projectSettings, {
-            appLogoUrl,
-            appName,
-            customerApiProviders: projectSettings.providers || [],
-            deepLinkPreference,
-            flowNetwork,
-            networkConfigurations,
-            skipMemo: true,
-            walletBook,
-            walletConnectV1Bridge,
-            walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [],
-            walletUiUtils,
-        });
-        return [...installedWallets, ...notInstalledWallets];
         // Cannot include walletUiUtils in the dependency array because it will cause an infinite loop
     }, [
         appLogoUrl,

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

@@ -1,38 +1,27 @@
 import { useMemo, useEffect } from 'react';
-import { getInstalledWallets, getNotInstalledWallets } from '../../../views/WalletList/data.js';
+import { getWallets } from '../../../views/WalletList/data.js';
 import { verifyMagicIsSetup } from './utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
 
 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 [];
-        const installedWallets = getInstalledWallets(projectSettings, {
-            appLogoUrl,
-            appName,
-            customerApiProviders: projectSettings.providers || [],
-            deepLinkPreference,
-            flowNetwork,
-            networkConfigurations,
-            skipMemo: true,
-            walletBook,
-            walletConnectV1Bridge,
-            walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [],
-            walletUiUtils,
+        return getWallets({
+            getSupportedWalletOpts: {
+                appLogoUrl,
+                appName,
+                customerApiProviders: projectSettings.providers || [],
+                deepLinkPreference,
+                flowNetwork,
+                networkConfigurations,
+                skipMemo: true,
+                walletBook,
+                walletConnectV1Bridge,
+                walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [],
+                walletUiUtils,
+            },
+            settings: projectSettings,
         });
-        const notInstalledWallets = getNotInstalledWallets(projectSettings, {
-            appLogoUrl,
-            appName,
-            customerApiProviders: projectSettings.providers || [],
-            deepLinkPreference,
-            flowNetwork,
-            networkConfigurations,
-            skipMemo: true,
-            walletBook,
-            walletConnectV1Bridge,
-            walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [],
-            walletUiUtils,
-        });
-        return [...installedWallets, ...notInstalledWallets];
         // Cannot include walletUiUtils in the dependency array because it will cause an infinite loop
     }, [
         appLogoUrl,

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

@@ -17,6 +17,7 @@ require('ethers');
 require('../../../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var isProviderEnabled = require('../../../../functions/isProviderEnabled/isProviderEnabled.cjs');
+require('../../../../../config/ApiEndpoint.cjs');
 
 const MissingMagicSetupError = new utils.DynamicError('Magic is enabled but @dynamic-labs/magic package is not set up.\nSee https://docs.dynamic.xyz/docs/reduce-bundle-size-with-modular-sdk for more information');
 const magicEmailOtpWalletConnectorKey = 'magicemailotp';

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

@@ -13,6 +13,7 @@ import 'ethers';
 import '../../../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { isProviderEnabled } from '../../../../functions/isProviderEnabled/isProviderEnabled.js';
+import '../../../../../config/ApiEndpoint.js';
 
 const MissingMagicSetupError = new DynamicError('Magic is enabled but @dynamic-labs/magic package is not set up.\nSee https://docs.dynamic.xyz/docs/reduce-bundle-size-with-modular-sdk for more information');
 const magicEmailOtpWalletConnectorKey = 'magicemailotp';

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

@@ -18,6 +18,7 @@ require('ethers');
 require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var isWalletConnected = require('../../functions/isWalletConnected/isWalletConnected.cjs');
+require('../../../config/ApiEndpoint.cjs');
 
 const connectedWalletStateReducer = (state, connectedWalletsMap) => {
     const isConnectedWalletsMapEmpty = Object.values(connectedWalletsMap).length === 0;

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

@@ -14,6 +14,7 @@ import 'ethers';
 import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { isWalletConnected } from '../../functions/isWalletConnected/isWalletConnected.js';
+import '../../../config/ApiEndpoint.js';
 
 const connectedWalletStateReducer = (state, connectedWalletsMap) => {
     const isConnectedWalletsMapEmpty = Object.values(connectedWalletsMap).length === 0;