@dynamic-labs/sdk-react-core 3.0.0-alpha.12 → 3.0.0-alpha.14

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

@@ -13,6 +13,7 @@ import '../../../constants/colors.js';
 import '../../../constants/values.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
 import '../../../../shared/utils/classes/storage/sessionStorage.js';
+import '@dynamic-labs/logger';
 import '../../../../shared/consts/index.js';
 import '../../../../events/dynamicEvents.js';
 import '../../../../../../_virtual/_tslib.js';
@@ -24,6 +25,7 @@ import 'react-international-phone';
 import '../../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../../locale/locale.js';
+import { logVerboseTroubleshootingMessage } from '../../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -72,64 +74,69 @@ import '../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/Dynamic
 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';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
-import { isWalletLinked } from '../../../functions/isWalletLinked/isWalletLinked.js';
 
 const useSyncPrimaryWallet = (canSync = true) => {
-    const { setShowAuthFlow, isAuthenticated, authMode, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showLockedWalletView, showWidgetStatePopup, setSelectedWalletWithAction, } = useInternalDynamicContext();
+    const { setShowAuthFlow, isAuthenticated, authMode, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, setMultiWalletWidgetState, showLockedWalletView, secondaryWallets, setPrimaryWallet, setSelectedWalletWithAction, multiWallet, } = useInternalDynamicContext();
     const { setView } = useViewContext();
     const handlePrimaryWalletNotActive = useCallback((connectedAddress) => {
+        logVerboseTroubleshootingMessage('[useSyncPrimaryWallet] handlePrimaryWalletNotActive', {
+            authMode,
+            connectedAddress,
+            primaryWallet: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address,
+        });
         if (!primaryWallet)
             return;
         if (authMode === 'connect-only') {
             connectWallet(primaryWallet.connector);
             return;
         }
-        const connectedWalletIsLinked = isWalletLinked(connectedAddress, [
-            primaryWallet,
-            ...secondaryWallets,
-        ]);
-        if (!connectedWalletIsLinked) {
-            // MM returns all connected wallets now, so we need to check if the active account
-            // is not in the same wallet as the primary wallet before automatically switching
-            // to a connected secondary wallet as it was causing an infinite loop
-            const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected && primaryWallet.connector !== wallet.connector);
-            if (!connectedSecondaryWallet) {
-                setSelectedWalletWithAction({
-                    action: 'select',
-                    wallet: primaryWallet,
-                });
-                setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
-                return;
-            }
-            setPrimaryWallet(connectedSecondaryWallet.id);
-            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);
+        const connectedWalletWithSameProvider = connectedAddress &&
+            secondaryWallets.find((wallet) => wallet.isConnected &&
+                wallet.connector.key === primaryWallet.connector.key &&
+                isSameAddress(wallet.address, connectedAddress, wallet.chain));
+        logVerboseTroubleshootingMessage('[useSyncPrimaryWallet] handlePrimaryWalletNotActive', {
+            connectedWalletWithSameProvider,
+            multiWallet,
+        });
+        if (multiWallet && connectedWalletWithSameProvider) {
+            setPrimaryWallet(connectedWalletWithSameProvider.id);
             return;
         }
-        setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
+        logVerboseTroubleshootingMessage('[useSyncPrimaryWallet] handlePrimaryWalletNotActive - setSelectedWalletWithAction(primaryWallet)');
+        setSelectedWalletWithAction({
+            action: 'select',
+            wallet: primaryWallet,
+        });
+        setMultiWalletWidgetState('awaiting_account_switch', 'switching_primary');
     }, [
-        primaryWallet,
         authMode,
+        primaryWallet,
         secondaryWallets,
-        showWidgetStatePopup,
+        multiWallet,
+        setSelectedWalletWithAction,
         setMultiWalletWidgetState,
-        setPrimaryWallet,
-        setShowWidgetStatePopup,
         connectWallet,
+        setPrimaryWallet,
     ]);
     useEffect(() => {
+        logVerboseTroubleshootingMessage('[useSyncPrimaryWallet]', {
+            canSync,
+            connectedChain: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.connectedChain,
+            multiWalletWidgetState,
+            primaryWallet: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address,
+        });
         if (!canSync)
             return;
         if (!primaryWallet || multiWalletWidgetState !== 'idle')
@@ -142,6 +149,10 @@ const useSyncPrimaryWallet = (canSync = true) => {
             .getConnectedAccounts()
             .then((accounts) => {
             const [connectedAddress] = accounts;
+            logVerboseTroubleshootingMessage('[useSyncPrimaryWallet] getConnectedAccounts', {
+                accounts,
+                connectedAddress,
+            });
             if (!connectedAddress) {
                 throw new DynamicError('Missing wallet address', MISSING_ADDRESS_ERROR);
             }
@@ -151,31 +162,32 @@ const useSyncPrimaryWallet = (canSync = true) => {
             handlePrimaryWalletNotActive(connectedAddress);
         })
             .catch((e) => {
-            const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected);
-            if (connectedSecondaryWallet) {
-                setPrimaryWallet(connectedSecondaryWallet.id);
-                return;
-            }
+            logVerboseTroubleshootingMessage('[useSyncPrimaryWallet] getConnectedAccounts error', {
+                error: e,
+                isAuthenticated,
+            });
             // user is logged in (has valid jwt), but no wallet is connected
             if (isAuthenticated && e.code === MISSING_ADDRESS_ERROR) {
                 if (!primaryWallet.connector.isInstalledOnBrowser()) {
+                    logVerboseTroubleshootingMessage('[useSyncPrimaryWallet] getConnectedAccounts error - not installed in browser - will log out');
                     handleLogOut();
                     return;
                 }
                 if (showLockedWalletView) {
+                    logVerboseTroubleshootingMessage('[useSyncPrimaryWallet] getConnectedAccounts error - will show locked wallet view');
                     setShowAuthFlow(true);
                     setView('wallet-locked-view');
+                    return;
                 }
+                handlePrimaryWalletNotActive();
             }
         });
     }, [
         primaryWallet,
-        secondaryWallets,
         multiWalletWidgetState,
         setMultiWalletWidgetState,
         handlePrimaryWalletNotActive,
         handleLogOut,
-        setPrimaryWallet,
         canSync,
         setView,
         setShowAuthFlow,

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

@@ -17,6 +17,7 @@ require('../../../constants/colors.cjs');
 require('../../../constants/values.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../../shared/utils/classes/storage/sessionStorage.cjs');
+require('@dynamic-labs/logger');
 require('@dynamic-labs/utils');
 require('../../../../shared/consts/index.cjs');
 var useDynamicEvents = require('../../events/useDynamicEvents/useDynamicEvents.cjs');
@@ -78,6 +79,17 @@ require('../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/Dynami
 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');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useVerifyOnAwaitingSignature = () => {

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

@@ -13,6 +13,7 @@ import '../../../constants/colors.js';
 import '../../../constants/values.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
 import '../../../../shared/utils/classes/storage/sessionStorage.js';
+import '@dynamic-labs/logger';
 import '@dynamic-labs/utils';
 import '../../../../shared/consts/index.js';
 import { useInternalDynamicEvents } from '../../events/useDynamicEvents/useDynamicEvents.js';
@@ -74,6 +75,17 @@ import '../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/Dynamic
 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';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useVerifyOnAwaitingSignature = () => {

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

@@ -16,6 +16,7 @@ require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../shared/utils/classes/storage/sessionStorage.cjs');
+require('@dynamic-labs/logger');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
@@ -77,6 +78,17 @@ require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWi
 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');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useAuthLayoutChecks = () => {

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

@@ -12,6 +12,7 @@ import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import '../../../shared/utils/classes/storage/sessionStorage.js';
+import '@dynamic-labs/logger';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
@@ -73,6 +74,17 @@ import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWid
 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';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useAuthLayoutChecks = () => {

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

@@ -18,6 +18,7 @@ require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../shared/utils/classes/storage/sessionStorage.cjs');
+require('@dynamic-labs/logger');
 require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -76,6 +77,17 @@ require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWi
 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');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useAuthenticateConnectedUser = () => {

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

@@ -14,6 +14,7 @@ import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import '../../../shared/utils/classes/storage/sessionStorage.js';
+import '@dynamic-labs/logger';
 import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
@@ -72,6 +73,17 @@ import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWid
 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';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useAuthenticateConnectedUser = () => {

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

@@ -16,6 +16,7 @@ require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 var localStorage$1 = require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../shared/utils/classes/storage/sessionStorage.cjs');
+require('@dynamic-labs/logger');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 

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

@@ -12,6 +12,7 @@ import '../../constants/colors.js';
 import '../../constants/values.js';
 import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
 import '../../../shared/utils/classes/storage/sessionStorage.js';
+import '@dynamic-labs/logger';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 

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

@@ -15,6 +15,7 @@ require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../shared/utils/classes/storage/sessionStorage.cjs');
+require('@dynamic-labs/logger');
 var useMediaQuery = require('../../../shared/utils/hooks/useMediaQuery/useMediaQuery.cjs');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');

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

@@ -11,6 +11,7 @@ import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import '../../../shared/utils/classes/storage/sessionStorage.js';
+import '@dynamic-labs/logger';
 import { useMediaQuery } from '../../../shared/utils/hooks/useMediaQuery/useMediaQuery.js';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';

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

@@ -16,6 +16,7 @@ require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../shared/utils/classes/storage/sessionStorage.cjs');
+require('@dynamic-labs/logger');
 var usePreventPageScroll = require('../../../shared/utils/hooks/usePreventPageScroll/usePreventPageScroll.cjs');
 require('../../../shared/consts/index.cjs');
 

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

@@ -12,6 +12,7 @@ import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import '../../../shared/utils/classes/storage/sessionStorage.js';
+import '@dynamic-labs/logger';
 import { usePreventPageScroll } from '../../../shared/utils/hooks/usePreventPageScroll/usePreventPageScroll.js';
 import '../../../shared/consts/index.js';
 

package/src/lib/utils/hooks/useConnectWallet/updateUserWalletsFromConnectedWallets/updateUserWalletsFromConnectedWallets.cjs

@@ -23,7 +23,7 @@ const updateUserWalletsFromConnectedWallets = (userWallets, connectedWallets) =>
             continue;
         }
         // If already present, just update properties that might have changed
-        userWallet.connected = connectedWallet.connected;
+        userWallet.isConnected = connectedWallet.isConnected;
         userWallet.network = connectedWallet.network;
     }
     // This filter is to remove a wallet that was previously added to userWallets but is not present
@@ -32,7 +32,7 @@ const updateUserWalletsFromConnectedWallets = (userWallets, connectedWallets) =>
     // Keep wallets that are still in the new list
     newWalletsAddresses.has(userWallet.address) ||
         // Or are linked to the current user
-        userWallet.authenticated);
+        userWallet.isAuthenticated);
 };
 
 exports.updateUserWalletsFromConnectedWallets = updateUserWalletsFromConnectedWallets;

