@dynamic-labs/sdk-react-core 3.0.0-alpha.52 → 3.0.0-alpha.54

package/src/lib/layouts/BridgeNextWalletToConnectLayout/BridgeNextWalletToConnectLayout.js

@@ -60,10 +60,10 @@ import { IconButton } from '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import { TypographyButton } from '../../components/TypographyButton/TypographyButton.js';
 import 'formik';
+import '@dynamic-labs/ethereum-core';
 import '../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import { ModalHeader } from '../../components/ModalHeader/ModalHeader.js';
 import '../../components/Input/Input.js';
-import '@dynamic-labs/ethereum-core';
 import '../../context/PasskeyContext/PasskeyContext.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import '../../../polyfills.js';

package/src/lib/layouts/BridgeWelcomeLayout/BridgeWelcomeLayout.cjs

@@ -64,10 +64,10 @@ var IconButton = require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
 var TypographyButton = require('../../components/TypographyButton/TypographyButton.cjs');
 require('formik');
+require('@dynamic-labs/ethereum-core');
 require('../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 var ModalHeader = require('../../components/ModalHeader/ModalHeader.cjs');
 require('../../components/Input/Input.cjs');
-require('@dynamic-labs/ethereum-core');
 require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 require('../../../polyfills.cjs');

package/src/lib/layouts/BridgeWelcomeLayout/BridgeWelcomeLayout.js

@@ -60,10 +60,10 @@ import { IconButton } from '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import { TypographyButton } from '../../components/TypographyButton/TypographyButton.js';
 import 'formik';
+import '@dynamic-labs/ethereum-core';
 import '../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import { ModalHeader } from '../../components/ModalHeader/ModalHeader.js';
 import '../../components/Input/Input.js';
-import '@dynamic-labs/ethereum-core';
 import '../../context/PasskeyContext/PasskeyContext.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import '../../../polyfills.js';

package/src/lib/layouts/ConnectedWalletsListLayout/ConnectedWalletsListLayout.cjs

@@ -65,10 +65,10 @@ var IconButton = require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
 var TypographyButton = require('../../components/TypographyButton/TypographyButton.cjs');
 require('formik');
+require('@dynamic-labs/ethereum-core');
 require('../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 var ModalHeader = require('../../components/ModalHeader/ModalHeader.cjs');
 require('../../components/Input/Input.cjs');
-require('@dynamic-labs/ethereum-core');
 require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 require('../../../polyfills.cjs');

package/src/lib/layouts/ConnectedWalletsListLayout/ConnectedWalletsListLayout.js

@@ -61,10 +61,10 @@ import { IconButton } from '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import { TypographyButton } from '../../components/TypographyButton/TypographyButton.js';
 import 'formik';
+import '@dynamic-labs/ethereum-core';
 import '../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import { ModalHeader } from '../../components/ModalHeader/ModalHeader.js';
 import '../../components/Input/Input.js';
-import '@dynamic-labs/ethereum-core';
 import '../../context/PasskeyContext/PasskeyContext.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import '../../../polyfills.js';

package/src/lib/locale/en/translation.cjs

@@ -2051,16 +2051,50 @@ const translation = {
         confirm_button: 'Yes, link this wallet',
     },
     /**
-       * @description copy keys for sync wallet prompt
+       * @description copy keys for sync wallet view
        * @default
        * {
-          title: 'Switch wallet in {{walletName}}',
-          description: 'Switch to wallet {{walletAddress}} in {{walletName}} to make it active.',
+          switch_wallet: {
+            title: 'Your wallets are mismatched. \nSwitch to continue.',
+            active_address: {
+              heading: 'Currently active in wallet',
+            },
+            expected_address: {
+              heading: 'Currently active on website',
+              prompt: 'Manually switch to this wallet',
+            },
+          },
+          reconnecting: {
+            title: 'This wallet is not connected',
+            description: 'Reconnecting wallet {{walletAddress}} to make it active...',
+          },
+          reconnect_with_qr_code: {
+            title: 'This wallet is not connected',
+          },
+          cancel_button: 'Cancel',
+          retry_button: 'Retry',
         }
       */
     dyn_sync_wallet: {
-        title: 'Switch wallet in {{walletName}}',
-        description: 'Switch to wallet {{walletAddress}} in {{walletName}} to make it active.',
+        switch_wallet: {
+            title: 'Your wallets are mismatched. \nSwitch to continue.',
+            active_address: {
+                heading: 'Currently active in wallet',
+            },
+            expected_address: {
+                heading: 'Currently active on website',
+                prompt: 'Manually switch to this wallet',
+            },
+        },
+        reconnecting: {
+            title: 'This wallet is not connected',
+            description: 'Reconnecting wallet {{walletAddress}} to make it active...',
+        },
+        reconnect_with_qr_code: {
+            title: 'This wallet is not connected',
+        },
+        cancel_button: 'Cancel',
+        retry_button: 'Retry',
     },
 };
 

package/src/lib/locale/en/translation.d.ts

@@ -2047,15 +2047,49 @@ export declare const translation: {
         confirm_button: string;
     };
     /**
-       * @description copy keys for sync wallet prompt
+       * @description copy keys for sync wallet view
        * @default
        * {
-          title: 'Switch wallet in {{walletName}}',
-          description: 'Switch to wallet {{walletAddress}} in {{walletName}} to make it active.',
+          switch_wallet: {
+            title: 'Your wallets are mismatched. \nSwitch to continue.',
+            active_address: {
+              heading: 'Currently active in wallet',
+            },
+            expected_address: {
+              heading: 'Currently active on website',
+              prompt: 'Manually switch to this wallet',
+            },
+          },
+          reconnecting: {
+            title: 'This wallet is not connected',
+            description: 'Reconnecting wallet {{walletAddress}} to make it active...',
+          },
+          reconnect_with_qr_code: {
+            title: 'This wallet is not connected',
+          },
+          cancel_button: 'Cancel',
+          retry_button: 'Retry',
         }
       */
     dyn_sync_wallet: {
-        title: string;
-        description: string;
+        switch_wallet: {
+            title: string;
+            active_address: {
+                heading: string;
+            };
+            expected_address: {
+                heading: string;
+                prompt: string;
+            };
+        };
+        reconnecting: {
+            title: string;
+            description: string;
+        };
+        reconnect_with_qr_code: {
+            title: string;
+        };
+        cancel_button: string;
+        retry_button: string;
     };
 };

