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

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

@@ -4,7 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var utils = require('@dynamic-labs/utils');
 var showPendingConnectView = require('../helpers/showPendingConnectView.cjs');
 var isConnectOnly = require('../helpers/isConnectOnly.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
@@ -16,6 +15,7 @@ require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('react');
 require('@dynamic-labs/wallet-book');
+require('@dynamic-labs/utils');
 var localStorage$1 = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
 var localStorage = require('../../../../shared/utils/classes/storage/localStorage.cjs');
@@ -27,12 +27,13 @@ var useHandleWalletsToConnect = require('../../useHandleWalletsToConnect/useHand
 require('@dynamic-labs/multi-wallet');
 var isSupportedNetwork = require('../../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
 var isProgrammableNetworkSwitchSupported = require('../../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.cjs');
+require('../../../../config/ApiEndpoint.cjs');
 
 const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = true, } = {}) => {
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { captchaToken } = CaptchaContext.useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, walletsToConnectByChain = [], connectedWallets, isBridgeFlow, selectedWalletConnector, walletsByChain, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, walletsToConnectByChain = [], } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
@@ -42,7 +43,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
         setIsSingleWalletAccount,
     });
     return ({ walletConnector, fetchPublicAddressOpts = undefined, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b;
         // Raise verification ongoing flag
         setIsVerificationInProgress(true);
         try {
@@ -72,24 +73,8 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             }
             if (isConnectOnly.isConnectOnly(user, authMode)) {
                 localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.name);
-                if (isBridgeFlow) {
-                    const didConnectLastWallet = (selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.connectedChain) ===
-                        ((_a = utils.last(walletsByChain || [])) === null || _a === void 0 ? void 0 : _a.chain);
-                    // we don't want to re-calculate wallets to connect state if wallet is already connected.
-                    // it may happen when user switch network in connect flow on already connected wallet
-                    const isAlreadyConnected = connectedWallets.find((wallet) => walletConnectorCore.isSameAddress(publicWalletAddress, wallet.address, wallet.chain));
-                    if (shouldUpdateWallets &&
-                        (!isAlreadyConnected || didConnectLastWallet)) {
-                        handleWalletsToConnect();
-                    }
-                    if (isAlreadyConnected && !didConnectLastWallet) {
-                        setView('bridge-next-wallet-connection');
-                    }
-                }
-                else {
-                    if (shouldUpdateWallets) {
-                        handleWalletsToConnect();
-                    }
+                if (shouldUpdateWallets) {
+                    handleWalletsToConnect();
                 }
                 if (!isFullyConnected || walletsToConnectByChain.length) {
                     setCallback('connectSuccess');
@@ -97,7 +82,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 return;
             }
             setCallback('connectSuccess');
-            if ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _b === void 0 ? void 0 : _b.enabled) {
+            if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
                 setView('captcha');
                 return;
             }
@@ -118,7 +103,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             const userCancelled = (err === null || err === void 0 ? void 0 : err.code) === 'user-cancelled';
             if (!userCancelled)
                 logger.logger.debug(err);
-            setErrorMessage((_c = err === null || err === void 0 ? void 0 : err.code) === null || _c === void 0 ? void 0 : _c.toString());
+            setErrorMessage((_b = err === null || err === void 0 ? void 0 : err.code) === null || _b === void 0 ? void 0 : _b.toString());
             goToInitialView();
             // Since auth failed, clear verification flag
             // But if user cancelled, clearStatesOnBackClick will have already cleared it. So avoid

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

@@ -1,6 +1,5 @@
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
-import { isEmailWalletConnector, isEmailOTPWalletConnector, isBloctoConnector, isSameAddress } from '@dynamic-labs/wallet-connector-core';
-import { last } from '@dynamic-labs/utils';
+import { isEmailWalletConnector, isEmailOTPWalletConnector, isBloctoConnector } from '@dynamic-labs/wallet-connector-core';
 import { showPendingConnectView } from '../helpers/showPendingConnectView.js';
 import { isConnectOnly } from '../helpers/isConnectOnly.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
@@ -12,6 +11,7 @@ import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import 'react';
 import '@dynamic-labs/wallet-book';
+import '@dynamic-labs/utils';
 import { LAST_USED_WALLET } from '../../../constants/localStorage.js';
 import '../../../constants/colors.js';
 import { LocalStorage } from '../../../../shared/utils/classes/storage/localStorage.js';
@@ -23,12 +23,13 @@ import { useHandleWalletsToConnect } from '../../useHandleWalletsToConnect/useHa
 import '@dynamic-labs/multi-wallet';
 import { isSupportedNetwork } from '../../../functions/isSupportedNetwork/isSupportedNetwork.js';
 import { isProgrammableNetworkSwitchSupported } from '../../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.js';
+import '../../../../config/ApiEndpoint.js';
 
 const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = true, } = {}) => {
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
     const { captchaToken } = useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, walletsToConnectByChain = [], connectedWallets, isBridgeFlow, selectedWalletConnector, walletsByChain, } = useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, walletsToConnectByChain = [], } = useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
