@dynamic-labs/sdk-react-core 2.1.0-alpha.1 → 2.1.0-alpha.10

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

@@ -0,0 +1,99 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../_virtual/_tslib.cjs');
+require('@dynamic-labs/wallet-connector-core');
+require('@dynamic-labs/sdk-api-core');
+require('../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('react/jsx-runtime');
+require('../../../context/ViewContext/ViewContext.cjs');
+require('react');
+require('@dynamic-labs/wallet-book');
+require('../../constants/colors.cjs');
+require('../../constants/values.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('@dynamic-labs/utils');
+require('../../../shared/consts/index.cjs');
+require('@dynamic-labs/multi-wallet');
+var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
+require('react-international-phone');
+require('viem');
+require('viem/chains');
+require('../../../config/ApiEndpoint.cjs');
+require('../../../locale/locale.cjs');
+var user = require('../../../data/api/user/user.cjs');
+var updateJWTAndCreateUserProfile = require('../../functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.cjs');
+require('../../../context/DynamicContext/DynamicContext.cjs');
+require('../../../events/dynamicEvents.cjs');
+require('../../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../../context/ErrorContext/ErrorContext.cjs');
+require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
+var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
+require('../../../context/VerificationContext/VerificationContext.cjs');
+require('react-dom');
+require('../../../context/WalletContext/WalletContext.cjs');
+require('../../../context/ThemeContext/ThemeContext.cjs');
+require('@dynamic-labs/types');
+require('yup');
+require('../../../context/MockContext/MockContext.cjs');
+require('react-i18next');
+require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
+require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('@dynamic-labs/rpc-providers');
+require('../../../components/Alert/Alert.cjs');
+require('../../../components/ShadowDOM/ShadowDOM.cjs');
+require('../../../components/IconButton/IconButton.cjs');
+require('../../../components/InlineWidget/InlineWidget.cjs');
+require('../../../components/Input/Input.cjs');
+require('../../../components/IsBrowser/IsBrowser.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/OverlayCard/OverlayCardTarget/OverlayCardTarget.cjs');
+require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
+require('../../../components/Popper/Popper/Popper.cjs');
+require('../../../components/Popper/PopperContext/PopperContext.cjs');
+require('react-focus-lock');
+require('qrcode');
+require('formik');
+require('../../../views/WalletList/WalletList.cjs');
+require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
+require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
+require('@hcaptcha/react-hcaptcha');
+require('../../../context/LoadingContext/LoadingContext.cjs');
+require('../../../context/FooterAnimationContext/index.cjs');
+require('../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
+require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
+require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
+require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
+
+const useMergeUserAccounts = () => {
+    const { environmentId, setShowAuthFlow, setUser } = useInternalDynamicContext.useInternalDynamicContext();
+    const { addedWalletsIds } = UserWalletsContext.useInternalUserWallets();
+    const mergeUserAccounts = (mergeConflictResolutions) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const authToken = getAuthToken.getAuthToken();
+        const response = yield user.verifyMergeUsers(authToken, environmentId, mergeConflictResolutions);
+        const userProfile = updateJWTAndCreateUserProfile.updateJWTAndCreateUserProfile(response === null || response === void 0 ? void 0 : response.jwt, response === null || response === void 0 ? void 0 : response.minifiedJwt);
+        setUser(userProfile);
+        const walletId = userProfile.lastVerifiedCredentialId;
+        if (walletId) {
+            addedWalletsIds.current.push(walletId);
+        }
+        setShowAuthFlow(false);
+    });
+    return {
+        mergeUserAccounts,
+    };
+};
+
+exports.useMergeUserAccounts = useMergeUserAccounts;

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

@@ -0,0 +1,4 @@
+import { MergeUserConflictResolution } from '@dynamic-labs/sdk-api-core';
+export declare const useMergeUserAccounts: () => {
+    mergeUserAccounts: (mergeConflictResolutions: MergeUserConflictResolution[]) => Promise<void>;
+};

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

@@ -0,0 +1,95 @@
+'use client'
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import '@dynamic-labs/wallet-connector-core';
+import '@dynamic-labs/sdk-api-core';
+import '../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import 'react';
+import '@dynamic-labs/wallet-book';
+import '../../constants/colors.js';
+import '../../constants/values.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
+import '@dynamic-labs/utils';
+import '../../../shared/consts/index.js';
+import '@dynamic-labs/multi-wallet';
+import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
+import 'react-international-phone';
+import 'viem';
+import 'viem/chains';
+import '../../../config/ApiEndpoint.js';
+import '../../../locale/locale.js';
+import { verifyMergeUsers } from '../../../data/api/user/user.js';
+import { updateJWTAndCreateUserProfile } from '../../functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.js';
+import '../../../context/DynamicContext/DynamicContext.js';
+import '../../../events/dynamicEvents.js';
+import '../../../context/CaptchaContext/CaptchaContext.js';
+import '../../../context/ErrorContext/ErrorContext.js';
+import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
+import '../../../context/AccountExistsContext/AccountExistsContext.js';
+import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
+import '../../../context/VerificationContext/VerificationContext.js';
+import 'react-dom';
+import '../../../context/WalletContext/WalletContext.js';
+import '../../../context/ThemeContext/ThemeContext.js';
+import '@dynamic-labs/types';
+import 'yup';
+import '../../../context/MockContext/MockContext.js';
+import 'react-i18next';
+import '../../../context/FieldsStateContext/FieldsStateContext.js';
+import '../useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
+import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import '@dynamic-labs/rpc-providers';
+import '../../../components/Alert/Alert.js';
+import '../../../components/ShadowDOM/ShadowDOM.js';
+import '../../../components/IconButton/IconButton.js';
+import '../../../components/InlineWidget/InlineWidget.js';
+import '../../../components/Input/Input.js';
+import '../../../components/IsBrowser/IsBrowser.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/OverlayCard/OverlayCardTarget/OverlayCardTarget.js';
+import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
+import '../../../components/Popper/Popper/Popper.js';
+import '../../../components/Popper/PopperContext/PopperContext.js';
+import 'react-focus-lock';
+import 'qrcode';
+import 'formik';
+import '../../../views/WalletList/WalletList.js';
+import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
+import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
+import '@hcaptcha/react-hcaptcha';
+import '../../../context/LoadingContext/LoadingContext.js';
+import '../../../context/FooterAnimationContext/index.js';
+import '../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
+import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/PasskeyContext/PasskeyContext.js';
+import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
+import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
+import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
+import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
+
+const useMergeUserAccounts = () => {
+    const { environmentId, setShowAuthFlow, setUser } = useInternalDynamicContext();
+    const { addedWalletsIds } = useInternalUserWallets();
+    const mergeUserAccounts = (mergeConflictResolutions) => __awaiter(void 0, void 0, void 0, function* () {
+        const authToken = getAuthToken();
+        const response = yield verifyMergeUsers(authToken, environmentId, mergeConflictResolutions);
+        const userProfile = updateJWTAndCreateUserProfile(response === null || response === void 0 ? void 0 : response.jwt, response === null || response === void 0 ? void 0 : response.minifiedJwt);
+        setUser(userProfile);
+        const walletId = userProfile.lastVerifiedCredentialId;
+        if (walletId) {
+            addedWalletsIds.current.push(walletId);
+        }
+        setShowAuthFlow(false);
+    });
+    return {
+        mergeUserAccounts,
+    };
+};
+
+export { useMergeUserAccounts };

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

@@ -91,7 +91,8 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 const usePasskeyRecovery = () => {
     var _a, _b;
     const { authToken, environmentId, primaryWallet, projectSettings, setShowAuthFlow, user: user$1, setUser, } = useInternalDynamicContext.useInternalDynamicContext();
-    const iframeContainerRef = useElementById.useElementById(constants.iframeContainerId);
+    const { createRootElement } = useElementById.useElementById();
+    const iframeContainerRef = createRootElement(constants.iframeContainerId);
     const { userHasEmbeddedWallet } = useEmbeddedWallet.useEmbeddedWallet();
     const { isTurnkeyWalletWithoutAuthenticator, hasRecoveryEmail } = useIsTurnkeyWallet.useIsTurnkeyWallet();
     const { initAuthMethod } = useInitEmbeddedWalletAuthMethod.useInitEmbeddedWalletAuthMethod();

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

@@ -87,7 +87,8 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 const usePasskeyRecovery = () => {
     var _a, _b;
     const { authToken, environmentId, primaryWallet, projectSettings, setShowAuthFlow, user, setUser, } = useInternalDynamicContext();
-    const iframeContainerRef = useElementById(iframeContainerId);
+    const { createRootElement } = useElementById();
+    const iframeContainerRef = createRootElement(iframeContainerId);
     const { userHasEmbeddedWallet } = useEmbeddedWallet();
     const { isTurnkeyWalletWithoutAuthenticator, hasRecoveryEmail } = useIsTurnkeyWallet();
     const { initAuthMethod } = useInitEmbeddedWalletAuthMethod();

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

@@ -3,6 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 require('@dynamic-labs/sdk-api-core');
 require('../../../shared/logger.cjs');
@@ -19,19 +20,27 @@ var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLo
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 var primaryWalletIdValidator = require('../useWalletConnectors/utils/primaryWalletIdValidator/primaryWalletIdValidator.cjs');
-require('../../../../../_virtual/_tslib.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('viem');
 require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
 require('../../../locale/locale.cjs');
+var wallets = require('../../../data/api/wallets/wallets.cjs');
+var updateJWTAndCreateUserProfile = require('../../functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.cjs');
 
-const usePrimaryWalletId = () => {
+const usePrimaryWalletId = ({ minAuthToken, environmentId, setUser, }) => {
     const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletId] = useLocalStorage.useLocalStorage(localStorage.PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator.primaryWalletIdValidator);
-    const setPrimaryWalletId = React.useCallback((walletId) => {
+    const setPrimaryWalletId = React.useCallback((walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         setPrimaryWalletIdState(walletId);
-    }, [setPrimaryWalletIdState]);
+        if (minAuthToken) {
+            const response = yield wallets.storeSelectedWallet({ environmentId, walletId }, minAuthToken);
+            // only update userProfile, authToken, and minAuthToken when response is valid from storeSelectedWallet
+            if (response) {
+                setUser(updateJWTAndCreateUserProfile.updateJWTAndCreateUserProfile(response.jwt, response.minifiedJwt));
+            }
+        }
+    }), [setPrimaryWalletIdState]);
     return {
         clearPrimaryWalletId,
         primaryWalletId,

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

@@ -1,5 +1,13 @@
-export declare const usePrimaryWalletId: () => {
+import { Dispatch, SetStateAction } from 'react';
+import { UserProfile } from '@dynamic-labs/types';
+type Props = {
+    setUser: Dispatch<SetStateAction<UserProfile | undefined>>;
+    environmentId: string;
+    minAuthToken: string | undefined;
+};
+export declare const usePrimaryWalletId: ({ minAuthToken, environmentId, setUser, }: Props) => {
     clearPrimaryWalletId: () => void;
     primaryWalletId: string | undefined;
-    setPrimaryWalletId: (walletId: string) => void;
+    setPrimaryWalletId: (walletId: string) => Promise<void>;
 };
+export {};

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

@@ -1,4 +1,5 @@
 'use client'
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
 import '@dynamic-labs/sdk-api-core';
 import '../../../shared/logger.js';
@@ -15,19 +16,27 @@ import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/use
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import { primaryWalletIdValidator } from '../useWalletConnectors/utils/primaryWalletIdValidator/primaryWalletIdValidator.js';
-import '../../../../../_virtual/_tslib.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
 import '../../../locale/locale.js';
+import { storeSelectedWallet } from '../../../data/api/wallets/wallets.js';
+import { updateJWTAndCreateUserProfile } from '../../functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.js';
 
-const usePrimaryWalletId = () => {
+const usePrimaryWalletId = ({ minAuthToken, environmentId, setUser, }) => {
     const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletId] = useLocalStorage(PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator);
-    const setPrimaryWalletId = useCallback((walletId) => {
+    const setPrimaryWalletId = useCallback((walletId) => __awaiter(void 0, void 0, void 0, function* () {
         setPrimaryWalletIdState(walletId);
-    }, [setPrimaryWalletIdState]);
+        if (minAuthToken) {
+            const response = yield storeSelectedWallet({ environmentId, walletId }, minAuthToken);
+            // only update userProfile, authToken, and minAuthToken when response is valid from storeSelectedWallet
+            if (response) {
+                setUser(updateJWTAndCreateUserProfile(response.jwt, response.minifiedJwt));
+            }
+        }
+    }), [setPrimaryWalletIdState]);
     return {
         clearPrimaryWalletId,
         primaryWalletId,

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

@@ -21,6 +21,11 @@ require('../../../../../_virtual/_tslib.cjs');
 require('../../../config/ApiEndpoint.cjs');
 var settings = require('../../../data/api/settings/settings.cjs');
 require('../../../locale/locale.cjs');
+require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
+require('viem');
+require('viem/chains');
+var serializeWalletConnectors = require('../../functions/serializeWalletConnectors/serializeWalletConnectors.cjs');
 
 const useSendDynamicProps = ({ settings: settings$1, environmentId, }) => {
     useEffectOnce.useEffectOnce(() => {
@@ -32,7 +37,7 @@ const useSendDynamicProps = ({ settings: settings$1, environmentId, }) => {
             settings: Object.assign(Object.assign({}, settings$1), { customPrivacyPolicy: Boolean(settings$1.customPrivacyPolicy), customTermsOfServices: Boolean(settings$1.customTermsOfServices), policiesConsentInnerComponent: Boolean(settings$1.policiesConsentInnerComponent) }),
         };
         const serializedEventsCallbacks = serializeEventsCallbacks(settings$1.events);
-        const serializedWalletConnectors = serializeWalletConnectors(settings$1.walletConnectors);
+        const serializedWalletConnectors = serializeWalletConnectors.serializeWalletConnectors(settings$1.walletConnectors);
         const serializedDynamicContextProps = Object.assign(Object.assign({}, updatedDynamicProps), { settings: Object.assign(Object.assign({}, updatedDynamicProps.settings), { events: serializedEventsCallbacks, walletConnectors: serializedWalletConnectors }) });
         settings.sendDynamicProps(environmentId, {
             dynamicContextProps: serializedDynamicContextProps,
@@ -58,17 +63,6 @@ const serializeEventsCallbacks = (events) => {
         return undefined;
     }
 };
-const serializeWalletConnectors = (walletConnectors) => {
-    try {
-        if (!walletConnectors)
-            return undefined;
-        return walletConnectors.map((connector) => connector.name);
-    }
-    catch (error) {
-        logger.logger.error('error serializing walletConnectors', error);
-        return undefined;
-    }
-};
 const getFrameworkSettings = () => {
     var _a;
     return ({
@@ -84,5 +78,4 @@ const getFrameworkSettings = () => {
 };
 
 exports.serializeEventsCallbacks = serializeEventsCallbacks;
-exports.serializeWalletConnectors = serializeWalletConnectors;
 exports.useSendDynamicProps = useSendDynamicProps;

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

@@ -1,5 +1,4 @@
-import { WalletConnectorsMethod } from '@dynamic-labs/wallet-connector-core';
-import { DynamicContextProps } from '../../../..';
+import { DynamicContextProps } from '../../../context/DynamicContext';
 import { DynamicEventsCallbacks } from '../../../shared';
 type UseSendDynamicHookProps = {
     settings: DynamicContextProps['settings'];
@@ -7,5 +6,4 @@ type UseSendDynamicHookProps = {
 };
 export declare const useSendDynamicProps: ({ settings, environmentId, }: UseSendDynamicHookProps) => void;
 export declare const serializeEventsCallbacks: (events: DynamicEventsCallbacks | undefined) => string[] | undefined;
-export declare const serializeWalletConnectors: (walletConnectors?: WalletConnectorsMethod[]) => string[] | undefined;
 export {};

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

@@ -17,6 +17,11 @@ import '../../../../../_virtual/_tslib.js';
 import '../../../config/ApiEndpoint.js';
 import { sendDynamicProps } from '../../../data/api/settings/settings.js';
 import '../../../locale/locale.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import 'viem';
+import 'viem/chains';
+import { serializeWalletConnectors } from '../../functions/serializeWalletConnectors/serializeWalletConnectors.js';
 
 const useSendDynamicProps = ({ settings, environmentId, }) => {
     useEffectOnce(() => {
@@ -54,17 +59,6 @@ const serializeEventsCallbacks = (events) => {
         return undefined;
     }
 };
-const serializeWalletConnectors = (walletConnectors) => {
-    try {
-        if (!walletConnectors)
-            return undefined;
-        return walletConnectors.map((connector) => connector.name);
-    }
-    catch (error) {
-        logger.error('error serializing walletConnectors', error);
-        return undefined;
-    }
-};
 const getFrameworkSettings = () => {
     var _a;
     return ({
@@ -79,4 +73,4 @@ const getFrameworkSettings = () => {
     });
 };
 
-export { serializeEventsCallbacks, serializeWalletConnectors, useSendDynamicProps };
+export { serializeEventsCallbacks, useSendDynamicProps };

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

@@ -177,6 +177,11 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             handleDisconnectWallet({ endSession: false, walletConnector });
             return handleWalletUsedError(e);
         }
+        if (e instanceof utils.MergeAccountsConfirmationError) {
+            setView('merge-user-accounts', Object.assign({}, e));
+            setShowAuthFlow(true);
+            return;
+        }
         if (e instanceof utils.ChainalysisError) {
             handleDisconnectWallet({ walletConnector });
             setDeniedAddress(address);

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

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { DynamicError, WalletUsedError, ChainalysisError, GateBlockedError, NoAccessError, AccountExistsError } from '@dynamic-labs/utils';
+import { DynamicError, WalletUsedError, MergeAccountsConfirmationError, ChainalysisError, GateBlockedError, NoAccessError, AccountExistsError } from '@dynamic-labs/utils';
 import { isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import 'react';
 import '../../../events/dynamicEvents.js';
@@ -173,6 +173,11 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             handleDisconnectWallet({ endSession: false, walletConnector });
             return handleWalletUsedError(e);
         }
+        if (e instanceof MergeAccountsConfirmationError) {
+            setView('merge-user-accounts', Object.assign({}, e));
+            setShowAuthFlow(true);
+            return;
+        }
         if (e instanceof ChainalysisError) {
             handleDisconnectWallet({ walletConnector });
             setDeniedAddress(address);

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

@@ -5,9 +5,31 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
 var data = require('../../../views/WalletList/data.cjs');
+require('@dynamic-labs/wallet-connector-core');
+require('@dynamic-labs/sdk-api-core');
+require('../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('react/jsx-runtime');
+require('../../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/wallet-book');
+require('../../constants/colors.cjs');
+require('../../constants/values.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('@dynamic-labs/utils');
+require('../../../shared/consts/index.cjs');
+require('../../../../../_virtual/_tslib.cjs');
+require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
+require('viem');
+require('viem/chains');
+require('../../../config/ApiEndpoint.cjs');
+require('../../../locale/locale.cjs');
+var serializeWalletConnectors = require('../../functions/serializeWalletConnectors/serializeWalletConnectors.cjs');
 var verifyRequiredConnectorsAreSetup = require('./utils/verifyRequiredConnectorsAreSetup/verifyRequiredConnectorsAreSetup.cjs');
 
 const useWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, mobileExperience, networkConfigurations, walletBook, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
+    const walletConnectorsKey = React.useMemo(() => { var _a; return (_a = serializeWalletConnectors.serializeWalletConnectors(walletConnectorsProp)) === null || _a === void 0 ? void 0 : _a.join(','); }, [walletConnectorsProp]);
+    const walletBookLength = React.useMemo(() => Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length, [walletBook]);
     const walletConnectorOptions = React.useMemo(() => {
         if (!projectSettings ||
             !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length ||
@@ -31,14 +53,15 @@ const useWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, deepL
             walletConnectorExtensions,
         });
         // Cannot include walletUiUtils in the dependency array because it will cause an infinite loop
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
         appLogoUrl,
         appName,
         projectSettings,
-        walletConnectorsProp,
+        walletConnectorsKey,
         walletConnectPreferredChains,
         flowNetwork,
-        Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length,
+        walletBookLength,
         networkConfigurations,
     ]);
     React.useEffect(() => {

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

@@ -1,9 +1,31 @@
 'use client'
 import { useMemo, useEffect } from 'react';
 import { getWallets } from '../../../views/WalletList/data.js';
+import '@dynamic-labs/wallet-connector-core';
+import '@dynamic-labs/sdk-api-core';
+import '../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/wallet-book';
+import '../../constants/colors.js';
+import '../../constants/values.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
+import '@dynamic-labs/utils';
+import '../../../shared/consts/index.js';
+import '../../../../../_virtual/_tslib.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import 'viem';
+import 'viem/chains';
+import '../../../config/ApiEndpoint.js';
+import '../../../locale/locale.js';
+import { serializeWalletConnectors } from '../../functions/serializeWalletConnectors/serializeWalletConnectors.js';
 import { verifyRequiredConnectorsAreSetup } from './utils/verifyRequiredConnectorsAreSetup/verifyRequiredConnectorsAreSetup.js';
 
 const useWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, mobileExperience, networkConfigurations, walletBook, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
+    const walletConnectorsKey = useMemo(() => { var _a; return (_a = serializeWalletConnectors(walletConnectorsProp)) === null || _a === void 0 ? void 0 : _a.join(','); }, [walletConnectorsProp]);
+    const walletBookLength = useMemo(() => Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length, [walletBook]);
     const walletConnectorOptions = useMemo(() => {
         if (!projectSettings ||
             !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length ||
@@ -27,14 +49,15 @@ const useWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, deepL
             walletConnectorExtensions,
         });
         // Cannot include walletUiUtils in the dependency array because it will cause an infinite loop
+        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
         appLogoUrl,
         appName,
         projectSettings,
-        walletConnectorsProp,
+        walletConnectorsKey,
         walletConnectPreferredChains,
         flowNetwork,
-        Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length,
+        walletBookLength,
         networkConfigurations,
     ]);
     useEffect(() => {

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

@@ -20,7 +20,7 @@ require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
 var useWalletConnectorEvent = require('../events/useWalletConnectorEvent/useWalletConnectorEvent.cjs');
 
-const useWalletEventListeners = ({ handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
+const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
     useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'disconnect', () => {
         logger.logger.debug('primary wallet disconnect');
         handleLogOut();
@@ -109,13 +109,11 @@ const useWalletEventListeners = ({ handleLogOut, multiWallet, multiWalletWidgetS
     }));
     useWalletConnectorEvent.useWalletConnectorEvent(uniqueNonPrimaryWallets, 'disconnect', (affectedConnector) => {
         logger.logger.debug('secondary wallet disconnect');
-        // argent sends a disconnect event when the user adds a new account
         if (authMode === 'connect-only') {
             // Get all wallets with this connector
             const affectedWallets = secondaryWallets.filter(({ connector }) => connector.key === affectedConnector.key);
             for (const wallet of affectedWallets) {
-                if (wallet.connector.key === 'argentx')
-                    refreshConnectedWallet(wallet.id, wallet.connector);
+                disconnectWallet(wallet.id);
             }
         }
     });

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

@@ -4,6 +4,7 @@ import { IDynamicContext } from '../../../context/DynamicContext/types';
 import { AuthModeType, MultiWalletWidgetState, Wallet, WalletWithAction } from '../../../shared';
 import { MultiWalletWidgetStateSetter } from '../multiWallet';
 export type UseWalletEventListenersArgs = {
+    disconnectWallet: (walletId: string) => Promise<void>;
     handleLogOut(): Promise<void>;
     multiWallet: boolean;
     multiWalletWidgetState: MultiWalletWidgetState;
@@ -19,4 +20,4 @@ export type UseWalletEventListenersArgs = {
     authMode: AuthModeType;
     refreshConnectedWallet: (walletId: string, walletConnector: WalletConnector, shouldCallCallback?: boolean) => Promise<void>;
 };
-export declare const useWalletEventListeners: ({ handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }: UseWalletEventListenersArgs) => void;
+export declare const useWalletEventListeners: ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }: UseWalletEventListenersArgs) => void;

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

@@ -16,7 +16,7 @@ import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
 import { useWalletConnectorEvent } from '../events/useWalletConnectorEvent/useWalletConnectorEvent.js';
 
-const useWalletEventListeners = ({ handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
+const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
     useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'disconnect', () => {
         logger.debug('primary wallet disconnect');
         handleLogOut();
@@ -105,13 +105,11 @@ const useWalletEventListeners = ({ handleLogOut, multiWallet, multiWalletWidgetS
     }));
     useWalletConnectorEvent(uniqueNonPrimaryWallets, 'disconnect', (affectedConnector) => {
         logger.debug('secondary wallet disconnect');
-        // argent sends a disconnect event when the user adds a new account
         if (authMode === 'connect-only') {
             // Get all wallets with this connector
             const affectedWallets = secondaryWallets.filter(({ connector }) => connector.key === affectedConnector.key);
             for (const wallet of affectedWallets) {
-                if (wallet.connector.key === 'argentx')
-                    refreshConnectedWallet(wallet.id, wallet.connector);
+                disconnectWallet(wallet.id);
             }
         }
     });