package/src/lib/utils/hooks/useConnectWallet/updateUserWalletsFromConnectedWallets/updateUserWalletsFromConnectedWallets.js

@@ -19,7 +19,7 @@ const updateUserWalletsFromConnectedWallets = (userWallets, connectedWallets) =>
             continue;
         }
         // If already present, just update properties that might have changed
-        userWallet.connected = connectedWallet.connected;
+        userWallet.isConnected = connectedWallet.isConnected;
         userWallet.network = connectedWallet.network;
     }
     // This filter is to remove a wallet that was previously added to userWallets but is not present
@@ -28,7 +28,7 @@ const updateUserWalletsFromConnectedWallets = (userWallets, connectedWallets) =>
     // Keep wallets that are still in the new list
     newWalletsAddresses.has(userWallet.address) ||
         // Or are linked to the current user
-        userWallet.authenticated);
+        userWallet.isAuthenticated);
 };
 
 export { updateUserWalletsFromConnectedWallets };

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

@@ -19,6 +19,7 @@ require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../shared/utils/classes/storage/sessionStorage.cjs');
+require('@dynamic-labs/logger');
 var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 require('../../../shared/consts/index.cjs');
 require('../../../config/ApiEndpoint.cjs');
@@ -80,6 +81,17 @@ require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWi
 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');
 var session = require('../../../data/api/session/session.cjs');
 var updateUserWalletsFromConnectedWallets = require('./updateUserWalletsFromConnectedWallets/updateUserWalletsFromConnectedWallets.cjs');
 
