@dynamic-labs/sdk-react-core 4.0.0-alpha.4 → 4.0.0-alpha.41

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

@@ -30,9 +30,11 @@ require('../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
+require('../../../store/state/environmentId.cjs');
 var useSignConnectOnlyUser = require('../authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
+require('../../functions/compareChains/compareChains.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
@@ -45,7 +47,6 @@ require('../../../views/CollectUserDataView/useFields.cjs');
 require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
-require('../../../store/state/environmentId.cjs');
 require('../../../store/state/walletConnectorOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
@@ -56,10 +57,10 @@ require('../../../components/InlineWidget/InlineWidget.cjs');
 require('../../../components/Input/Input.cjs');
 require('../../../components/IsBrowser/IsBrowser.cjs');
 require('../../../components/MenuList/Dropdown/Dropdown.cjs');
+require('../../../components/OverlayCard/OverlayCard.cjs');
 require('../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
 require('../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
 require('../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
-require('../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../../components/Popper/Popper/Popper.cjs');
 require('../../../components/Popper/PopperContext/PopperContext.cjs');
@@ -68,28 +69,20 @@ require('qrcode');
 require('formik');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
-require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../store/state/sendBalances.cjs');
+require('../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
-require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+require('../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
 require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
-require('../../../../polyfills.cjs');
-require('../../../context/ErrorBoundary/ErrorBoundaryBase.cjs');
-require('../../../context/ErrorBoundary/ErrorBoundaryContext.cjs');
-require('../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
-require('../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.cjs');
-require('../../../context/WidgetRegistry/WidgetRegistryContextProvider.cjs');
-require('../../../context/FundingContext/FundingContext.cjs');
-require('../../../context/SendBalanceContext/SendBalanceContext.cjs');
-require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
-require('../../../context/ConnectWithOtpContext/constants.cjs');
-require('../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
+require('../../../../index.cjs');
 require('../../../store/state/tokenBalances.cjs');
+require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useAuthenticateConnectedUser = () => {

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

@@ -26,9 +26,11 @@ import '../../../store/state/projectSettings/projectSettings.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
+import '../../../store/state/environmentId.js';
 import { useSignConnectOnlyUser } from '../authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
+import '../../functions/compareChains/compareChains.js';
 import '../../../context/WalletContext/WalletContext.js';
 import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../context/ThemeContext/ThemeContext.js';
@@ -41,7 +43,6 @@ import '../../../views/CollectUserDataView/useFields.js';
 import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
-import '../../../store/state/environmentId.js';
 import '../../../store/state/walletConnectorOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
@@ -52,10 +53,10 @@ import '../../../components/InlineWidget/InlineWidget.js';
 import '../../../components/Input/Input.js';
 import '../../../components/IsBrowser/IsBrowser.js';
 import '../../../components/MenuList/Dropdown/Dropdown.js';
+import '../../../components/OverlayCard/OverlayCard.js';
 import '../../../components/Transition/ZoomTransition/ZoomTransition.js';
 import '../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
 import '../../../components/Transition/OpacityTransition/OpacityTransition.js';
-import '../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.js';
 import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
 import '../../../components/Popper/Popper/Popper.js';
 import '../../../components/Popper/PopperContext/PopperContext.js';
@@ -64,28 +65,20 @@ import 'qrcode';
 import 'formik';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
-import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../store/state/sendBalances.js';
+import '../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
-import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
+import '../../../views/TransactionConfirmationView/TransactionConfirmationView.js';
 import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
-import '../../../../polyfills.js';
-import '../../../context/ErrorBoundary/ErrorBoundaryBase.js';
-import '../../../context/ErrorBoundary/ErrorBoundaryContext.js';
-import '../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
-import '../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.js';
-import '../../../context/WidgetRegistry/WidgetRegistryContextProvider.js';
-import '../../../context/FundingContext/FundingContext.js';
-import '../../../context/SendBalanceContext/SendBalanceContext.js';
-import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
-import '../../../context/ConnectWithOtpContext/constants.js';
-import '../../../context/ReinitializeContext/ReinitializeContextProvider.js';
+import '../../../../index.js';
 import '../../../store/state/tokenBalances.js';
+import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useAuthenticateConnectedUser = () => {

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

@@ -13,20 +13,24 @@ const updateUserWalletsFromConnectedWallets = (userWallets, connectedWallets) =>
     const userWalletsCopy = [...userWallets];
     /** We will use this to find wallets addresses that were removed */
     const newWalletsAddresses = new Set();
+    const newWalletsChains = new Set();
     // First pass: add missing wallets and update changed properties
     for (const connectedWallet of connectedWallets) {
         newWalletsAddresses.add(connectedWallet.address);
-        const userWallet = userWalletsCopy.find((wallet) => wallet.address === connectedWallet.address);
+        newWalletsChains.add(connectedWallet.chain);
+        const userWallet = userWalletsCopy.find((wallet) => wallet.address === connectedWallet.address &&
+            wallet.chain === connectedWallet.chain);
         // Catch new wallets
         if (!userWallet) {
             userWalletsCopy.push(connectedWallet);
         }
     }
     // This filter is to remove a wallet that was previously added to userWallets but is not present
-    // among the connected wallets (it should not be removed if it's authenticated to the suer tho)
+    // among the connected wallets (it should not be removed if it's authenticated to the user tho)
     return userWalletsCopy.filter((userWallet) => 
     // Keep wallets that are still in the new list
-    newWalletsAddresses.has(userWallet.address) ||
+    (newWalletsAddresses.has(userWallet.address) &&
+        newWalletsChains.has(userWallet.chain)) ||
         // Or are linked to the current user
         userWallet.isAuthenticated);
 };

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

@@ -9,20 +9,24 @@ const updateUserWalletsFromConnectedWallets = (userWallets, connectedWallets) =>
     const userWalletsCopy = [...userWallets];
     /** We will use this to find wallets addresses that were removed */
     const newWalletsAddresses = new Set();
+    const newWalletsChains = new Set();
     // First pass: add missing wallets and update changed properties
     for (const connectedWallet of connectedWallets) {
         newWalletsAddresses.add(connectedWallet.address);
-        const userWallet = userWalletsCopy.find((wallet) => wallet.address === connectedWallet.address);
+        newWalletsChains.add(connectedWallet.chain);
+        const userWallet = userWalletsCopy.find((wallet) => wallet.address === connectedWallet.address &&
+            wallet.chain === connectedWallet.chain);
         // Catch new wallets
         if (!userWallet) {
             userWalletsCopy.push(connectedWallet);
         }
     }
     // This filter is to remove a wallet that was previously added to userWallets but is not present
-    // among the connected wallets (it should not be removed if it's authenticated to the suer tho)
+    // among the connected wallets (it should not be removed if it's authenticated to the user tho)
     return userWalletsCopy.filter((userWallet) => 
     // Keep wallets that are still in the new list
-    newWalletsAddresses.has(userWallet.address) ||
+    (newWalletsAddresses.has(userWallet.address) &&
+        newWalletsChains.has(userWallet.chain)) ||
         // Or are linked to the current user
         userWallet.isAuthenticated);
 };

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

@@ -30,6 +30,8 @@ var session = require('../../../data/api/session/session.cjs');
 require('../../../locale/locale.cjs');
 var getWalletProvider = require('../../functions/getWalletProvider/getWalletProvider.cjs');
 var isConnectOnly = require('../authenticationHooks/helpers/isConnectOnly.cjs');
+var getWalletConnectorForWallet = require('../../functions/getWalletConnectorForWallet/getWalletConnectorForWallet.cjs');
+var useDebounce = require('../useDebounce/useDebounce.cjs');
 var updateUserWalletsFromConnectedWallets = require('./updateUserWalletsFromConnectedWallets/updateUserWalletsFromConnectedWallets.cjs');
 
 const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, walletConnectorOptions, handleConnectedWallet, setShowAuthFlow, isBridgeFlow, user, }) => {
@@ -68,11 +70,10 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         setPrimaryWalletId,
     ]);
     // The function to update and define the connectedWallets list.
-    // It uses walletConnector to get the current wallet address and network
-    // The address and network in the runtime are updated by the event listeners
-    // The event listeners are updating `connectedWallets` list.
-    // It should be called on the first render and when connectedWalletsInfo updates
-    const updateConnectedWalletsList = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    // It should be called on the first render, when connectedWalletsInfo updates and when walletConnectorOptions updates.
+    // To avoid unnecessary updates that are causing issues with connectors added asynchronously,
+    // we're debouncing this function
+    const updateConnectedWalletsList = useDebounce.useDebounce(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const walletConnectors = walletConnectorOptions.map((wallet) => wallet.walletConnector);
         if (!walletConnectors.length) {
             return;
@@ -109,12 +110,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             return walletObject;
         })))).filter((wallet) => Boolean(wallet));
         setConnectedWallets(updatedConnectedWallets);
-    }), [
-        connectedWalletsInfo,
-        disconnectWallet,
-        setConnectedWallets,
-        walletConnectorOptions,
-    ]);
+    }), 300);
     // Generate the connectedWallets list when connectedWalletsInfo (localStorage) or memoized wallet connector updates
     React.useEffect(() => {
         updateConnectedWalletsList();
@@ -136,10 +132,11 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         var _a;
         const clonedConnectedWalletsList = [...connectedWallets];
         const connectedWalletIndex = clonedConnectedWalletsList.findIndex((connectedWallet) => connectedWallet.id === walletId);
-        if (connectedWalletIndex > -1) {
-            clonedConnectedWalletsList[connectedWalletIndex].address =
-                (_a = walletObject.address) !== null && _a !== void 0 ? _a : clonedConnectedWalletsList[connectedWalletIndex].address;
+        if (connectedWalletIndex < 0) {
+            return;
         }
+        clonedConnectedWalletsList[connectedWalletIndex] =
+            clonedConnectedWalletsList[connectedWalletIndex].connector.createWallet(Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), { address: (_a = walletObject.address) !== null && _a !== void 0 ? _a : clonedConnectedWalletsList[connectedWalletIndex].address, connector: getWalletConnectorForWallet.getWalletConnectorForWallet(clonedConnectedWalletsList[connectedWalletIndex]) }));
         setConnectedWallets(clonedConnectedWalletsList);
     }, [connectedWallets, setConnectedWallets]);
     // Keeps connected wallet data inside localStorage

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

