@dynamic-labs/sdk-react-core 0.17.0-RC.2 → 0.17.0-RC.20

package/src/lib/utils/functions/parseWalletLinks/parseWalletLinks.js

@@ -1,12 +1,14 @@
-import { isIPhone, isIPad, isMobile } from '@dynamic-labs/multi-wallet';
+import { isIPhone, isIPad, isMobile } from '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import 'react';
 import { detectBrowserName } from '../../../shared/utils/functions/detectBrowser/detectBrowser.js';
 import '../../constants/colors.js';
+import 'ethers';
 import '../../../shared/consts/index.js';
 
 const parseWalletLinks = (links) => {
@@ -32,6 +34,7 @@ const parseWalletLinks = (links) => {
         canShowIosAppButton,
         currentDesktopUrl,
         hasMobileAppUrl: canShowAndroidAppButton || canShowIosAppButton,
+        userBrowser,
     };
 };
 

package/src/lib/utils/functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.cjs

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var utils = require('@dynamic-labs/utils');
 
 const walletsRequiringTwoStepAuthentication = ['Dapper'];
-const requiresTwoStepAuthentication = (connector) => (multiWallet.isMobile() && !(connector === null || connector === void 0 ? void 0 : connector.canConnectViaCustodialService)) ||
+const requiresTwoStepAuthentication = (connector) => (utils.isMobile() && !(connector === null || connector === void 0 ? void 0 : connector.canConnectViaCustodialService)) ||
     walletsRequiringTwoStepAuthentication.includes((connector === null || connector === void 0 ? void 0 : connector.name) || '');
 
 exports.requiresTwoStepAuthentication = requiresTwoStepAuthentication;

package/src/lib/utils/functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.js

@@ -1,4 +1,4 @@
-import { isMobile } from '@dynamic-labs/multi-wallet';
+import { isMobile } from '@dynamic-labs/utils';
 
 const walletsRequiringTwoStepAuthentication = ['Dapper'];
 const requiresTwoStepAuthentication = (connector) => (isMobile() && !(connector === null || connector === void 0 ? void 0 : connector.canConnectViaCustodialService)) ||

