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

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

@@ -9,10 +9,13 @@ const updateUserWalletsFromLinkedWallets = (userWallets, authenticatedWallets) =
     const userWalletsCopy = [...userWallets];
     /** We will use this to find wallets addresses that were removed */
     const newWalletsAddresses = new Set();
+    const newWalletsChains = new Set();
     // First pass: add missing wallets and update changed properties
     for (const authenticatedWallet of authenticatedWallets) {
         newWalletsAddresses.add(authenticatedWallet.address);
-        const respectiveIndex = userWalletsCopy.findIndex((wallet) => wallet.address === authenticatedWallet.address);
+        newWalletsChains.add(authenticatedWallet.chain);
+        const respectiveIndex = userWalletsCopy.findIndex((wallet) => wallet.address === authenticatedWallet.address &&
+            wallet.chain === authenticatedWallet.chain);
         // Catch new wallets
         if (respectiveIndex === -1) {
             userWalletsCopy.push(authenticatedWallet);
@@ -25,7 +28,8 @@ const updateUserWalletsFromLinkedWallets = (userWallets, authenticatedWallets) =
     }
     // This filter is to remove a wallet that was previously added to userWallets but is not present
     // among the verified credentials wallets anymore
-    return userWalletsCopy.filter((userWallet) => newWalletsAddresses.has(userWallet.address));
+    return userWalletsCopy.filter((userWallet) => newWalletsAddresses.has(userWallet.address) &&
+        newWalletsChains.has(userWallet.chain));
 };
 
 export { updateUserWalletsFromLinkedWallets };

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

@@ -22,13 +22,6 @@ var useWalletConnectorEvent = require('../events/useWalletConnectorEvent/useWall
 var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 
 const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, detectNewWalletsForLinking, }) => {
-    useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'chainChange', ({ chain }) => {
-        logger.logger.debug('primary wallet chain change', { chain });
-        if (!primaryWallet) {
-            return;
-        }
-        refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
-    });
     const handleAccountChangeWhenAwaitingAccountSwitch = React.useCallback((isPrimaryWallet, newAddress) => {
         logger.logger.debug('handleAccountChangeWhenAwaitingAccountSwitch', {
             isPrimaryWallet,
@@ -44,8 +37,7 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
             }
             return;
         }
-        const isTryingToUpdateUnkownWallet = linkedSecondaryWallet.connector.key === 'unknown';
-        if (isTryingToUpdateUnkownWallet) {
+        if (!linkedSecondaryWallet.connector.isAvailable) {
             //prompt the user to connect and sign with the wallet
             dynamicEvents.dynamicEvents.emit('triggerConnectAndSign');
             return;
@@ -149,13 +141,6 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
             handleAccountChangeWhenAwaitingAccountSwitch(false, (selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet.address) || '');
         }
     }));
-    useWalletConnectorEvent.useWalletConnectorEvent(uniqueNonPrimaryWallets, 'chainChange', (_, changedConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        logger.logger.debug('secondary wallet chain change');
-        // Get all wallets with this connector
-        const affectedWallets = secondaryWallets.filter(({ connector }) => connector.key === changedConnector.key);
-        for (const wallet of affectedWallets)
-            refreshConnectedWallet(wallet.id, wallet.connector);
-    }));
     useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'disconnect', () => {
         logger.logger.debug('primary wallet disconnect');
         if (authMode === 'connect-only') {

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

@@ -18,13 +18,6 @@ import { useWalletConnectorEvent } from '../events/useWalletConnectorEvent/useWa
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
 
 const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, detectNewWalletsForLinking, }) => {
-    useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'chainChange', ({ chain }) => {
-        logger.debug('primary wallet chain change', { chain });
-        if (!primaryWallet) {
-            return;
-        }
-        refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
-    });
     const handleAccountChangeWhenAwaitingAccountSwitch = useCallback((isPrimaryWallet, newAddress) => {
         logger.debug('handleAccountChangeWhenAwaitingAccountSwitch', {
             isPrimaryWallet,
@@ -40,8 +33,7 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
             }
             return;
         }
-        const isTryingToUpdateUnkownWallet = linkedSecondaryWallet.connector.key === 'unknown';
-        if (isTryingToUpdateUnkownWallet) {
+        if (!linkedSecondaryWallet.connector.isAvailable) {
             //prompt the user to connect and sign with the wallet
             dynamicEvents.emit('triggerConnectAndSign');
             return;
@@ -145,13 +137,6 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
             handleAccountChangeWhenAwaitingAccountSwitch(false, (selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet.address) || '');
         }
     }));
