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

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

@@ -28,28 +28,32 @@ import '../../../store/state/user/user.js';
 import '../../../locale/locale.js';
 import { verifyWallet, linkWallet } from '../../../data/api/wallets/wallets.js';
 import '../../../store/state/projectSettings/projectSettings.js';
+import { updatePrimaryWalletId } from '../../functions/updatePrimaryWalletId/updatePrimaryWalletId.js';
 import { useAccessDeniedContext } from '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import { useAccountExistsContext } from '../../../context/AccountExistsContext/AccountExistsContext.js';
 import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
 import { getSiweStatement } from '../../functions/getSiweStatement/getSiweStatement.js';
 import { getWalletProvider } from '../../functions/getWalletProvider/getWalletProvider.js';
 import '../../../context/VerificationContext/VerificationContext.js';
+import '../../../store/state/nonce/nonce.js';
 import 'react-dom';
+import '../../functions/compareChains/compareChains.js';
+import { useEmbeddedWalletSessionKeys } from '../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js';
 import '../../../context/WalletContext/WalletContext.js';
+import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
 import { useUserAuth } from '../useUserAuth/useUserAuth.js';
-import { useEmbeddedWalletSessionKeys } from '../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js';
 import 'yup';
 import '../../../context/MockContext/MockContext.js';
 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 '../../../store/state/dynamicContextProps/dynamicContextProps.js';
+import '../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../components/Alert/Alert.js';
@@ -59,28 +63,31 @@ 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';
 import 'react-focus-lock';
 import 'qrcode';
 import 'formik';
+import '../useSubdomainCheck/useSubdomainCheck.js';
 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 '../../../context/LoadingContext/LoadingContext.js';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
-import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../store/state/sendBalances.js';
+import '@dynamic-labs/ethereum-aa';
+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 '../../../../index.js';
 import '../../../store/state/tokenBalances.js';
@@ -89,12 +96,12 @@ import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 // This logic is used to both verify or link a wallet
 // Since we are re-using the different screens to authenticate or link the wallet.
 // This logic is the best place to determine whether we should verify or verify and link.
