@dynamic-labs/sdk-react-core 1.1.0-alpha.8 → 1.1.0-phantom.0

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

@@ -13,8 +13,10 @@ import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../../shared/consts/index.js';
-import { isSameWalletName } from '../../functions/isSameWalletName/isSameWalletName.js';
 import { useWalletsConnectionState } from '../useWalletsConnectionState/useWalletsConnectionState.js';
+import '@dynamic-labs/multi-wallet';
+import { getWalletIdentifier } from '../../functions/getWalletIdentifier/getWalletIdentifier.js';
+import 'viem/chains';
 import { reconnectSocialWallet } from './reconnectSocialWallet.js';
 import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
 import { updateUserWalletsFromLinkedWallets } from './utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.js';
@@ -61,12 +63,14 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConn
         wallet.connector.initEventListener();
     }), [walletsBasedOnAuthMode]);
     const { connectedWalletMap, didConnectedStateLoad } = useWalletsConnectionState(walletsBasedOnAuthMode);
-    const wallets = useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[wallet.id]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
+    const wallets = useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[getWalletIdentifier(wallet)]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
     const { setUserWallets } = useInternalUserWallets();
     // Keep userWallets in sync whenever linkedWallets changes
     useEffect(() => {
-        setUserWallets((userWallets) => updateUserWalletsFromLinkedWallets(userWallets, wallets));
-    }, [setUserWallets, wallets]);
+        setUserWallets((userWallets) => didConnectedStateLoad
+            ? updateUserWalletsFromLinkedWallets(userWallets, wallets)
+            : userWallets);
+    }, [didConnectedStateLoad, setUserWallets, wallets]);
     const primaryWallet = useMemo(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
     const secondaryWallets = useMemo(() => canHaveMultipleWalletsConnected
         ? wallets.filter((wallet) => wallet.id !== primaryWalletId)
@@ -92,7 +96,8 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConn
         const accountIsNotConnectedInSecondaryWallet = connectedAccounts &&
             !connectedAccounts.find((connectedAccount) => connectedAccount.toLowerCase() ===
                 newPrimaryWallet.address.toLowerCase());
-        return (isSameWalletName(newPrimaryWallet.connector.name, primaryWallet.connector.name) || accountIsNotConnectedInSecondaryWallet);
+        return (newPrimaryWallet.connector.key === primaryWallet.connector.key ||
+            accountIsNotConnectedInSecondaryWallet);
     }, [multiWalletWidgetState]);
     const checkIfShowQrCodeModal = useCallback((wallet) => !wallet.connector.isInstalledOnBrowser() &&
         !wallet.connector.canConnectViaCustodialService, []);

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs

