@dynamic-labs/sdk-react-core 1.1.0-alpha.1 → 1.1.0-alpha.11

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

@@ -34,11 +34,12 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
     const { setExistentAccountData } = useAccountExistsContext();
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage, setError } = useErrorContext();
-    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallets, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, } = useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallets, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, primaryWallet, enableConnectOnlyFallback, setMultiWalletWidgetState, setLogInWithEmail, } = useInternalDynamicContext();
     // If the user is not already logged it means that we only need to verify
     // We need this boolean for the part of the logic where we already persisted a new authToken,
     // and need to distinguish between logic for verify or linking.
     const verifyOnly = !authToken;
+    const shouldFallbackToConnectOnly = enableConnectOnlyFallback && (verifyOnly || !multiWalletEnabled);
     const generateJWT = (walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth) => __awaiter(void 0, void 0, void 0, function* () {
         let Jwt;
         const nonce = consumeNonce();
@@ -76,7 +77,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
         if (newSelectedCredentialWallet) {
             const currentPrimaryWallet = user.verifiedCredentials.find((a) => a.id === primaryWalletId);
             if (verifyOnly ||
-                primaryWalletId === undefined ||
+                !primaryWallet ||
                 (multiWalletWidgetState === 'awaiting_signature' &&
                     newSelectedCredentialWallet.walletName ===
                         (currentPrimaryWallet === null || currentPrimaryWallet === void 0 ? void 0 : currentPrimaryWallet.walletName)) ||
@@ -100,25 +101,33 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             setIsSingleWalletAccount(true);
         }
     };
-    const handleError = (e, walletConnector, address, oauth) => {
+    const handleDisconnectWallet = ({ walletConnector, endSession = true, }) => {
         removeConnectedWalletsInfo();
         // Ensure auth verification flag is taken down
         setIsVerificationInProgress(false);
+        if (endSession)
+            walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.endSession();
+    };
+    const handleError = (e, walletConnector, address, oauth) => {
+        var _a;
         if (e instanceof WalletUsedError) {
+            handleDisconnectWallet({ endSession: false, walletConnector });
             return handleWalletUsedError(e);
         }
-        walletConnector.endSession();
         if (e instanceof ChainalysisError) {
+            handleDisconnectWallet({ walletConnector });
             setDeniedAddress(address);
             setView('chainalysis-blocked-wallet');
             return;
         }
         if (e instanceof GateBlockedError) {
+            handleDisconnectWallet({ walletConnector });
             setDeniedAddress(address);
             setView('gate-blocked-wallet');
             return;
         }
         if (e instanceof NoAccessError) {
+            handleDisconnectWallet({ walletConnector });
             setDeniedAddress(address);
             // we need to set this value if it's magic in order to set proper icon
             if (isSocialWalletConnector(walletConnector)) {
@@ -128,6 +137,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             return;
         }
         if (e instanceof AccountExistsError) {
+            handleDisconnectWallet({ walletConnector });
             setExistentAccountData(e.errorPayload);
             setView('account-exists');
             return;
@@ -135,7 +145,19 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
         if (connectedWallets.length && authMode === 'connect-only') {
             throw new DynamicError(e.message);
         }
-        goToInitialView();
+        const userRejectedRequestError = (_a = e === null || e === void 0 ? void 0 : e.message) === null || _a === void 0 ? void 0 : _a.includes('User rejected the request');
+        const fallbackToConnectOnly = shouldFallbackToConnectOnly && !userRejectedRequestError;
+        if (fallbackToConnectOnly) {
+            logger.warn('Verification failed, changing to connect-only');
+            // verification failed for unknown reason, set authmode to connect-only and show wallet list
+            setAuthMode('connect-only');
+            setView('wallet-list');
+            setIsVerificationInProgress(false);
+        }
+        else {
+            handleDisconnectWallet({ walletConnector });
+            goToInitialView();
+        }
         logger.error(e);
         if (debugError) {
             setError(`${e.message}\n ${e.stack}`);
@@ -175,7 +197,9 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             }
             storeAuthToken(Jwt);
             setOnboardingOnlyJwt(undefined);
+            setMultiWalletWidgetState('idle');
             setUser(user); // The user should only be set if no KYC is needed.
+            setLogInWithEmail(false);
             setShowAuthFlow(false);
             /* istanbul ignore else */
             if (verifyOnly) {

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

@@ -0,0 +1 @@
+export { useWalletConnectorNetwork } from './useWalletConnectorNetwork';

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

@@ -0,0 +1,42 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+var usePromise = require('../usePromise/usePromise.cjs');
+require('../../../events/dynamicEvents.cjs');
+var useWalletConnectorEvent = require('../events/useWalletConnectorEvent/useWalletConnectorEvent.cjs');
+
+/**
+ * Sync wallet connector network.
+ *
+ * @param walletConnector - The WalletConnector instance to be used.
+ *
+ * @returns {{ network: string | number | undefined }} An object containing the current network state.
+ *
+ * @example
+ * // Example of using the useWalletConnectorNetwork hook
+ * const { network } = useWalletConnectorNetwork(walletConnector);
+ *
+ * // You can then use the 'network' state in your component
+ * return <div>Current Network: {network}</div>;
+ */
+const useWalletConnectorNetwork = (walletConnector) => {
+    const [network, setNetwork] = React.useState();
+    usePromise.usePromise(() => walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getNetwork(), {
+        onResolve: (network) => setNetwork(network),
+    });
+    useWalletConnectorEvent.useWalletConnectorEvent(walletConnector || undefined, 'chainChange', ({ chain }) => setNetwork(chain));
+    /**
+     * Listen to disconnect event and update the network because ArgentX
+     * emits a disconnect event when the user switches network.
+     */
+    useWalletConnectorEvent.useWalletConnectorEvent(walletConnector || undefined, 'disconnect', () => {
+        if ((walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.key) === 'argentx') {
+            walletConnector.getNetwork().then(setNetwork);
+        }
+    });
+    return { network };
+};
+
+exports.useWalletConnectorNetwork = useWalletConnectorNetwork;

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

@@ -0,0 +1,18 @@
+import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+/**
+ * Sync wallet connector network.
+ *
+ * @param walletConnector - The WalletConnector instance to be used.
+ *
+ * @returns {{ network: string | number | undefined }} An object containing the current network state.
+ *
+ * @example
+ * // Example of using the useWalletConnectorNetwork hook
+ * const { network } = useWalletConnectorNetwork(walletConnector);
+ *
+ * // You can then use the 'network' state in your component
+ * return <div>Current Network: {network}</div>;
+ */
+export declare const useWalletConnectorNetwork: (walletConnector: WalletConnector | null | undefined) => {
+    network: string | number | undefined;
+};

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

@@ -0,0 +1,38 @@
+import { useState } from 'react';
+import { usePromise } from '../usePromise/usePromise.js';
+import '../../../events/dynamicEvents.js';
+import { useWalletConnectorEvent } from '../events/useWalletConnectorEvent/useWalletConnectorEvent.js';
+
+/**
+ * Sync wallet connector network.
+ *
+ * @param walletConnector - The WalletConnector instance to be used.
+ *
+ * @returns {{ network: string | number | undefined }} An object containing the current network state.
+ *
+ * @example
+ * // Example of using the useWalletConnectorNetwork hook
+ * const { network } = useWalletConnectorNetwork(walletConnector);
+ *
+ * // You can then use the 'network' state in your component
+ * return <div>Current Network: {network}</div>;
+ */
+const useWalletConnectorNetwork = (walletConnector) => {
+    const [network, setNetwork] = useState();
+    usePromise(() => walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getNetwork(), {
+        onResolve: (network) => setNetwork(network),
+    });
+    useWalletConnectorEvent(walletConnector || undefined, 'chainChange', ({ chain }) => setNetwork(chain));
+    /**
+     * Listen to disconnect event and update the network because ArgentX
+     * emits a disconnect event when the user switches network.
+     */
+    useWalletConnectorEvent(walletConnector || undefined, 'disconnect', () => {
+        if ((walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.key) === 'argentx') {
+            walletConnector.getNetwork().then(setNetwork);
+        }
+    });
+    return { network };
+};
+
+export { useWalletConnectorNetwork };

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var sdkApi = require('@dynamic-labs/sdk-api');
+require('@dynamic-labs/wallet-connector-core');
 require('../../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../../../context/ViewContext/ViewContext.cjs');
 require('react');

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyMagicIsSetup/verifyMagicIsSetup.js

@@ -1,7 +1,7 @@
 import { ProviderEnum } from '@dynamic-labs/sdk-api';
+import '@dynamic-labs/wallet-connector-core';
 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';

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyZeroDevIsSetup/verifyZeroDevIsSetup.cjs

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var sdkApi = require('@dynamic-labs/sdk-api');
+require('@dynamic-labs/wallet-connector-core');
 require('../../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../../../context/ViewContext/ViewContext.cjs');
 require('react');

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyZeroDevIsSetup/verifyZeroDevIsSetup.js

@@ -1,7 +1,7 @@
 import { ProviderEnum } from '@dynamic-labs/sdk-api';
+import '@dynamic-labs/wallet-connector-core';
 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';

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

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

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

@@ -13,8 +13,9 @@ 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 { reconnectSocialWallet } from './reconnectSocialWallet.js';
 import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
 import { updateUserWalletsFromLinkedWallets } from './utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.js';
@@ -61,12 +62,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 +95,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/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

@@ -8,10 +8,10 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useInte
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 var MockContext = require('../../../context/MockContext/MockContext.cjs');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/wallet-connector-core');
 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');
 require('@dynamic-labs/wallet-book');
@@ -127,7 +127,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

@@ -4,10 +4,10 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useIn
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import { useMockContext } from '../../../context/MockContext/MockContext.js';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/wallet-connector-core';
 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 '@dynamic-labs/wallet-book';
@@ -123,7 +123,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

@@ -50,12 +50,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('../../../context/WalletGroupContext/WalletGroupContext.cjs');
-require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.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');

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

@@ -46,12 +46,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 '../../../context/WalletGroupContext/WalletGroupContext.js';
-import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.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';

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

@@ -17,15 +17,18 @@ 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('../../../events/dynamicEvents.cjs');
 var useEventListener = require('../events/useEventListener/useEventListener.cjs');
 var useWalletConnectorEvent = require('../events/useWalletConnectorEvent/useWalletConnectorEvent.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 +37,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 +64,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();
     }, 

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

@@ -13,15 +13,18 @@ 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 '../../../events/dynamicEvents.js';
 import { useEventListener } from '../events/useEventListener/useEventListener.js';
 import { useWalletConnectorEvent } from '../events/useWalletConnectorEvent/useWalletConnectorEvent.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 +33,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 +60,7 @@ const useWalletsConnectionState = (wallets) => {
     useWalletConnectorEvent(connectors, 'accountChange', handleOnEventUpdate);
     useWalletConnectorEvent(connectors, 'disconnect', handleOnEventUpdate);
     useWalletConnectorEvent(connectors, 'chainChange', handleOnEventUpdate);
+    const refreshKey = wallets.map(getWalletIdentifier).join('-');
     useEffect(() => {
         computeConnectedStateForWallets();
     }, 

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

@@ -44,29 +44,33 @@ 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('qrcode');
 require('../../context/LoadingContext/LoadingContext.cjs');
 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');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
 require('../../components/Popper/Popper/Popper.cjs');
 require('../../components/Popper/PopperContext/PopperContext.cjs');
-require('react-focus-lock');
 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

@@ -40,29 +40,33 @@ 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 'qrcode';
 import '../../context/LoadingContext/LoadingContext.js';
 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';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import '../../components/Popper/Popper/Popper.js';
 import '../../components/Popper/PopperContext/PopperContext.js';
-import 'react-focus-lock';
 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 = () => {

package/src/lib/views/BridgeNextWalletConnectionView/BridgeNextWalletConnectionView.cjs

@@ -32,7 +32,7 @@ const BridgeNextWalletConnectionView = () => {
     if (!chainInfo) {
         throw new utils.DynamicError('No chain info found for chain', chain);
     }
-    return (jsxRuntime.jsx(BridgeNextWalletToConnectLayout.BridgeNextWalletToConnectLayout, { chainName: chainInfo.blockchainName, chainIcon: jsxRuntime.jsx(ChainIcon, {}), onClickAction: () => setView('wallet-list'), onClickClose: () => setShowAuthFlow(false) }));
+    return (jsxRuntime.jsx(BridgeNextWalletToConnectLayout.BridgeNextWalletToConnectLayout, { chainName: chainInfo.blockchainName, chainIcon: jsxRuntime.jsx(ChainIcon, {}), onClickAction: () => setView('wallet-list'), onClickClose: () => setShowAuthFlow(false, { emitCancelAuth: true }) }));
 };
 
 exports.BridgeNextWalletConnectionView = BridgeNextWalletConnectionView;