package/src/lib/locale/en/translation.js

@@ -2047,16 +2047,50 @@ const translation = {
         confirm_button: 'Yes, link this wallet',
     },
     /**
-       * @description copy keys for sync wallet prompt
+       * @description copy keys for sync wallet view
        * @default
        * {
-          title: 'Switch wallet in {{walletName}}',
-          description: 'Switch to wallet {{walletAddress}} in {{walletName}} to make it active.',
+          switch_wallet: {
+            title: 'Your wallets are mismatched. \nSwitch to continue.',
+            active_address: {
+              heading: 'Currently active in wallet',
+            },
+            expected_address: {
+              heading: 'Currently active on website',
+              prompt: 'Manually switch to this wallet',
+            },
+          },
+          reconnecting: {
+            title: 'This wallet is not connected',
+            description: 'Reconnecting wallet {{walletAddress}} to make it active...',
+          },
+          reconnect_with_qr_code: {
+            title: 'This wallet is not connected',
+          },
+          cancel_button: 'Cancel',
+          retry_button: 'Retry',
         }
       */
     dyn_sync_wallet: {
-        title: 'Switch wallet in {{walletName}}',
-        description: 'Switch to wallet {{walletAddress}} in {{walletName}} to make it active.',
+        switch_wallet: {
+            title: 'Your wallets are mismatched. \nSwitch to continue.',
+            active_address: {
+                heading: 'Currently active in wallet',
+            },
+            expected_address: {
+                heading: 'Currently active on website',
+                prompt: 'Manually switch to this wallet',
+            },
+        },
+        reconnecting: {
+            title: 'This wallet is not connected',
+            description: 'Reconnecting wallet {{walletAddress}} to make it active...',
+        },
+        reconnect_with_qr_code: {
+            title: 'This wallet is not connected',
+        },
+        cancel_button: 'Cancel',
+        retry_button: 'Retry',
     },
 };
 