-const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, }) => {
+const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, }) => {
     const { setExistentAccountData } = useAccountExistsContext();
     const { setDeniedAddress, setDeniedOauthProvider } = useAccessDeniedContext();
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage, setError } = useErrorContext();
-    const { multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallets, authMode, user, setAuthMode, removeConnectedWalletsInfo, events, primaryWallet, enableConnectOnlyFallback, selectedWalletConnector, } = useInternalDynamicContext();
+    const { multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setShowAuthFlow, siweStatement, connectedWallets, authMode, user, setAuthMode, removeConnectedWalletsInfo, events, primaryWallet, enableConnectOnlyFallback, selectedWalletConnector, } = useInternalDynamicContext();
     const { addedWalletsIds } = useInternalUserWallets();
     const { initAuth } = useUserAuth({ authMethod: 'wallet' });
     const { generateSessionKey, shouldRegisterSessionKeysOnSignin } = useEmbeddedWalletSessionKeys({
@@ -106,15 +113,11 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
     const verifyOnly = !user;
     const shouldFallbackToConnectOnly = enableConnectOnlyFallback && (verifyOnly || !multiWalletEnabled);
     const generateJWT = (walletConnector, walletProvider, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride) => __awaiter(void 0, void 0, void 0, function* () {
-        const nonce = consumeNonce();
-        if (nonce === undefined)
-            throw new DynamicError('Missing nonce');
         const verifyArgs = yield getVerifyArgs({
             displaySiweStatement,
             environmentId,
             getAddressOpts,
             messageToSignOverride,
-            nonce,
             publicWalletAddress,
             signedMessageOverride,
             siweStatement: getSiweStatement({ appName, siweStatement }),
@@ -139,7 +142,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
     // user logs in for the first time.
     // Or when the user is linking an additional
     // account on the same wallet as the primary wallet.
-    const updatePrimaryWalletId = ({ walletConnector, verifiedCredentials, lastVerifiedCredentialId, }) => {
+    const updatePrimaryWallet = ({ walletConnector, verifiedCredentials, lastVerifiedCredentialId, }) => {
         const newSelectedCredentialWallet = verifiedCredentials.find((cred) => cred.id === lastVerifiedCredentialId && cred.format === 'blockchain');
         if (newSelectedCredentialWallet) {
             const currentPrimaryWallet = verifiedCredentials.find((a) => a.id === primaryWalletId);
@@ -150,7 +153,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
                         (currentPrimaryWallet === null || currentPrimaryWallet === void 0 ? void 0 : currentPrimaryWallet.walletName)) ||
                 ((currentPrimaryWallet === null || currentPrimaryWallet === void 0 ? void 0 : currentPrimaryWallet.chain) === 'flow' &&
                     walletConnector.connectedChain === 'FLOW')) {
-                setPrimaryWalletId(newSelectedCredentialWallet.id);
+                updatePrimaryWalletId(newSelectedCredentialWallet.id);
             }
         }
     };
@@ -284,7 +287,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
                     }
                     StorageService.setItem(LAST_USED_WALLET, walletConnector.key);
                     setAuthMode('connect-and-sign');
-                    updatePrimaryWalletId({
+                    updatePrimaryWallet({
                         lastVerifiedCredentialId: user.lastVerifiedCredentialId,
                         verifiedCredentials: user.verifiedCredentials,
                         walletConnector,

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

@@ -23,15 +23,19 @@ require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
+require('../../../store/state/nonce/nonce.cjs');
 require('../../../config/ApiEndpoint.cjs');
 require('../../../store/state/user/user.cjs');
 require('../../../locale/locale.cjs');
 require('../../../store/state/projectSettings/projectSettings.cjs');
+require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
+require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.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');
@@ -44,8 +48,7 @@ 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('../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../components/Alert/Alert.cjs');
@@ -55,27 +58,30 @@ 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');
 require('react-focus-lock');
 require('qrcode');
 require('formik');
+require('../useSubdomainCheck/useSubdomainCheck.cjs');
 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('@dynamic-labs/ethereum-aa');
+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('../../../../index.cjs');
 require('../../../store/state/tokenBalances.cjs');

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

@@ -19,15 +19,19 @@ import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
+import '../../../store/state/nonce/nonce.js';
 import '../../../config/ApiEndpoint.js';
 import '../../../store/state/user/user.js';
 import '../../../locale/locale.js';
 import '../../../store/state/projectSettings/projectSettings.js';
+import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
+import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.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';
@@ -40,8 +44,7 @@ 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 '../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../components/Alert/Alert.js';
@@ -51,27 +54,30 @@ 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';
 import 'react-focus-lock';
 import 'qrcode';
 import 'formik';
+import '../useSubdomainCheck/useSubdomainCheck.js';
 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 '@dynamic-labs/ethereum-aa';
+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 '../../../../index.js';
 import '../../../store/state/tokenBalances.js';

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

@@ -18,21 +18,38 @@ require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../shared/consts/index.cjs');
+var dynamicEvents = require('../../../events/dynamicEvents.cjs');
+require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
+require('../../../store/state/nonce/nonce.cjs');
+require('../../../config/ApiEndpoint.cjs');
+require('../../../store/state/user/user.cjs');
+require('../../../locale/locale.cjs');
+require('../../../store/state/projectSettings/projectSettings.cjs');
+var updatePrimaryWalletId = require('../../functions/updatePrimaryWalletId/updatePrimaryWalletId.cjs');
 var createLinkedWalletsFromWalletOptions = require('./utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs');
 var updateUserWalletsFromLinkedWallets = require('./utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.cjs');
 
-const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, }) => {
+const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, user, canHaveMultipleWalletsConnected, separateSmartWalletAndSigner = false, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = React.useState(false);
+    // keeps track of the last primary wallet id to avoid emitting the same event multiple times
+    const lastPrimaryWalletId = React.useRef(primaryWalletId);
     const linkedWallets = React.useMemo(() => {
         if (!user) {
             return [];
         }
         return createLinkedWalletsFromWalletOptions.createLinkedWalletsFromWalletOptions({
             primaryWalletId,
+            separateSmartWalletAndSigner,
             user,
             walletConnectorOptions,
         });
-    }, [user, primaryWalletId, walletConnectorOptions]);
+    }, [
+        user,
+        primaryWalletId,
+        walletConnectorOptions,
+        separateSmartWalletAndSigner,
+    ]);
     logger.logger.logVerboseTroubleshootingMessage('linkedWallets', linkedWallets);
     const wallets = React.useMemo(() => {
         // Before signing the first message we are using connected wallets list
@@ -71,6 +88,13 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
         setUserWallets((userWallets) => updateUserWalletsFromLinkedWallets.updateUserWalletsFromLinkedWallets(userWallets, wallets));
     }, [setUserWallets, wallets]);
     const primaryWallet = React.useMemo(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
+    // emit primaryWalletChanged event if the primary wallet changes
+    React.useEffect(() => {
+        if (primaryWallet && primaryWallet.id !== lastPrimaryWalletId.current) {
+            lastPrimaryWalletId.current = primaryWallet.id;
+            dynamicEvents.dynamicEvents.emit('primaryWalletChanged', primaryWallet);
+        }
+    }, [primaryWallet]);
     const secondaryWallets = React.useMemo(() => canHaveMultipleWalletsConnected
         ? wallets.filter((wallet) => wallet.id !== primaryWalletId)
         : [], [primaryWalletId, wallets, canHaveMultipleWalletsConnected]);
@@ -85,7 +109,7 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
         const newPrimaryWallet = yield getSelectedWallet(walletId);
         if (!primaryWalletId) {
             yield newPrimaryWallet.connector.connect();
-            setPrimaryWalletId(walletId);
+            updatePrimaryWalletId.updatePrimaryWalletId(walletId);
             return;
         }
         if (primaryWalletId === walletId)
@@ -97,14 +121,9 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
                 emailConnector.setEmail(email);
             }
         }
-        setPrimaryWalletId(walletId);
+        updatePrimaryWalletId.updatePrimaryWalletId(walletId);
         setMultiWalletWidgetState('idle');
-    }), [
-        getSelectedWallet,
-        primaryWalletId,
-        setMultiWalletWidgetState,
-        setPrimaryWalletId,
-    ]);
+    }), [getSelectedWallet, primaryWalletId, setMultiWalletWidgetState]);
     return {
         primaryWallet,
         secondaryWallets,

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

@@ -8,9 +8,9 @@ type Props = {
     walletConnectorOptions: WalletOption[];
     setMultiWalletWidgetState: MultiWalletWidgetStateSetter;
     primaryWalletId: string | undefined;
-    setPrimaryWalletId: (walletId: string) => void;
     user?: UserProfile;
     canHaveMultipleWalletsConnected?: boolean;
+    separateSmartWalletAndSigner?: boolean;
 };
 export interface UseWalletConnectors {
     primaryWallet: Wallet | null;
@@ -20,5 +20,5 @@ export interface UseWalletConnectors {
     showQrcodeModal: boolean;
     wallets: Wallet[];
 }
-export declare const useWalletConnectors: ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, }: Props) => UseWalletConnectors;
+export declare const useWalletConnectors: ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, user, canHaveMultipleWalletsConnected, separateSmartWalletAndSigner, }: Props) => UseWalletConnectors;
 export {};

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

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useState, useMemo, useEffect, useCallback } from 'react';
+import { useState, useRef, useMemo, useEffect, useCallback } from 'react';
 import { DynamicError } from '@dynamic-labs/utils';
 import { isEmbeddedConnector, isEmailWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -14,21 +14,38 @@ import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../store/state/loadingAndLifecycle.js';
 import '../../../shared/consts/index.js';
+import { dynamicEvents } from '../../../events/dynamicEvents.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import '../../../store/state/nonce/nonce.js';
+import '../../../config/ApiEndpoint.js';
+import '../../../store/state/user/user.js';
+import '../../../locale/locale.js';
+import '../../../store/state/projectSettings/projectSettings.js';
+import { updatePrimaryWalletId } from '../../functions/updatePrimaryWalletId/updatePrimaryWalletId.js';
 import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
 import { updateUserWalletsFromLinkedWallets } from './utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.js';
 
-const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, setPrimaryWalletId, user, canHaveMultipleWalletsConnected, }) => {
+const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOptions, setMultiWalletWidgetState, primaryWalletId, user, canHaveMultipleWalletsConnected, separateSmartWalletAndSigner = false, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = useState(false);
+    // keeps track of the last primary wallet id to avoid emitting the same event multiple times
+    const lastPrimaryWalletId = useRef(primaryWalletId);
     const linkedWallets = useMemo(() => {
         if (!user) {
             return [];
         }
         return createLinkedWalletsFromWalletOptions({
             primaryWalletId,
+            separateSmartWalletAndSigner,
             user,
             walletConnectorOptions,
         });
-    }, [user, primaryWalletId, walletConnectorOptions]);
+    }, [
+        user,
+        primaryWalletId,
+        walletConnectorOptions,
+        separateSmartWalletAndSigner,
+    ]);
     logger.logVerboseTroubleshootingMessage('linkedWallets', linkedWallets);
     const wallets = useMemo(() => {
         // Before signing the first message we are using connected wallets list
@@ -67,6 +84,13 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
         setUserWallets((userWallets) => updateUserWalletsFromLinkedWallets(userWallets, wallets));
     }, [setUserWallets, wallets]);
     const primaryWallet = useMemo(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
+    // emit primaryWalletChanged event if the primary wallet changes
+    useEffect(() => {
+        if (primaryWallet && primaryWallet.id !== lastPrimaryWalletId.current) {
+            lastPrimaryWalletId.current = primaryWallet.id;
+            dynamicEvents.emit('primaryWalletChanged', primaryWallet);
+        }
+    }, [primaryWallet]);
     const secondaryWallets = useMemo(() => canHaveMultipleWalletsConnected
         ? wallets.filter((wallet) => wallet.id !== primaryWalletId)
         : [], [primaryWalletId, wallets, canHaveMultipleWalletsConnected]);
@@ -81,7 +105,7 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
         const newPrimaryWallet = yield getSelectedWallet(walletId);
         if (!primaryWalletId) {
             yield newPrimaryWallet.connector.connect();
-            setPrimaryWalletId(walletId);
+            updatePrimaryWalletId(walletId);
             return;
         }
         if (primaryWalletId === walletId)
@@ -93,14 +117,9 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
                 emailConnector.setEmail(email);
             }
         }