@@ -26,6 +26,8 @@ import { createVisit } from '../../../data/api/session/session.js';
 import '../../../locale/locale.js';
 import { getWalletProvider } from '../../functions/getWalletProvider/getWalletProvider.js';
 import { isConnectOnly } from '../authenticationHooks/helpers/isConnectOnly.js';
+import { getWalletConnectorForWallet } from '../../functions/getWalletConnectorForWallet/getWalletConnectorForWallet.js';
+import { useDebounce } from '../useDebounce/useDebounce.js';
 import { updateUserWalletsFromConnectedWallets } from './updateUserWalletsFromConnectedWallets/updateUserWalletsFromConnectedWallets.js';
 
 const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, walletConnectorOptions, handleConnectedWallet, setShowAuthFlow, isBridgeFlow, user, }) => {
@@ -64,11 +66,10 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         setPrimaryWalletId,
     ]);
     // The function to update and define the connectedWallets list.
-    // It uses walletConnector to get the current wallet address and network
-    // The address and network in the runtime are updated by the event listeners
-    // The event listeners are updating `connectedWallets` list.
-    // It should be called on the first render and when connectedWalletsInfo updates
-    const updateConnectedWalletsList = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+    // It should be called on the first render, when connectedWalletsInfo updates and when walletConnectorOptions updates.
+    // To avoid unnecessary updates that are causing issues with connectors added asynchronously,
+    // we're debouncing this function
+    const updateConnectedWalletsList = useDebounce(() => __awaiter(void 0, void 0, void 0, function* () {
         const walletConnectors = walletConnectorOptions.map((wallet) => wallet.walletConnector);
         if (!walletConnectors.length) {
             return;
@@ -105,12 +106,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             return walletObject;
         })))).filter((wallet) => Boolean(wallet));
         setConnectedWallets(updatedConnectedWallets);
