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

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

@@ -1,8 +1,7 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
 import { isHardwareWalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { useWalletBookContext, getWalletGroup } from '@dynamic-labs/wallet-book';
 import { DynamicError } from '@dynamic-labs/utils';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api-core';
@@ -10,6 +9,7 @@ import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import { isWalletGroup } from '../../functions/walletListBuilder/utils/isWalletGroup/isWalletGroup.js';
@@ -20,15 +20,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';
@@ -41,8 +45,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 { useWalletGroups } from '../../../store/state/walletOptions/walletOptions.js';
 import { useWalletItemActions } from '../useWalletItemActions/useWalletItemActions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
@@ -53,28 +56,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 { groupWalletOptions } from '../../functions/walletListBuilder/utils/groupWalletOptions/groupWalletOptions.js';
 import '../../../context/FooterAnimationContext/index.js';
 import { useWalletGroupContext } from '../../../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';
@@ -92,37 +98,41 @@ const embeddedWalletsKeys = [
 ];
 const useWalletOptions = () => {
     const { walletConnectorOptions, setShowAuthFlow } = useInternalDynamicContext();
-    const { walletBook } = useWalletBookContext();
+    const walletGroups = useWalletGroups();
     const { setView } = useViewContext();
     const { navigateToWalletGroup } = useWalletGroupContext();
     const { handleWalletItemClick } = useWalletItemActions();
-    const walletOptions = useMemo(() => {
-        var _a;
-        return (_a = walletConnectorOptions === null || walletConnectorOptions === void 0 ? void 0 : walletConnectorOptions.filter((option) => !embeddedWalletsKeys.includes(option.walletConnector.key)).map((option) => {
-            const groupName = option.group
-                ? getWalletGroup(walletBook, option.group).name
-                : undefined;
+    const getFilteredWalletOptions = useCallback((filter) => {
+        const nonEmbeddedOptions = walletConnectorOptions.filter((option) => !embeddedWalletsKeys.includes(option.walletConnector.key));
+        return filter(nonEmbeddedOptions).map((option) => {
+            var _a;
+            const groupName = option.group && ((_a = walletGroups[option.group]) === null || _a === void 0 ? void 0 : _a.name);
             return {
+                chain: option.walletConnector.connectedChain,
                 group: option.group,
                 groupName,
                 isInstalledOnBrowser: option.isInstalledOnBrowser,
+                isWalletConnect: option.walletConnector.isWalletConnect,
                 key: option.walletConnector.key,
                 name: option.name,
             };
-        })) !== null && _a !== void 0 ? _a : [];
-    }, [walletBook, walletConnectorOptions]);
-    const selectWalletOption = (walletKey) => __awaiter(void 0, void 0, void 0, function* () {
-        const group = groupWalletOptions(walletBook, walletConnectorOptions);
-        const walletOption = group.find((wallet) => wallet.key === walletKey);
+        });
+    }, [walletConnectorOptions, walletGroups]);
+    const allWalletOptions = useMemo(() => getFilteredWalletOptions((options) => options), [getFilteredWalletOptions]);
+    const selectWalletOption = useCallback((walletKey_1, ...args_1) => __awaiter(void 0, [walletKey_1, ...args_1], void 0, function* (walletKey, selectGroupIfAvailable = true) {
+        const group = groupWalletOptions(walletGroups, walletConnectorOptions);
+        const walletGroup = group.find((wallet) => wallet.key === walletKey);
+        const walletOption = walletConnectorOptions === null || walletConnectorOptions === void 0 ? void 0 : walletConnectorOptions.find((wallet) => wallet.key === walletKey);
         logger.logVerboseTroubleshootingMessage('[useWalletOptions] selectWalletOption', {
+            selectGroupIfAvailable,
             walletKey,
             walletOption: walletOption === null || walletOption === void 0 ? void 0 : walletOption.key,
         });
         if (!walletOption) {
             throw new DynamicError('Invalid wallet option key provided.');
         }
-        if (isWalletGroup(walletOption)) {
-            navigateToWalletGroup(walletOption);
+        if (selectGroupIfAvailable && walletGroup && isWalletGroup(walletGroup)) {
+            navigateToWalletGroup(walletGroup);
         }
         else if (isHardwareWalletConnector(walletOption.walletConnector) &&
             walletOption.walletConnector.canConnectWithHardwareWallet()) {
@@ -135,10 +145,18 @@ const useWalletOptions = () => {
             handleWalletItemClick(walletOption);
         }
         setShowAuthFlow(true);
-    });
+    }), [
+        handleWalletItemClick,
+        navigateToWalletGroup,
+        setShowAuthFlow,
+        setView,
+        walletConnectorOptions,
+        walletGroups,
+    ]);
     return {
+        getFilteredWalletOptions,
         selectWalletOption,
-        walletOptions,
+        walletOptions: allWalletOptions,
     };
 };
 

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

@@ -7,10 +7,10 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var reactI18next = require('react-i18next');
+require('@dynamic-labs/utils');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../components/Alert/Alert.cjs');
 require('../../../events/dynamicEvents.cjs');
-require('@dynamic-labs/utils');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/sdk-api-core');
 require('../../../shared/logger.cjs');
@@ -26,15 +26,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');
 var useConfirmationModal = require('../useConfirmationModal/useConfirmationModal.cjs');
+require('../../functions/compareChains/compareChains.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
@@ -47,8 +51,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('../../../store/state/tokenBalances.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
@@ -59,32 +62,36 @@ 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/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');
 var CreatePasswordModal = require('../../../modals/CreatePasswordModal/CreatePasswordModal.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');
 var EnterPasswordModal = require('../../../modals/EnterPasswordModal/EnterPasswordModal.cjs');
 var SignMessageConfirmationModal = require('../../../modals/SignMessageConfirmationModal/SignMessageConfirmationModal.cjs');
 var SyncWalletPromptModal = require('../../../modals/SyncWalletPromptModal/SyncWalletPromptModal.cjs');
 var TransactionConfirmationModal = require('../../../modals/TransactionConfirmationModal/TransactionConfirmationModal.cjs');
+var AddNetworkModal = require('../../../modals/AddNetworkModal/AddNetworkModal.cjs');
 
 const useWalletUiUtils = ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUIs = false, }) => {
     const confirmationStateRef = React.useRef('enabled');
@@ -104,6 +111,9 @@ const useWalletUiUtils = ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUI
     const { modal: syncWalletPromptModal, open: openSyncWalletPrompt } = useConfirmationModal.useConfirmationModal({
         elementId: 'dynamic-sync-wallet',
     });
+    const { modal: addNetworkModal, open: openAddNetwork } = useConfirmationModal.useConfirmationModal({
+        elementId: 'dynamic-prompt-to-add-network',
+    });
     const shouldConfirmAction = React.useCallback(() => {
         if (confirmationStateRef.current === 'disabled') {
             confirmationStateRef.current = 'enabled';
@@ -146,6 +156,24 @@ const useWalletUiUtils = ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUI
         shouldConfirmAction,
         t,
     ]);
+    // Solana only
+    const signTransaction = React.useCallback((walletConnector, transaction) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        // prevent the modal from opening itself again
+        if (!shouldConfirmAction())
+            return transaction.submit();
+        return openSendTransaction((resolve, reject) => (jsxRuntime.jsx(TransactionConfirmationModal.TransactionConfirmationModal, { copykey: 'dyn_send_transaction.confirmation.title', title: t('dyn_send_transaction.confirmation.title'), transaction: transaction, onTransactionResponseSuccess: resolve, onReject: reject, walletConnector: walletConnector, hideModal: hideEmbeddedWalletTransactionUIs &&
+                !(walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.isGlobalTransaction) }))).then((signedTransaction) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+            if (signedTransaction === 'callHandlerOutsideModal')
+                return transaction.submit();
+            else
+                return signedTransaction;
+        }));
+    }), [
+        hideEmbeddedWalletTransactionUIs,
+        openSendTransaction,
+        shouldConfirmAction,
+        t,
+    ]);
     const enterPassword = React.useCallback((_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ handler, closeView = true }) {
         return openEnterPassword((resolve, reject) => (jsxRuntime.jsx(EnterPasswordModal.EnterPasswordModal, { handler: handler, onResolve: resolve, onReject: reject, closeView: closeView })));
     }), [openEnterPassword]);
