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

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
+var sdkApi = require('@dynamic-labs/sdk-api');
 var types = require('@dynamic-labs/types');
 var utils = require('@dynamic-labs/utils');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
@@ -22,12 +23,11 @@ require('ethers');
 require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
-require('@dynamic-labs/sdk-api');
 var randomString = require('../../functions/randomString/randomString.cjs');
 var stringifyURIQuery = require('../../functions/stringifyURIQuery/stringifyURIQuery.cjs');
 var digestSHA256 = require('../../functions/digestSHA256/digestSHA256.cjs');
 var encodeBase64URL = require('../../functions/encodeBase64URL/encodeBase64URL.cjs');
-var getRedirectURIOrigin = require('../../functions/getRedirectURIOrigin/getRedirectURIOrigin.cjs');
+var getOauthLoginUrl = require('../../functions/getOauthLoginUrl/getOauthLoginUrl.cjs');
 var useCreateUserProfileByJWTCallback = require('../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.cjs');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 
@@ -47,15 +47,16 @@ 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.useInternalDynamicContext();
+    const { environmentId, onboardingOnlyJwt, setOnboardingOnlyJwt, setCallback, setShowAuthFlow, setIsVerificationInProgress, projectSettings, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const { setErrorMessage, setError: setContextError } = ErrorContext.useErrorContext();
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback.useUpdateUserProfileByJWTCallback();
     const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback.useCreateUserProfileByJWTCallback();
     const [isProcessing, setIsProcessing] = React.useState(false);
     const [error, setError] = React.useState();
-    const providersWaitingOauthMessages = React.useRef({});
+    const providersWaitingOauthMessage = React.useRef({});
     const authWindowInterval = React.useRef();
+    const shouldPool = React.useRef(false);
     const userJwt = (_a = getAuthToken.getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
     const clearError = () => {
         setError(undefined);
@@ -69,23 +70,26 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
         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) {
+    const poolOauthResult = (provider, state) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        if (!shouldPool.current) {
             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 result = yield api.getOAuthResult(environmentId, provider, {
+            state,
+        });
+        if ((result === null || result === void 0 ? void 0 : result.status) !== sdkApi.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(types.SocialOAuthErrorCode.NO_PROVIDER, 'Provider is required');
@@ -149,7 +153,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
         }
     });
     const connectSocialAccount = (provider, validator) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _b;
+        var _b, _c;
         clearInterval(authWindowInterval.current);
         clearError();
         setIsProcessing(true);
@@ -160,15 +164,15 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
         if (validator && !validator(provider)) {
             return;
         }
+        const authWindow = window.open('', '_blank', 'width=500,height=600');
         const state = randomString.randomString(8);
         const verifier = randomString.randomString(43);
         const clearListeners = () => {
-            removeOAuthIFrame();
             window.removeEventListener('message', handleAuthWindowMessage);
-            providersWaitingOauthMessages.current = Object.assign(Object.assign({}, providersWaitingOauthMessages.current), { [provider]: false });
+            providersWaitingOauthMessage.current = Object.assign(Object.assign({}, providersWaitingOauthMessage.current), { [provider]: false });
         };
         const handleAuthWindowMessage = (event) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            var _c;
+            var _d;
             const message = event.data;
             const isAuthorizationMessage = (message === null || message === void 0 ? void 0 : message.type) === 'authorization_response';
             if (isAuthorizationMessage) {
@@ -180,7 +184,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
                 return;
             }
             setIsProcessing(true);
-            if (!((_c = providersWaitingOauthMessages.current) === null || _c === void 0 ? void 0 : _c[provider])) {
+            if (!((_d = providersWaitingOauthMessage.current) === null || _d === void 0 ? void 0 : _d[provider])) {
                 handleError(types.SocialOAuthErrorCode.SESSION_TIMEOUT, `Connecting ${provider} account session timeout.`);
                 return;
             }
@@ -202,16 +206,11 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             }
             setIsProcessing(false);
         });