@@ -114,6 +126,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         connectedWalletsInfo,
         isBridgeFlow,
         primaryWalletId,
+        removedWalletsIds,
         setConnectedWalletsInfo,
         setPrimaryWalletId,
     ]);
@@ -145,17 +158,17 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 walletConnector.getAdditionalAddresses(walletAddress),
             ]);
             const walletChain = walletConnector.connectedChain;
-            const walletObject = {
+            const walletObject = new walletConnectorCore.Wallet({
                 additionalAddresses,
                 address: walletAddress || '',
-                authenticated: false,
                 chain: walletChain || '',
-                connected: true,
                 connector: walletConnector,
                 id: storedConnectedWalletInfo.id,
+                isAuthenticated: false,
+                isConnected: true,
                 key: walletConnector.key,
                 network: walletNetwork,
-            };
+            });
             return walletObject;
         })))).filter((wallet) => Boolean(wallet));
         setConnectedWallets(updatedConnectedWallets);
@@ -183,21 +196,14 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         return sortedIds.length;
     }, []);
     const updateConnectedWalletById = React.useCallback((walletId, walletObject) => {
+        var _a, _b;
         const clonedConnectedWalletsList = [...connectedWallets];
         const connectedWalletIndex = clonedConnectedWalletsList.findIndex((connectedWallet) => connectedWallet.id === walletId);
         if (connectedWalletIndex > -1) {
-            if (walletObject.address && walletObject.network) {
-                clonedConnectedWalletsList[connectedWalletIndex] = Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), { address: walletObject.address, network: walletObject.network });
-            }
-            else if (walletObject.address) {
-                clonedConnectedWalletsList[connectedWalletIndex] = Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), { address: walletObject.address });
-            }
-            else {
-                clonedConnectedWalletsList[connectedWalletIndex] = Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), { network: walletObject.network });
-            }
+            clonedConnectedWalletsList[connectedWalletIndex] = new walletConnectorCore.Wallet(Object.assign(Object.assign({}, clonedConnectedWalletsList[connectedWalletIndex]), { address: (_a = walletObject.address) !== null && _a !== void 0 ? _a : clonedConnectedWalletsList[connectedWalletIndex].address, connector: clonedConnectedWalletsList[connectedWalletIndex].connector, network: (_b = walletObject.network) !== null && _b !== void 0 ? _b : clonedConnectedWalletsList[connectedWalletIndex].network }));
             setConnectedWallets(clonedConnectedWalletsList);
         }
