@dynamic-labs/sdk-react-core 0.18.100-viem.1 → 0.18.100-viem.10

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

@@ -23,6 +23,11 @@ require('@dynamic-labs/multi-wallet');
 var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
 var index = require('../../functions/getEnabledOAuthProviders/index.cjs');
 var isSocialKycEnabled = require('../../functions/isSocialKycEnabled/isSocialKycEnabled.cjs');
+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');
 
 const socialProviders = [
     'discord',
@@ -33,12 +38,20 @@ const socialProviders = [
     'twitch',
     'twitter',
 ];
-const useSocialAccounts = () => {
+// 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'];
+const useSocialAccounts = ({ sessionTimeout } = {
+    sessionTimeout: 10000,
+}) => {
     var _a;
     const { environmentId, user, projectSettings, onboardingOnlyJwt } = useInternalDynamicContext.useInternalDynamicContext();
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback.useUpdateUserProfileByJWTCallback();
     const [isProcessing, setIsProcessing] = React.useState(false);
     const [error, setError] = React.useState();
+    const providersWaitingOauthMessages = React.useRef({});
+    const authWindowInterval = React.useRef();
     const userJwt = (_a = getAuthToken.getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
     const oauthProviders = index.getEnabledOAuthProviders(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers);
     const verifiedOAuthCredentialsMap = React.useMemo(() => {
@@ -57,6 +70,23 @@ const useSocialAccounts = () => {
         setIsProcessing(false);
         setError(message);
     };
+    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('Provider is required');
@@ -68,38 +98,73 @@ const useSocialAccounts = () => {
         }
         return true;
     };
-    const linkSocialAccount = (provider) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        setError(undefined);
-        setIsProcessing(true);
+    const checkValidOAuthLinking = (provider) => {
         if (!isSocialKycEnabled.isSocialKycEnabled(projectSettings)) {
             handleError('Social linking is not enabled on the dashboard');
-            return;
+            return false;
         }
         if (!checkValidProvider(provider)) {
-            return;
+            return false;
         }
         const verifiedCredential = verifiedOAuthCredentialsMap[provider];
         if (verifiedCredential) {
             handleError(`Account already linked for provider: ${provider}`);
-            return;
+            return false;
         }
         const oauthProvider = oauthProviders.find((p) => p.provider === provider);
         if (!oauthProvider) {
             handleError(`Provider is not enabled on the dashboard: ${provider}`);
+            return false;
+        }
+        return true;
+    };
+    const linkSocialAccount = (provider) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        var _b;
+        clearInterval(authWindowInterval.current);
+        setError(undefined);
+        setIsProcessing(true);
+        // invalid linking request
+        if (!checkValidOAuthLinking(provider)) {
             return;
         }
+        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 });
+        };
         const handleAuthWindowMessage = (event) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            var _b, _c, _d;
-            if (((_b = event.data) === null || _b === void 0 ? void 0 : _b.type) === 'authorization_response') {
-                logger.logger.debug('Message received', { data: event.data });
+            var _c;
+            const message = event.data;
+            const isAuthorizationMessage = (message === null || message === void 0 ? void 0 : message.type) === 'authorization_response';
+            if (isAuthorizationMessage) {
+                logger.logger.debug('Message received', { data: message });
+            }
+            const isValidMessage = isAuthorizationMessage && (message === null || message === void 0 ? void 0 : message.provider) === provider;
+            // don't process imvalid messages for provider
+            if (!isValidMessage) {
+                return;
+            }
+            setIsProcessing(true);
+            if (!((_c = providersWaitingOauthMessages.current) === null || _c === void 0 ? void 0 : _c[provider])) {
+                handleError(`Linking ${provider} account session timeout.`);
+                return;
+            }
+            clearListeners();
+            const { code, error } = message;
+            if (error && error !== 'undefined') {
+                handleError(`Failed to link ${provider} social account: ${error}`);
+                return;
             }
-            if (((_c = event.data) === null || _c === void 0 ? void 0 : _c.type) !== 'authorization_response' ||
-                ((_d = event.data) === null || _d === void 0 ? void 0 : _d.provider) !== provider) {
+            if (!code) {
+                handleError(`Failed to link ${provider} social account: no authorization code`);
                 return;
             }
-            const { code } = event.data;
             const jwt = yield api.verifyOAuth(environmentId, provider, {
                 code,
+                codeVerifier: verifier,
+                state,
             }, String(userJwt));
             if (!jwt) {
                 handleError(`Failed to link social account: ${provider}`);
@@ -108,18 +173,58 @@ const useSocialAccounts = () => {
             yield updateUserProfileByJWT(jwt);
             setIsProcessing(false);
         });
-        window.addEventListener('message', handleAuthWindowMessage);
-        const authWindow = window.open(oauthProvider.authorizationUrl, '_blank', 'width=500,height=600');
-        const authWindowInterval = setInterval(() => {
-            if (authWindow === null || authWindow === void 0 ? void 0 : authWindow.closed) {
-                window.removeEventListener('message', handleAuthWindowMessage);
-                clearInterval(authWindowInterval);
+        const loginUrl = yield api.getOauthLoginUrl(environmentId, provider, String(userJwt));
+        if (!loginUrl) {
+            handleError(`Failed to get login url to link 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);
+            const pkceParams = stringifyURIQuery.stringifyURIQuery({
+                code_challenge: encodeBase64URL.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 (!providersWithoutWindowOpenerRefence.includes(provider)) {
+            // For provider that support window.opener, we need to clear all states/listeners when the window is closed
+            authWindowInterval.current = setInterval(() => {
+                if (!(authWindow === null || authWindow === void 0 ? void 0 : authWindow.closed)) {
+                    return;
+                }
+                clearInterval(authWindowInterval.current);
                 setIsProcessing(false);
-            }
-        }, 1000);
+            });
+        }
+        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(`Linking ${provider} account window timeout.`);
+                }
+                setIsProcessing(false);
+                clearInterval(authWindowInterval.current);
+            }, sessionTimeout);
+        }
     });
     const unlinkSocialAccount = (provider) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _e;
+        var _d;
         setError(undefined);
         setIsProcessing(true);
         if (!checkValidProvider(provider)) {
@@ -133,7 +238,7 @@ const useSocialAccounts = () => {
         try {
             const jwt = yield api.unlinkOAuth({
                 environmentId,
-                verifiedCrentialId: (_e = verifiedCredential.id) !== null && _e !== void 0 ? _e : '',
+                verifiedCrentialId: (_d = verifiedCredential.id) !== null && _d !== void 0 ? _d : '',
             }, String(userJwt));
             if (!jwt) {
                 handleError(`Failed to unlink social account: ${provider} | ${verifiedCredential.id}`);

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

@@ -1,6 +1,9 @@
 import { ProviderEnum } from '@dynamic-labs/sdk-api';
 import { SocialAccountInformation } from '@dynamic-labs/types';
-export declare const useSocialAccounts: () => {
+type UseSocialAccountsProps = {
+    sessionTimeout: number;
+};
+export declare const useSocialAccounts: ({ sessionTimeout }?: UseSocialAccountsProps) => {
     readonly error: string | undefined;
     readonly getLinkedAccountInformation: (provider: ProviderEnum) => SocialAccountInformation | undefined;
     readonly isLinked: (provider: ProviderEnum) => boolean;
@@ -8,3 +11,4 @@ export declare const useSocialAccounts: () => {
     readonly linkSocialAccount: (provider: ProviderEnum) => Promise<void>;
     readonly unlinkSocialAccount: (provider: ProviderEnum) => Promise<void>;
 };
+export {};

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

@@ -1,7 +1,7 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useState, useMemo } from 'react';
+import { useState, useRef, useMemo } from 'react';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
-import { unlinkOAuth, verifyOAuth } from '../../../data/api.js';
+import { getOauthLoginUrl, unlinkOAuth, verifyOAuth } from '../../../data/api.js';
 import { useUpdateUserProfileByJWTCallback } from '../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.js';
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../shared/logger.js';
@@ -19,6 +19,11 @@ import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
 import { getEnabledOAuthProviders } from '../../functions/getEnabledOAuthProviders/index.js';
 import { isSocialKycEnabled } from '../../functions/isSocialKycEnabled/isSocialKycEnabled.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 { getRedirectURIOrigin } from '../../functions/getRedirectURIOrigin/getRedirectURIOrigin.js';
 
 const socialProviders = [
     'discord',
@@ -29,12 +34,20 @@ const socialProviders = [
     'twitch',
     'twitter',
 ];
-const useSocialAccounts = () => {
+// 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'];
+const useSocialAccounts = ({ sessionTimeout } = {
+    sessionTimeout: 10000,
+}) => {
     var _a;
     const { environmentId, user, projectSettings, onboardingOnlyJwt } = useInternalDynamicContext();
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback();
     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 oauthProviders = getEnabledOAuthProviders(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers);
     const verifiedOAuthCredentialsMap = useMemo(() => {
@@ -53,6 +66,23 @@ const useSocialAccounts = () => {
         setIsProcessing(false);
         setError(message);
     };
+    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('Provider is required');
@@ -64,38 +94,73 @@ const useSocialAccounts = () => {
         }
         return true;
     };
-    const linkSocialAccount = (provider) => __awaiter(void 0, void 0, void 0, function* () {
-        setError(undefined);
-        setIsProcessing(true);
+    const checkValidOAuthLinking = (provider) => {
         if (!isSocialKycEnabled(projectSettings)) {
             handleError('Social linking is not enabled on the dashboard');
-            return;
+            return false;
         }
         if (!checkValidProvider(provider)) {
-            return;
+            return false;
         }
         const verifiedCredential = verifiedOAuthCredentialsMap[provider];
         if (verifiedCredential) {
             handleError(`Account already linked for provider: ${provider}`);
-            return;
+            return false;
         }
         const oauthProvider = oauthProviders.find((p) => p.provider === provider);
         if (!oauthProvider) {
             handleError(`Provider is not enabled on the dashboard: ${provider}`);
+            return false;
+        }
+        return true;
+    };
+    const linkSocialAccount = (provider) => __awaiter(void 0, void 0, void 0, function* () {
+        var _b;
+        clearInterval(authWindowInterval.current);
+        setError(undefined);
+        setIsProcessing(true);
+        // invalid linking request
+        if (!checkValidOAuthLinking(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 _b, _c, _d;
-            if (((_b = event.data) === null || _b === void 0 ? void 0 : _b.type) === 'authorization_response') {
-                logger.debug('Message received', { data: event.data });
+            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 imvalid messages for provider
+            if (!isValidMessage) {
+                return;
+            }
+            setIsProcessing(true);
+            if (!((_c = providersWaitingOauthMessages.current) === null || _c === void 0 ? void 0 : _c[provider])) {
+                handleError(`Linking ${provider} account session timeout.`);
+                return;
+            }
+            clearListeners();
+            const { code, error } = message;
+            if (error && error !== 'undefined') {
+                handleError(`Failed to link ${provider} social account: ${error}`);
+                return;
             }
-            if (((_c = event.data) === null || _c === void 0 ? void 0 : _c.type) !== 'authorization_response' ||
-                ((_d = event.data) === null || _d === void 0 ? void 0 : _d.provider) !== provider) {
+            if (!code) {
+                handleError(`Failed to link ${provider} social account: no authorization code`);
                 return;
             }
-            const { code } = event.data;
             const jwt = yield verifyOAuth(environmentId, provider, {
                 code,
+                codeVerifier: verifier,
+                state,
             }, String(userJwt));
             if (!jwt) {
                 handleError(`Failed to link social account: ${provider}`);
@@ -104,18 +169,58 @@ const useSocialAccounts = () => {
             yield updateUserProfileByJWT(jwt);
             setIsProcessing(false);
         });
-        window.addEventListener('message', handleAuthWindowMessage);
-        const authWindow = window.open(oauthProvider.authorizationUrl, '_blank', 'width=500,height=600');
-        const authWindowInterval = setInterval(() => {
-            if (authWindow === null || authWindow === void 0 ? void 0 : authWindow.closed) {
-                window.removeEventListener('message', handleAuthWindowMessage);
-                clearInterval(authWindowInterval);
+        const loginUrl = yield getOauthLoginUrl(environmentId, provider, String(userJwt));
+        if (!loginUrl) {
+            handleError(`Failed to get login url to link 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 (!providersWithoutWindowOpenerRefence.includes(provider)) {
+            // For provider that support window.opener, we need to clear all states/listeners when the window is closed
+            authWindowInterval.current = setInterval(() => {
+                if (!(authWindow === null || authWindow === void 0 ? void 0 : authWindow.closed)) {
+                    return;
+                }
+                clearInterval(authWindowInterval.current);
                 setIsProcessing(false);
-            }
-        }, 1000);
+            });
+        }
+        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(`Linking ${provider} account window timeout.`);
+                }
+                setIsProcessing(false);
+                clearInterval(authWindowInterval.current);
+            }, sessionTimeout);
+        }
     });
     const unlinkSocialAccount = (provider) => __awaiter(void 0, void 0, void 0, function* () {
-        var _e;
+        var _d;
         setError(undefined);
         setIsProcessing(true);
         if (!checkValidProvider(provider)) {
@@ -129,7 +234,7 @@ const useSocialAccounts = () => {
         try {
             const jwt = yield unlinkOAuth({
                 environmentId,
-                verifiedCrentialId: (_e = verifiedCredential.id) !== null && _e !== void 0 ? _e : '',
+                verifiedCrentialId: (_d = verifiedCredential.id) !== null && _d !== void 0 ? _d : '',
             }, String(userJwt));
             if (!jwt) {
                 handleError(`Failed to unlink social account: ${provider} | ${verifiedCredential.id}`);

package/src/lib/views/CaptchaVerifyUser/CaptchaVerifyUser.cjs

@@ -5,11 +5,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../_virtual/_tslib.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 var iconic = require('@dynamic-labs/iconic');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('react');
 var Typography = require('../../components/Typography/Typography.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../shared/logger.cjs');
-require('@dynamic-labs/wallet-connector-core');
 var ViewContext = require('../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
@@ -47,7 +47,7 @@ require('../../components/MenuList/Dropdown/Dropdown.cjs');
 var Captcha = require('../../components/Captcha/Captcha.cjs');
 
 const CaptchaVerifyUser = () => {
-    const { consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, selectedWalletConnector: walletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, selectedWalletConnector: walletConnector, walletUiUtils, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const { setCaptchaToken } = CaptchaContext.useCaptchaContext();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
@@ -65,7 +65,13 @@ const CaptchaVerifyUser = () => {
         if (!publicWalletAddress) {
             return;
         }
-        setView('pending-signature');
+        if (!walletConnectorCore.isEmbeddedConnector(walletConnector) ||
+            walletConnectorCore.isBloctoConnector(walletConnector)) {
+            setView('pending-signature');
+        }
+        else {
+            walletUiUtils.disabledConfirmationOnce();
+        }
         if (requiresTwoStepAuthentication.requiresTwoStepAuthentication(walletConnector)) {
             setCaptchaToken(captchaToken);
             return;

package/src/lib/views/CaptchaVerifyUser/CaptchaVerifyUser.js

@@ -1,11 +1,11 @@
 import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { CaptchaWaveIcon } from '@dynamic-labs/iconic';
+import { isEmbeddedConnector, isBloctoConnector } from '@dynamic-labs/wallet-connector-core';
 import 'react';
 import { Typography } from '../../components/Typography/Typography.js';
 import '@dynamic-labs/sdk-api';
 import '../../shared/logger.js';
-import '@dynamic-labs/wallet-connector-core';
 import { useViewContext } from '../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
@@ -43,7 +43,7 @@ import '../../components/MenuList/Dropdown/Dropdown.js';
 import { Captcha } from '../../components/Captcha/Captcha.js';
 
 const CaptchaVerifyUser = () => {
-    const { consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, selectedWalletConnector: walletConnector, } = useInternalDynamicContext();
+    const { consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, selectedWalletConnector: walletConnector, walletUiUtils, } = useInternalDynamicContext();
     const { setView } = useViewContext();
     const { setCaptchaToken } = useCaptchaContext();
     const verifyWallet = useVerifyWallet({
@@ -61,7 +61,13 @@ const CaptchaVerifyUser = () => {
         if (!publicWalletAddress) {
             return;
         }
-        setView('pending-signature');
+        if (!isEmbeddedConnector(walletConnector) ||
+            isBloctoConnector(walletConnector)) {
+            setView('pending-signature');
+        }
+        else {
+            walletUiUtils.disabledConfirmationOnce();
+        }
         if (requiresTwoStepAuthentication(walletConnector)) {
             setCaptchaToken(captchaToken);
             return;

package/src/lib/views/EmailWalletOTPVerificationView/EmailWalletOTPVerificationView.cjs

@@ -65,7 +65,7 @@ const EmailWalletOTPVerificationView = () => {
     const { data: isValid, isLoading, mutate: onSubmit, } = useMutation.useMutation((otp) => emailWalletConnector.verifyOneTimePassword(otp), {
         onFailure: (error) => setError(error),
     });
-    return (jsxRuntime.jsx(OTPVerificationView.OTPVerificationView, { email: email, error: error, onClickBack: handleBackClick, isLoading: isLoading, onPinComplete: onSubmit, isValid: isValid === true, onPinChange: () => setError(undefined), onClickClose: handleOnClickClose, onClickEditEmail: handleBackClick, displayPoweredByDynamic: true }));
+    return (jsxRuntime.jsx(OTPVerificationView.OTPVerificationView, { email: email, error: error, onClickBack: handleBackClick, isLoading: isLoading, onPinComplete: onSubmit, isValid: isValid === true, onPinChange: () => setError(undefined), onClickClose: handleOnClickClose, onClickEditEmail: handleBackClick, displayPoweredByDynamic: true, successBannerText: 'Sign in to access your email based wallet' }));
 };
 
 exports.EmailWalletOTPVerificationView = EmailWalletOTPVerificationView;

package/src/lib/views/EmailWalletOTPVerificationView/EmailWalletOTPVerificationView.js

@@ -61,7 +61,7 @@ const EmailWalletOTPVerificationView = () => {
     const { data: isValid, isLoading, mutate: onSubmit, } = useMutation((otp) => emailWalletConnector.verifyOneTimePassword(otp), {
         onFailure: (error) => setError(error),
     });
-    return (jsx(OTPVerificationView, { email: email, error: error, onClickBack: handleBackClick, isLoading: isLoading, onPinComplete: onSubmit, isValid: isValid === true, onPinChange: () => setError(undefined), onClickClose: handleOnClickClose, onClickEditEmail: handleBackClick, displayPoweredByDynamic: true }));
+    return (jsx(OTPVerificationView, { email: email, error: error, onClickBack: handleBackClick, isLoading: isLoading, onPinComplete: onSubmit, isValid: isValid === true, onPinChange: () => setError(undefined), onClickClose: handleOnClickClose, onClickEditEmail: handleBackClick, displayPoweredByDynamic: true, successBannerText: 'Sign in to access your email based wallet' }));
 };
 
 export { EmailWalletOTPVerificationView };

package/src/lib/views/NetworkNotSupported/NetworkNotSupported.cjs

@@ -53,12 +53,13 @@ var SelectNetworkButton = require('../../components/SelectNetworkButton/SelectNe
 var useApplyWalletConnectorNetwork = require('../../utils/hooks/useApplyWalletConnectorNetwork/useApplyWalletConnectorNetwork.cjs');
 
 const NetworkNotSupported = () => {
-    const { network, onboardingImageUrl, selectedWalletConnector: walletConnector, connectedWallets, primaryWallet, isFullyConnected, setShowAuthFlow, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { network, onboardingImageUrl, selectedWalletConnector: walletConnector, connectedWallets, primaryWallet, isFullyConnected, setShowAuthFlow, walletsToConnectByChain, } = useInternalDynamicContext.useInternalDynamicContext();
     // Refresh selectedWalletConnector network when primaryWallet or connectedWallets updates
     const { data: walletConnectorNetwork } = usePromise.usePromise(() => walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getNetwork(), { deps: [primaryWallet, walletConnector, connectedWallets] });
     const finishConnectAndSign = useConnectAndSign.useConnectAndSign({
         shouldCallCallback: false,
-        shouldUpdateWallets: !isFullyConnected,
+        shouldUpdateWallets: !isFullyConnected ||
+            (isFullyConnected && Boolean(walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.length)),
     });
     const [isNetworkPickerOpen, setIsNetworkPickerOpen] = React.useState(false);
     // Finishes auth flow when wallet switches to proper network

package/src/lib/views/NetworkNotSupported/NetworkNotSupported.js

@@ -49,12 +49,13 @@ import { SelectNetworkButton } from '../../components/SelectNetworkButton/Select
 import { useApplyWalletConnectorNetwork } from '../../utils/hooks/useApplyWalletConnectorNetwork/useApplyWalletConnectorNetwork.js';
 
 const NetworkNotSupported = () => {
-    const { network, onboardingImageUrl, selectedWalletConnector: walletConnector, connectedWallets, primaryWallet, isFullyConnected, setShowAuthFlow, } = useInternalDynamicContext();
+    const { network, onboardingImageUrl, selectedWalletConnector: walletConnector, connectedWallets, primaryWallet, isFullyConnected, setShowAuthFlow, walletsToConnectByChain, } = useInternalDynamicContext();
     // Refresh selectedWalletConnector network when primaryWallet or connectedWallets updates
     const { data: walletConnectorNetwork } = usePromise(() => walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getNetwork(), { deps: [primaryWallet, walletConnector, connectedWallets] });
     const finishConnectAndSign = useConnectAndSign({
         shouldCallCallback: false,
-        shouldUpdateWallets: !isFullyConnected,
+        shouldUpdateWallets: !isFullyConnected ||
+            (isFullyConnected && Boolean(walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.length)),
     });
     const [isNetworkPickerOpen, setIsNetworkPickerOpen] = useState(false);
     // Finishes auth flow when wallet switches to proper network

package/src/lib/views/NetworkNotSupportedSwitchManual/NetworkNotSupportedSwitchManual.cjs

@@ -54,14 +54,15 @@ var useApplyWalletConnectorNetwork = require('../../utils/hooks/useApplyWalletCo
 //   as the wallet does not support programmatic network change.
 const NetworkNotSupportedSwitchManual = () => {
     var _a, _b;
-    const { user, selectedWalletConnector: walletConnector, connectedWallets, isFullyConnected, setShowAuthFlow, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { user, selectedWalletConnector: walletConnector, connectedWallets, isFullyConnected, setShowAuthFlow, walletsToConnectByChain, } = useInternalDynamicContext.useInternalDynamicContext();
     // Refresh selectedWalletConnector network when primaryWallet or connectedWallets updates
     const { data: walletConnectorNetwork } = usePromise.usePromise(() => walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getNetwork(), {
         deps: [walletConnector, connectedWallets],
     });
     const finishConnectAndSign = useConnectAndSign.useConnectAndSign({
         shouldCallCallback: false,
-        shouldUpdateWallets: !isFullyConnected,
+        shouldUpdateWallets: !isFullyConnected ||
+            (isFullyConnected && Boolean(walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.length)),
     });
     // Finishes auth flow when wallet switches to proper network
     React.useEffect(() => {

package/src/lib/views/NetworkNotSupportedSwitchManual/NetworkNotSupportedSwitchManual.js

@@ -50,14 +50,15 @@ import { useApplyWalletConnectorNetwork } from '../../utils/hooks/useApplyWallet
 //   as the wallet does not support programmatic network change.
 const NetworkNotSupportedSwitchManual = () => {
     var _a, _b;
-    const { user, selectedWalletConnector: walletConnector, connectedWallets, isFullyConnected, setShowAuthFlow, } = useInternalDynamicContext();
+    const { user, selectedWalletConnector: walletConnector, connectedWallets, isFullyConnected, setShowAuthFlow, walletsToConnectByChain, } = useInternalDynamicContext();
     // Refresh selectedWalletConnector network when primaryWallet or connectedWallets updates
     const { data: walletConnectorNetwork } = usePromise(() => walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getNetwork(), {
         deps: [walletConnector, connectedWallets],
     });
     const finishConnectAndSign = useConnectAndSign({
         shouldCallCallback: false,
-        shouldUpdateWallets: !isFullyConnected,
+        shouldUpdateWallets: !isFullyConnected ||
+            (isFullyConnected && Boolean(walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.length)),
     });
     // Finishes auth flow when wallet switches to proper network
     useEffect(() => {