@@ -155,30 +183,38 @@ const useWalletUiUtils = ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUI
     const syncWallet = React.useCallback((_d) => _tslib.__awaiter(void 0, [_d], void 0, function* ({ walletConnector, activeAddress, expectedAddress }) {
         yield openSyncWalletPrompt((resolve, reject) => (jsxRuntime.jsx(SyncWalletPromptModal.SyncWalletPromptModal, { onResolve: resolve, onReject: reject, connector: walletConnector, expectedAddress: expectedAddress, activeAddress: activeAddress })));
     }), [openSyncWalletPrompt]);
+    const addNetwork = React.useCallback((_e) => _tslib.__awaiter(void 0, [_e], void 0, function* ({ handler, network, walletConnector }) {
+        yield openAddNetwork((resolve) => (jsxRuntime.jsx(AddNetworkModal.AddNetworkModal, { network: network, walletConnector: walletConnector, onCancel: resolve, onNetworkAdded: resolve, addNetworkMutation: handler })));
+    }), [openAddNetwork]);
     const disabledConfirmationOnce = React.useCallback(() => {
         confirmationStateRef.current = 'disabled';
     }, []);
     const walletUiUtils = React.useMemo(() => ({
+        addNetwork,
         createPassword,
         disabledConfirmationOnce,
         enterPassword,
         sendTransaction,
         signMessage,
+        signTransaction,
         syncWallet,
     }), [
         signMessage,
+        signTransaction,
         disabledConfirmationOnce,
         sendTransaction,
         enterPassword,
         createPassword,
         syncWallet,
+        addNetwork,
     ]);
     return React.useMemo(() => [
         signMessageModal ||
             sendTransactionModal ||
             enterPasswordModal ||
             createPasswordModal ||
-            syncWalletPromptModal,
+            syncWalletPromptModal ||
+            addNetworkModal,
         walletUiUtils,
     ], [
         signMessageModal,
@@ -186,6 +222,7 @@ const useWalletUiUtils = ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUI
         enterPasswordModal,
         createPasswordModal,
         syncWalletPromptModal,
+        addNetworkModal,
         walletUiUtils,
     ]);
 };

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