-    }, [connectedWallets]);
+    }, [connectedWallets, setConnectedWallets]);
     // Keeps connected wallet data inside localStorage
     const applyConnectedWalletToStore = ({ walletId, walletConnectorKey, walletChain, provider, }) => {
         const updatedConnectedWalletsInfo = [...connectedWalletsInfo];
@@ -234,7 +240,6 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             network: currentWalletConnectorNetwork,
         });
     });
-    const shouldSkipCreatingVisit = authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly;
     const connectWallet = (walletConnector, getAddressOpts, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const { applyHandleConnectedWallet = true } = options !== null && options !== void 0 ? options : {};
         const walletAddress = yield walletConnector.getAddress(getAddressOpts);
@@ -253,6 +258,23 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 return;
             }
         }
+        const isWalletStored = connectedWalletsInfo.some(({ walletConnectorKey: storedWalletConnectorKey }) => storedWalletConnectorKey === walletConnector.key);
+        const walletChain = walletConnector.connectedChain;
+        const shouldCreateVisit = !isWalletStored &&
+            (authMode !== 'connect-only' || enableVisitTrackingOnConnectOnly);
+        if (shouldCreateVisit) {
+            // send information to backend to kick off background jobs
+            // so verify/sign on the next step could go by more quickly
+            // this is async work, but DO NOT AWAIT
+            session.createVisit({
+                authMode,
+                chain: walletChain || '',
+                environmentId,
+                publicWalletAddress: walletAddress,
+                walletName: walletConnector.key,
+                walletProvider: getWalletProvider.getWalletProvider(walletConnector),
+            });
+        }
         // On connect and sign, we don't want to add this wallet to userWallets
         // until it has been signed. Therefore, we don't add it to
         // the connectedWallets array because userWallets draws from it.
@@ -266,8 +288,6 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
             setPrimaryWalletId(walletId);
         }
         addedWalletsIds.current.push(walletId);
-        const walletChain = walletConnector.connectedChain;
-        const isWalletStored = connectedWalletsInfo.some(({ walletConnectorKey: storedWalletConnectorKey }) => storedWalletConnectorKey === walletConnector.key);
         if (isWalletStored) {
             yield updateConnectedWalletsList();
         }
@@ -279,19 +299,6 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 walletConnectorKey: walletConnector.key,
                 walletId,
             });
-            if (!shouldSkipCreatingVisit) {
-                // send information to backend to kick off background jobs
-                // so verify/sign on the next step could go by more quickly
-                // this is async work, but DO NOT AWAIT
-                session.createVisit({
-                    authMode,
-                    chain: walletChain || '',
-                    environmentId,
-                    publicWalletAddress: walletAddress,
-                    walletName: walletConnector.key,
-                    walletProvider: getWalletProvider.getWalletProvider(walletConnector),
-                });
-            }
         }
         return { address: walletAddress, id: walletId };
     });

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

@@ -1,8 +1,8 @@
 import { UserProfile } from '@dynamic-labs/types';
-import { Chain, GetAddressOpts, WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { Chain, GetAddressOpts, Wallet, WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { SetShowAuthFlow } from '../../../context/DynamicContext/hooks';
 import { ConnectWalletResult } from '../../../context/DynamicContext/types';
-import { AuthModeType, HandleConnectedWallet, Wallet, WalletOption } from '../../../shared';
+import { AuthModeType, HandleConnectedWallet, WalletOption } from '../../../shared';
 export type ConnectedWalletConnectorType = {
     id: string;
     walletChain?: Chain;