package/src/lib/modals/ConfirmationModal/ConfirmationModal.cjs

@@ -63,9 +63,9 @@ require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
 require('formik');
+require('@dynamic-labs/ethereum-core');
 require('../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../components/Input/Input.cjs');
-require('@dynamic-labs/ethereum-core');
 require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 require('../../../polyfills.cjs');

package/src/lib/modals/ConfirmationModal/ConfirmationModal.js

@@ -59,9 +59,9 @@ import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import 'formik';
+import '@dynamic-labs/ethereum-core';
 import '../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../components/Input/Input.js';
-import '@dynamic-labs/ethereum-core';
 import '../../context/PasskeyContext/PasskeyContext.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import '../../../polyfills.js';

package/src/lib/modals/DynamicAuthModal/DynamicAuthModal.cjs

@@ -61,9 +61,9 @@ require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
 require('formik');
+require('@dynamic-labs/ethereum-core');
 require('../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../components/Input/Input.cjs');
-require('@dynamic-labs/ethereum-core');
 require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 var WalletProgressStepper = require('../../layout/DynamicAuthLayout/WalletProgressStepper/WalletProgressStepper.cjs');

package/src/lib/modals/DynamicAuthModal/DynamicAuthModal.js

@@ -57,9 +57,9 @@ import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import 'formik';
+import '@dynamic-labs/ethereum-core';
 import '../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../components/Input/Input.js';
-import '@dynamic-labs/ethereum-core';
 import '../../context/PasskeyContext/PasskeyContext.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import { WalletProgressStepper } from '../../layout/DynamicAuthLayout/WalletProgressStepper/WalletProgressStepper.js';

package/src/lib/modals/SendBalanceModal/SendBalanceModal.cjs

@@ -82,6 +82,7 @@ require('../../views/WalletList/WalletList.cjs');
 require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../../context/IpConfigurationContext/IpConfigurationContext.cjs');