@@ -3,10 +3,10 @@ import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { jsx } from 'react/jsx-runtime';
 import { useRef, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
+import '@dynamic-labs/utils';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../components/Alert/Alert.js';
 import '../../../events/dynamicEvents.js';
-import '@dynamic-labs/utils';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api-core';
 import '../../../shared/logger.js';
@@ -22,15 +22,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 { useConfirmationModal } from '../useConfirmationModal/useConfirmationModal.js';
+import '../../functions/compareChains/compareChains.js';
 import '../../../context/WalletContext/WalletContext.js';
 import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../context/ThemeContext/ThemeContext.js';
@@ -43,8 +47,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 '../../../store/state/tokenBalances.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
@@ -55,32 +58,36 @@ 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/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 { CreatePasswordModal } from '../../../modals/CreatePasswordModal/CreatePasswordModal.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 { EnterPasswordModal } from '../../../modals/EnterPasswordModal/EnterPasswordModal.js';
 import { SignMessageConfirmationModal } from '../../../modals/SignMessageConfirmationModal/SignMessageConfirmationModal.js';
 import { SyncWalletPromptModal } from '../../../modals/SyncWalletPromptModal/SyncWalletPromptModal.js';
 import { TransactionConfirmationModal } from '../../../modals/TransactionConfirmationModal/TransactionConfirmationModal.js';
+import { AddNetworkModal } from '../../../modals/AddNetworkModal/AddNetworkModal.js';
 
 const useWalletUiUtils = ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUIs = false, }) => {
     const confirmationStateRef = useRef('enabled');
@@ -100,6 +107,9 @@ const useWalletUiUtils = ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUI
     const { modal: syncWalletPromptModal, open: openSyncWalletPrompt } = useConfirmationModal({
         elementId: 'dynamic-sync-wallet',
     });
+    const { modal: addNetworkModal, open: openAddNetwork } = useConfirmationModal({
+        elementId: 'dynamic-prompt-to-add-network',
+    });
     const shouldConfirmAction = useCallback(() => {
         if (confirmationStateRef.current === 'disabled') {
             confirmationStateRef.current = 'enabled';
@@ -142,6 +152,24 @@ const useWalletUiUtils = ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUI
         shouldConfirmAction,
         t,
     ]);
+    // Solana only
+    const signTransaction = useCallback((walletConnector, transaction) => __awaiter(void 0, void 0, void 0, function* () {
+        // prevent the modal from opening itself again
+        if (!shouldConfirmAction())
+            return transaction.submit();
+        return openSendTransaction((resolve, reject) => (jsx(TransactionConfirmationModal, { copykey: 'dyn_send_transaction.confirmation.title', title: t('dyn_send_transaction.confirmation.title'), transaction: transaction, onTransactionResponseSuccess: resolve, onReject: reject, walletConnector: walletConnector, hideModal: hideEmbeddedWalletTransactionUIs &&
+                !(walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.isGlobalTransaction) }))).then((signedTransaction) => __awaiter(void 0, void 0, void 0, function* () {
+            if (signedTransaction === 'callHandlerOutsideModal')
+                return transaction.submit();
+            else
+                return signedTransaction;
+        }));
+    }), [
+        hideEmbeddedWalletTransactionUIs,
+        openSendTransaction,
+        shouldConfirmAction,
+        t,
+    ]);
     const enterPassword = useCallback((_b) => __awaiter(void 0, [_b], void 0, function* ({ handler, closeView = true }) {
         return openEnterPassword((resolve, reject) => (jsx(EnterPasswordModal, { handler: handler, onResolve: resolve, onReject: reject, closeView: closeView })));
     }), [openEnterPassword]);
@@ -151,30 +179,38 @@ const useWalletUiUtils = ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUI
     const syncWallet = useCallback((_d) => __awaiter(void 0, [_d], void 0, function* ({ walletConnector, activeAddress, expectedAddress }) {
         yield openSyncWalletPrompt((resolve, reject) => (jsx(SyncWalletPromptModal, { onResolve: resolve, onReject: reject, connector: walletConnector, expectedAddress: expectedAddress, activeAddress: activeAddress })));
     }), [openSyncWalletPrompt]);
+    const addNetwork = useCallback((_e) => __awaiter(void 0, [_e], void 0, function* ({ handler, network, walletConnector }) {
+        yield openAddNetwork((resolve) => (jsx(AddNetworkModal, { network: network, walletConnector: walletConnector, onCancel: resolve, onNetworkAdded: resolve, addNetworkMutation: handler })));
+    }), [openAddNetwork]);
     const disabledConfirmationOnce = useCallback(() => {
         confirmationStateRef.current = 'disabled';
     }, []);
     const walletUiUtils = useMemo(() => ({
+        addNetwork,
         createPassword,
         disabledConfirmationOnce,
         enterPassword,
         sendTransaction,
         signMessage,
+        signTransaction,
         syncWallet,
     }), [
         signMessage,
+        signTransaction,
         disabledConfirmationOnce,
         sendTransaction,
         enterPassword,
         createPassword,
         syncWallet,
+        addNetwork,
     ]);
     return useMemo(() => [
         signMessageModal ||
             sendTransactionModal ||
             enterPasswordModal ||
             createPasswordModal ||
-            syncWalletPromptModal,
+            syncWalletPromptModal ||
+            addNetworkModal,
         walletUiUtils,
     ], [
         signMessageModal,
@@ -182,6 +218,7 @@ const useWalletUiUtils = ({ appLogoUrl, appName, hideEmbeddedWalletTransactionUI
         enterPasswordModal,
         createPasswordModal,
         syncWalletPromptModal,
+        addNetworkModal,
         walletUiUtils,
     ]);
 };

package/src/lib/views/AccessBlockedView/AccessBlockedView.cjs

@@ -27,20 +27,24 @@ 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('../../utils/functions/compareChains/compareChains.cjs');
 require('../../context/WalletContext/WalletContext.cjs');
 require('../../utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
-var usePromise = require('../../utils/hooks/usePromise/usePromise.cjs');
 require('../../context/ThemeContext/ThemeContext.cjs');
 require('../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
+var usePromise = require('../../utils/hooks/usePromise/usePromise.cjs');
 require('@dynamic-labs/types');
 require('../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
@@ -49,15 +53,14 @@ require('../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');
 var Typography = require('../../components/Typography/Typography.cjs');
 require('../../context/FooterAnimationContext/index.cjs');
 require('../../components/ShadowDOM/ShadowDOM.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/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
@@ -66,23 +69,26 @@ require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../components/IconButton/IconButton.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
 require('formik');
+require('../../utils/hooks/useSubdomainCheck/useSubdomainCheck.cjs');
 require('../../store/state/sendBalances.cjs');
 require('../../components/Input/Input.cjs');
-require('../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+require('../../components/OverlayCard/OverlayCard.cjs');
+require('../TransactionConfirmationView/TransactionConfirmationView.cjs');
 require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 require('../../../index.cjs');
+var IpConfigurationContext = require('../../context/IpConfigurationContext/IpConfigurationContext.cjs');
+require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
+require('@hcaptcha/react-hcaptcha');
+require('../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../store/state/tokenBalances.cjs');
 require('../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 require('../../components/InlineWidget/InlineWidget.cjs');
 require('../../components/IsBrowser/IsBrowser.cjs');
-require('../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../components/Popper/Popper/Popper.cjs');
 require('../../components/Popper/PopperContext/PopperContext.cjs');
 require('qrcode');
-require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
-require('@hcaptcha/react-hcaptcha');
-var IpConfigurationContext = require('../../context/IpConfigurationContext/IpConfigurationContext.cjs');
+require('@dynamic-labs/ethereum-aa');
 
 const AccessBlockedView = () => {
     const [country, setCountry] = React.useState();