@dynamic-labs/sdk-react-core 3.0.0-alpha.3 → 3.0.0-alpha.31

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

@@ -26,14 +26,13 @@ import 'react-international-phone';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../locale/locale.js';
-import 'viem';
-import 'viem/chains';
 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 '../../../context/WalletContext/WalletContext.js';
+import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
@@ -45,6 +44,7 @@ import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
+import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import 'react-dom';
 import '../../../components/ShadowDOM/ShadowDOM.js';
 import '../../../components/IconButton/IconButton.js';
@@ -67,7 +67,6 @@ import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../../context/FooterAnimationContext/index.js';
-import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import { CreatePasswordModal } from '../../../modals/CreatePasswordModal/CreatePasswordModal.js';
@@ -77,6 +76,7 @@ import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessa
 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';
 
 const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalletTransactionUIs = false, }) => {
@@ -94,34 +94,50 @@ const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalle
     const { modal: createPasswordModal, open: openCreatePassword } = useConfirmationModal({
         elementId: 'dynamic-create-password',
     });
+    const { modal: syncWalletPromptModal, open: openSyncWalletPrompt } = useConfirmationModal({
+        elementId: 'dynamic-sync-wallet',
+    });
     const shouldConfirmAction = useCallback(() => {
-        if (hideEmbeddedWalletTransactionUIs) {
-            return false;
-        }
         if (confirmationStateRef.current === 'disabled') {
             confirmationStateRef.current = 'enabled';
             return false;
         }
         return true;
-    }, [confirmationStateRef]);
-    const signMessage = useCallback(({ message, handler }) => {
-        if (!shouldConfirmAction()) {
+    }, [confirmationStateRef, hideEmbeddedWalletTransactionUIs]);
+    const signMessage = useCallback((_a) => __awaiter(void 0, [_a], void 0, function* ({ message, handler }) {
+        // prevent the modal from opening itself again
+        if (!shouldConfirmAction())
             return handler();
-        }
-        return openSignMessage((resolve, reject) => (jsx(SignMessageConfirmationModal, { appLogoUrl: appLogoUrl, appName: appName, appOrigin: getAppOrigin(), message: message, handler: handler, onSignMessage: resolve, onReject: reject })));
-    }, [appLogoUrl, appName, getAppOrigin, openSignMessage, shouldConfirmAction]);
+        return openSignMessage((resolve, reject) => (jsx(SignMessageConfirmationModal, { appLogoUrl: appLogoUrl, appName: appName, appOrigin: getAppOrigin(), message: message, handler: handler, onSignMessage: resolve, onReject: reject, hideModal: hideEmbeddedWalletTransactionUIs }))).then((signedMessage) => __awaiter(void 0, void 0, void 0, function* () {
+            if (signedMessage === 'callHandlerOutsideModal')
+                return handler();
+            else
+                return signedMessage;
+        }));
+    }), [appLogoUrl, appName, getAppOrigin, openSignMessage, shouldConfirmAction]);
     const sendTransaction = useCallback((walletConnector, transaction) => __awaiter(void 0, void 0, void 0, function* () {
-        if (!shouldConfirmAction()) {
+        // 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 })));
+        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 }))).then((signedTransaction) => __awaiter(void 0, void 0, void 0, function* () {
+            if (signedTransaction === 'callHandlerOutsideModal')
+                return transaction.submit();
+            else
+                return signedTransaction;
+        }));
     }), [openSendTransaction, shouldConfirmAction, t]);