@@ -38,7 +39,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
         setIsSingleWalletAccount,
     });
     return ({ walletConnector, fetchPublicAddressOpts = undefined, }) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b;
         // Raise verification ongoing flag
         setIsVerificationInProgress(true);
         try {
@@ -68,24 +69,8 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             }
             if (isConnectOnly(user, authMode)) {
                 LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.name);
-                if (isBridgeFlow) {
-                    const didConnectLastWallet = (selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.connectedChain) ===
-                        ((_a = last(walletsByChain || [])) === null || _a === void 0 ? void 0 : _a.chain);
-                    // we don't want to re-calculate wallets to connect state if wallet is already connected.
-                    // it may happen when user switch network in connect flow on already connected wallet
-                    const isAlreadyConnected = connectedWallets.find((wallet) => isSameAddress(publicWalletAddress, wallet.address, wallet.chain));
-                    if (shouldUpdateWallets &&
-                        (!isAlreadyConnected || didConnectLastWallet)) {
-                        handleWalletsToConnect();
-                    }
-                    if (isAlreadyConnected && !didConnectLastWallet) {
-                        setView('bridge-next-wallet-connection');
-                    }
-                }
-                else {
-                    if (shouldUpdateWallets) {
-                        handleWalletsToConnect();
-                    }
+                if (shouldUpdateWallets) {
+                    handleWalletsToConnect();
                 }
                 if (!isFullyConnected || walletsToConnectByChain.length) {
                     setCallback('connectSuccess');
@@ -93,7 +78,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 return;
             }
             setCallback('connectSuccess');
-            if ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _b === void 0 ? void 0 : _b.enabled) {
+            if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
                 setView('captcha');
                 return;
             }
@@ -114,7 +99,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             const userCancelled = (err === null || err === void 0 ? void 0 : err.code) === 'user-cancelled';
             if (!userCancelled)
                 logger.debug(err);
-            setErrorMessage((_c = err === null || err === void 0 ? void 0 : err.code) === null || _c === void 0 ? void 0 : _c.toString());
+            setErrorMessage((_b = err === null || err === void 0 ? void 0 : err.code) === null || _b === void 0 ? void 0 : _b.toString());
             goToInitialView();
             // Since auth failed, clear verification flag
             // But if user cancelled, clearStatesOnBackClick will have already cleared it. So avoid

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