package/src/lib/utils/functions/walletListBuilder/walletListBuilder.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var getCalculatedOffset = require('./utils/getCalculatedOffset/getCalculatedOffset.cjs');
 
 const PRIORITY_WALLET_LIST = [
@@ -19,7 +19,6 @@ const PRIORITY_WALLET_LIST = [
     'rainbow',
     'dapper',
     'glow',
-    'fortmatic',
     'lilico',
 ];
 const SIGN_IN_WITH_EMAIL_WALLET_NAME = 'Sign In With Email';
@@ -28,7 +27,7 @@ const sortedInputList = (inputList) => {
     const unsortedPriorityWallets = [];
     const unsortedOtherWallets = [];
     inputList.forEach((wallet) => {
-        if (PRIORITY_WALLET_LIST.includes(multiWallet.normalizeWalletName(wallet.name))) {
+        if (PRIORITY_WALLET_LIST.includes(walletConnectorCore.normalizeWalletName(wallet.name))) {
             unsortedPriorityWallets.push(wallet);
         }
         else {
@@ -37,8 +36,8 @@ const sortedInputList = (inputList) => {
     });
     const sortedPriorityWallets = unsortedPriorityWallets
         .slice()
-        .sort((a, b) => PRIORITY_WALLET_LIST.indexOf(multiWallet.normalizeWalletName(a.name)) -
-        PRIORITY_WALLET_LIST.indexOf(multiWallet.normalizeWalletName(b.name)));
+        .sort((a, b) => PRIORITY_WALLET_LIST.indexOf(walletConnectorCore.normalizeWalletName(a.name)) -
+        PRIORITY_WALLET_LIST.indexOf(walletConnectorCore.normalizeWalletName(b.name)));
     return [...sortedPriorityWallets, ...unsortedOtherWallets];
 };
 const walletListBuilder = ({ numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletName, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, }) => {
@@ -53,8 +52,8 @@ const walletListBuilder = ({ numberOfWalletsToShow, inputList, isWalletConnectLi
     const otherWallets = [];
     const orderedInputList = orderAndFilterList(walletList, walletsFilter, isWalletConnectList);
     orderedInputList.forEach((wallet) => {
-        if (multiWallet.isEmailWalletConnector(wallet.walletConnector) ||
-            multiWallet.isSocialWalletConnector(wallet.walletConnector)) {
+        if (walletConnectorCore.isEmailWalletConnector(wallet.walletConnector) ||
+            walletConnectorCore.isSocialWalletConnector(wallet.walletConnector)) {
             return;
         }
         else if ((lastUsedWalletName === null || lastUsedWalletName === void 0 ? void 0 : lastUsedWalletName.toLowerCase()) === wallet.name.toLowerCase()) {

package/src/lib/utils/functions/walletListBuilder/walletListBuilder.js

@@ -1,4 +1,4 @@
-import { isEmailWalletConnector, isSocialWalletConnector, normalizeWalletName } from '@dynamic-labs/multi-wallet';
+import { isEmailWalletConnector, isSocialWalletConnector, normalizeWalletName } from '@dynamic-labs/wallet-connector-core';
 import { getCalculatedOffset } from './utils/getCalculatedOffset/getCalculatedOffset.js';
 
 const PRIORITY_WALLET_LIST = [
@@ -15,7 +15,6 @@ const PRIORITY_WALLET_LIST = [
     'rainbow',
     'dapper',
     'glow',
-    'fortmatic',
     'lilico',
 ];
 const SIGN_IN_WITH_EMAIL_WALLET_NAME = 'Sign In With Email';

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../../_virtual/_tslib.cjs');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var showPendingConnectView = require('../helpers/showPendingConnectView.cjs');
 var isConnectOnly = require('../helpers/isConnectOnly.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
@@ -15,8 +15,10 @@ var setToLS = require('../../../../shared/utils/functions/storage/setToLS.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('react');
+require('@dynamic-labs/utils');
 var localStorage = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
+require('ethers');
 require('../../../../shared/consts/index.cjs');
 var useVerifyWallet = require('../../useVerifyWallet/useVerifyWallet.cjs');
 var CaptchaContext = require('../../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -37,8 +39,8 @@ const useConnectAndSign = () => {
         var _a, _b;
         yield showPendingConnectView.showPendingConnectView(walletConnector, setView);
         try {
-            if (multiWallet.isEmailWalletConnector(walletConnector)) {
-                if (multiWallet.isEmailOTPWalletConnector(walletConnector)) {
+            if (walletConnectorCore.isEmailWalletConnector(walletConnector)) {
+                if (walletConnectorCore.isEmailOTPWalletConnector(walletConnector)) {
                     setView('email-wallet-otp-verification-view');
                 }
                 else {
@@ -56,11 +58,11 @@ const useConnectAndSign = () => {
                 setView('captcha');
                 return;
             }
-            if (!multiWallet.isEmailWalletConnector(walletConnector)) {
+            if (!walletConnectorCore.isEmailWalletConnector(walletConnector)) {
                 setView('pending-signature');
             }
             else {
-                walletUiUtils.enableInternalSign();
+                walletUiUtils.disabledConfirmationOnce();
             }
             yield verifyWallet({
                 captchaToken,

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js

@@ -1,5 +1,5 @@
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
-import { isEmailWalletConnector, isEmailOTPWalletConnector } from '@dynamic-labs/multi-wallet';
+import { isEmailWalletConnector, isEmailOTPWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { showPendingConnectView } from '../helpers/showPendingConnectView.js';
 import { isConnectOnly } from '../helpers/isConnectOnly.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
@@ -11,8 +11,10 @@ import { setToLS } from '../../../../shared/utils/functions/storage/setToLS.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import 'react';
+import '@dynamic-labs/utils';
 import { LAST_USED_WALLET } from '../../../constants/localStorage.js';
 import '../../../constants/colors.js';
+import 'ethers';
 import '../../../../shared/consts/index.js';
 import { useVerifyWallet } from '../../useVerifyWallet/useVerifyWallet.js';
 import { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';
@@ -56,7 +58,7 @@ const useConnectAndSign = () => {
                 setView('pending-signature');
             }
             else {
-                walletUiUtils.enableInternalSign();
+                walletUiUtils.disabledConfirmationOnce();
             }
             yield verifyWallet({
                 captchaToken,

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.cjs

@@ -13,11 +13,13 @@ require('@dynamic-labs/sdk-api');
 require('../../../../shared/logger.cjs');
 var setToLS = require('../../../../shared/utils/functions/storage/setToLS.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/multi-wallet');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('react');
+require('@dynamic-labs/utils');
 var localStorage = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
+require('ethers');
 require('../../../../shared/consts/index.cjs');
 var CaptchaContext = require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.js

@@ -9,11 +9,13 @@ import '@dynamic-labs/sdk-api';
 import '../../../../shared/logger.js';
 import { setToLS } from '../../../../shared/utils/functions/storage/setToLS.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/multi-wallet';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import 'react';
+import '@dynamic-labs/utils';
 import { LAST_USED_WALLET } from '../../../constants/localStorage.js';
 import '../../../constants/colors.js';
+import 'ethers';
 import '../../../../shared/consts/index.js';
 import { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';
 

package/src/lib/utils/hooks/authenticationHooks/useEmailVerificationRequest/useEmailVerificationRequest.cjs

@@ -8,12 +8,16 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useI
 var api = require('../../../../data/api.cjs');
 var index = require('../../../functions/storeAuthToken/index.cjs');
 require('@dynamic-labs/multi-wallet');
+require('@dynamic-labs/utils');
 require('../../../constants/colors.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../../context/ViewContext/ViewContext.cjs');
+require('ethers');
+require('../../../../shared/consts/index.cjs');
 var useUpdateUserProfileByJWTCallback = require('../../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.cjs');
 var EmailVerificationContext = require('../../../../context/EmailVerificationContext/EmailVerificationContext.cjs');
 

package/src/lib/utils/hooks/authenticationHooks/useEmailVerificationRequest/useEmailVerificationRequest.js

@@ -4,12 +4,16 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
 import { verifyEmail } from '../../../../data/api.js';
 import { storeAuthToken } from '../../../functions/storeAuthToken/index.js';
 import '@dynamic-labs/multi-wallet';
+import '@dynamic-labs/utils';
 import '../../../constants/colors.js';
 import '@dynamic-labs/sdk-api';
 import '../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../../context/ViewContext/ViewContext.js';
+import 'ethers';
+import '../../../../shared/consts/index.js';
 import { useUpdateUserProfileByJWTCallback } from '../../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.js';
 import { useEmailVerificationContext } from '../../../../context/EmailVerificationContext/EmailVerificationContext.js';
 

package/src/lib/utils/hooks/multiWallet/index.d.ts

@@ -1,2 +1,3 @@
 export * from './useMultiWalletWidgetState';
 export * from './useVerifyOnAwaitingSignature';
+export * from './useSyncPrimaryWallet';

package/src/lib/utils/hooks/multiWallet/useMultiWalletWidgetState/useMultiWalletWidgetState.cjs

@@ -10,13 +10,11 @@ const validTransitions = {
     awaiting_account_switch: ['awaiting_signature', 'idle'],
     awaiting_connection: ['idle'],
     awaiting_signature: ['idle'],
-    detected_known_secondary_wallet: ['idle'],
     detected_new_wallet: ['awaiting_signature', 'idle'],
     idle: [
         'awaiting_account_switch',
         'awaiting_connection',
         'awaiting_signature',
-        'detected_known_secondary_wallet',
         'detected_new_wallet',
     ],
 };

package/src/lib/utils/hooks/multiWallet/useMultiWalletWidgetState/useMultiWalletWidgetState.js

@@ -6,13 +6,11 @@ const validTransitions = {
     awaiting_account_switch: ['awaiting_signature', 'idle'],
     awaiting_connection: ['idle'],
     awaiting_signature: ['idle'],
-    detected_known_secondary_wallet: ['idle'],
     detected_new_wallet: ['awaiting_signature', 'idle'],
     idle: [
         'awaiting_account_switch',
         'awaiting_connection',
         'awaiting_signature',
-        'detected_known_secondary_wallet',
         'detected_new_wallet',
     ],
 };

package/src/lib/utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.cjs

@@ -3,9 +3,51 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var isWalletLinked = require('../../../functions/isWalletLinked/isWalletLinked.cjs');
 
-const useSyncPrimaryWallet = ({ primaryWallet, setMultiWalletWidgetState, multiWalletWidgetState, }) => {
+const useSyncPrimaryWallet = ({ computeConnectedStateForWallets, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showWidgetStatePopup, }) => {
+    const handlePrimaryWalletNotActive = React.useCallback((connectedAddress) => {
+        if (!primaryWallet)
+            return;
+        const connectedWalletIsLinked = isWalletLinked.isWalletLinked(connectedAddress, [
+            primaryWallet,
+            ...secondaryWallets,
+        ]);
+        if (!connectedWalletIsLinked) {
+            const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected);
+            if (!connectedSecondaryWallet) {
+                setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
+                return;
+            }
+            setPrimaryWallet(connectedSecondaryWallet.id);
+            computeConnectedStateForWallets();
+            return;
+        }
+        if (showWidgetStatePopup) {
+            // user updates wallet address in the widget
+            setShowWidgetStatePopup(false);
+            setMultiWalletWidgetState('awaiting_account_switch', 'switching_primary');
+            return;
+        }
+        // !showWidgetStatePopup - user comes back to site with different wallet address
+        const connectedWallet = secondaryWallets.find((wallet) => wallet.connected &&
+            walletConnectorCore.isSameAddress(wallet.address, connectedAddress, wallet.chain));
+        if (connectedWallet) {
+            setPrimaryWallet(connectedWallet.id);
+            computeConnectedStateForWallets();
+            return;
+        }
+        setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
+    }, [
+        primaryWallet,
+        secondaryWallets,
+        showWidgetStatePopup,
+        setShowWidgetStatePopup,
+        setMultiWalletWidgetState,
+        setPrimaryWallet,
+        computeConnectedStateForWallets,
+    ]);
     React.useEffect(() => {
         if (!primaryWallet || multiWalletWidgetState !== 'idle')
             return;
@@ -15,17 +57,31 @@ const useSyncPrimaryWallet = ({ primaryWallet, setMultiWalletWidgetState, multiW
             return;
         primaryWallet.connector
             .getConnectedAccounts()
-            .then(([selectedAddress]) => {
-            if (!selectedAddress)
+            .then(([connectedAddress]) => {
+            if (walletConnectorCore.isSameAddress(connectedAddress, primaryWallet.address, primaryWallet.chain)) {
                 return;
-            if (!multiWallet.isSameAddress(selectedAddress, primaryWallet.address, primaryWallet.chain)) {
-                setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
             }
+            handlePrimaryWalletNotActive(connectedAddress);
         })
             .catch(() => {
-            setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
+            const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected);
+            if (connectedSecondaryWallet) {
+                setPrimaryWallet(connectedSecondaryWallet.id);
+                computeConnectedStateForWallets();
+                return;
+            }
+            handleLogOut();
         });
-    }, [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id, setMultiWalletWidgetState, multiWalletWidgetState]);
+    }, [
+        primaryWallet,
+        secondaryWallets,
+        multiWalletWidgetState,
+        setMultiWalletWidgetState,
+        computeConnectedStateForWallets,
+        handlePrimaryWalletNotActive,
+        handleLogOut,
+        setPrimaryWallet,
+    ]);
 };
 
 exports.useSyncPrimaryWallet = useSyncPrimaryWallet;

package/src/lib/utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.d.ts

@@ -1,9 +1,16 @@
+import { Dispatch, SetStateAction } from 'react';
 import { MultiWalletWidgetState, Wallet } from '../../../../shared/types';
 import { MultiWalletWidgetStateSetter } from '../useMultiWalletWidgetState';
 type UseSyncPrimaryWalletArgs = {
+    computeConnectedStateForWallets: () => Promise<void>;
+    handleLogOut: () => Promise<void>;
     multiWalletWidgetState: MultiWalletWidgetState;
     primaryWallet: Wallet | null;
+    secondaryWallets: Wallet[];
     setMultiWalletWidgetState: MultiWalletWidgetStateSetter;
+    setPrimaryWallet: (walletId: string) => Promise<void>;
+    setShowWidgetStatePopup: Dispatch<SetStateAction<boolean>>;
+    showWidgetStatePopup: boolean;
 };
-export declare const useSyncPrimaryWallet: ({ primaryWallet, setMultiWalletWidgetState, multiWalletWidgetState, }: UseSyncPrimaryWalletArgs) => void;
+export declare const useSyncPrimaryWallet: ({ computeConnectedStateForWallets, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showWidgetStatePopup, }: UseSyncPrimaryWalletArgs) => void;
 export {};

package/src/lib/utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.js

@@ -1,7 +1,49 @@
-import { useEffect } from 'react';
-import { isSameAddress } from '@dynamic-labs/multi-wallet';
+import { useCallback, useEffect } from 'react';
+import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
+import { isWalletLinked } from '../../../functions/isWalletLinked/isWalletLinked.js';
 
-const useSyncPrimaryWallet = ({ primaryWallet, setMultiWalletWidgetState, multiWalletWidgetState, }) => {
+const useSyncPrimaryWallet = ({ computeConnectedStateForWallets, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showWidgetStatePopup, }) => {
+    const handlePrimaryWalletNotActive = useCallback((connectedAddress) => {
+        if (!primaryWallet)
+            return;
+        const connectedWalletIsLinked = isWalletLinked(connectedAddress, [
+            primaryWallet,
+            ...secondaryWallets,
+        ]);
+        if (!connectedWalletIsLinked) {
+            const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected);
+            if (!connectedSecondaryWallet) {
+                setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
+                return;
+            }
+            setPrimaryWallet(connectedSecondaryWallet.id);
+            computeConnectedStateForWallets();
+            return;
+        }
+        if (showWidgetStatePopup) {
+            // user updates wallet address in the widget
+            setShowWidgetStatePopup(false);
+            setMultiWalletWidgetState('awaiting_account_switch', 'switching_primary');
+            return;
+        }
+        // !showWidgetStatePopup - user comes back to site with different wallet address
+        const connectedWallet = secondaryWallets.find((wallet) => wallet.connected &&
+            isSameAddress(wallet.address, connectedAddress, wallet.chain));
+        if (connectedWallet) {
+            setPrimaryWallet(connectedWallet.id);
+            computeConnectedStateForWallets();
+            return;
+        }
+        setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
+    }, [
+        primaryWallet,
+        secondaryWallets,
+        showWidgetStatePopup,
+        setShowWidgetStatePopup,
+        setMultiWalletWidgetState,
+        setPrimaryWallet,
+        computeConnectedStateForWallets,
+    ]);
     useEffect(() => {
         if (!primaryWallet || multiWalletWidgetState !== 'idle')
             return;
@@ -11,17 +53,31 @@ const useSyncPrimaryWallet = ({ primaryWallet, setMultiWalletWidgetState, multiW
             return;
         primaryWallet.connector
             .getConnectedAccounts()
-            .then(([selectedAddress]) => {
-            if (!selectedAddress)
+            .then(([connectedAddress]) => {
+            if (isSameAddress(connectedAddress, primaryWallet.address, primaryWallet.chain)) {
                 return;
-            if (!isSameAddress(selectedAddress, primaryWallet.address, primaryWallet.chain)) {
-                setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
             }
+            handlePrimaryWalletNotActive(connectedAddress);
         })
             .catch(() => {
-            setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
+            const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected);
+            if (connectedSecondaryWallet) {
+                setPrimaryWallet(connectedSecondaryWallet.id);
+                computeConnectedStateForWallets();
+                return;
+            }
+            handleLogOut();
         });
-    }, [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id, setMultiWalletWidgetState, multiWalletWidgetState]);
+    }, [
+        primaryWallet,
+        secondaryWallets,
+        multiWalletWidgetState,
+        setMultiWalletWidgetState,
+        computeConnectedStateForWallets,
+        handlePrimaryWalletNotActive,
+        handleLogOut,
+        setPrimaryWallet,
+    ]);
 };
 
 export { useSyncPrimaryWallet };

package/src/lib/utils/hooks/multiWallet/useVerifyOnAwaitingSignature/useVerifyOnAwaitingSignature.cjs

@@ -7,15 +7,19 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useI
 require('@dynamic-labs/sdk-api');
 var logger = require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/multi-wallet');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/utils');
 require('../../../constants/colors.cjs');
+require('ethers');
 require('../../../../shared/consts/index.cjs');
+require('@dynamic-labs/multi-wallet');
 var requiresTwoStepAuthentication = require('../../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.cjs');
 var useConnectAndSign = require('../../authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
 require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('../../../../config/ApiEndpoint.cjs');
+require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 
 const useVerifyOnAwaitingSignature = () => {

package/src/lib/utils/hooks/multiWallet/useVerifyOnAwaitingSignature/useVerifyOnAwaitingSignature.js

@@ -3,15 +3,19 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/multi-wallet';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/utils';
 import '../../../constants/colors.js';
+import 'ethers';
 import '../../../../shared/consts/index.js';
+import '@dynamic-labs/multi-wallet';
 import { requiresTwoStepAuthentication } from '../../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.js';
 import { useConnectAndSign } from '../../authenticationHooks/useConnectAndSign/useConnectAndSign.js';
 import '../../../../context/ErrorContext/ErrorContext.js';
 import '../../../../config/ApiEndpoint.js';
+import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
 
 const useVerifyOnAwaitingSignature = () => {

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

@@ -4,8 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var utils = require('@dynamic-labs/utils');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
+require('@dynamic-labs/wallet-connector-core');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/sdk-api');
@@ -13,8 +14,11 @@ require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('../../constants/colors.cjs');
+require('ethers');
 require('../../../shared/consts/index.cjs');
 require('../../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/multi-wallet');
+require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 var useSignConnectOnlyUser = require('../authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.cjs');
 
@@ -24,10 +28,10 @@ const useAuthenticateConnectedUser = () => {
     const [isAuthenticating, setIsAuthenticating] = React.useState(false);
     const authenticateUser = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         if (user) {
-            throw new multiWallet.DynamicError('User is already authenticated');
+            throw new utils.DynamicError('User is already authenticated');
         }
         if (!connectedWallet) {
-            throw new multiWallet.DynamicError('No connected wallet');
+            throw new utils.DynamicError('No connected wallet');
         }
         setIsAuthenticating(true);
         yield signConnectOnlyUser({

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

@@ -1,7 +1,8 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useCallback } from 'react';
-import { DynamicError } from '@dynamic-labs/multi-wallet';
+import { DynamicError } from '@dynamic-labs/utils';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
+import '@dynamic-labs/wallet-connector-core';
 import '../../../context/ViewContext/ViewContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/sdk-api';
@@ -9,8 +10,11 @@ import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import '../../constants/colors.js';
+import 'ethers';
 import '../../../shared/consts/index.js';
 import '../../../config/ApiEndpoint.js';
+import '@dynamic-labs/multi-wallet';
+import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import { useSignConnectOnlyUser } from '../authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.js';
 

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 
 const useClearWalletConnectSessions = ({ connectors }) => {
     const clearOphanedWalletConnectSessions = React.useCallback(() => {
@@ -11,7 +11,7 @@ const useClearWalletConnectSessions = ({ connectors }) => {
             return;
         if (connectors.length === 0)
             return;
-        const names = new Set(connectors.map((connector) => multiWallet.normalizeWalletName(connector.name)));
+        const names = new Set(connectors.map((connector) => walletConnectorCore.normalizeWalletName(connector.name)));
         for (const key of Object.keys(localStorage)) {
             if (key.startsWith('walletconnect') &&
                 !names.has(key.replace('walletconnect-', ''))) {

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

@@ -1,5 +1,5 @@
 import { useCallback } from 'react';
-import { normalizeWalletName } from '@dynamic-labs/multi-wallet';
+import { normalizeWalletName } from '@dynamic-labs/wallet-connector-core';
 
 const useClearWalletConnectSessions = ({ connectors }) => {
     const clearOphanedWalletConnectSessions = useCallback(() => {

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

@@ -13,7 +13,12 @@ const useConfirmationModal = ({ elementId, }) => {
     const [node, setNode] = React.useState(null);
     const open = React.useCallback((builder) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const promise = new Promise((resolve, reject) => {
-            setNode(builder(resolve, reject));
+            try {
+                setNode(builder(resolve, reject));
+            }
+            catch (err) {
+                reject(err);
+            }
         });
         return promise.finally(() => {
             setNode(undefined);