-    const enterPassword = useCallback((_a) => __awaiter(void 0, [_a], void 0, function* ({ handler, closeView = true }) {
+    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]);
-    const createPassword = useCallback((_b) => __awaiter(void 0, [_b], void 0, function* ({ closeView = true }) {
+    const createPassword = useCallback((_c) => __awaiter(void 0, [_c], void 0, function* ({ closeView = true }) {
         return openCreatePassword((resolve, reject) => (jsx(CreatePasswordModal, { onResolve: resolve, onReject: reject, closeView: closeView })));
     }), [openCreatePassword]);
+    const syncWallet = useCallback((_d) => __awaiter(void 0, [_d], void 0, function* ({ walletConnector, activeAddress, expectedAddress }) {
+        if (!activeAddress) {
+            return;
+        }
+        yield openSyncWalletPrompt((resolve) => (jsx(SyncWalletPromptModal, { onResolve: resolve, connector: walletConnector, expectedAddress: expectedAddress })));
+    }), [openSyncWalletPrompt]);
     const disabledConfirmationOnce = useCallback(() => {
         confirmationStateRef.current = 'disabled';
     }, []);
@@ -131,24 +147,28 @@ const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, hideEmbeddedWalle
         enterPassword,
         sendTransaction,
         signMessage,
+        syncWallet,
     }), [
         signMessage,
         disabledConfirmationOnce,
         sendTransaction,
         enterPassword,
         createPassword,
+        syncWallet,
     ]);
     return useMemo(() => [
         signMessageModal ||
             sendTransactionModal ||
             enterPasswordModal ||
-            createPasswordModal,
+            createPasswordModal ||
+            syncWalletPromptModal,
         walletUiUtils,
     ], [
         signMessageModal,
         sendTransactionModal,
         enterPasswordModal,
         createPasswordModal,
+        syncWalletPromptModal,
         walletUiUtils,
     ]);
 };

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

@@ -6,12 +6,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var walletBook = require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/sdk-api-core');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
-require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
@@ -26,24 +26,89 @@ require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');
 var getWalletIdentifier = require('../../functions/getWalletIdentifier/getWalletIdentifier.cjs');
 var isWalletConnected = require('../../functions/isWalletConnected/isWalletConnected.cjs');
-require('viem');
-require('viem/chains');
 require('../../../events/dynamicEvents.cjs');
 var useWalletConnectorEvent = require('../events/useWalletConnectorEvent/useWalletConnectorEvent.cjs');
 var useWindowEvent = require('../events/useWindowEvent/useWindowEvent.cjs');