-    }), [
-        connectedWalletsInfo,
-        disconnectWallet,
-        setConnectedWallets,
-        walletConnectorOptions,
-    ]);
+    }), 300);
     // Generate the connectedWallets list when connectedWalletsInfo (localStorage) or memoized wallet connector updates
     useEffect(() => {
         updateConnectedWalletsList();
@@ -132,10 +128,11 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         var _a;
         const clonedConnectedWalletsList = [...connectedWallets];
         const connectedWalletIndex = clonedConnectedWalletsList.findIndex((connectedWallet) => connectedWallet.id === walletId);
-        if (connectedWalletIndex > -1) {
-            clonedConnectedWalletsList[connectedWalletIndex].address =
-                (_a = walletObject.address) !== null && _a !== void 0 ? _a : clonedConnectedWalletsList[connectedWalletIndex].address;
+        if (connectedWalletIndex < 0) {
+            return;
         }
+        clonedConnectedWalletsList[connectedWalletIndex] =
+            clonedConnectedWalletsList[connectedWalletIndex].connector.createWallet(Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), { address: (_a = walletObject.address) !== null && _a !== void 0 ? _a : clonedConnectedWalletsList[connectedWalletIndex].address, connector: getWalletConnectorForWallet(clonedConnectedWalletsList[connectedWalletIndex]) }));
         setConnectedWallets(clonedConnectedWalletsList);
     }, [connectedWallets, setConnectedWallets]);
     // Keeps connected wallet data inside localStorage

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