@@ -18,9 +18,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 useConnectAndSign = require('../../authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
 require('../../../../context/ErrorContext/ErrorContext.cjs');
-require('../../../../config/ApiEndpoint.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');

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

@@ -14,9 +14,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 { useConnectAndSign } from '../../authenticationHooks/useConnectAndSign/useConnectAndSign.js';
 import '../../../../context/ErrorContext/ErrorContext.js';
-import '../../../../config/ApiEndpoint.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';

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

@@ -11,10 +11,10 @@ var useDynamicLayoutData = require('../useDynamicLayoutData/useDynamicLayoutData
 
 const useAuthLayoutChecks = (walletConnector) => {
     const { view } = ViewContext.useViewContext();
-    const { user, customPrivacyPolicy, customTermsOfServices, privacyPolicyUrl, termsOfServiceUrl, isBridgeFlow, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { user, customPrivacyPolicy, customTermsOfServices, privacyPolicyUrl, termsOfServiceUrl, isBridgeFlow, authMode, } = useInternalDynamicContext.useInternalDynamicContext();
     const { showQrCodeMessage, showQrCodeImage } = QrCodeContext.useQrCodeContext();
     const { mockedSDK } = MockContext.useMockContext();
-    const { helpHeaderData } = useDynamicLayoutData.useDynamicLayoutData({ view });
+    const { helpHeaderData } = useDynamicLayoutData.useDynamicLayoutData({ authMode, view });
     const isWalletListTypeView = view === 'wallet-connect-mobile-wallets-list' ||
         view === 'wallet-list' ||
         view === 'login-with-email-or-wallet-full-wallet-list' ||
@@ -40,6 +40,8 @@ const useAuthLayoutChecks = (walletConnector) => {
         view !== 'bridge-welcome' &&
         view !== 'bridge-summary' &&
         view !== 'bridge-next-wallet-connection' &&
+        view !== 'passkey-intro' &&
+        view !== 'passkey-success' &&
         view !== 'social-redirect-view';
     const showConnectedWalletProgress = isBridgeFlow &&
         (view === 'wallet-list' ||
@@ -72,6 +74,7 @@ const useAuthLayoutChecks = (walletConnector) => {
         view === 'wallet-group' ||
         view === 'pending-connect' ||
         view === 'account-exists' ||
+        view === 'passkey-intro' ||
         (view === 'merge-user-accounts' && !user);
     const showQrCodePreHeader = view === 'qr-code' && showQrCodeMessage && !showQrCodeImage;
     return {

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

@@ -7,10 +7,10 @@ import { useDynamicLayoutData } from '../useDynamicLayoutData/useDynamicLayoutDa
 
 const useAuthLayoutChecks = (walletConnector) => {
     const { view } = useViewContext();
-    const { user, customPrivacyPolicy, customTermsOfServices, privacyPolicyUrl, termsOfServiceUrl, isBridgeFlow, } = useInternalDynamicContext();
+    const { user, customPrivacyPolicy, customTermsOfServices, privacyPolicyUrl, termsOfServiceUrl, isBridgeFlow, authMode, } = useInternalDynamicContext();
     const { showQrCodeMessage, showQrCodeImage } = useQrCodeContext();
     const { mockedSDK } = useMockContext();
-    const { helpHeaderData } = useDynamicLayoutData({ view });
+    const { helpHeaderData } = useDynamicLayoutData({ authMode, view });
     const isWalletListTypeView = view === 'wallet-connect-mobile-wallets-list' ||
         view === 'wallet-list' ||
         view === 'login-with-email-or-wallet-full-wallet-list' ||
@@ -36,6 +36,8 @@ const useAuthLayoutChecks = (walletConnector) => {
         view !== 'bridge-welcome' &&
         view !== 'bridge-summary' &&
         view !== 'bridge-next-wallet-connection' &&
+        view !== 'passkey-intro' &&
+        view !== 'passkey-success' &&
         view !== 'social-redirect-view';
     const showConnectedWalletProgress = isBridgeFlow &&
         (view === 'wallet-list' ||
@@ -68,6 +70,7 @@ const useAuthLayoutChecks = (walletConnector) => {
         view === 'wallet-group' ||
         view === 'pending-connect' ||
         view === 'account-exists' ||
+        view === 'passkey-intro' ||
         (view === 'merge-user-accounts' && !user);
     const showQrCodePreHeader = view === 'qr-code' && showQrCodeMessage && !showQrCodeImage;
     return {

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

@@ -22,6 +22,7 @@ var getWalletProvider = require('../../functions/getWalletProvider/getWalletProv
 var api = require('../../../data/api.cjs');
 require('@dynamic-labs/multi-wallet');
 var shouldManuallyReconnectOnRefresh = require('../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
+require('../../../config/ApiEndpoint.cjs');
 
 const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onUnlink, onBeforeConnectSuccessConfirmation, setShowAuthFlow, }) => {
     const [connectedWalletsInfo, setConnectedWalletsInfo, removeConnectedWalletsInfo,] = useLocalStorage.useLocalStorage(localStorage.CONNECTED_WALLETS_INFO, []);

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

@@ -18,6 +18,7 @@ import { getWalletProvider } from '../../functions/getWalletProvider/getWalletPr
 import { createVisit } from '../../../data/api.js';
 import '@dynamic-labs/multi-wallet';
 import { shouldManuallyReconnectOnRefresh } from '../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
+import '../../../config/ApiEndpoint.js';
 
 const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onUnlink, onBeforeConnectSuccessConfirmation, setShowAuthFlow, }) => {
     const [connectedWalletsInfo, setConnectedWalletsInfo, removeConnectedWalletsInfo,] = useLocalStorage(CONNECTED_WALLETS_INFO, []);

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

@@ -19,6 +19,7 @@ require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var isSupportedNetwork = require('../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
 var isProgrammableNetworkSwitchSupported = require('../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.cjs');
+require('../../../config/ApiEndpoint.cjs');
 
 const useConnectedWalletsNetworkValidation = () => {
     const { connectedWallets, selectedWalletConnector, setSelectedWalletConnector, setShowAuthFlow, showAuthFlow, walletsToConnectByChain, isBridgeFlow, } = useInternalDynamicContext.useInternalDynamicContext();

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

@@ -15,6 +15,7 @@ import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { isSupportedNetwork } from '../../functions/isSupportedNetwork/isSupportedNetwork.js';
 import { isProgrammableNetworkSwitchSupported } from '../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.js';
+import '../../../config/ApiEndpoint.js';
 
 const useConnectedWalletsNetworkValidation = () => {
     const { connectedWallets, selectedWalletConnector, setSelectedWalletConnector, setShowAuthFlow, showAuthFlow, walletsToConnectByChain, isBridgeFlow, } = useInternalDynamicContext();

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

@@ -21,6 +21,7 @@ var index = require('../../functions/storeAuthToken/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var createUserProfile = require('../../functions/createUserProfile/createUserProfile.cjs');
 require('@dynamic-labs/sdk-api');
+require('../../../config/ApiEndpoint.cjs');
 
 const useCreateUserProfileByJWTCallback = () => {
     const { setUser, handleLogOut } = useInternalDynamicContext.useInternalDynamicContext();

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

@@ -17,6 +17,7 @@ import { storeAuthToken } from '../../functions/storeAuthToken/index.js';
 import '@dynamic-labs/multi-wallet';
 import { createUserProfile } from '../../functions/createUserProfile/createUserProfile.js';
 import '@dynamic-labs/sdk-api';
+import '../../../config/ApiEndpoint.js';
 
 const useCreateUserProfileByJWTCallback = () => {
     const { setUser, handleLogOut } = useInternalDynamicContext();

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

@@ -6,7 +6,7 @@ var jsxRuntime = require('react/jsx-runtime');
 var reactI18next = require('react-i18next');
 var iconic = require('@dynamic-labs/iconic');
 
-const useDynamicLayoutData = ({ view }) => {
+const useDynamicLayoutData = ({ view, authMode, }) => {
     const { t } = reactI18next.useTranslation();
     if (view === 'no-access') {
         const headerData = {
@@ -21,14 +21,17 @@ const useDynamicLayoutData = ({ view }) => {
         'login-with-wallet-only': {
             heading: t('dyn_login.helper.wallet_only'),
         },
+        'passkey-intro': {
+            heading: t('dyn_passkey_intro.helper.title'),
+        },
         'pending-connect': {
-            heading: t('dyn_login.helper.pending_connect'),
+            heading: t('dyn_login.helper.pending_connect.title'),
         },
         'pending-signature': {
-            heading: t('dyn_login.helper.pending_signature'),
+            heading: t('dyn_login.helper.pending_signature.title'),
         },
         'pending-signature-without-back-button': {
-            heading: t('dyn_login.helper.pending_signature_without_back_button'),
+            heading: t('dyn_login.helper.pending_signature_without_back_button.title'),
         },
         'qr-code': {
             heading: t('dyn_login.helper.qr_code.title'),
@@ -53,7 +56,9 @@ const useDynamicLayoutData = ({ view }) => {
             heading: t('dyn_login.title.wallet_only'),
         },
         'multi-wallet-wallet-list': {
-            heading: t('dyn_wallet_list.title.link'),
+            heading: authMode === 'connect-only'
+                ? t('dyn_wallet_list.title.connect')
+                : t('dyn_wallet_list.title.link'),
         },
         'wallet-connect-mobile-wallets-list': {
             heading: (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(iconic.WalletConnectIcon, { style: { height: '1.5rem', width: '1.5rem' } }), ' ', t('dyn_wallet_conect.mobile.wallet_list.title')] })),

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

@@ -1,5 +1,6 @@
 /// <reference types="react" />
 import { ViewType } from '../../../context/ViewContext';
+import { AuthModeType } from '../../../shared';
 interface FooterContentProps {
     heading: string;
 }
@@ -8,8 +9,9 @@ interface HeaderContentProps {
 }
 interface DynamicLayoutProps {
     view: ViewType;
+    authMode: AuthModeType;
 }
-export declare const useDynamicLayoutData: ({ view }: DynamicLayoutProps) => {
+export declare const useDynamicLayoutData: ({ view, authMode, }: DynamicLayoutProps) => {
     headerData: {
         heading: any;
     };

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

@@ -2,7 +2,7 @@ import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { useTranslation } from 'react-i18next';
 import { WalletConnectIcon } from '@dynamic-labs/iconic';
 
-const useDynamicLayoutData = ({ view }) => {
+const useDynamicLayoutData = ({ view, authMode, }) => {
     const { t } = useTranslation();
     if (view === 'no-access') {
         const headerData = {
@@ -17,14 +17,17 @@ const useDynamicLayoutData = ({ view }) => {
         'login-with-wallet-only': {
             heading: t('dyn_login.helper.wallet_only'),
         },
+        'passkey-intro': {
+            heading: t('dyn_passkey_intro.helper.title'),
+        },
         'pending-connect': {
-            heading: t('dyn_login.helper.pending_connect'),
+            heading: t('dyn_login.helper.pending_connect.title'),
         },
         'pending-signature': {
-            heading: t('dyn_login.helper.pending_signature'),
+            heading: t('dyn_login.helper.pending_signature.title'),
         },
         'pending-signature-without-back-button': {
-            heading: t('dyn_login.helper.pending_signature_without_back_button'),
+            heading: t('dyn_login.helper.pending_signature_without_back_button.title'),
         },
         'qr-code': {
             heading: t('dyn_login.helper.qr_code.title'),
@@ -49,7 +52,9 @@ const useDynamicLayoutData = ({ view }) => {
             heading: t('dyn_login.title.wallet_only'),
         },
         'multi-wallet-wallet-list': {
-            heading: t('dyn_wallet_list.title.link'),
+            heading: authMode === 'connect-only'
+                ? t('dyn_wallet_list.title.connect')
+                : t('dyn_wallet_list.title.link'),
         },
         'wallet-connect-mobile-wallets-list': {
             heading: (jsxs(Fragment, { children: [jsx(WalletConnectIcon, { style: { height: '1.5rem', width: '1.5rem' } }), ' ', t('dyn_wallet_conect.mobile.wallet_list.title')] })),

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

@@ -21,6 +21,7 @@ require('../../../shared/consts/index.cjs');
 var validators = require('../../../context/DynamicContext/validators.cjs');
 require('@dynamic-labs/multi-wallet');
 var index = require('../../functions/getEnabledProviders/index.cjs');
+require('../../../config/ApiEndpoint.cjs');
 
 const useFetchProjectSettings = ({ authToken, environmentId, maxRetries = 2, dynamicContextProps, }) => {
     const [lsSettings, setLsSettings, removeLsSettings] = useLocalStorage.useLocalStorage(localStorage.PROJECT_SETTINGS_STORAGE_KEY, undefined, validators.validateLocalStorageExpiry);

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

@@ -17,6 +17,7 @@ import '../../../shared/consts/index.js';
 import { validateLocalStorageExpiry } from '../../../context/DynamicContext/validators.js';
 import '@dynamic-labs/multi-wallet';
 import { getEnabledProviders } from '../../functions/getEnabledProviders/index.js';
+import '../../../config/ApiEndpoint.js';
 
 const useFetchProjectSettings = ({ authToken, environmentId, maxRetries = 2, dynamicContextProps, }) => {
     const [lsSettings, setLsSettings, removeLsSettings] = useLocalStorage(PROJECT_SETTINGS_STORAGE_KEY, undefined, validateLocalStorageExpiry);

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

@@ -6,7 +6,7 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useInte
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 
 const useHandleWalletsToConnect = () => {
-    const { walletsToConnectByChain, setWalletsToConnectByChain, setShowAuthFlow, setIsFullyConnected, isFullyConnected, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { walletsToConnectByChain, setWalletsToConnectByChain, setShowAuthFlow, setIsFullyConnected, selectedWalletConnector, isFullyConnected, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const handleWalletsToConnect = () => {
         if (!walletsToConnectByChain) {
@@ -19,6 +19,20 @@ const useHandleWalletsToConnect = () => {
             setShowAuthFlow(false);
             return goToInitialView();
         }
+        if (!selectedWalletConnector || !selectedWalletConnector.connectedChain) {
+            setShowAuthFlow(false);
+            return goToInitialView();
+        }
+        // Assuming based on the logic above that we have at least one more chain/wallet to connect
+        // If the current connected wallet is already connected to the bridge,
+        // we can go directly to bridge-next-wallet-connection since we know there is a different chain to connect
+        const walletChainsToConnect = walletsToConnectByChain
+            .filter((wallet) => wallet.numberOfWallets > 0)
+            .map((wallet) => wallet.chain.toString());
+        if (!walletChainsToConnect.includes(selectedWalletConnector.connectedChain)) {
+            setView('bridge-next-wallet-connection');
+            return;
+        }
         const [firstWallet, ...restOfTheWallets] = walletsToConnectByChain;
         if (firstWallet.numberOfWallets > 1) {
             const updatedWallets = [

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

@@ -2,7 +2,7 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useIn
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 
 const useHandleWalletsToConnect = () => {
-    const { walletsToConnectByChain, setWalletsToConnectByChain, setShowAuthFlow, setIsFullyConnected, isFullyConnected, } = useInternalDynamicContext();
+    const { walletsToConnectByChain, setWalletsToConnectByChain, setShowAuthFlow, setIsFullyConnected, selectedWalletConnector, isFullyConnected, } = useInternalDynamicContext();
     const { setView, goToInitialView } = useViewContext();
     const handleWalletsToConnect = () => {
         if (!walletsToConnectByChain) {
@@ -15,6 +15,20 @@ const useHandleWalletsToConnect = () => {
             setShowAuthFlow(false);
             return goToInitialView();
         }
+        if (!selectedWalletConnector || !selectedWalletConnector.connectedChain) {
+            setShowAuthFlow(false);
+            return goToInitialView();
+        }
+        // Assuming based on the logic above that we have at least one more chain/wallet to connect
+        // If the current connected wallet is already connected to the bridge,
+        // we can go directly to bridge-next-wallet-connection since we know there is a different chain to connect
+        const walletChainsToConnect = walletsToConnectByChain
+            .filter((wallet) => wallet.numberOfWallets > 0)
+            .map((wallet) => wallet.chain.toString());
+        if (!walletChainsToConnect.includes(selectedWalletConnector.connectedChain)) {
+            setView('bridge-next-wallet-connection');
+            return;
+        }
         const [firstWallet, ...restOfTheWallets] = walletsToConnectByChain;
         if (firstWallet.numberOfWallets > 1) {
             const updatedWallets = [

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

@@ -20,6 +20,7 @@ require('ethers');
 require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var isSocialKycEnabled = require('../../functions/isSocialKycEnabled/isSocialKycEnabled.cjs');
+require('../../../config/ApiEndpoint.cjs');
 
 /* eslint-disable max-len */
 /**

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

@@ -16,6 +16,7 @@ import 'ethers';
 import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { isSocialKycEnabled } from '../../functions/isSocialKycEnabled/isSocialKycEnabled.js';
+import '../../../config/ApiEndpoint.js';
 
 /* eslint-disable max-len */
 /**

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

@@ -17,7 +17,6 @@ require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 require('../../../shared/consts/index.cjs');
-var useOnlyConnectedMode = require('../useOnlyConnectedMode/useOnlyConnectedMode.cjs');
 
 const isMultiWalletEnabledInURL = () => {
     const flag = 'multiwallet.widget';
@@ -30,9 +29,6 @@ const isMultiWalletEnabledInURL = () => {
 };
 const useMultiWalletFlag = () => {
     const { multiWallet: isMultiWalletEnabled } = useInternalDynamicContext.useInternalDynamicContext();
-    const isOnlyConnected = useOnlyConnectedMode.useOnlyConnectedMode();
-    if (isOnlyConnected)
-        return false;
     return isMultiWalletEnabled && isMultiWalletEnabledInURL();
 };
 

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

@@ -13,7 +13,6 @@ import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import '../../../shared/consts/index.js';
-import { useOnlyConnectedMode } from '../useOnlyConnectedMode/useOnlyConnectedMode.js';
 
 const isMultiWalletEnabledInURL = () => {
     const flag = 'multiwallet.widget';
@@ -26,9 +25,6 @@ const isMultiWalletEnabledInURL = () => {
 };
 const useMultiWalletFlag = () => {
     const { multiWallet: isMultiWalletEnabled } = useInternalDynamicContext();
-    const isOnlyConnected = useOnlyConnectedMode();
-    if (isOnlyConnected)
-        return false;
     return isMultiWalletEnabled && isMultiWalletEnabledInURL();
 };
 

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

@@ -19,6 +19,7 @@ var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLo
 require('../../../shared/consts/index.cjs');
 var primaryWalletIdValidator = require('../useWalletConnectors/utils/primaryWalletIdValidator/primaryWalletIdValidator.cjs');
 require('@dynamic-labs/multi-wallet');
+require('../../../config/ApiEndpoint.cjs');
 
 const usePrimaryWalletId = (internalEvents) => {
     const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletIdStorage,] = useLocalStorage.useLocalStorage(localStorage.PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator.primaryWalletIdValidator);

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

@@ -15,6 +15,7 @@ import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/use
 import '../../../shared/consts/index.js';
 import { primaryWalletIdValidator } from '../useWalletConnectors/utils/primaryWalletIdValidator/primaryWalletIdValidator.js';
 import '@dynamic-labs/multi-wallet';
+import '../../../config/ApiEndpoint.js';
 
 const usePrimaryWalletId = (internalEvents) => {
     const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletIdStorage,] = useLocalStorage(PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator);

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

@@ -16,14 +16,16 @@ require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
+var localStorage$1 = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
-require('../../../shared/utils/classes/storage/localStorage.cjs');
+var localStorage = require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 require('../../../shared/consts/index.cjs');
 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');
+require('../../../config/ApiEndpoint.cjs');
 var useSocialAuth = require('../useSocialAuth/useSocialAuth.cjs');
 
 // Hook exposed to customers and used internally to handle social account linking
@@ -83,8 +85,10 @@ const useSocialAccounts = ({ sessionTimeout } = {
             return;
         }
         try {
+            const primaryWalletId = localStorage.LocalStorage.getFromLS(localStorage$1.PRIMARY_WALLET_ID);
             const jwt = yield api.unlinkOAuth({
                 environmentId,
+                primaryWalletId,
                 verifiedCrentialId: (_b = verifiedCredential.id) !== null && _b !== void 0 ? _b : '',
             }, String(userJwt));
             if (!jwt) {

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

@@ -12,14 +12,16 @@ import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
+import { PRIMARY_WALLET_ID } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
-import '../../../shared/utils/classes/storage/localStorage.js';
+import { LocalStorage } from '../../../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 { getEnabledOAuthProviders } from '../../functions/getEnabledOAuthProviders/index.js';
 import { isSocialKycEnabled } from '../../functions/isSocialKycEnabled/isSocialKycEnabled.js';
+import '../../../config/ApiEndpoint.js';
 import { useSocialAuth } from '../useSocialAuth/useSocialAuth.js';
 
 // Hook exposed to customers and used internally to handle social account linking
@@ -79,8 +81,10 @@ const useSocialAccounts = ({ sessionTimeout } = {
             return;
         }
         try {
+            const primaryWalletId = LocalStorage.getFromLS(PRIMARY_WALLET_ID);
             const jwt = yield unlinkOAuth({
                 environmentId,
+                primaryWalletId,
                 verifiedCrentialId: (_b = verifiedCredential.id) !== null && _b !== void 0 ? _b : '',
             }, String(userJwt));
             if (!jwt) {