-        setPrimaryWalletId(walletId);
+        updatePrimaryWalletId(walletId);
         setMultiWalletWidgetState('idle');
-    }), [
-        getSelectedWallet,
-        primaryWalletId,
-        setMultiWalletWidgetState,
-        setPrimaryWalletId,
-    ]);
+    }), [getSelectedWallet, primaryWalletId, setMultiWalletWidgetState]);
     return {
         primaryWallet,
         secondaryWallets,

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

@@ -10,7 +10,7 @@ var shouldManuallyReconnectOnRefresh = require('../../../../functions/shouldManu
 var convertLegacyPhantomLedgerConnector = require('../convertLegacyPhantomLedgerConnector/convertLegacyPhantomLedgerConnector.cjs');
 var smartWallet = require('../smartWallet/smartWallet.cjs');
 
-const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, primaryWalletId, }) => {
+const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, primaryWalletId, separateSmartWalletAndSigner, }) => {
     // wallet state should be null while loading all the wallets or when there is no user
     if (!walletConnectorOptions || !user) {
         return [];
@@ -37,13 +37,15 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
             wallet.walletConnector.isHardwareWalletEnabled = true;
         }
         // this account is the owner of a smart wallet, and should not be surfaced
-        if (smartWallet.isOwnerOfASmartWallet(account, user.verifiedCredentials)) {
+        if (!separateSmartWalletAndSigner &&
+            smartWallet.isOwnerOfASmartWallet(account, user.verifiedCredentials)) {
             return null;
         }
         if (account.address && account.chain) {
             if (account.walletProvider === sdkApiCore.WalletProviderEnum.SmartContractWallet) {
                 smartWallet.initializeSmartWallet({
                     account,
+                    primaryWalletId,
                     verifiedCredentials: user.verifiedCredentials,
                     walletConnectorOptions,
                 });

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.d.ts

@@ -4,6 +4,7 @@ type CreateWalletsFromWalletOptionsProps = {
     user: UserProfile;
     primaryWalletId: string | undefined;
     walletConnectorOptions: WalletOption[] | undefined;
+    separateSmartWalletAndSigner?: boolean;
 };
-export declare const createLinkedWalletsFromWalletOptions: ({ user, walletConnectorOptions, primaryWalletId, }: CreateWalletsFromWalletOptionsProps) => Wallet[];
+export declare const createLinkedWalletsFromWalletOptions: ({ user, walletConnectorOptions, primaryWalletId, separateSmartWalletAndSigner, }: CreateWalletsFromWalletOptionsProps) => Wallet[];
 export {};

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

@@ -6,7 +6,7 @@ import { shouldManuallyReconnectOnRefresh } from '../../../../functions/shouldMa
 import { convertLegacyPhantomLedgerConnector } from '../convertLegacyPhantomLedgerConnector/convertLegacyPhantomLedgerConnector.js';
 import { isOwnerOfASmartWallet, initializeSmartWallet } from '../smartWallet/smartWallet.js';
 
-const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, primaryWalletId, }) => {
+const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, primaryWalletId, separateSmartWalletAndSigner, }) => {
     // wallet state should be null while loading all the wallets or when there is no user
     if (!walletConnectorOptions || !user) {
         return [];
@@ -33,13 +33,15 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
             wallet.walletConnector.isHardwareWalletEnabled = true;
         }
         // this account is the owner of a smart wallet, and should not be surfaced
-        if (isOwnerOfASmartWallet(account, user.verifiedCredentials)) {
+        if (!separateSmartWalletAndSigner &&
+            isOwnerOfASmartWallet(account, user.verifiedCredentials)) {
             return null;
         }
         if (account.address && account.chain) {
             if (account.walletProvider === WalletProviderEnum.SmartContractWallet) {
                 initializeSmartWallet({
                     account,
+                    primaryWalletId,
                     verifiedCredentials: user.verifiedCredentials,
                     walletConnectorOptions,
                 });

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

@@ -13,8 +13,8 @@ var findWalletOptionFor = require('../../../../functions/findWalletOptionFor/fin
 const findOwner = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.id === account.signerRefId);
 const findSmartWallet = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.signerRefId === account.id);
 const isOwnerOfASmartWallet = (account, verifiedCredentials) => Boolean(findSmartWallet(account, verifiedCredentials));
-const initializeSmartWallet = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ account, verifiedCredentials, walletConnectorOptions, }) {
-    var _b, _c;
+const initializeSmartWallet = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ account, verifiedCredentials, walletConnectorOptions, primaryWalletId, }) {
+    var _b, _c, _d, _e, _f;
     const owner = findOwner(account, verifiedCredentials);
     if (!owner) {
         throw new Error('could not find associated eoa account for smart wallet');
@@ -45,7 +45,19 @@ const initializeSmartWallet = (_a) => _tslib.__awaiter(void 0, [_a], void 0, fun
     if (!walletConnectorCore.isAccountAbstractionConnector(connector)) {
         throw new Error('could not initialize smart wallet');
     }
-    yield connector.setEoaConnector(ownerWallet.walletConnector);
+    if (!owner.address || !account.address) {
+        throw new Error('could not find owner or smart wallet address');
+    }
+    const shouldSetEoaConnector = primaryWalletId === owner.id || primaryWalletId === account.id;
+    yield connector.registerEoa({
+        ecdsaProviderType: (_d = account.walletProperties) === null || _d === void 0 ? void 0 : _d.ecdsaProviderType,
+        entryPointVersion: (_e = account.walletProperties) === null || _e === void 0 ? void 0 : _e.entryPointVersion,
+        eoaAddress: owner.address,
+        eoaConnector: ownerWallet.walletConnector,
+        kernelVersion: (_f = account.walletProperties) === null || _f === void 0 ? void 0 : _f.kernelVersion,
+        shouldSetEoaConnector,
+        smartWalletAddress: account.address,
+    });
 });
 
 exports.findOwner = findOwner;

package/src/lib/utils/hooks/useWalletConnectors/utils/smartWallet/smartWallet.d.ts

@@ -3,8 +3,9 @@ import { WalletOption } from '../../../../../shared';
 export declare const findOwner: (account: JwtVerifiedCredential, verifiedCredentials: JwtVerifiedCredential[]) => JwtVerifiedCredential | undefined;
 export declare const findSmartWallet: (account: JwtVerifiedCredential, verifiedCredentials: JwtVerifiedCredential[]) => JwtVerifiedCredential | undefined;
 export declare const isOwnerOfASmartWallet: (account: JwtVerifiedCredential, verifiedCredentials: JwtVerifiedCredential[]) => boolean;
-export declare const initializeSmartWallet: ({ account, verifiedCredentials, walletConnectorOptions, }: {
+export declare const initializeSmartWallet: ({ account, verifiedCredentials, walletConnectorOptions, primaryWalletId, }: {
     account: JwtVerifiedCredential;
     verifiedCredentials: JwtVerifiedCredential[];
     walletConnectorOptions: WalletOption[];
+    primaryWalletId?: string;
 }) => Promise<void>;

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

@@ -9,8 +9,8 @@ import { findWalletOptionFor } from '../../../../functions/findWalletOptionFor/f
 const findOwner = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.id === account.signerRefId);
 const findSmartWallet = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.signerRefId === account.id);
 const isOwnerOfASmartWallet = (account, verifiedCredentials) => Boolean(findSmartWallet(account, verifiedCredentials));
-const initializeSmartWallet = (_a) => __awaiter(void 0, [_a], void 0, function* ({ account, verifiedCredentials, walletConnectorOptions, }) {
-    var _b, _c;
+const initializeSmartWallet = (_a) => __awaiter(void 0, [_a], void 0, function* ({ account, verifiedCredentials, walletConnectorOptions, primaryWalletId, }) {
+    var _b, _c, _d, _e, _f;
     const owner = findOwner(account, verifiedCredentials);
     if (!owner) {
         throw new Error('could not find associated eoa account for smart wallet');
@@ -41,7 +41,19 @@ const initializeSmartWallet = (_a) => __awaiter(void 0, [_a], void 0, function*
     if (!isAccountAbstractionConnector(connector)) {
         throw new Error('could not initialize smart wallet');
     }
-    yield connector.setEoaConnector(ownerWallet.walletConnector);
+    if (!owner.address || !account.address) {
+        throw new Error('could not find owner or smart wallet address');
+    }
+    const shouldSetEoaConnector = primaryWalletId === owner.id || primaryWalletId === account.id;
+    yield connector.registerEoa({
+        ecdsaProviderType: (_d = account.walletProperties) === null || _d === void 0 ? void 0 : _d.ecdsaProviderType,
+        entryPointVersion: (_e = account.walletProperties) === null || _e === void 0 ? void 0 : _e.entryPointVersion,
+        eoaAddress: owner.address,
+        eoaConnector: ownerWallet.walletConnector,
+        kernelVersion: (_f = account.walletProperties) === null || _f === void 0 ? void 0 : _f.kernelVersion,
+        shouldSetEoaConnector,
+        smartWalletAddress: account.address,
+    });
 });
 
 export { findOwner, findSmartWallet, initializeSmartWallet, isOwnerOfASmartWallet };

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

@@ -13,10 +13,13 @@ const updateUserWalletsFromLinkedWallets = (userWallets, authenticatedWallets) =
     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 authenticatedWallet of authenticatedWallets) {
         newWalletsAddresses.add(authenticatedWallet.address);
-        const respectiveIndex = userWalletsCopy.findIndex((wallet) => wallet.address === authenticatedWallet.address);
+        newWalletsChains.add(authenticatedWallet.chain);
+        const respectiveIndex = userWalletsCopy.findIndex((wallet) => wallet.address === authenticatedWallet.address &&
+            wallet.chain === authenticatedWallet.chain);
         // Catch new wallets
         if (respectiveIndex === -1) {
             userWalletsCopy.push(authenticatedWallet);
@@ -29,7 +32,8 @@ const updateUserWalletsFromLinkedWallets = (userWallets, authenticatedWallets) =
     }
     // This filter is to remove a wallet that was previously added to userWallets but is not present
     // among the verified credentials wallets anymore
-    return userWalletsCopy.filter((userWallet) => newWalletsAddresses.has(userWallet.address));
+    return userWalletsCopy.filter((userWallet) => newWalletsAddresses.has(userWallet.address) &&
+        newWalletsChains.has(userWallet.chain));
 };
 
 exports.updateUserWalletsFromLinkedWallets = updateUserWalletsFromLinkedWallets;