-        const loginUrl = yield api.getOauthLoginUrl(environmentId, provider, String(userJwt));
+        const loginUrl = getOauthLoginUrl.getOauthLoginUrl((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _b !== void 0 ? _b : [], provider, environmentId);
         if (!loginUrl) {
             handleError(types.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.getRedirectURIOrigin(loginUrl)}/sdkoauth`;
-        addOAuthIFrame(oauthIFrameUrl);
         let oauthLoginUrl = loginUrl;
         if (providersRequiringPkce.includes(provider)) {
             const digest = yield digestSHA256.digestSHA256(verifier);
@@ -222,16 +221,11 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             });
             oauthLoginUrl = `${loginUrl}&${pkceParams}`;
         }
-        if (!((_b = providersWaitingOauthMessages.current) === null || _b === void 0 ? void 0 : _b[provider])) {
+        if (!((_c = providersWaitingOauthMessage.current) === null || _c === void 0 ? void 0 : _c[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(types.SocialOAuthErrorCode.OAUTH_WINDOW_BLOCKED, 'Please allow popups and try again.');
-            return;
+            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(() => {
@@ -242,26 +236,31 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
                 clearInterval(authWindowInterval.current);
                 setIsProcessing(false);
                 // user didn't complete oauth
-                if ((_a = providersWaitingOauthMessages.current) === null || _a === void 0 ? void 0 : _a[provider]) {
+                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 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]) {
+            // 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(() => _tslib.__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(types.SocialOAuthErrorCode.OAUTH_WINDOW_TIMEOUT, `Connecting ${provider} account window timeout.`);
                 }
                 clearInterval(authWindowInterval.current);
                 setIsProcessing(false);
                 onSettled === null || onSettled === void 0 ? void 0 : onSettled();
-            }, sessionTimeout);
+            }), sessionTimeout);
         }
     });
     return {

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

@@ -1,9 +1,10 @@
 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 { getOauthLoginUrl, verifyOAuth, signInOAuth } from '../../../data/api.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';
@@ -18,12 +19,11 @@ 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 { getOauthLoginUrl } from '../../functions/getOauthLoginUrl/getOauthLoginUrl.js';
 import { useCreateUserProfileByJWTCallback } from '../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 
@@ -43,15 +43,16 @@ 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 { 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 providersWaitingOauthMessages = useRef({});
+    const providersWaitingOauthMessage = useRef({});
     const authWindowInterval = useRef();
+    const shouldPool = useRef(false);
     const userJwt = (_a = getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
     const clearError = () => {
         setError(undefined);
@@ -65,23 +66,26 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
         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) {
+    const poolOauthResult = (provider, state) => __awaiter(void 0, void 0, void 0, function* () {
+        if (!shouldPool.current) {
             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 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');
@@ -145,7 +149,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
         }
     });
     const connectSocialAccount = (provider, validator) => __awaiter(void 0, void 0, void 0, function* () {
-        var _b;
+        var _b, _c;
         clearInterval(authWindowInterval.current);
         clearError();
         setIsProcessing(true);
@@ -156,15 +160,15 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
         if (validator && !validator(provider)) {
             return;
         }
+        const authWindow = window.open('', '_blank', 'width=500,height=600');
         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 });
+            providersWaitingOauthMessage.current = Object.assign(Object.assign({}, providersWaitingOauthMessage.current), { [provider]: false });
         };
         const handleAuthWindowMessage = (event) => __awaiter(void 0, void 0, void 0, function* () {
-            var _c;
+            var _d;
             const message = event.data;
             const isAuthorizationMessage = (message === null || message === void 0 ? void 0 : message.type) === 'authorization_response';
             if (isAuthorizationMessage) {
@@ -176,7 +180,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
                 return;
             }
             setIsProcessing(true);
-            if (!((_c = providersWaitingOauthMessages.current) === null || _c === void 0 ? void 0 : _c[provider])) {
+            if (!((_d = providersWaitingOauthMessage.current) === null || _d === void 0 ? void 0 : _d[provider])) {
                 handleError(SocialOAuthErrorCode.SESSION_TIMEOUT, `Connecting ${provider} account session timeout.`);
                 return;
             }
@@ -198,16 +202,11 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             }
             setIsProcessing(false);
         });
-        const loginUrl = yield getOauthLoginUrl(environmentId, provider, String(userJwt));
+        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;
         }
-        // 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);
@@ -218,16 +217,11 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             });
             oauthLoginUrl = `${loginUrl}&${pkceParams}`;
         }
-        if (!((_b = providersWaitingOauthMessages.current) === null || _b === void 0 ? void 0 : _b[provider])) {
+        if (!((_c = providersWaitingOauthMessage.current) === null || _c === void 0 ? void 0 : _c[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;
+            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(() => {
@@ -238,26 +232,31 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
                 clearInterval(authWindowInterval.current);
                 setIsProcessing(false);
                 // user didn't complete oauth
-                if ((_a = providersWaitingOauthMessages.current) === null || _a === void 0 ? void 0 : _a[provider]) {
+                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 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]) {
+            // 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);
+            }), sessionTimeout);
         }
     });
     return {

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');

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';

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,