-    useWalletConnectorEvent(uniqueNonPrimaryWallets, 'chainChange', (_, changedConnector) => __awaiter(void 0, void 0, void 0, function* () {
-        logger.debug('secondary wallet chain change');
-        // Get all wallets with this connector
-        const affectedWallets = secondaryWallets.filter(({ connector }) => connector.key === changedConnector.key);
-        for (const wallet of affectedWallets)
-            refreshConnectedWallet(wallet.id, wallet.connector);
-    }));
     useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'disconnect', () => {
         logger.debug('primary wallet disconnect');
         if (authMode === 'connect-only') {

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

@@ -19,7 +19,7 @@ require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../shared/consts/index.cjs');
-require('../../../events/dynamicEvents.cjs');
+var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 var useConnectAndSign = require('../authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
@@ -28,6 +28,7 @@ require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
+require('../../../store/state/nonce/nonce.cjs');
 var requiresTwoStepAuthentication = require('../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.cjs');
 require('../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../store/state/user/user.cjs');
@@ -36,6 +37,7 @@ require('../../../context/CaptchaContext/CaptchaContext.cjs');
 var useConnectAndSignSplitSteps = require('../authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
+require('../../functions/compareChains/compareChains.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
@@ -48,8 +50,8 @@ 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/dynamicContextProps/dynamicContextProps.cjs');
+require('../../../store/state/walletOptions/walletOptions.cjs');
 var isSelectedWalletAlreadyConnected = require('../../functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
@@ -60,40 +62,34 @@ require('../../../components/InlineWidget/InlineWidget.cjs');
 require('../../../components/Input/Input.cjs');
 require('../../../components/IsBrowser/IsBrowser.cjs');
 require('../../../components/MenuList/Dropdown/Dropdown.cjs');
+require('../../../components/OverlayCard/OverlayCard.cjs');
 require('../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
 require('../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
 require('../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
-require('../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../../components/Popper/Popper/Popper.cjs');
 require('../../../components/Popper/PopperContext/PopperContext.cjs');
 require('react-focus-lock');
 require('qrcode');
 require('formik');
+require('../useSubdomainCheck/useSubdomainCheck.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
-require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../store/state/sendBalances.cjs');
+require('@dynamic-labs/ethereum-aa');
+require('../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
-require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+require('../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
 require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
-require('../../../../polyfills.cjs');
-require('../../../context/ErrorBoundary/ErrorBoundaryBase.cjs');
-require('../../../context/ErrorBoundary/ErrorBoundaryContext.cjs');
-require('../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
-require('../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.cjs');
-require('../../../context/WidgetRegistry/WidgetRegistryContextProvider.cjs');
-require('../../../context/FundingContext/FundingContext.cjs');
-require('../../../context/SendBalanceContext/SendBalanceContext.cjs');
-require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
-require('../../../context/ConnectWithOtpContext/constants.cjs');
-require('../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
+require('../../../../index.cjs');
 require('../../../store/state/tokenBalances.cjs');
+require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useWalletItemActions = () => {
@@ -140,12 +136,22 @@ const useWalletItemActions = () => {
                 verificationType: 'awaiting_verification',
             });
         }
-        onlyConnectUser({ walletConnector });
+        const attemptConnection = () => {
+            onlyConnectUser({ shouldShowPendingConnectView: false, walletConnector });
+        };
+        setView('mobile-wallet-redirect-view', { onRetry: attemptConnection });
+        attemptConnection();
     });
     const handleInstalledExtensionClick = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         logger.logger.debug('handleInstalledExtensionClick', walletConnector);
         setSelectedWalletConnectorKey(walletConnector.key);
-        setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
+        if (authMode === 'connect-only') {
+            setView('pending-connect');
+            onlyConnectUser({ walletConnector });
+        }
+        else {
+            setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
+        }
     });
     const handleUninstalledClick = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         logger.logger.debug('handleUninstalledClick', walletConnector);
@@ -178,14 +184,20 @@ const useWalletItemActions = () => {
             activeAccountAlreadyLinked,
             connectedAccounts,
             linkedWallets,
+            walletConnectorKey: walletConnector.key,
         });
-        if (activeAccountAlreadyLinked) {
-            setMultiWalletWidgetState('awaiting_account_switch', 'linking_new_wallet');
-        }
-        else {
+        setSelectedWalletConnectorKey(walletConnector.key);
+        if (!activeAccountAlreadyLinked) {
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
+            return;
         }
-        setSelectedWalletConnectorKey(walletConnector.key);
+        const isTryingToUpdateUnkownWallet = activeAccountAlreadyLinked.connector.key === 'unknown';
+        if (isTryingToUpdateUnkownWallet) {
+            //prompt the user to connect and sign with the wallet
+            dynamicEvents.dynamicEvents.emit('triggerConnectAndSign', walletConnector);
+            return;
+        }
+        setMultiWalletWidgetState('awaiting_account_switch', 'linking_new_wallet');
     });
     const openWallet = (walletKey, handlers) => {
         var _a;
@@ -218,9 +230,13 @@ const useWalletItemActions = () => {
             yield walletConnector.endSession();
         }
         setLegacyIsVerifying(false);
+        const isMetamask = walletConnector.key === 'metamask';
         // in connect only we only allow one account to be connected in the same wallet
-        if (authMode !== 'connect-only') {
+        // also this is only a feature in MM
+        if (authMode !== 'connect-only' && isMetamask) {
             try {
+                setSelectedWalletConnectorKey(walletConnector.key);
+                setView('pending-connect');
                 yield walletConnector.chooseAccountsToConnect();
             }
             catch (error) {

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

@@ -15,7 +15,7 @@ import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../store/state/loadingAndLifecycle.js';
 import '../../../shared/consts/index.js';
-import '../../../events/dynamicEvents.js';
+import { dynamicEvents } from '../../../events/dynamicEvents.js';
 import { useConnectAndSign } from '../authenticationHooks/useConnectAndSign/useConnectAndSign.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
@@ -24,6 +24,7 @@ import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
+import '../../../store/state/nonce/nonce.js';
 import { requiresTwoStepAuthentication } from '../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.js';
 import '../../../store/state/projectSettings/projectSettings.js';
 import '../../../store/state/user/user.js';
@@ -32,6 +33,7 @@ import '../../../context/CaptchaContext/CaptchaContext.js';
 import { useConnectAndSignSplitSteps } from '../authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.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';
@@ -44,8 +46,8 @@ import '../../../views/CollectUserDataView/useFields.js';
 import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
-import '../../../store/state/environmentId.js';
-import '../../../store/state/walletConnectorOptions.js';
+import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
+import '../../../store/state/walletOptions/walletOptions.js';
 import { isSelectedWalletAlreadyConnected } from '../../functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
@@ -56,40 +58,34 @@ import '../../../components/InlineWidget/InlineWidget.js';
 import '../../../components/Input/Input.js';
 import '../../../components/IsBrowser/IsBrowser.js';
 import '../../../components/MenuList/Dropdown/Dropdown.js';
+import '../../../components/OverlayCard/OverlayCard.js';
 import '../../../components/Transition/ZoomTransition/ZoomTransition.js';
 import '../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
 import '../../../components/Transition/OpacityTransition/OpacityTransition.js';
-import '../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.js';
 import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
 import '../../../components/Popper/Popper/Popper.js';
 import '../../../components/Popper/PopperContext/PopperContext.js';
 import 'react-focus-lock';
 import 'qrcode';
 import 'formik';
+import '../useSubdomainCheck/useSubdomainCheck.js';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
-import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../store/state/sendBalances.js';
+import '@dynamic-labs/ethereum-aa';
+import '../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
-import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
+import '../../../views/TransactionConfirmationView/TransactionConfirmationView.js';
 import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
-import '../../../../polyfills.js';
-import '../../../context/ErrorBoundary/ErrorBoundaryBase.js';
-import '../../../context/ErrorBoundary/ErrorBoundaryContext.js';
-import '../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
-import '../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.js';
-import '../../../context/WidgetRegistry/WidgetRegistryContextProvider.js';
-import '../../../context/FundingContext/FundingContext.js';
-import '../../../context/SendBalanceContext/SendBalanceContext.js';
-import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
-import '../../../context/ConnectWithOtpContext/constants.js';
-import '../../../context/ReinitializeContext/ReinitializeContextProvider.js';
+import '../../../../index.js';
 import '../../../store/state/tokenBalances.js';
+import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useWalletItemActions = () => {
@@ -136,12 +132,22 @@ const useWalletItemActions = () => {
                 verificationType: 'awaiting_verification',
             });
         }
-        onlyConnectUser({ walletConnector });
+        const attemptConnection = () => {
+            onlyConnectUser({ shouldShowPendingConnectView: false, walletConnector });
+        };
+        setView('mobile-wallet-redirect-view', { onRetry: attemptConnection });
+        attemptConnection();
     });
     const handleInstalledExtensionClick = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
         logger.debug('handleInstalledExtensionClick', walletConnector);
         setSelectedWalletConnectorKey(walletConnector.key);
-        setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
+        if (authMode === 'connect-only') {
+            setView('pending-connect');
+            onlyConnectUser({ walletConnector });
+        }
+        else {
+            setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
+        }
     });
     const handleUninstalledClick = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
         logger.debug('handleUninstalledClick', walletConnector);
@@ -174,14 +180,20 @@ const useWalletItemActions = () => {
             activeAccountAlreadyLinked,
             connectedAccounts,
             linkedWallets,
+            walletConnectorKey: walletConnector.key,
         });
-        if (activeAccountAlreadyLinked) {
-            setMultiWalletWidgetState('awaiting_account_switch', 'linking_new_wallet');
-        }
-        else {
+        setSelectedWalletConnectorKey(walletConnector.key);
+        if (!activeAccountAlreadyLinked) {
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
+            return;
         }
-        setSelectedWalletConnectorKey(walletConnector.key);
+        const isTryingToUpdateUnkownWallet = activeAccountAlreadyLinked.connector.key === 'unknown';
+        if (isTryingToUpdateUnkownWallet) {
+            //prompt the user to connect and sign with the wallet
+            dynamicEvents.emit('triggerConnectAndSign', walletConnector);
+            return;
+        }
+        setMultiWalletWidgetState('awaiting_account_switch', 'linking_new_wallet');
     });
     const openWallet = (walletKey, handlers) => {
         var _a;
@@ -214,9 +226,13 @@ const useWalletItemActions = () => {
             yield walletConnector.endSession();
         }
         setLegacyIsVerifying(false);
+        const isMetamask = walletConnector.key === 'metamask';
         // in connect only we only allow one account to be connected in the same wallet
-        if (authMode !== 'connect-only') {
+        // also this is only a feature in MM
+        if (authMode !== 'connect-only' && isMetamask) {
             try {
+                setSelectedWalletConnectorKey(walletConnector.key);
+                setView('pending-connect');
                 yield walletConnector.chooseAccountsToConnect();
             }
             catch (error) {

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

@@ -6,7 +6,6 @@ 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');
 var utils = require('@dynamic-labs/utils');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/sdk-api-core');
@@ -14,6 +13,7 @@ var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 var isWalletGroup = require('../../functions/walletListBuilder/utils/isWalletGroup/isWalletGroup.cjs');
@@ -24,6 +24,7 @@ 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');
@@ -33,6 +34,7 @@ require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
+require('../../functions/compareChains/compareChains.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
@@ -45,8 +47,8 @@ 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/dynamicContextProps/dynamicContextProps.cjs');
+var walletOptions = require('../../../store/state/walletOptions/walletOptions.cjs');
 var useWalletItemActions = require('../useWalletItemActions/useWalletItemActions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
@@ -57,41 +59,35 @@ 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');
 var groupWalletOptions = require('../../functions/walletListBuilder/utils/groupWalletOptions/groupWalletOptions.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
 var WalletGroupContext = require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
-require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../store/state/sendBalances.cjs');
+require('@dynamic-labs/ethereum-aa');
+require('../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
-require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+require('../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
 require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
-require('../../../../polyfills.cjs');
-require('../../../context/ErrorBoundary/ErrorBoundaryBase.cjs');
-require('../../../context/ErrorBoundary/ErrorBoundaryContext.cjs');
-require('../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
-require('../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.cjs');
-require('../../../context/WidgetRegistry/WidgetRegistryContextProvider.cjs');
-require('../../../context/FundingContext/FundingContext.cjs');
-require('../../../context/SendBalanceContext/SendBalanceContext.cjs');
-require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
-require('../../../context/ConnectWithOtpContext/constants.cjs');
-require('../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
+require('../../../../index.cjs');
 require('../../../store/state/tokenBalances.cjs');
+require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const embeddedWalletsKeys = [
@@ -105,28 +101,31 @@ const embeddedWalletsKeys = [
 ];
 const useWalletOptions = () => {
     const { walletConnectorOptions, setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
-    const { walletBook: walletBook$1 } = walletBook.useWalletBookContext();
+    const walletGroups = walletOptions.useWalletGroups();
     const { setView } = ViewContext.useViewContext();
     const { navigateToWalletGroup } = WalletGroupContext.useWalletGroupContext();
     const { handleWalletItemClick } = useWalletItemActions.useWalletItemActions();
-    const walletOptions = React.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
-                ? walletBook.getWalletGroup(walletBook$1, option.group).name
-                : undefined;
+    const getFilteredWalletOptions = React.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$1, walletConnectorOptions]);
+        });
+    }, [walletConnectorOptions, walletGroups]);
+    const allWalletOptions = React.useMemo(() => getFilteredWalletOptions((options) => options), [getFilteredWalletOptions]);
     const selectWalletOption = (walletKey) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const group = groupWalletOptions.groupWalletOptions(walletBook$1, walletConnectorOptions);
-        const walletOption = group.find((wallet) => wallet.key === walletKey);
+        const group = groupWalletOptions.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.logger.logVerboseTroubleshootingMessage('[useWalletOptions] selectWalletOption', {
             walletKey,
             walletOption: walletOption === null || walletOption === void 0 ? void 0 : walletOption.key,
@@ -134,8 +133,8 @@ const useWalletOptions = () => {
         if (!walletOption) {
             throw new utils.DynamicError('Invalid wallet option key provided.');
         }
-        if (isWalletGroup.isWalletGroup(walletOption)) {
-            navigateToWalletGroup(walletOption);
+        if (walletGroup && isWalletGroup.isWalletGroup(walletGroup)) {
+            navigateToWalletGroup(walletGroup);
         }
         else if (walletConnectorCore.isHardwareWalletConnector(walletOption.walletConnector) &&
             walletOption.walletConnector.canConnectWithHardwareWallet()) {
@@ -150,8 +149,9 @@ const useWalletOptions = () => {
         setShowAuthFlow(true);
     });
     return {
+        getFilteredWalletOptions,
         selectWalletOption,
-        walletOptions,
+        walletOptions: allWalletOptions,
     };
 };
 

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

@@ -1,9 +1,21 @@
+import { WalletOption } from '../../../shared';
 export declare const useWalletOptions: () => {
+    getFilteredWalletOptions: (filter: (options: WalletOption[]) => WalletOption[]) => {
+        chain: "ETH" | "FLOW" | "SOL" | "EVM" | "ALGO" | "STARK" | "ATOM" | "COSMOS" | "BTC" | "ECLIPSE";
+        group: string | undefined;
+        groupName: string | undefined;
+        isInstalledOnBrowser: boolean;
+        isWalletConnect: boolean;
+        key: string;
+        name: string;
+    }[];
     selectWalletOption: (walletKey: string) => Promise<void>;
     walletOptions: {
+        chain: "ETH" | "FLOW" | "SOL" | "EVM" | "ALGO" | "STARK" | "ATOM" | "COSMOS" | "BTC" | "ECLIPSE";
         group: string | undefined;
         groupName: string | undefined;
         isInstalledOnBrowser: boolean;
+        isWalletConnect: boolean;
         key: string;
         name: string;
     }[];