@@ -19,6 +19,7 @@ require('../../constants/values.cjs');
 require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
+var useWalletConnectorEvent = require('../events/useWalletConnectorEvent/useWalletConnectorEvent.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
@@ -32,8 +33,10 @@ require('../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
+require('../../../store/state/environmentId.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
+require('../../functions/compareChains/compareChains.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
@@ -47,7 +50,6 @@ require('../../../views/CollectUserDataView/useFields.cjs');
 require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
-require('../../../store/state/environmentId.cjs');
 require('../../../store/state/walletConnectorOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
@@ -58,10 +60,10 @@ require('../../../components/InlineWidget/InlineWidget.cjs');
 require('../../../components/Input/Input.cjs');
 require('../../../components/IsBrowser/IsBrowser.cjs');
 require('../../../components/MenuList/Dropdown/Dropdown.cjs');
+require('../../../components/OverlayCard/OverlayCard.cjs');
 require('../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
 require('../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
 require('../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
-require('../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../../components/Popper/Popper/Popper.cjs');
 require('../../../components/Popper/PopperContext/PopperContext.cjs');
@@ -70,28 +72,20 @@ require('qrcode');
 require('formik');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
-require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../store/state/sendBalances.cjs');
+require('../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
-require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+require('../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
 require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
-require('../../../../polyfills.cjs');
-require('../../../context/ErrorBoundary/ErrorBoundaryBase.cjs');
-require('../../../context/ErrorBoundary/ErrorBoundaryContext.cjs');
-require('../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
-require('../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.cjs');
-require('../../../context/WidgetRegistry/WidgetRegistryContextProvider.cjs');
-require('../../../context/FundingContext/FundingContext.cjs');
-require('../../../context/SendBalanceContext/SendBalanceContext.cjs');
-require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
-require('../../../context/ConnectWithOtpContext/constants.cjs');
-require('../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
+require('../../../../index.cjs');
 require('../../../store/state/tokenBalances.cjs');
+require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useConnectedWalletsNetworkValidation = () => {
@@ -140,6 +134,14 @@ const useConnectedWalletsNetworkValidation = () => {
         setShowAuthFlow,
         setView,
     ]);
+    const uniqueConnectors = React.useMemo(() => {
+        const connectors = connectedWallets.map(({ connector }) => connector);
+        const allWalletConnectors = new Set([...connectors].filter((connector) => Boolean(connector)));
+        return Array.from(allWalletConnectors);
+    }, [connectedWallets]);
+    useWalletConnectorEvent.useWalletConnectorEvent(uniqueConnectors, 'chainChange', ({ chain }) => {
+        validateNetwork();
+    });
     React.useEffect(() => {
         /**
          * This check was added to prevent the "wrong network" modal from appearing

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

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useCallback, useEffect } from 'react';
+import { useCallback, useMemo, useEffect } from 'react';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api-core';
 import '../../../shared/logger.js';
@@ -15,6 +15,7 @@ import '../../constants/values.js';
 import '../../../store/state/loadingAndLifecycle.js';
 import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
+import { useWalletConnectorEvent } from '../events/useWalletConnectorEvent/useWalletConnectorEvent.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
@@ -28,8 +29,10 @@ import '../../../store/state/projectSettings/projectSettings.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
+import '../../../store/state/environmentId.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
+import '../../functions/compareChains/compareChains.js';
 import '../../../context/WalletContext/WalletContext.js';
 import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../context/ThemeContext/ThemeContext.js';
@@ -43,7 +46,6 @@ import '../../../views/CollectUserDataView/useFields.js';
 import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
-import '../../../store/state/environmentId.js';
 import '../../../store/state/walletConnectorOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
@@ -54,10 +56,10 @@ import '../../../components/InlineWidget/InlineWidget.js';
 import '../../../components/Input/Input.js';
 import '../../../components/IsBrowser/IsBrowser.js';
 import '../../../components/MenuList/Dropdown/Dropdown.js';
+import '../../../components/OverlayCard/OverlayCard.js';
 import '../../../components/Transition/ZoomTransition/ZoomTransition.js';
 import '../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
 import '../../../components/Transition/OpacityTransition/OpacityTransition.js';
-import '../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.js';
 import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
 import '../../../components/Popper/Popper/Popper.js';
 import '../../../components/Popper/PopperContext/PopperContext.js';
@@ -66,28 +68,20 @@ import 'qrcode';
 import 'formik';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
-import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../store/state/sendBalances.js';
+import '../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
-import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
+import '../../../views/TransactionConfirmationView/TransactionConfirmationView.js';
 import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
-import '../../../../polyfills.js';
-import '../../../context/ErrorBoundary/ErrorBoundaryBase.js';
-import '../../../context/ErrorBoundary/ErrorBoundaryContext.js';
-import '../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
-import '../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.js';
-import '../../../context/WidgetRegistry/WidgetRegistryContextProvider.js';
-import '../../../context/FundingContext/FundingContext.js';
-import '../../../context/SendBalanceContext/SendBalanceContext.js';
-import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
-import '../../../context/ConnectWithOtpContext/constants.js';
-import '../../../context/ReinitializeContext/ReinitializeContextProvider.js';
+import '../../../../index.js';
 import '../../../store/state/tokenBalances.js';
+import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useConnectedWalletsNetworkValidation = () => {
@@ -136,6 +130,14 @@ const useConnectedWalletsNetworkValidation = () => {
         setShowAuthFlow,
         setView,
     ]);
+    const uniqueConnectors = useMemo(() => {
+        const connectors = connectedWallets.map(({ connector }) => connector);
+        const allWalletConnectors = new Set([...connectors].filter((connector) => Boolean(connector)));
+        return Array.from(allWalletConnectors);
+    }, [connectedWallets]);
+    useWalletConnectorEvent(uniqueConnectors, 'chainChange', ({ chain }) => {
+        validateNetwork();
+    });
     useEffect(() => {
         /**
          * This check was added to prevent the "wrong network" modal from appearing

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

@@ -31,13 +31,16 @@ require('../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
+require('../../../store/state/environmentId.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 var createEmbeddedWalletRequest = require('../../../views/Passkey/utils/createEmbeddedWalletRequest/createEmbeddedWalletRequest.cjs');
 var findPasskeyEmailWalletConnector = require('../../../views/Passkey/utils/findPasskeyEmailWalletConnector/findPasskeyEmailWalletConnector.cjs');
 var smartWallet = require('../useWalletConnectors/utils/smartWallet/smartWallet.cjs');
 var findPrimaryEmbeddedChain = require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
+var useEmbeddedWalletSessionKeys = require('../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
+require('../../functions/compareChains/compareChains.cjs');
 require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
@@ -49,7 +52,6 @@ require('../../../views/CollectUserDataView/useFields.cjs');
 require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
-require('../../../store/state/environmentId.cjs');
 require('../../../store/state/walletConnectorOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
@@ -60,10 +62,10 @@ require('../../../components/InlineWidget/InlineWidget.cjs');
 require('../../../components/Input/Input.cjs');
 require('../../../components/IsBrowser/IsBrowser.cjs');
 require('../../../components/MenuList/Dropdown/Dropdown.cjs');
+require('../../../components/OverlayCard/OverlayCard.cjs');
 require('../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
 require('../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
 require('../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
-require('../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../../components/Popper/Popper/Popper.cjs');
 require('../../../components/Popper/PopperContext/PopperContext.cjs');
@@ -72,36 +74,32 @@ require('qrcode');
 require('formik');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
-require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../store/state/sendBalances.cjs');
+require('../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
-require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+require('../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
 require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
-require('../../../../polyfills.cjs');
-require('../../../context/ErrorBoundary/ErrorBoundaryBase.cjs');
-require('../../../context/ErrorBoundary/ErrorBoundaryContext.cjs');
-require('../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
-require('../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.cjs');
-require('../../../context/WidgetRegistry/WidgetRegistryContextProvider.cjs');
-require('../../../context/FundingContext/FundingContext.cjs');
-require('../../../context/SendBalanceContext/SendBalanceContext.cjs');
-require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
-require('../../../context/ConnectWithOtpContext/constants.cjs');
-require('../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
+require('../../../../index.cjs');
 require('../../../store/state/tokenBalances.cjs');
+require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 // This hook needs to be async that's why it's not using useMutation
 const useCreateDynamicEmbeddedWalletMutation = () => {
     var _a, _b;
-    const { setPrimaryWalletId, user, setShowAuthFlow, projectSettings } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setPrimaryWalletId, user, setShowAuthFlow, projectSettings, environmentId, } = useInternalDynamicContext.useInternalDynamicContext();
     const [isLoading, setIsLoading] = React.useState(false);
     const [error, setError] = React.useState();
+    const { getSessionPublicKey, shouldRegisterSessionKeysOnSignin } = useEmbeddedWalletSessionKeys.useEmbeddedWalletSessionKeys({
+        environmentId,
+        projectSettings,
+    });
     const embeddedChainConfig = ((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.chainConfigurations) || [];
     const primaryEmbeddedChain = findPrimaryEmbeddedChain.findPrimaryEmbeddedChain(projectSettings);
     const embeddedChains = embeddedChainConfig
@@ -115,10 +113,16 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
         if (!user) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
+        let sessionPublicKey;
+        // get the session public key that was created in the login/signup flow
+        if (shouldRegisterSessionKeysOnSignin()) {
+            sessionPublicKey = getSessionPublicKey();
+        }
         try {
             const { embeddedWalletVerifiedCredential, updatedUser, walletConnector, } = yield createEmbeddedWalletRequest.createEmbeddedWalletRequest({
                 chains: chains !== null && chains !== void 0 ? chains : embeddedChains,
                 environmentId,
+                sessionPublicKey,
                 user,
                 walletConnector: findPasskeyEmailWalletConnector.findPasskeyEmailWalletConnector(walletConnectorOptions, primaryEmbeddedChain),
                 webAuthnAttestation: options === null || options === void 0 ? void 0 : options.webAuthnAttestation,
@@ -127,7 +131,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
             const turnkeyVerifiedCredentials = (_d = updatedUser.verifiedCredentials) === null || _d === void 0 ? void 0 : _d.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'));
             /** It's not authenticated if it's a turnkey wallet that still hasn't created a passkey */
             const isAuthenticated = Boolean((_e = turnkeyVerifiedCredentials === null || turnkeyVerifiedCredentials === void 0 ? void 0 : turnkeyVerifiedCredentials.walletProperties) === null || _e === void 0 ? void 0 : _e.isAuthenticatorAttached);
-            const passkeyWallet = walletConnector.createWallet({
+            const embeddedWallet = walletConnector.createWallet({
                 address: (yield walletConnector.getAddress()) || '',
                 chain: walletConnector.connectedChain,
                 connector: walletConnector,
@@ -142,12 +146,13 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
             else {
                 yield smartWallet.initializeSmartWallet({
                     account: smartWallet$1,
+                    primaryWalletId: smartWallet$1.id,
                     verifiedCredentials: updatedUser.verifiedCredentials,
                     walletConnectorOptions,
                 });
                 setPrimaryWalletId(smartWallet$1.id);
             }
-            dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', passkeyWallet, turnkeyVerifiedCredentials, updatedUser);
+            dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', embeddedWallet, turnkeyVerifiedCredentials, updatedUser);
             setShowAuthFlow(false, { performMultiWalletChecks: false });
         }
         catch (err) {