@@ -18,6 +18,7 @@ require('@dynamic-labs/utils');
 require('../../../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var shouldManuallyReconnectOnRefresh = require('../../../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
+require('viem/chains');
 var findWallet = require('../findWallet/findWallet.cjs');
 var smartWallet = require('../smartWallet/smartWallet.cjs');
 
@@ -53,6 +54,7 @@ const createLinkedWalletsFromWalletOptions = ({ authToken, walletConnectorOption
                 });
             }
             return {
+                additionalAddresses: account.walletAdditionalAddresses,
                 address: account.address,
                 authenticated: true,
                 chain: account.chain,

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

@@ -14,6 +14,7 @@ import '@dynamic-labs/utils';
 import '../../../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { shouldManuallyReconnectOnRefresh } from '../../../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
+import 'viem/chains';
 import { findWallet } from '../findWallet/findWallet.js';
 import { isOwnerOfASmartWallet, initializeSmartWallet } from '../smartWallet/smartWallet.js';
 
@@ -49,6 +50,7 @@ const createLinkedWalletsFromWalletOptions = ({ authToken, walletConnectorOption
                 });
             }
             return {
+                additionalAddresses: account.walletAdditionalAddresses,
                 address: account.address,
                 authenticated: true,
                 chain: account.chain,

package/src/lib/utils/hooks/useWalletConnectors/utils/findWallet/findWallet.cjs

@@ -2,8 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var isSameWalletName = require('../../../../functions/isSameWalletName/isSameWalletName.cjs');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 
-const findWallet = (account, walletOptions) => walletOptions.find((wallet) => account.walletName && isSameWalletName.isSameWalletName(wallet.name, account.walletName));
+// remaining normalizeWalletName until QNTM-846 is complete due to us still passing the walletname to redcoast:
+// https://linear.app/dynamic-labs/issue/QNTM-846/remove-usage-of-walletwalletconnectorwname-to-instead-use
+const findWallet = (account, walletOptions) => walletOptions.find((wallet) => account.walletName &&
+    walletConnectorCore.normalizeWalletName(account.walletName) === wallet.key);
 
 exports.findWallet = findWallet;

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

@@ -1,5 +1,8 @@
-import { isSameWalletName } from '../../../../functions/isSameWalletName/isSameWalletName.js';
+import { normalizeWalletName } from '@dynamic-labs/wallet-connector-core';
 
-const findWallet = (account, walletOptions) => walletOptions.find((wallet) => account.walletName && isSameWalletName(wallet.name, account.walletName));
+// remaining normalizeWalletName until QNTM-846 is complete due to us still passing the walletname to redcoast:
+// https://linear.app/dynamic-labs/issue/QNTM-846/remove-usage-of-walletwalletconnectorwname-to-instead-use
+const findWallet = (account, walletOptions) => walletOptions.find((wallet) => account.walletName &&
+    normalizeWalletName(account.walletName) === wallet.key);
 
 export { findWallet };

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

@@ -4,31 +4,72 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
-var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
-var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
-var MockContext = require('../../../context/MockContext/MockContext.cjs');
-var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
+require('react');
+require('../../../context/DynamicContext/DynamicContext.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('react');
+var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../../shared/consts/index.cjs');
-require('@dynamic-labs/multi-wallet');
-var requiresTwoStepAuthentication = require('../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.cjs');
-var isSelectedWalletAlreadyConnected = require('../../functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.cjs');
+require('../../../events/dynamicEvents.cjs');
 var useConnectAndSign = require('../authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
+var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/multi-wallet');
+var requiresTwoStepAuthentication = require('../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.cjs');
+require('viem/chains');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 var useConnectAndSignSplitSteps = require('../authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.cjs');
 require('../../../context/EmailVerificationContext/EmailVerificationContext.cjs');
+require('react-dom');
+require('../../../context/ThemeContext/ThemeContext.cjs');
+require('@dynamic-labs/types');
+require('yup');
+require('react-i18next');
+var MockContext = require('../../../context/MockContext/MockContext.cjs');
+require('../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
+require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('@dynamic-labs/rpc-providers');
+require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
+var isSelectedWalletAlreadyConnected = require('../../functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.cjs');
+require('../../../components/Alert/Alert.cjs');
+require('../../../components/ShadowDOM/ShadowDOM.cjs');
+require('../../../components/IconButton/IconButton.cjs');
+require('../../../components/InlineWidget/InlineWidget.cjs');
+require('../../../components/MenuList/Dropdown/Dropdown.cjs');
+require('../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
+require('../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
+require('../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
+require('../../../components/Popper/Popper/Popper.cjs');
+require('../../../components/Popper/PopperContext/PopperContext.cjs');
+require('react-focus-lock');
+require('formik');
+require('i18next');
+require('../../../components/OverlayCard/OverlayCard.context.cjs');
+require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
+require('../../../views/WalletList/WalletList.cjs');
+require('qrcode');
+require('@hcaptcha/react-hcaptcha');
+require('../../../context/LoadingContext/LoadingContext.cjs');
+require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
+require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
+require('../../../context/FooterAnimationContext/index.cjs');
+require('../../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
+require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
+require('../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.cjs');
+require('@dynamic-labs/viem-utils');
+require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useWalletItemActions = () => {
     const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnectorKey, walletConnectorOptions, setQrcodeUri, setDesktopUri, user, linkedWallets, setLegacyIsVerifying, } = useInternalDynamicContext.useInternalDynamicContext();
@@ -127,7 +168,7 @@ const useWalletItemActions = () => {
         }
         else if (utils.isMobile()) {
             // mobile wallets
-            if (walletConnector.name === 'WalletConnect') {
+            if (walletConnector.key === 'walletconnect') {
                 setView('wallet-connect-mobile-wallets-list');
             }
             else {

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

@@ -1,30 +1,71 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { isMobile } from '@dynamic-labs/utils';
-import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
-import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
-import { useMockContext } from '../../../context/MockContext/MockContext.js';
-import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
+import 'react';
+import '../../../context/DynamicContext/DynamicContext.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 'react';
+import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../../shared/consts/index.js';
-import '@dynamic-labs/multi-wallet';
-import { requiresTwoStepAuthentication } from '../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.js';
-import { isSelectedWalletAlreadyConnected } from '../../functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.js';
+import '../../../events/dynamicEvents.js';
 import { useConnectAndSign } from '../authenticationHooks/useConnectAndSign/useConnectAndSign.js';
+import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../config/ApiEndpoint.js';
+import '@dynamic-labs/multi-wallet';
+import { requiresTwoStepAuthentication } from '../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.js';
+import 'viem/chains';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import { useConnectAndSignSplitSteps } from '../authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.js';
 import '../../../context/EmailVerificationContext/EmailVerificationContext.js';
+import 'react-dom';
+import '../../../context/ThemeContext/ThemeContext.js';
+import '@dynamic-labs/types';
+import 'yup';
+import 'react-i18next';
+import { useMockContext } from '../../../context/MockContext/MockContext.js';
+import '../useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
+import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import '@dynamic-labs/rpc-providers';
+import '../../../context/UserWalletsContext/UserWalletsContext.js';
+import { isSelectedWalletAlreadyConnected } from '../../functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.js';
+import '../../../components/Alert/Alert.js';
+import '../../../components/ShadowDOM/ShadowDOM.js';
+import '../../../components/IconButton/IconButton.js';
+import '../../../components/InlineWidget/InlineWidget.js';
+import '../../../components/MenuList/Dropdown/Dropdown.js';
+import '../../../components/Transition/ZoomTransition/ZoomTransition.js';
+import '../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
+import '../../../components/Transition/OpacityTransition/OpacityTransition.js';
+import '../../../components/Popper/Popper/Popper.js';
+import '../../../components/Popper/PopperContext/PopperContext.js';
+import 'react-focus-lock';
+import 'formik';
+import 'i18next';
+import '../../../components/OverlayCard/OverlayCard.context.js';
+import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
+import '../../../views/WalletList/WalletList.js';
+import 'qrcode';
+import '@hcaptcha/react-hcaptcha';
+import '../../../context/LoadingContext/LoadingContext.js';
+import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
+import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
+import '../../../context/FooterAnimationContext/index.js';
+import '../../../context/PasskeyContext/PasskeyContext.js';
+import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
+import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
+import '../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.js';
+import '@dynamic-labs/viem-utils';
+import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useWalletItemActions = () => {
     const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnectorKey, walletConnectorOptions, setQrcodeUri, setDesktopUri, user, linkedWallets, setLegacyIsVerifying, } = useInternalDynamicContext();
@@ -123,7 +164,7 @@ const useWalletItemActions = () => {
         }
         else if (isMobile()) {
             // mobile wallets
-            if (walletConnector.name === 'WalletConnect') {
+            if (walletConnector.key === 'walletconnect') {
                 setView('wallet-connect-mobile-wallets-list');
             }
             else {

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

@@ -9,19 +9,20 @@ var reactI18next = require('react-i18next');
 require('../../../events/dynamicEvents.cjs');
 require('@dynamic-labs/utils');
 require('../../../context/DynamicContext/DynamicContext.cjs');
-require('@dynamic-labs/wallet-connector-core');
-require('../../../context/CaptchaContext/CaptchaContext.cjs');
-require('../../../context/ErrorContext/ErrorContext.cjs');
-require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../../shared/consts/index.cjs');
+require('../../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
+require('viem/chains');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../config/ApiEndpoint.cjs');
@@ -50,12 +51,17 @@ require('react-focus-lock');
 require('formik');
 require('i18next');
 require('../../../components/OverlayCard/OverlayCard.context.cjs');
-require('../../../context/FooterAnimationContext/index.cjs');
-require('../../../context/QrCodeContext/QrCodeContext.cjs');
+require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
+require('../../../views/WalletList/WalletList.cjs');
+require('qrcode');
+require('@hcaptcha/react-hcaptcha');
+require('../../../context/LoadingContext/LoadingContext.cjs');
+require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
+require('../../../context/FooterAnimationContext/index.cjs');
+require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
-require('../../../context/LoadingContext/LoadingContext.cjs');
-require('qrcode');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.cjs');
 require('@dynamic-labs/viem-utils');

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

@@ -5,19 +5,20 @@ import { useTranslation } from 'react-i18next';
 import '../../../events/dynamicEvents.js';
 import '@dynamic-labs/utils';
 import '../../../context/DynamicContext/DynamicContext.js';
-import '@dynamic-labs/wallet-connector-core';
-import '../../../context/CaptchaContext/CaptchaContext.js';
-import '../../../context/ErrorContext/ErrorContext.js';
-import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../../shared/consts/index.js';
+import '../../../context/CaptchaContext/CaptchaContext.js';
+import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
+import 'viem/chains';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../config/ApiEndpoint.js';
@@ -46,12 +47,17 @@ import 'react-focus-lock';
 import 'formik';
 import 'i18next';
 import '../../../components/OverlayCard/OverlayCard.context.js';
-import '../../../context/FooterAnimationContext/index.js';
-import '../../../context/QrCodeContext/QrCodeContext.js';
+import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
+import '../../../views/WalletList/WalletList.js';
+import 'qrcode';
+import '@hcaptcha/react-hcaptcha';
+import '../../../context/LoadingContext/LoadingContext.js';
+import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
+import '../../../context/FooterAnimationContext/index.js';
+import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
-import '../../../context/LoadingContext/LoadingContext.js';
-import 'qrcode';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.js';
 import '@dynamic-labs/viem-utils';

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

@@ -17,15 +17,19 @@ require('viem');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
+var getWalletIdentifier = require('../../functions/getWalletIdentifier/getWalletIdentifier.cjs');
 var isWalletConnected = require('../../functions/isWalletConnected/isWalletConnected.cjs');
+require('viem/chains');
 require('../../../events/dynamicEvents.cjs');
-var useEventListener = require('../events/useEventListener/useEventListener.cjs');
 var useWalletConnectorEvent = require('../events/useWalletConnectorEvent/useWalletConnectorEvent.cjs');
+var useWindowEvent = require('../events/useWindowEvent/useWindowEvent.cjs');
 
 const connectedWalletStateReducer = (state, connectedWalletsMap) => {
-    const isConnectedWalletsMapEmpty = Object.values(connectedWalletsMap).length === 0;
-    if (isConnectedWalletsMapEmpty && state.didLoad === false) {
-        return state;
+    // When setting to empty, unset load flag
+    if (Object.values(connectedWalletsMap).length === 0) {
+        if (state.didLoad === false)
+            return state;
+        return Object.assign(Object.assign({}, state), { connectedWalletsMap, didLoad: false });
     }
     return Object.assign(Object.assign({}, state), { connectedWalletsMap, didLoad: true });
 };
@@ -34,13 +38,13 @@ const useWalletsConnectionState = (wallets) => {
         connectedWalletsMap: {},
         didLoad: false,
     });
-    const refreshKey = wallets.map(({ id }) => id).join('-');
     const connectors = wallets.map(({ connector }) => connector);
     const lastCallTimestamp = React.useRef(0);
     const computeConnectedStateForWallets = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const connectedWalletsMap = {};
         yield Promise.all(wallets.map((wallet) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            connectedWalletsMap[wallet.id] = yield isWalletConnected.isWalletConnected(wallet);
+            connectedWalletsMap[getWalletIdentifier.getWalletIdentifier(wallet)] =
+                yield isWalletConnected.isWalletConnected(wallet);
         })));
         setState(connectedWalletsMap);
     }), [wallets]);
@@ -61,6 +65,7 @@ const useWalletsConnectionState = (wallets) => {
     useWalletConnectorEvent.useWalletConnectorEvent(connectors, 'accountChange', handleOnEventUpdate);
     useWalletConnectorEvent.useWalletConnectorEvent(connectors, 'disconnect', handleOnEventUpdate);
     useWalletConnectorEvent.useWalletConnectorEvent(connectors, 'chainChange', handleOnEventUpdate);
+    const refreshKey = wallets.map(getWalletIdentifier.getWalletIdentifier).join('-');
     React.useEffect(() => {
         computeConnectedStateForWallets();
     }, 
@@ -74,7 +79,7 @@ const useWalletsConnectionState = (wallets) => {
      * This is a workaround to detect when the user switches to another tab/extension
      * and then comes back to the dapp.
      */
-    useEventListener.useEventListener('focus', computeConnectedStateForWallets);
+    useWindowEvent.useWindowEvent('focus', computeConnectedStateForWallets);
     return {
         connectedWalletMap: state.connectedWalletsMap,
         didConnectedStateLoad: state.didLoad,

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

@@ -13,15 +13,19 @@ import 'viem';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
+import { getWalletIdentifier } from '../../functions/getWalletIdentifier/getWalletIdentifier.js';
 import { isWalletConnected } from '../../functions/isWalletConnected/isWalletConnected.js';
+import 'viem/chains';
 import '../../../events/dynamicEvents.js';
-import { useEventListener } from '../events/useEventListener/useEventListener.js';
 import { useWalletConnectorEvent } from '../events/useWalletConnectorEvent/useWalletConnectorEvent.js';
+import { useWindowEvent } from '../events/useWindowEvent/useWindowEvent.js';
 
 const connectedWalletStateReducer = (state, connectedWalletsMap) => {
-    const isConnectedWalletsMapEmpty = Object.values(connectedWalletsMap).length === 0;
-    if (isConnectedWalletsMapEmpty && state.didLoad === false) {
-        return state;
+    // When setting to empty, unset load flag
+    if (Object.values(connectedWalletsMap).length === 0) {
+        if (state.didLoad === false)
+            return state;
+        return Object.assign(Object.assign({}, state), { connectedWalletsMap, didLoad: false });
     }
     return Object.assign(Object.assign({}, state), { connectedWalletsMap, didLoad: true });
 };
@@ -30,13 +34,13 @@ const useWalletsConnectionState = (wallets) => {
         connectedWalletsMap: {},
         didLoad: false,
     });
-    const refreshKey = wallets.map(({ id }) => id).join('-');
     const connectors = wallets.map(({ connector }) => connector);
     const lastCallTimestamp = useRef(0);
     const computeConnectedStateForWallets = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
         const connectedWalletsMap = {};
         yield Promise.all(wallets.map((wallet) => __awaiter(void 0, void 0, void 0, function* () {
-            connectedWalletsMap[wallet.id] = yield isWalletConnected(wallet);
+            connectedWalletsMap[getWalletIdentifier(wallet)] =
+                yield isWalletConnected(wallet);
         })));
         setState(connectedWalletsMap);
     }), [wallets]);
@@ -57,6 +61,7 @@ const useWalletsConnectionState = (wallets) => {
     useWalletConnectorEvent(connectors, 'accountChange', handleOnEventUpdate);
     useWalletConnectorEvent(connectors, 'disconnect', handleOnEventUpdate);
     useWalletConnectorEvent(connectors, 'chainChange', handleOnEventUpdate);
+    const refreshKey = wallets.map(getWalletIdentifier).join('-');
     useEffect(() => {
         computeConnectedStateForWallets();
     }, 
@@ -70,7 +75,7 @@ const useWalletsConnectionState = (wallets) => {
      * This is a workaround to detect when the user switches to another tab/extension
      * and then comes back to the dapp.
      */
-    useEventListener('focus', computeConnectedStateForWallets);
+    useWindowEvent('focus', computeConnectedStateForWallets);
     return {
         connectedWalletMap: state.connectedWalletsMap,
         didConnectedStateLoad: state.didLoad,

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

@@ -10,19 +10,20 @@ require('react');
 require('../../events/dynamicEvents.cjs');
 require('@dynamic-labs/utils');
 require('../../context/DynamicContext/DynamicContext.cjs');
-require('@dynamic-labs/wallet-connector-core');
-require('../../context/CaptchaContext/CaptchaContext.cjs');
-require('../../context/ErrorContext/ErrorContext.cjs');
-require('../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../shared/logger.cjs');
+require('@dynamic-labs/wallet-connector-core');
+require('../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../utils/constants/colors.cjs');
 require('../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../shared/consts/index.cjs');
+require('../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 var getSocialSignInProviderForProviderEnum = require('../../utils/functions/getSocialSignInProviderForProviderEnum/getSocialSignInProviderForProviderEnum.cjs');
+require('viem/chains');
 require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 var AccountExistsContext = require('../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../config/ApiEndpoint.cjs');
@@ -44,21 +45,22 @@ require('../../components/Transition/OpacityTransition/OpacityTransition.cjs');
 require('../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../components/OverlayCard/OverlayCard.context.cjs');
 require('../../context/FooterAnimationContext/index.cjs');
-require('../../context/QrCodeContext/QrCodeContext.cjs');
 var Typography = require('../../components/Typography/Typography.cjs');
 require('../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
 var IconWithSpinner = require('../../components/IconWithSpinner/IconWithSpinner.cjs');
 require('../../context/LoadingContext/LoadingContext.cjs');
-require('qrcode');
 require('i18next');
+require('qrcode');
 require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.cjs');
 require('formik');
 require('../../components/IconButton/IconButton.cjs');
 require('../../components/Alert/Alert.cjs');
+require('../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('@dynamic-labs/viem-utils');
+require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 var IconListTile = require('../../components/IconListTile/IconListTile.cjs');
 require('../../components/InlineWidget/InlineWidget.cjs');
@@ -66,7 +68,10 @@ require('../../components/MenuList/Dropdown/Dropdown.cjs');
 require('../../components/Popper/Popper/Popper.cjs');
 require('../../components/Popper/PopperContext/PopperContext.cjs');
 var capitalize = require('../../shared/utils/functions/capitalize/capitalize.cjs');
+require('../WalletList/WalletList.cjs');
+require('@hcaptcha/react-hcaptcha');
 var SocialRedirectContext = require('../../context/SocialRedirectContext/SocialRedirectContext.cjs');
+require('../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 var LoginEmailForm = require('../LoginView/sections/EmailSignInSection/LoginEmailForm.cjs');
 
 const AccountExistsView = () => {

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

@@ -6,19 +6,20 @@ import 'react';
 import '../../events/dynamicEvents.js';
 import '@dynamic-labs/utils';
 import '../../context/DynamicContext/DynamicContext.js';
-import '@dynamic-labs/wallet-connector-core';
-import '../../context/CaptchaContext/CaptchaContext.js';
-import '../../context/ErrorContext/ErrorContext.js';
-import '../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/sdk-api';
 import '../../shared/logger.js';
+import '@dynamic-labs/wallet-connector-core';
+import '../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../utils/constants/colors.js';
 import '../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../shared/consts/index.js';
+import '../../context/CaptchaContext/CaptchaContext.js';
+import '../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import { getSocialSignInProviderForProviderEnum } from '../../utils/functions/getSocialSignInProviderForProviderEnum/getSocialSignInProviderForProviderEnum.js';
+import 'viem/chains';
 import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import { useAccountExistsContext } from '../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../config/ApiEndpoint.js';
@@ -40,21 +41,22 @@ import '../../components/Transition/OpacityTransition/OpacityTransition.js';
 import '../../components/ShadowDOM/ShadowDOM.js';
 import '../../components/OverlayCard/OverlayCard.context.js';
 import '../../context/FooterAnimationContext/index.js';
-import '../../context/QrCodeContext/QrCodeContext.js';
 import { Typography } from '../../components/Typography/Typography.js';
 import '../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
 import { IconWithSpinner } from '../../components/IconWithSpinner/IconWithSpinner.js';
 import '../../context/LoadingContext/LoadingContext.js';
-import 'qrcode';
 import 'i18next';
+import 'qrcode';
 import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.js';
 import 'formik';
 import '../../components/IconButton/IconButton.js';
 import '../../components/Alert/Alert.js';
+import '../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
 import '@dynamic-labs/viem-utils';
+import '../../context/PasskeyContext/PasskeyContext.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import { IconListTile } from '../../components/IconListTile/IconListTile.js';
 import '../../components/InlineWidget/InlineWidget.js';
@@ -62,7 +64,10 @@ import '../../components/MenuList/Dropdown/Dropdown.js';
 import '../../components/Popper/Popper/Popper.js';
 import '../../components/Popper/PopperContext/PopperContext.js';
 import { capitalize } from '../../shared/utils/functions/capitalize/capitalize.js';
+import '../WalletList/WalletList.js';
+import '@hcaptcha/react-hcaptcha';
 import { useSocialRedirectContext } from '../../context/SocialRedirectContext/SocialRedirectContext.js';
+import '../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import { LoginEmailForm } from '../LoginView/sections/EmailSignInSection/LoginEmailForm.js';
 
 const AccountExistsView = () => {