+require('../../../context/DynamicContext/DynamicContext.cjs');
+require('../../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../../context/ErrorContext/ErrorContext.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('../../../context/WalletContext/WalletContext.cjs');
+require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
+require('../../../context/ThemeContext/ThemeContext.cjs');
+require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
+require('@dynamic-labs/types');
+require('../../../context/LoadingContext/LoadingContext.cjs');
+require('yup');
+require('../../../context/MockContext/MockContext.cjs');
+require('../../../views/CollectUserDataView/useFields.cjs');
+require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('@dynamic-labs/rpc-providers');
+require('react-i18next');
+require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
+require('../../../components/Alert/Alert.cjs');
+require('../../../components/ShadowDOM/ShadowDOM.cjs');
+require('../../../components/IconButton/IconButton.cjs');
+require('../../../components/InlineWidget/InlineWidget.cjs');
+require('../../../components/Input/Input.cjs');
+require('../../../components/IsBrowser/IsBrowser.cjs');
+require('../../../components/MenuList/Dropdown/Dropdown.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('../../../views/WalletList/WalletList.cjs');
+require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
+require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
+require('@hcaptcha/react-hcaptcha');
+require('../../../context/FooterAnimationContext/index.cjs');
+require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+var getPlatformForConnector = require('../../functions/getPlatformForConnector/getPlatformForConnector.cjs');
+require('../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
+require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
+require('../../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
+require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
+require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+require('../../../../polyfills.cjs');
+require('../../../context/ErrorBoundary/ErrorBoundaryBase.cjs');
+require('../../../context/ErrorBoundary/ErrorBoundaryContext.cjs');
+require('../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
+require('../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.cjs');
+require('../../../context/WidgetRegistry/WidgetRegistryContextProvider.cjs');
+require('../../../context/FundingContext/FundingContext.cjs');
+require('../../../context/SendBalanceContext/SendBalanceContext.cjs');
+require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
+require('../../../context/ConnectWithOtpContext/constants.cjs');
+require('../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
 
 /**
  * For the given wallet array, this returns an object mapping from each wallet's
  * identifier to whether its connector recognizes it as currently connected or not.
  */
-const getConnectedWalletsMap = (wallets) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const getConnectedWalletsMap = (wallets, walletBook$1, primaryWalletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     const newMap = {};
-    yield Promise.all(wallets.map((wallet) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    yield Promise.all(wallets
+        .filter((wallet) => wallet.id === primaryWalletId ||
+        walletBook.isWalletMethodSupported(walletBook.findWalletBookWallet(walletBook$1, wallet.key), 'getConnectedAccounts', getPlatformForConnector.getPlatformForConnector(wallet.connector)))
+        .map((wallet) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         newMap[getWalletIdentifier.getWalletIdentifier(wallet)] = yield isWalletConnected.isWalletConnected(wallet);
     })));
     return newMap;
 });
-const useWalletsConnectionState = (wallets) => {
+const useWalletsConnectionState = (wallets, walletBook, primaryWalletId, authMode) => {
     const [connectedWalletsMap, setConnectedWalletsMap] = React.useState({});
     /**
      * Whether the connection map has been loaded off of the current wallet array.
@@ -60,7 +125,7 @@ const useWalletsConnectionState = (wallets) => {
     const incomingWalletSwitchAddress = React.useRef(undefined);
     const computeConnectedStateForWallets = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         didConnectedStateLoad.current = false;
-        const newMap = yield getConnectedWalletsMap(wallets);
+        const newMap = yield getConnectedWalletsMap(wallets, walletBook, primaryWalletId);
         if (Object.values(newMap).length === 0) {
             setConnectedWalletsMap({});
             return;
@@ -76,7 +141,7 @@ const useWalletsConnectionState = (wallets) => {
                 return;
         }
         setConnectedWalletsMap(newMap);
-    }), [wallets]);
+    }), [primaryWalletId, walletBook, wallets]);
     /** A string that is unique for each possible value of the wallets prop */
     const walletsHash = wallets.map(getWalletIdentifier.getWalletIdentifier).join('-');
     const connectors = wallets.map(({ connector }) => connector);
@@ -93,6 +158,9 @@ const useWalletsConnectionState = (wallets) => {
     useWalletConnectorEvent.useWalletConnectorEvent(connectors, 'accountChange', onAccountChange);
     useWalletConnectorEvent.useWalletConnectorEvent(connectors, 'disconnect', handleEvent);
     useWalletConnectorEvent.useWalletConnectorEvent(connectors, 'chainChange', handleEvent);
+    const computeConnectedStateKey = authMode === 'connect-and-sign'
+        ? `${primaryWalletId}-${walletsHash}`
+        : walletsHash;
     React.useEffect(() => {
         computeConnectedStateForWallets();
     }, 
@@ -101,7 +169,7 @@ const useWalletsConnectionState = (wallets) => {
      * wallets change.
      */
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [walletsHash]);
+    [computeConnectedStateKey]);
     /**
      * This is a workaround to detect when the user switches to another tab/extension
      * and then comes back to the dapp.

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

@@ -1,9 +1,10 @@
 import { MutableRefObject } from 'react';
-import { Wallet } from '../../../shared';
+import { WalletBookSchema } from '@dynamic-labs/wallet-book';
+import { AuthModeType, Wallet } from '../../../shared';
 type ConnectedWalletsMap = {
     [address: string]: boolean;
 };
-type WalletsConnectionStateHook = (wallets: Wallet[]) => {
+type WalletsConnectionStateHook = (wallets: Wallet[], walletBook: WalletBookSchema, primaryWalletId: string | undefined, authMode: AuthModeType) => {
     connectedWalletsMap: ConnectedWalletsMap;
     didConnectedStateLoad: MutableRefObject<boolean>;
 };

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

@@ -2,12 +2,12 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useRef, useCallback, useEffect } from 'react';
 import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
+import { isWalletMethodSupported, findWalletBookWallet } from '@dynamic-labs/wallet-book';
 import '@dynamic-labs/sdk-api-core';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
-import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
@@ -22,24 +22,89 @@ import '@dynamic-labs/store';
 import '../../../locale/locale.js';
 import { getWalletIdentifier } from '../../functions/getWalletIdentifier/getWalletIdentifier.js';
 import { isWalletConnected } from '../../functions/isWalletConnected/isWalletConnected.js';
-import 'viem';
-import 'viem/chains';
 import '../../../events/dynamicEvents.js';
 import { useWalletConnectorEvent } from '../events/useWalletConnectorEvent/useWalletConnectorEvent.js';
 import { useWindowEvent } from '../events/useWindowEvent/useWindowEvent.js';
+import '../../../context/DynamicContext/DynamicContext.js';
+import '../../../context/CaptchaContext/CaptchaContext.js';
+import '../../../context/ErrorContext/ErrorContext.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 '../../../context/WalletContext/WalletContext.js';
+import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
+import '../../../context/ThemeContext/ThemeContext.js';
+import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
+import '@dynamic-labs/types';
+import '../../../context/LoadingContext/LoadingContext.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 'react-i18next';
+import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
+import '../../../components/Alert/Alert.js';
+import '../../../components/ShadowDOM/ShadowDOM.js';
+import '../../../components/IconButton/IconButton.js';
+import '../../../components/InlineWidget/InlineWidget.js';
+import '../../../components/Input/Input.js';
+import '../../../components/IsBrowser/IsBrowser.js';
+import '../../../components/MenuList/Dropdown/Dropdown.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 '../../../views/WalletList/WalletList.js';
+import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
+import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
+import '@hcaptcha/react-hcaptcha';
+import '../../../context/FooterAnimationContext/index.js';
+import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import { getPlatformForConnector } from '../../functions/getPlatformForConnector/getPlatformForConnector.js';
+import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
+import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
+import '../../../context/PasskeyContext/PasskeyContext.js';
+import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
+import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
+import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
+import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import '../../../../polyfills.js';
+import '../../../context/ErrorBoundary/ErrorBoundaryBase.js';
+import '../../../context/ErrorBoundary/ErrorBoundaryContext.js';
+import '../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
+import '../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.js';
+import '../../../context/WidgetRegistry/WidgetRegistryContextProvider.js';
+import '../../../context/FundingContext/FundingContext.js';
+import '../../../context/SendBalanceContext/SendBalanceContext.js';
+import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
+import '../../../context/ConnectWithOtpContext/constants.js';
+import '../../../context/ReinitializeContext/ReinitializeContextProvider.js';
 
 /**
  * For the given wallet array, this returns an object mapping from each wallet's
  * identifier to whether its connector recognizes it as currently connected or not.
  */
-const getConnectedWalletsMap = (wallets) => __awaiter(void 0, void 0, void 0, function* () {
+const getConnectedWalletsMap = (wallets, walletBook, primaryWalletId) => __awaiter(void 0, void 0, void 0, function* () {
     const newMap = {};
-    yield Promise.all(wallets.map((wallet) => __awaiter(void 0, void 0, void 0, function* () {
+    yield Promise.all(wallets
+        .filter((wallet) => wallet.id === primaryWalletId ||
+        isWalletMethodSupported(findWalletBookWallet(walletBook, wallet.key), 'getConnectedAccounts', getPlatformForConnector(wallet.connector)))
+        .map((wallet) => __awaiter(void 0, void 0, void 0, function* () {
         newMap[getWalletIdentifier(wallet)] = yield isWalletConnected(wallet);
     })));
     return newMap;
 });
-const useWalletsConnectionState = (wallets) => {
+const useWalletsConnectionState = (wallets, walletBook, primaryWalletId, authMode) => {
     const [connectedWalletsMap, setConnectedWalletsMap] = useState({});
     /**
      * Whether the connection map has been loaded off of the current wallet array.
@@ -56,7 +121,7 @@ const useWalletsConnectionState = (wallets) => {
     const incomingWalletSwitchAddress = useRef(undefined);
     const computeConnectedStateForWallets = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
         didConnectedStateLoad.current = false;
-        const newMap = yield getConnectedWalletsMap(wallets);
+        const newMap = yield getConnectedWalletsMap(wallets, walletBook, primaryWalletId);
         if (Object.values(newMap).length === 0) {
             setConnectedWalletsMap({});
             return;
@@ -72,7 +137,7 @@ const useWalletsConnectionState = (wallets) => {
                 return;
         }
         setConnectedWalletsMap(newMap);
-    }), [wallets]);
+    }), [primaryWalletId, walletBook, wallets]);
     /** A string that is unique for each possible value of the wallets prop */
     const walletsHash = wallets.map(getWalletIdentifier).join('-');
     const connectors = wallets.map(({ connector }) => connector);
@@ -89,6 +154,9 @@ const useWalletsConnectionState = (wallets) => {
     useWalletConnectorEvent(connectors, 'accountChange', onAccountChange);
     useWalletConnectorEvent(connectors, 'disconnect', handleEvent);
     useWalletConnectorEvent(connectors, 'chainChange', handleEvent);
+    const computeConnectedStateKey = authMode === 'connect-and-sign'
+        ? `${primaryWalletId}-${walletsHash}`
+        : walletsHash;
     useEffect(() => {
         computeConnectedStateForWallets();
     }, 
@@ -97,7 +165,7 @@ const useWalletsConnectionState = (wallets) => {
      * wallets change.
      */
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [walletsHash]);
+    [computeConnectedStateKey]);
     /**
      * This is a workaround to detect when the user switches to another tab/extension
      * and then comes back to the dapp.

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

@@ -31,14 +31,13 @@ require('react-international-phone');
 require('../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../locale/locale.cjs');
-require('viem');
-require('viem/chains');
 require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 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');
@@ -71,15 +70,26 @@ require('../../components/Input/Input.cjs');
 require('../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
-require('../../components/InlineWidget/InlineWidget.cjs');
+require('../../../polyfills.cjs');
+require('../../context/ErrorBoundary/ErrorBoundaryBase.cjs');
+require('../../context/ErrorBoundary/ErrorBoundaryContext.cjs');
+require('../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
+require('../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.cjs');
 require('../../components/IsBrowser/IsBrowser.cjs');
+require('../../context/WidgetRegistry/WidgetRegistryContextProvider.cjs');
+require('../../context/FundingContext/FundingContext.cjs');
 require('../../components/Popper/Popper/Popper.cjs');
 require('../../components/Popper/PopperContext/PopperContext.cjs');
-require('qrcode');
 require('../WalletList/WalletList.cjs');
 require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 var IpConfigurationContext = require('../../context/IpConfigurationContext/IpConfigurationContext.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');
+require('qrcode');
 
 const AccessBlockedView = () => {
     const [country, setCountry] = React.useState();

package/src/lib/views/AccessBlockedView/AccessBlockedView.js

@@ -27,14 +27,13 @@ import 'react-international-phone';
 import '../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../locale/locale.js';
-import 'viem';
-import 'viem/chains';
 import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../context/WalletContext/WalletContext.js';
+import '../../utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import { usePromise } from '../../utils/hooks/usePromise/usePromise.js';
 import '../../context/ThemeContext/ThemeContext.js';
 import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
@@ -67,15 +66,26 @@ import '../../components/Input/Input.js';
 import '../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
 import '../../context/PasskeyContext/PasskeyContext.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
-import '../../components/InlineWidget/InlineWidget.js';
+import '../../../polyfills.js';
+import '../../context/ErrorBoundary/ErrorBoundaryBase.js';
+import '../../context/ErrorBoundary/ErrorBoundaryContext.js';
+import '../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
+import '../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.js';
 import '../../components/IsBrowser/IsBrowser.js';
+import '../../context/WidgetRegistry/WidgetRegistryContextProvider.js';
+import '../../context/FundingContext/FundingContext.js';
 import '../../components/Popper/Popper/Popper.js';
 import '../../components/Popper/PopperContext/PopperContext.js';
-import 'qrcode';
 import '../WalletList/WalletList.js';
 import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import { useIpConfigurationContext } from '../../context/IpConfigurationContext/IpConfigurationContext.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 'qrcode';
 
 const AccessBlockedView = () => {
     const [country, setCountry] = useState();

package/src/lib/views/AccountExistsView/AccountExistsView.cjs

@@ -32,14 +32,13 @@ require('../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../locale/locale.cjs');
 var getSocialSignInProviderForProviderEnum = require('../../utils/functions/getSocialSignInProviderForProviderEnum/getSocialSignInProviderForProviderEnum.cjs');
-require('viem');
-require('viem/chains');
 require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 var AccountExistsContext = require('../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../context/WalletContext/WalletContext.cjs');
+require('../../utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 var useFindSocialIcon = require('../../utils/hooks/useFindSocialIcon/useFindSocialIcon.cjs');
 require('../../context/ThemeContext/ThemeContext.cjs');
 require('../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
@@ -74,17 +73,28 @@ require('../../components/Input/Input.cjs');
 require('../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
-var IconListTile = require('../../components/IconListTile/IconListTile.cjs');
-require('../../components/InlineWidget/InlineWidget.cjs');
+require('../../../polyfills.cjs');
+require('../../context/ErrorBoundary/ErrorBoundaryBase.cjs');
+require('../../context/ErrorBoundary/ErrorBoundaryContext.cjs');
+require('../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
+require('../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.cjs');
 require('../../components/IsBrowser/IsBrowser.cjs');
+require('../../context/WidgetRegistry/WidgetRegistryContextProvider.cjs');
+require('../../context/FundingContext/FundingContext.cjs');
 require('../../components/Popper/Popper/Popper.cjs');
 require('../../components/Popper/PopperContext/PopperContext.cjs');
-require('qrcode');
 require('../WalletList/WalletList.cjs');
 var LoginEmailForm = require('../LoginView/sections/EmailSignInSection/LoginEmailForm.cjs');
 require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../../context/IpConfigurationContext/IpConfigurationContext.cjs');
+require('../../context/SendBalanceContext/SendBalanceContext.cjs');
+require('../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
+require('../../context/ConnectWithOtpContext/constants.cjs');
+require('../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
+var IconListTile = require('../../components/IconListTile/IconListTile.cjs');
+require('../../components/InlineWidget/InlineWidget.cjs');
+require('qrcode');
 
 const AccountExistsView = () => {
     const { existentAccountData } = AccountExistsContext.useAccountExistsContext();

package/src/lib/views/AccountExistsView/AccountExistsView.js

@@ -28,14 +28,13 @@ import '../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../locale/locale.js';
 import { getSocialSignInProviderForProviderEnum } from '../../utils/functions/getSocialSignInProviderForProviderEnum/getSocialSignInProviderForProviderEnum.js';
-import 'viem';
-import 'viem/chains';
 import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import { useAccountExistsContext } from '../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../context/WalletContext/WalletContext.js';
+import '../../utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import { useFindSocialIcon } from '../../utils/hooks/useFindSocialIcon/useFindSocialIcon.js';
 import '../../context/ThemeContext/ThemeContext.js';
 import '../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
@@ -70,17 +69,28 @@ import '../../components/Input/Input.js';
 import '../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
 import '../../context/PasskeyContext/PasskeyContext.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
-import { IconListTile } from '../../components/IconListTile/IconListTile.js';
-import '../../components/InlineWidget/InlineWidget.js';
+import '../../../polyfills.js';
+import '../../context/ErrorBoundary/ErrorBoundaryBase.js';
+import '../../context/ErrorBoundary/ErrorBoundaryContext.js';
+import '../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
+import '../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.js';
 import '../../components/IsBrowser/IsBrowser.js';
+import '../../context/WidgetRegistry/WidgetRegistryContextProvider.js';
+import '../../context/FundingContext/FundingContext.js';
 import '../../components/Popper/Popper/Popper.js';
 import '../../components/Popper/PopperContext/PopperContext.js';
-import 'qrcode';
 import '../WalletList/WalletList.js';
 import { LoginEmailForm } from '../LoginView/sections/EmailSignInSection/LoginEmailForm.js';
 import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../context/IpConfigurationContext/IpConfigurationContext.js';
+import '../../context/SendBalanceContext/SendBalanceContext.js';
+import '../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
+import '../../context/ConnectWithOtpContext/constants.js';
+import '../../context/ReinitializeContext/ReinitializeContextProvider.js';
+import { IconListTile } from '../../components/IconListTile/IconListTile.js';
+import '../../components/InlineWidget/InlineWidget.js';
+import 'qrcode';
 
 const AccountExistsView = () => {
     const { existentAccountData } = useAccountExistsContext();