+require('../../components/Input/Input.cjs');
 require('../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../context/SendBalanceContext/SendBalanceContext.cjs');
 require('../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
@@ -89,7 +90,6 @@ require('../../context/ConnectWithOtpContext/constants.cjs');
 require('../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
 require('../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../components/InlineWidget/InlineWidget.cjs');
-require('../../components/Input/Input.cjs');
 require('qrcode');
 require('@dynamic-labs/ethereum-core');
 

package/src/lib/modals/SendBalanceModal/SendBalanceModal.js

@@ -78,6 +78,7 @@ import '../../views/WalletList/WalletList.js';
 import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../context/IpConfigurationContext/IpConfigurationContext.js';
+import '../../components/Input/Input.js';
 import '../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
 import '../../context/SendBalanceContext/SendBalanceContext.js';
 import '../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
@@ -85,7 +86,6 @@ import '../../context/ConnectWithOtpContext/constants.js';
 import '../../context/ReinitializeContext/ReinitializeContextProvider.js';
 import '../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../components/InlineWidget/InlineWidget.js';
-import '../../components/Input/Input.js';
 import 'qrcode';
 import '@dynamic-labs/ethereum-core';
 

package/src/lib/modals/SignMessageConfirmationModal/SignMessageConfirmationModal.cjs

@@ -8,6 +8,7 @@ var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var reactI18next = require('react-i18next');
 var utils = require('@dynamic-labs/utils');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../components/Alert/Alert.cjs');
 var AnimatePresence = require('../../components/AnimatePresence/AnimatePresence.cjs');
@@ -15,7 +16,6 @@ var AppOriginTile = require('../../components/AppOriginTile/AppOriginTile.cjs');
 require('@dynamic-labs/sdk-api-core');
 require('../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 var ViewContext = require('../../context/ViewContext/ViewContext.cjs');
 var close = require('../../shared/assets/close.cjs');
 var signCircle = require('../../shared/assets/sign-circle.cjs');
@@ -24,7 +24,6 @@ require('../../utils/constants/colors.cjs');
 require('../../utils/constants/values.cjs');
 require('../../shared/utils/classes/storage/localStorage.cjs');
 require('../../shared/utils/classes/storage/sessionStorage.cjs');
-var usingSessionKeys = require('../../shared/utils/functions/usingSessionKeys/usingSessionKeys.cjs');
 var useEffectOnce = require('../../shared/utils/hooks/useEffectOnce/useEffectOnce.cjs');
 var usePreventPageScroll = require('../../shared/utils/hooks/usePreventPageScroll/usePreventPageScroll.cjs');
 var index = require('../../shared/consts/index.cjs');
@@ -49,6 +48,7 @@ require('../../context/VerificationContext/VerificationContext.cjs');
 require('../../context/WalletContext/WalletContext.cjs');
 var useIsTurnkeyWallet = require('../../utils/hooks/useIsTurnkeyWallet/useIsTurnkeyWallet.cjs');
 var usePasskeyRecovery = require('../../utils/hooks/usePasskeyRecovery/usePasskeyRecovery.cjs');
+var useSmartWallets = require('../../utils/hooks/useSmartWallets/useSmartWallets.cjs');
 require('../../utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../context/ThemeContext/ThemeContext.cjs');
 require('../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
@@ -81,10 +81,10 @@ var IconButton = require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
 var ErrorContainer = require('../../components/ErrorContainer/ErrorContainer.cjs');
 require('formik');
+require('@dynamic-labs/ethereum-core');
 require('../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 var ModalHeader = require('../../components/ModalHeader/ModalHeader.cjs');
 require('../../components/Input/Input.cjs');
-require('@dynamic-labs/ethereum-core');
 var PasskeyContext = require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 var getProperErrorMessage = require('./getProperErrorMessage.cjs');
@@ -102,13 +102,13 @@ require('../../views/WalletList/WalletList.cjs');
 require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../../context/IpConfigurationContext/IpConfigurationContext.cjs');
+var NeedHelpSection = require('../../components/NeedHelpSection/NeedHelpSection.cjs');
 var PasskeyCreatedSuccessBanner = require('../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../context/SendBalanceContext/SendBalanceContext.cjs');
 require('../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
 require('../../context/ConnectWithOtpContext/constants.cjs');
 require('../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
 require('../../components/InlineWidget/InlineWidget.cjs');
-var NeedHelpSection = require('../../components/NeedHelpSection/NeedHelpSection.cjs');
 require('qrcode');
 var SignMessagePreview = require('../../components/SignMessagePreview/SignMessagePreview.cjs');
 
@@ -122,7 +122,8 @@ const SignMessageConfirmationModal = ({ appLogoUrl, appName, appOrigin, message,
     const { setView } = ViewContext.useViewContext();
     const { userNeedsCrossDomainPasskey } = PasskeyContext.usePasskeyContext();
     const { t } = reactI18next.useTranslation();
-    const primaryConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
+    const { getEOAWallet } = useSmartWallets.useSmartWallets();
+    const eoaWallet = primaryWallet && getEOAWallet(primaryWallet);
     const handleOnReject = React.useCallback(() => {
         didConfirmRef.current = false;
         setShow(false);
@@ -154,19 +155,19 @@ const SignMessageConfirmationModal = ({ appLogoUrl, appName, appOrigin, message,
         if (signedMessage) {
             return onSignMessage(signedMessage);
         }
-        onReject(signMessageError || new Error('user rejected signing'));
+        onReject(signMessageError || new utils.UserRejectedRequestError());
     }, [signedMessage, onSignMessage, onReject, signMessageError]);
     const handleMessageSign = (signWithoutModal) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        if ((yield shouldInitRecovery()) &&
-            primaryConnector &&
-            !usingSessionKeys.usingSessionKey(primaryConnector)) {
+        const isSessionKeyCompatible = (primaryWallet && walletConnectorCore.isSessionKeyCompatibleWallet(primaryWallet)) ||
+            (eoaWallet && walletConnectorCore.isSessionKeyCompatibleWallet(eoaWallet));
+        if ((yield shouldInitRecovery()) && !isSessionKeyCompatible) {
             yield initPasskeyRecoveryProcess('email', 'signMessage');
         }
         if (signWithoutModal === true) {
             onSignMessage('callHandlerOutsideModal');
             return;
         }
-        if (primaryConnector && usingSessionKeys.usingSessionKey(primaryConnector)) {
+        if (isSessionKeyCompatible) {
             confirm();
             return;
         }

package/src/lib/modals/SignMessageConfirmationModal/SignMessageConfirmationModal.js

@@ -3,7 +3,8 @@ import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { useRef, useState, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { DynamicError, AccessBlockedError } from '@dynamic-labs/utils';
+import { DynamicError, AccessBlockedError, UserRejectedRequestError } from '@dynamic-labs/utils';
+import { isSessionKeyCompatibleWallet } from '@dynamic-labs/wallet-connector-core';
 import '../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../components/Alert/Alert.js';
 import { AnimatePresence } from '../../components/AnimatePresence/AnimatePresence.js';
@@ -11,7 +12,6 @@ import { AppOriginTile } from '../../components/AppOriginTile/AppOriginTile.js';
 import '@dynamic-labs/sdk-api-core';
 import '../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import { useViewContext } from '../../context/ViewContext/ViewContext.js';
 import { ReactComponent as SvgClose } from '../../shared/assets/close.js';
 import { ReactComponent as SvgSignCircle } from '../../shared/assets/sign-circle.js';
@@ -20,7 +20,6 @@ import '../../utils/constants/colors.js';
 import '../../utils/constants/values.js';
 import '../../shared/utils/classes/storage/localStorage.js';
 import '../../shared/utils/classes/storage/sessionStorage.js';
-import { usingSessionKey } from '../../shared/utils/functions/usingSessionKeys/usingSessionKeys.js';
 import { useEffectOnce } from '../../shared/utils/hooks/useEffectOnce/useEffectOnce.js';
 import { usePreventPageScroll } from '../../shared/utils/hooks/usePreventPageScroll/usePreventPageScroll.js';
 import { authModalZIndex } from '../../shared/consts/index.js';
@@ -45,6 +44,7 @@ import '../../context/VerificationContext/VerificationContext.js';
 import '../../context/WalletContext/WalletContext.js';
 import { useIsTurnkeyWallet } from '../../utils/hooks/useIsTurnkeyWallet/useIsTurnkeyWallet.js';
 import { usePasskeyRecovery } from '../../utils/hooks/usePasskeyRecovery/usePasskeyRecovery.js';
+import { useSmartWallets } from '../../utils/hooks/useSmartWallets/useSmartWallets.js';
 import '../../utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../context/ThemeContext/ThemeContext.js';
 import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
@@ -77,10 +77,10 @@ import { IconButton } from '../../components/IconButton/IconButton.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import { ErrorContainer } from '../../components/ErrorContainer/ErrorContainer.js';
 import 'formik';
+import '@dynamic-labs/ethereum-core';
 import '../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import { ModalHeader } from '../../components/ModalHeader/ModalHeader.js';
 import '../../components/Input/Input.js';
-import '@dynamic-labs/ethereum-core';
 import { usePasskeyContext } from '../../context/PasskeyContext/PasskeyContext.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import { getProperErrorMessage } from './getProperErrorMessage.js';
@@ -98,13 +98,13 @@ import '../../views/WalletList/WalletList.js';
 import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../context/IpConfigurationContext/IpConfigurationContext.js';
+import { NeedHelpSection } from '../../components/NeedHelpSection/NeedHelpSection.js';
 import { PasskeyCreatedSuccessBanner } from '../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
 import '../../context/SendBalanceContext/SendBalanceContext.js';
 import '../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
 import '../../context/ConnectWithOtpContext/constants.js';
 import '../../context/ReinitializeContext/ReinitializeContextProvider.js';
 import '../../components/InlineWidget/InlineWidget.js';
-import { NeedHelpSection } from '../../components/NeedHelpSection/NeedHelpSection.js';
 import 'qrcode';
 import { SignMessagePreview } from '../../components/SignMessagePreview/SignMessagePreview.js';
 
@@ -118,7 +118,8 @@ const SignMessageConfirmationModal = ({ appLogoUrl, appName, appOrigin, message,
     const { setView } = useViewContext();
     const { userNeedsCrossDomainPasskey } = usePasskeyContext();
     const { t } = useTranslation();
-    const primaryConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
+    const { getEOAWallet } = useSmartWallets();
+    const eoaWallet = primaryWallet && getEOAWallet(primaryWallet);
     const handleOnReject = useCallback(() => {
         didConfirmRef.current = false;
         setShow(false);
@@ -150,19 +151,19 @@ const SignMessageConfirmationModal = ({ appLogoUrl, appName, appOrigin, message,
         if (signedMessage) {
             return onSignMessage(signedMessage);
         }
-        onReject(signMessageError || new Error('user rejected signing'));
+        onReject(signMessageError || new UserRejectedRequestError());
     }, [signedMessage, onSignMessage, onReject, signMessageError]);
     const handleMessageSign = (signWithoutModal) => __awaiter(void 0, void 0, void 0, function* () {
-        if ((yield shouldInitRecovery()) &&
-            primaryConnector &&
-            !usingSessionKey(primaryConnector)) {
+        const isSessionKeyCompatible = (primaryWallet && isSessionKeyCompatibleWallet(primaryWallet)) ||
+            (eoaWallet && isSessionKeyCompatibleWallet(eoaWallet));
+        if ((yield shouldInitRecovery()) && !isSessionKeyCompatible) {
             yield initPasskeyRecoveryProcess('email', 'signMessage');
         }
         if (signWithoutModal === true) {
             onSignMessage('callHandlerOutsideModal');
             return;
         }
-        if (primaryConnector && usingSessionKey(primaryConnector)) {
+        if (isSessionKeyCompatible) {
             confirm();
             return;
         }

package/src/lib/modals/SyncWalletPromptModal/SyncWalletPromptModal.cjs

@@ -80,13 +80,13 @@ require('../../views/TransactionConfirmationView/helpers/transactionErrorMessage
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 var SyncWalletView = require('../../views/SyncWalletView/SyncWalletView.cjs');
 
-const SyncWalletPromptModal = ({ expectedAddress, connector, onResolve, }) => {
-    const { onSuccess, show, handleOnModalUnmount } = useConfirmationPortal.useConfirmationPortal({
+const SyncWalletPromptModal = ({ expectedAddress, connector, onResolve, onReject, activeAddress, }) => {
+    const { onSuccess, onError, show, handleOnModalUnmount } = useConfirmationPortal.useConfirmationPortal({
         defaultErrorMessage: 'User canceled',
-        onReject: () => { },
+        onReject,
         onResolve,
     });
-    return (jsxRuntime.jsx(ConfirmationModal.ConfirmationModal, { modalId: 'sync-wallet-modal', show: show, closeModal: () => { }, handleOnModalUnmount: handleOnModalUnmount, children: jsxRuntime.jsx(SyncWalletView.SyncWalletView, { onSuccess: onSuccess, expectedAddress: expectedAddress, connector: connector }) }));
+    return (jsxRuntime.jsx(ConfirmationModal.ConfirmationModal, { modalId: 'sync-wallet-modal', show: show, closeModal: () => { }, handleOnModalUnmount: handleOnModalUnmount, children: jsxRuntime.jsx(SyncWalletView.SyncWalletView, { onSuccess: onSuccess, onError: onError, expectedAddress: expectedAddress, connector: connector, activeAddress: activeAddress }) }));
 };
 
 exports.SyncWalletPromptModal = SyncWalletPromptModal;

package/src/lib/modals/SyncWalletPromptModal/SyncWalletPromptModal.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="react" />
 import { SyncWalletPromptModalProps } from './SyncWalletPromptModal.types';
-export declare const SyncWalletPromptModal: ({ expectedAddress, connector, onResolve, }: SyncWalletPromptModalProps) => JSX.Element;
+export declare const SyncWalletPromptModal: ({ expectedAddress, connector, onResolve, onReject, activeAddress, }: SyncWalletPromptModalProps) => JSX.Element;

package/src/lib/modals/SyncWalletPromptModal/SyncWalletPromptModal.js

@@ -76,13 +76,13 @@ import '../../views/TransactionConfirmationView/helpers/transactionErrorMessage.
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import { SyncWalletView } from '../../views/SyncWalletView/SyncWalletView.js';
 
-const SyncWalletPromptModal = ({ expectedAddress, connector, onResolve, }) => {
-    const { onSuccess, show, handleOnModalUnmount } = useConfirmationPortal({
+const SyncWalletPromptModal = ({ expectedAddress, connector, onResolve, onReject, activeAddress, }) => {
+    const { onSuccess, onError, show, handleOnModalUnmount } = useConfirmationPortal({
         defaultErrorMessage: 'User canceled',
-        onReject: () => { },
+        onReject,
         onResolve,
     });
-    return (jsx(ConfirmationModal, { modalId: 'sync-wallet-modal', show: show, closeModal: () => { }, handleOnModalUnmount: handleOnModalUnmount, children: jsx(SyncWalletView, { onSuccess: onSuccess, expectedAddress: expectedAddress, connector: connector }) }));
+    return (jsx(ConfirmationModal, { modalId: 'sync-wallet-modal', show: show, closeModal: () => { }, handleOnModalUnmount: handleOnModalUnmount, children: jsx(SyncWalletView, { onSuccess: onSuccess, onError: onError, expectedAddress: expectedAddress, connector: connector, activeAddress: activeAddress }) }));
 };
 
 export { SyncWalletPromptModal };

package/src/lib/modals/SyncWalletPromptModal/SyncWalletPromptModal.types.d.ts

@@ -3,4 +3,6 @@ export type SyncWalletPromptModalProps = {
     expectedAddress: string;
     connector: WalletConnector;
     onResolve: (isInSync: boolean) => void;
+    onReject: (error: unknown) => void;
+    activeAddress?: string;
 };

package/src/lib/modals/TransactionConfirmationModal/TransactionConfirmationModal.cjs

@@ -60,14 +60,13 @@ require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidge
 var Modal = require('../../components/Modal/Modal.cjs');
 var ModalCard = require('../../components/ModalCard/ModalCard.cjs');
 var Portal = require('../../components/Portal/Portal.cjs');
-var useFetchChain = require('../../widgets/DynamicWidget/hooks/useFetchChain/useFetchChain.cjs');
 require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
 require('formik');
+require('@dynamic-labs/ethereum-core');
 var TransactionConfirmationView = require('../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
 require('../../components/Input/Input.cjs');
-require('@dynamic-labs/ethereum-core');
 require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 require('../../../polyfills.cjs');
@@ -97,12 +96,6 @@ const TransactionConfirmationModal = ({ title, onReject, onTransactionResponseSu
     const [show, setShow] = React.useState(true);
     const errorRef = React.useRef(null);
     const transactionResponseRef = React.useRef(null);
-    const { chain } = useFetchChain.useFetchChain(walletConnector);
-    let activeChainName;
-    if (walletConnector && 'activeChain' in walletConnector) {
-        activeChainName = walletConnector.activeChain.name;
-    }
-    const chainName = activeChainName || (chain === null || chain === void 0 ? void 0 : chain.name) || (walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain);
     const closeModal = React.useCallback(() => {
         setShow(false);
     }, [setShow]);
@@ -118,7 +111,7 @@ const TransactionConfirmationModal = ({ title, onReject, onTransactionResponseSu
                         errorRef.current = null;
                         transactionResponseRef.current = transactionResponse;
                         closeModal();
-                    }, isNativeToken: isNativeToken, chainName: chainName, currentToken: currentToken, nativePrice: (currentToken === null || currentToken === void 0 ? void 0 : currentToken.price) || 0, isModal: true }) }) }) }));
+                    }, isNativeToken: isNativeToken, currentToken: currentToken, isModal: true }) }) }) }));
 };
 
 exports.TransactionConfirmationModal = TransactionConfirmationModal;