@dynamic-labs/sdk-react-core 4.20.4 → 4.20.5

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

@@ -7,19 +7,23 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var utils = require('@dynamic-labs/utils');
-var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
-require('../../constants/values.cjs');
-require('@dynamic-labs/multi-wallet');
+require('../../../context/DynamicContext/DynamicContext.cjs');
+require('../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 require('../../../shared/logger.cjs');
-require('../../constants/colors.cjs');
-var getMinAuthToken = require('../../functions/getMinAuthToken/getMinAuthToken.cjs');
-require('react-international-phone');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
+require('../../constants/colors.cjs');
+require('../../constants/values.cjs');
 require('../../../shared/consts/index.cjs');
+require('../../../events/dynamicEvents.cjs');
+require('../../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../../context/ErrorContext/ErrorContext.cjs');
+require('@dynamic-labs/multi-wallet');
+var getMinAuthToken = require('../../functions/getMinAuthToken/getMinAuthToken.cjs');
+require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
 var isCookieEnabled = require('../../functions/isCookieEnabled/isCookieEnabled.cjs');
 var projectSettings = require('../../../store/state/projectSettings/projectSettings.cjs');
@@ -27,32 +31,26 @@ var updatePrimaryWalletId = require('../../functions/updatePrimaryWalletId/updat
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 var dynamicContextProps = require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
-var useRefreshUser = require('../useRefreshUser/useRefreshUser.cjs');
-var compareChains = require('../../functions/compareChains/compareChains.cjs');
-var user = require('../../../store/state/user/user.cjs');
-var walletOptions = require('../../../store/state/walletOptions/walletOptions.cjs');
-require('../../../context/DynamicContext/DynamicContext.cjs');
-require('../../../store/state/loadingAndLifecycle/loadingAndLifecycle.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('../../../config/ApiEndpoint.cjs');
+var user = require('../../../store/state/user/user.cjs');
 require('../../../locale/locale.cjs');
 require('../../../store/state/authMode/authMode.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 var smartWallet = require('../useWalletConnectors/utils/smartWallet/smartWallet.cjs');
 require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
-var useEmbeddedWalletSessionKeys = require('../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
+var compareChains = require('../../functions/compareChains/compareChains.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');
 require('@dynamic-labs/types');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
+var getNewVerifiedCredentialsFromDiff = require('../../functions/getNewVerifiedCredentialsFromDiff/getNewVerifiedCredentialsFromDiff.cjs');
 require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('yup');
 require('../../../context/MockContext/MockContext.cjs');
@@ -60,6 +58,7 @@ require('../../../views/CollectUserDataView/useFields.cjs');
 require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
+var walletOptions = require('../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../components/Alert/Alert.cjs');
@@ -100,6 +99,8 @@ require('../../../context/OnrampContext/OnrampContext.cjs');
 require('../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
 require('../../../../index.cjs');
 var apiUrl = require('../../constants/waas/apiUrl.cjs');
+var useClientSessionKeys = require('../useClientSessionKeys/useClientSessionKeys.cjs');
+var useRefreshUser = require('../useRefreshUser/useRefreshUser.cjs');
 var constants = require('./constants.cjs');
 require('../../../store/state/tokenBalances.cjs');
 require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
@@ -119,13 +120,13 @@ const useDynamicWaas = () => {
     var _a, _b, _c;
     const { setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
     const { user: user$1 } = user.useUser();
+    const { addedWalletsIds, userWallets } = UserWalletsContext.useInternalUserWallets();
     const apiBaseUrl = dynamicContextProps.useApiBaseUrl();
     const projectSettings$1 = projectSettings.useProjectSettings();
     const environmentId = dynamicContextProps.useEnvironmentId();
     const walletConnectorOptions = walletOptions.useWalletConnectorOptions();
     const refresh = useRefreshUser.useRefreshUser();
     const relayUrl = (_b = (_a = projectSettings$1 === null || projectSettings$1 === void 0 ? void 0 : projectSettings$1.sdk) === null || _a === void 0 ? void 0 : _a.waas) === null || _b === void 0 ? void 0 : _b.relayUrl;
-    const userWallets = UserWalletsContext.useUserWallets();
     const embeddedWalletSettings = projectSettings$1 === null || projectSettings$1 === void 0 ? void 0 : projectSettings$1.sdk.embeddedWallets;
     const enabledChains = (_c = embeddedWalletSettings === null || embeddedWalletSettings === void 0 ? void 0 : embeddedWalletSettings.chainConfigurations) === null || _c === void 0 ? void 0 : _c.filter((c) => c.enabled);
     const primaryChain = enabledChains === null || enabledChains === void 0 ? void 0 : enabledChains.find((chain) => chain.primary);
@@ -135,9 +136,7 @@ const useDynamicWaas = () => {
     const defaultWalletVersion = embeddedWalletSettings === null || embeddedWalletSettings === void 0 ? void 0 : embeddedWalletSettings.defaultWalletVersion;
     const dynamicWaasIsEnabled = defaultWalletVersion === sdkApiCore.EmbeddedWalletVersionEnum.V3;
     const authToken = getMinAuthToken.getMinAuthToken();
-    const { getSignedSessionId } = useEmbeddedWalletSessionKeys.useEmbeddedWalletSessionKeys({
-        environmentId,
-    });
+    const { getSignedSessionId } = useClientSessionKeys.useClientSessionKeys();
     const isCookieAuthEnabled = projectSettings$1 && isCookieEnabled.isCookieEnabled(projectSettings$1);
     const getWalletConnector = React.useCallback((chainName) => {
         var _a;
@@ -174,30 +173,44 @@ const useDynamicWaas = () => {
         if (!(enabledChainNames === null || enabledChainNames === void 0 ? void 0 : enabledChainNames.length)) {
             throw new utils.DynamicError(constants.NO_ENABLED_CHAINS_ERROR);
         }
-        const invalidChains = chainNames === null || chainNames === void 0 ? void 0 : chainNames.filter((chain) => !enabledChainNames.includes(chain));
+        const invalidChains = chainNames.filter((chain) => !enabledChainNames.includes(chain));
         if (invalidChains && invalidChains.length) {
             throw new utils.DynamicError(`${constants.INVALID_CHAINS_ERROR}: ${invalidChains.join(', ')}`);
         }
-        const createdWalletAccounts = yield Promise.all(chainNames === null || chainNames === void 0 ? void 0 : chainNames.map((chain) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const currentVerifiedCredentials = (user$1 === null || user$1 === void 0 ? void 0 : user$1.verifiedCredentials) || [];
+        const results = yield Promise.allSettled(chainNames.map((chain) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
             const walletConnector = getWalletConnector(chain);
             if (!walletConnector)
-                return undefined;
-            const createdWalletAccount = yield walletConnector.createWalletAccount();
-            return Object.assign(Object.assign({}, createdWalletAccount), { chainName: chain });
+                throw new Error('No connector');
+            const account = yield walletConnector.createWalletAccount();
+            return Object.assign(Object.assign({}, account), { chainName: chain });
         })));
+        const failedChains = chainNames.filter((_, i) => results[i].status === 'rejected');
+        if (failedChains.length > 0) {
+            refresh();
+            throw new utils.DynamicError(`${constants.WALLET_CREATION_FAILED_ERROR}: ${failedChains.join(', ')}`);
+        }
+        const createdWalletAccounts = results.map((r) => r.status === 'fulfilled' ? r.value : undefined);
         const primaryWalletAccount = createdWalletAccounts === null || createdWalletAccounts === void 0 ? void 0 : createdWalletAccounts.find((wallet) => (wallet === null || wallet === void 0 ? void 0 : wallet.chainName) === (primaryChain === null || primaryChain === void 0 ? void 0 : primaryChain.name));
         const refreshedUser = yield refresh();
-        if (refreshedUser && primaryWalletAccount) {
-            const createdPrimaryWallet = refreshedUser.verifiedCredentials.find((wallet) => {
-                var _a, _b, _c;
-                return ((_a = wallet.walletName) === null || _a === void 0 ? void 0 : _a.includes(dynamicWaasKey)) &&
-                    ((_b = wallet.address) === null || _b === void 0 ? void 0 : _b.toLowerCase()) ===
-                        ((_c = primaryWalletAccount.accountAddress) === null || _c === void 0 ? void 0 : _c.toLowerCase());
-            });
-            if (createdPrimaryWallet) {
-                const smartWalletAccount = smartWallet.findSmartWallet(createdPrimaryWallet, refreshedUser.verifiedCredentials);
-                const walletIdToUse = (smartWalletAccount === null || smartWalletAccount === void 0 ? void 0 : smartWalletAccount.id) || createdPrimaryWallet.id;
-                updatePrimaryWalletId.updatePrimaryWalletId(walletIdToUse);
+        if (refreshedUser) {
+            // Add new wallet IDs to trigger walletAdded events
+            const newWalletIds = getNewVerifiedCredentialsFromDiff.getNewVerifiedCredentialsFromDiff(currentVerifiedCredentials, refreshedUser.verifiedCredentials)
+                .filter(({ format }) => format === sdkApiCore.JwtVerifiedCredentialFormatEnum.Blockchain)
+                .map(({ id }) => id);
+            addedWalletsIds.current = addedWalletsIds.current.concat(newWalletIds);
+            if (primaryWalletAccount) {
+                const createdPrimaryWallet = refreshedUser.verifiedCredentials.find((wallet) => {
+                    var _a, _b, _c;
+                    return ((_a = wallet.walletName) === null || _a === void 0 ? void 0 : _a.includes(dynamicWaasKey)) &&
+                        ((_b = wallet.address) === null || _b === void 0 ? void 0 : _b.toLowerCase()) ===
+                            ((_c = primaryWalletAccount.accountAddress) === null || _c === void 0 ? void 0 : _c.toLowerCase());
+                });
+                if (createdPrimaryWallet) {
+                    const smartWalletAccount = smartWallet.findSmartWallet(createdPrimaryWallet, refreshedUser.verifiedCredentials);
+                    const walletIdToUse = (smartWalletAccount === null || smartWalletAccount === void 0 ? void 0 : smartWalletAccount.id) || createdPrimaryWallet.id;
+                    updatePrimaryWalletId.updatePrimaryWalletId(walletIdToUse);
+                }
             }
         }
         setShowAuthFlow(false, { performMultiWalletChecks: false }); // close email otp pin modal
@@ -208,6 +221,8 @@ const useDynamicWaas = () => {
         enabledChainNames,
         refresh,
         setShowAuthFlow,
+        user$1 === null || user$1 === void 0 ? void 0 : user$1.verifiedCredentials,
+        addedWalletsIds,
     ]);
     const needsAutoCreateWalletChains = React.useMemo(() => {
         const hasDynamicWaasWalletForChain = (chain) => {

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

@@ -1,5 +1,5 @@
-import { IDynamicWaasConnector } from '@dynamic-labs/wallet-connector-core';
 import { ChainEnum } from '@dynamic-labs/sdk-api-core';
+import { IDynamicWaasConnector } from '@dynamic-labs/wallet-connector-core';
 export declare const configWaasWalletConnector: ({ walletConnector, environmentId, apiBaseUrl, authToken, relayUrl, getSignedSessionId, }: {
     walletConnector: IDynamicWaasConnector;
     environmentId: string;

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

@@ -3,19 +3,23 @@ import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback, useMemo } from 'react';
 import { EmbeddedWalletVersionEnum, JwtVerifiedCredentialFormatEnum, WalletProviderEnum } from '@dynamic-labs/sdk-api-core';
 import { DynamicError } from '@dynamic-labs/utils';
-import { useUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
-import '../../constants/values.js';
-import '@dynamic-labs/multi-wallet';
+import '../../../context/DynamicContext/DynamicContext.js';
+import '../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
 import '../../../shared/logger.js';
-import '../../constants/colors.js';
-import { getMinAuthToken } from '../../functions/getMinAuthToken/getMinAuthToken.js';
-import 'react-international-phone';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
+import '../../constants/colors.js';
+import '../../constants/values.js';
 import '../../../shared/consts/index.js';
+import '../../../events/dynamicEvents.js';
+import '../../../context/CaptchaContext/CaptchaContext.js';
+import '../../../context/ErrorContext/ErrorContext.js';
+import '@dynamic-labs/multi-wallet';
+import { getMinAuthToken } from '../../functions/getMinAuthToken/getMinAuthToken.js';
+import 'react-international-phone';
 import '../../../store/state/nonce/nonce.js';
 import { isCookieEnabled } from '../../functions/isCookieEnabled/isCookieEnabled.js';
 import { useProjectSettings } from '../../../store/state/projectSettings/projectSettings.js';
@@ -23,32 +27,26 @@ import { updatePrimaryWalletId } from '../../functions/updatePrimaryWalletId/upd
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import { useApiBaseUrl, useEnvironmentId } from '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
-import { useRefreshUser } from '../useRefreshUser/useRefreshUser.js';
-import { compareChains } from '../../functions/compareChains/compareChains.js';
-import { useUser } from '../../../store/state/user/user.js';
-import { useWalletConnectorOptions } from '../../../store/state/walletOptions/walletOptions.js';
-import '../../../context/DynamicContext/DynamicContext.js';
-import '../../../store/state/loadingAndLifecycle/loadingAndLifecycle.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 '../../../config/ApiEndpoint.js';
+import { useUser } from '../../../store/state/user/user.js';
 import '../../../locale/locale.js';
 import '../../../store/state/authMode/authMode.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import { findSmartWallet } from '../useWalletConnectors/utils/smartWallet/smartWallet.js';
 import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
-import { useEmbeddedWalletSessionKeys } from '../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js';
 import '../../../context/ThemeContext/ThemeContext.js';
+import { compareChains } from '../../functions/compareChains/compareChains.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';
 import '@dynamic-labs/types';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../context/LoadingContext/LoadingContext.js';
 import '../../../context/WalletContext/WalletContext.js';
+import { getNewVerifiedCredentialsFromDiff } from '../../functions/getNewVerifiedCredentialsFromDiff/getNewVerifiedCredentialsFromDiff.js';
 import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import 'yup';
 import '../../../context/MockContext/MockContext.js';
@@ -56,6 +54,7 @@ import '../../../views/CollectUserDataView/useFields.js';
 import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
+import { useWalletConnectorOptions } from '../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../components/Alert/Alert.js';
@@ -96,7 +95,9 @@ import '../../../context/OnrampContext/OnrampContext.js';
 import '../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../../index.js';
 import { DEFAULT_WAAS_API_URL } from '../../constants/waas/apiUrl.js';
-import { DYNAMIC_WAAS_CONNECTOR_NOT_FOUND_ERROR, NO_ENABLED_CHAINS_ERROR, INVALID_CHAINS_ERROR } from './constants.js';
+import { useClientSessionKeys } from '../useClientSessionKeys/useClientSessionKeys.js';
+import { useRefreshUser } from '../useRefreshUser/useRefreshUser.js';
+import { DYNAMIC_WAAS_CONNECTOR_NOT_FOUND_ERROR, NO_ENABLED_CHAINS_ERROR, INVALID_CHAINS_ERROR, WALLET_CREATION_FAILED_ERROR } from './constants.js';
 import '../../../store/state/tokenBalances.js';
 import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
@@ -115,13 +116,13 @@ const useDynamicWaas = () => {
     var _a, _b, _c;
     const { setShowAuthFlow } = useInternalDynamicContext();
     const { user } = useUser();
+    const { addedWalletsIds, userWallets } = useInternalUserWallets();
     const apiBaseUrl = useApiBaseUrl();
     const projectSettings = useProjectSettings();
     const environmentId = useEnvironmentId();
     const walletConnectorOptions = useWalletConnectorOptions();
     const refresh = useRefreshUser();
     const relayUrl = (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.waas) === null || _b === void 0 ? void 0 : _b.relayUrl;
-    const userWallets = useUserWallets();
     const embeddedWalletSettings = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets;
     const enabledChains = (_c = embeddedWalletSettings === null || embeddedWalletSettings === void 0 ? void 0 : embeddedWalletSettings.chainConfigurations) === null || _c === void 0 ? void 0 : _c.filter((c) => c.enabled);
     const primaryChain = enabledChains === null || enabledChains === void 0 ? void 0 : enabledChains.find((chain) => chain.primary);
@@ -131,9 +132,7 @@ const useDynamicWaas = () => {
     const defaultWalletVersion = embeddedWalletSettings === null || embeddedWalletSettings === void 0 ? void 0 : embeddedWalletSettings.defaultWalletVersion;
     const dynamicWaasIsEnabled = defaultWalletVersion === EmbeddedWalletVersionEnum.V3;
     const authToken = getMinAuthToken();
-    const { getSignedSessionId } = useEmbeddedWalletSessionKeys({
-        environmentId,
-    });
+    const { getSignedSessionId } = useClientSessionKeys();
     const isCookieAuthEnabled = projectSettings && isCookieEnabled(projectSettings);
     const getWalletConnector = useCallback((chainName) => {
         var _a;
@@ -170,30 +169,44 @@ const useDynamicWaas = () => {
         if (!(enabledChainNames === null || enabledChainNames === void 0 ? void 0 : enabledChainNames.length)) {
             throw new DynamicError(NO_ENABLED_CHAINS_ERROR);
         }
-        const invalidChains = chainNames === null || chainNames === void 0 ? void 0 : chainNames.filter((chain) => !enabledChainNames.includes(chain));
+        const invalidChains = chainNames.filter((chain) => !enabledChainNames.includes(chain));
         if (invalidChains && invalidChains.length) {
             throw new DynamicError(`${INVALID_CHAINS_ERROR}: ${invalidChains.join(', ')}`);
         }
-        const createdWalletAccounts = yield Promise.all(chainNames === null || chainNames === void 0 ? void 0 : chainNames.map((chain) => __awaiter(void 0, void 0, void 0, function* () {
+        const currentVerifiedCredentials = (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || [];
+        const results = yield Promise.allSettled(chainNames.map((chain) => __awaiter(void 0, void 0, void 0, function* () {
             const walletConnector = getWalletConnector(chain);
             if (!walletConnector)
-                return undefined;
-            const createdWalletAccount = yield walletConnector.createWalletAccount();
-            return Object.assign(Object.assign({}, createdWalletAccount), { chainName: chain });
+                throw new Error('No connector');
+            const account = yield walletConnector.createWalletAccount();
+            return Object.assign(Object.assign({}, account), { chainName: chain });
         })));
+        const failedChains = chainNames.filter((_, i) => results[i].status === 'rejected');
+        if (failedChains.length > 0) {
+            refresh();
+            throw new DynamicError(`${WALLET_CREATION_FAILED_ERROR}: ${failedChains.join(', ')}`);
+        }
+        const createdWalletAccounts = results.map((r) => r.status === 'fulfilled' ? r.value : undefined);
         const primaryWalletAccount = createdWalletAccounts === null || createdWalletAccounts === void 0 ? void 0 : createdWalletAccounts.find((wallet) => (wallet === null || wallet === void 0 ? void 0 : wallet.chainName) === (primaryChain === null || primaryChain === void 0 ? void 0 : primaryChain.name));
         const refreshedUser = yield refresh();
-        if (refreshedUser && primaryWalletAccount) {
-            const createdPrimaryWallet = refreshedUser.verifiedCredentials.find((wallet) => {
-                var _a, _b, _c;
-                return ((_a = wallet.walletName) === null || _a === void 0 ? void 0 : _a.includes(dynamicWaasKey)) &&
-                    ((_b = wallet.address) === null || _b === void 0 ? void 0 : _b.toLowerCase()) ===
-                        ((_c = primaryWalletAccount.accountAddress) === null || _c === void 0 ? void 0 : _c.toLowerCase());
-            });
-            if (createdPrimaryWallet) {
-                const smartWalletAccount = findSmartWallet(createdPrimaryWallet, refreshedUser.verifiedCredentials);
-                const walletIdToUse = (smartWalletAccount === null || smartWalletAccount === void 0 ? void 0 : smartWalletAccount.id) || createdPrimaryWallet.id;
-                updatePrimaryWalletId(walletIdToUse);
+        if (refreshedUser) {
+            // Add new wallet IDs to trigger walletAdded events
+            const newWalletIds = getNewVerifiedCredentialsFromDiff(currentVerifiedCredentials, refreshedUser.verifiedCredentials)
+                .filter(({ format }) => format === JwtVerifiedCredentialFormatEnum.Blockchain)
+                .map(({ id }) => id);
+            addedWalletsIds.current = addedWalletsIds.current.concat(newWalletIds);
+            if (primaryWalletAccount) {
+                const createdPrimaryWallet = refreshedUser.verifiedCredentials.find((wallet) => {
+                    var _a, _b, _c;
+                    return ((_a = wallet.walletName) === null || _a === void 0 ? void 0 : _a.includes(dynamicWaasKey)) &&
+                        ((_b = wallet.address) === null || _b === void 0 ? void 0 : _b.toLowerCase()) ===
+                            ((_c = primaryWalletAccount.accountAddress) === null || _c === void 0 ? void 0 : _c.toLowerCase());
+                });
+                if (createdPrimaryWallet) {
+                    const smartWalletAccount = findSmartWallet(createdPrimaryWallet, refreshedUser.verifiedCredentials);
+                    const walletIdToUse = (smartWalletAccount === null || smartWalletAccount === void 0 ? void 0 : smartWalletAccount.id) || createdPrimaryWallet.id;
+                    updatePrimaryWalletId(walletIdToUse);
+                }
             }
         }
         setShowAuthFlow(false, { performMultiWalletChecks: false }); // close email otp pin modal
@@ -204,6 +217,8 @@ const useDynamicWaas = () => {
         enabledChainNames,
         refresh,
         setShowAuthFlow,
+        user === null || user === void 0 ? void 0 : user.verifiedCredentials,
+        addedWalletsIds,
     ]);
     const needsAutoCreateWalletChains = useMemo(() => {
         const hasDynamicWaasWalletForChain = (chain) => {

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

@@ -8,7 +8,7 @@ var React = require('react');
 var utils = require('@dynamic-labs/utils');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var localStorage = require('../../constants/localStorage.cjs');
-var utils$1 = require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/utils.cjs');
+var keyService = require('../../functions/keyService/keyService.cjs');
 require('@dynamic-labs/sdk-api-core');
 require('../../../config/ApiEndpoint.cjs');
 require('../../../store/state/projectSettings/projectSettings.cjs');
@@ -85,7 +85,7 @@ const useEmbeddedWalletSessionKeys = ({ environmentId, projectSettings, }) => {
             publicKey = nextPublicKey;
             privateKey = nextPrivateKey;
             privateKeyJwk = nextPrivateKeyJwk;
-            prevSessionKeySignature = yield utils$1.p256Sign(decodedSessionKeys.privateKeyJwk, user$1.sessionId);
+            prevSessionKeySignature = yield keyService.p256Sign(decodedSessionKeys.privateKeyJwk, user$1.sessionId);
             utils.tracing.logEvent('session-key', 'Loaded prevSessionKeySignature', utils.tracing.formatObject({ nextPublicKey, prevSessionKeySignature }));
         }
         let resp;
@@ -116,16 +116,16 @@ const useEmbeddedWalletSessionKeys = ({ environmentId, projectSettings, }) => {
             expirationDate,
             publicKey,
         }));
-        utils.StorageService.setItem(localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS, toEncodedFormat(publicKey, privateKey, privateKeyJwk, true, expirationDate), localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS);
+        utils.StorageService.setItem(localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS, keyService.toEncodedFormat(publicKey, privateKey, privateKeyJwk, true, expirationDate), localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS);
         return { expirationDate, privateKey, publicKey };
     });
     const generateSessionKey = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const { private: privateKey, public: publicKey, privateJwk, } = yield utils$1.p256Keygen();
+        const { private: privateKey, public: publicKey, privateJwk, } = yield keyService.p256Keygen();
         // convert to base64 and store the session keys in session storage
         utils.tracing.logEvent('session-key', 'Generated new session key', utils.tracing.formatObject({
             publicKey,
         }));
-        utils.StorageService.setItem(localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS, toEncodedFormat(publicKey, privateKey, privateJwk, false), localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS);
+        utils.StorageService.setItem(localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS, keyService.toEncodedFormat(publicKey, privateKey, privateJwk, false), localStorage.SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS);
         return { privateKey, privateKeyJwk: privateJwk, publicKey };
     });
     const getSessionPublicKey = () => {
@@ -146,17 +146,6 @@ const useEmbeddedWalletSessionKeys = ({ environmentId, projectSettings, }) => {
     // the user is undefined at this point in the auth flow and we cant check the users wallet version
     // so we just return true for now
     const shouldRegisterSessionKeysOnSignin = () => true;
-    const toEncodedFormat = (publicKey, privateKey, privateKeyJwk, registered, expirationDate) => {
-        const sessionKeys = {
-            expirationDate,
-            privateKey,
-            privateKeyJwk,
-            publicKey,
-            registered,
-        };
-        const sessionKeysString = JSON.stringify(sessionKeys);
-        return Buffer.from(sessionKeysString).toString('base64');
-    };
     const getSignedSessionId = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const sessionId = user$1 === null || user$1 === void 0 ? void 0 : user$1.sessionId;
         if (!sessionId) {
@@ -169,7 +158,7 @@ const useEmbeddedWalletSessionKeys = ({ environmentId, projectSettings, }) => {
         if (!(decodedSessionKeys === null || decodedSessionKeys === void 0 ? void 0 : decodedSessionKeys.privateKeyJwk)) {
             throw new Error('Private key JWK not found');
         }
-        const signedSessionId = yield utils$1.p256Sign(decodedSessionKeys.privateKeyJwk, sessionId);
+        const signedSessionId = yield keyService.p256Sign(decodedSessionKeys.privateKeyJwk, sessionId);
         return signedSessionId;
     });
     const removeSessionKey = React.useCallback(() => {

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

@@ -4,7 +4,7 @@ import { useCallback } from 'react';
 import { tracing, StorageService, InvalidEmbeddedWalletSessionKeyError } from '@dynamic-labs/utils';
 import { logger } from '@dynamic-labs/wallet-connector-core';
 import { SECURE_ENCLAVE_WALLET_SESSION_KEYS, SECURE_ENCLAVE_WALLET_SESSION_KEYS_STORAGE_OPTIONS } from '../../constants/localStorage.js';
-import { p256Sign, p256Keygen } from '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/utils.js';
+import { p256Sign, toEncodedFormat, p256Keygen } from '../../functions/keyService/keyService.js';
 import '@dynamic-labs/sdk-api-core';
 import '../../../config/ApiEndpoint.js';
 import '../../../store/state/projectSettings/projectSettings.js';
@@ -142,17 +142,6 @@ const useEmbeddedWalletSessionKeys = ({ environmentId, projectSettings, }) => {
     // the user is undefined at this point in the auth flow and we cant check the users wallet version
     // so we just return true for now
     const shouldRegisterSessionKeysOnSignin = () => true;
-    const toEncodedFormat = (publicKey, privateKey, privateKeyJwk, registered, expirationDate) => {
-        const sessionKeys = {
-            expirationDate,
-            privateKey,
-            privateKeyJwk,
-            publicKey,
-            registered,
-        };
-        const sessionKeysString = JSON.stringify(sessionKeys);
-        return Buffer.from(sessionKeysString).toString('base64');
-    };
     const getSignedSessionId = () => __awaiter(void 0, void 0, void 0, function* () {
         const sessionId = user === null || user === void 0 ? void 0 : user.sessionId;
         if (!sessionId) {

package/src/lib/utils/hooks/useFundWithWallet/useChooseLinkedWallet/useChooseLinkedWallet.cjs

@@ -102,7 +102,7 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useD
 const useChooseLinkedWallet = () => {
     const { setDynamicWidgetView } = DynamicWidgetContext.useWidgetContext();
     const { setShowDynamicUserProfile } = useInternalDynamicContext.useInternalDynamicContext();
-    const userWallets = UserWalletsContext.useUserWallets();
+    const { userWallets } = UserWalletsContext.useInternalUserWallets();
     const { primaryWallet } = useInternalDynamicContext.useInternalDynamicContext();
     const filteredWallets = React.useMemo(() => userWallets.filter((wallet) => wallet.id !== (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id) &&
         wallet.chain === (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain)), [userWallets, primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain, primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id]);

package/src/lib/utils/hooks/useFundWithWallet/useChooseLinkedWallet/useChooseLinkedWallet.js

@@ -29,7 +29,7 @@ import '../../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
-import { useUserWallets } from '../../../../context/UserWalletsContext/UserWalletsContext.js';
+import { useInternalUserWallets } from '../../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../../events/dynamicEvents.js';
 import '../../../../store/state/authMode/authMode.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
@@ -98,7 +98,7 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
 const useChooseLinkedWallet = () => {
     const { setDynamicWidgetView } = useWidgetContext();
     const { setShowDynamicUserProfile } = useInternalDynamicContext();
-    const userWallets = useUserWallets();
+    const { userWallets } = useInternalUserWallets();
     const { primaryWallet } = useInternalDynamicContext();
     const filteredWallets = useMemo(() => userWallets.filter((wallet) => wallet.id !== (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id) &&
         wallet.chain === (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain)), [userWallets, primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain, primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id]);

package/src/lib/utils/hooks/useFundWithWallet/useConnectWalletForFunding/useConnectWalletForFunding.cjs

@@ -107,7 +107,7 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useD
 const useConnectWalletForFunding = () => {
     const { primaryWallet, setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
     const { clearStackAndPush } = ViewContext.useViewContext();
-    const userWallets = UserWalletsContext.useUserWallets();
+    const { userWallets } = UserWalletsContext.useInternalUserWallets();
     const initiatedByWidgetRef = React.useRef(false);
     const { walletOptions: walletOptions$1 } = useWalletOptions.useWalletOptions();
     const internalConnectionPromiseRef = React.useRef(null);

package/src/lib/utils/hooks/useFundWithWallet/useConnectWalletForFunding/useConnectWalletForFunding.js

@@ -29,7 +29,7 @@ import '../../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
-import { useUserWallets } from '../../../../context/UserWalletsContext/UserWalletsContext.js';
+import { useInternalUserWallets } from '../../../../context/UserWalletsContext/UserWalletsContext.js';
 import { dynamicEvents } from '../../../../events/dynamicEvents.js';
 import '../../../../store/state/authMode/authMode.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
@@ -103,7 +103,7 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
 const useConnectWalletForFunding = () => {
     const { primaryWallet, setShowAuthFlow } = useInternalDynamicContext();
     const { clearStackAndPush } = useViewContext();
-    const userWallets = useUserWallets();
+    const { userWallets } = useInternalUserWallets();
     const initiatedByWidgetRef = useRef(false);
     const { walletOptions } = useWalletOptions();
     const internalConnectionPromiseRef = useRef(null);

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

@@ -32,6 +32,7 @@ require('../../../locale/locale.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
+var usingV3Wallets = require('../../functions/usingV3Wallets/usingV3Wallets.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -42,7 +43,6 @@ require('../../functions/compareChains/compareChains.cjs');
 require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 var useSmartWallets = require('../useSmartWallets/useSmartWallets.cjs');
-var usingV3Wallets = require('../../functions/usingV3Wallets/usingV3Wallets.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');
 require('@dynamic-labs/types');

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

@@ -28,6 +28,7 @@ import '../../../locale/locale.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
+import { usingV3Wallets } from '../../functions/usingV3Wallets/usingV3Wallets.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -38,7 +39,6 @@ import '../../functions/compareChains/compareChains.js';
 import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import { useSmartWallets } from '../useSmartWallets/useSmartWallets.js';
-import { usingV3Wallets } from '../../functions/usingV3Wallets/usingV3Wallets.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';
 import '@dynamic-labs/types';

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

@@ -99,11 +99,13 @@ var useDynamicWaas = require('../useDynamicWaas/useDynamicWaas.cjs');
 var apiUrl = require('../../constants/waas/apiUrl.cjs');
 require('../../../store/state/tokenBalances.cjs');
 require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
+var useClientSessionKeys = require('../useClientSessionKeys/useClientSessionKeys.cjs');
 
 const useSetWalletConnectorFetchers = (walletOptions, environmentId, projectSettings) => {
     const apiBaseUrl = dynamicContextProps.useApiBaseUrl();
     const authToken = getMinAuthToken.getMinAuthToken();
-    const { registerEmbeddedWalletSessionKey, removeSessionKey, getSignedSessionId, } = useEmbeddedWalletSessionKeys.useEmbeddedWalletSessionKeys({ environmentId, projectSettings });
+    const { registerEmbeddedWalletSessionKey, removeSessionKey } = useEmbeddedWalletSessionKeys.useEmbeddedWalletSessionKeys({ environmentId, projectSettings });
+    const { getSignedSessionId } = useClientSessionKeys.useClientSessionKeys();
     if (!(walletOptions === null || walletOptions === void 0 ? void 0 : walletOptions.length))
         return;
     walletOptions.forEach((walletOption) => {

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

@@ -95,11 +95,13 @@ import { configWaasWalletConnector } from '../useDynamicWaas/useDynamicWaas.js';
 import { DEFAULT_WAAS_API_URL } from '../../constants/waas/apiUrl.js';
 import '../../../store/state/tokenBalances.js';
 import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
+import { useClientSessionKeys } from '../useClientSessionKeys/useClientSessionKeys.js';
 
 const useSetWalletConnectorFetchers = (walletOptions, environmentId, projectSettings) => {
     const apiBaseUrl = useApiBaseUrl();
     const authToken = getMinAuthToken();
-    const { registerEmbeddedWalletSessionKey, removeSessionKey, getSignedSessionId, } = useEmbeddedWalletSessionKeys({ environmentId, projectSettings });
+    const { registerEmbeddedWalletSessionKey, removeSessionKey } = useEmbeddedWalletSessionKeys({ environmentId, projectSettings });
+    const { getSignedSessionId } = useClientSessionKeys();
     if (!(walletOptions === null || walletOptions === void 0 ? void 0 : walletOptions.length))
         return;
     walletOptions.forEach((walletOption) => {

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

@@ -126,7 +126,7 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 const useSwitchWallet = () => {
     const { setPrimaryWallet, user, primaryWallet } = useInternalDynamicContext.useInternalDynamicContext();
     const { getEOAWallet } = useSmartWallets.useSmartWallets();
-    const userWallets = UserWalletsContext.useUserWallets();
+    const { userWallets } = UserWalletsContext.useInternalUserWallets();
     return React.useCallback((walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _a, _b, _c;
         const wallet = userWallets.find((wallet) => wallet.id === walletId);