@dynamic-labs/sdk-react-core 4.12.2-preview.0 → 4.12.3

package/src/lib/utils/functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.d.ts

@@ -1,2 +1,9 @@
 import { UserProfile } from '../../../..';
+/**
+ * Finds the first embedded wallet from the verified credentials for the given chains.
+ * If the user doesn't have embedded wallet for the chain, it will return the first embedded wallet for other chains.
+ * @param user - The user profile.
+ * @param chains - The chains to check for embedded wallets.
+ * @returns The first embedded wallet from the verified credentials for the given chains.
+ */
 export declare const findEmbeddedWalletFromVerifiedCredentials: (user: UserProfile, chains?: string[]) => import("@dynamic-labs/sdk-api-core").JwtVerifiedCredential | undefined;

package/src/lib/utils/functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js

@@ -2,13 +2,21 @@
 import { WalletProviderEnum } from '@dynamic-labs/sdk-api-core';
 import { VerifiedCredentialNameToChainEnum } from '../../constants/values.js';
 
+/**
+ * Finds the first embedded wallet from the verified credentials for the given chains.
+ * If the user doesn't have embedded wallet for the chain, it will return the first embedded wallet for other chains.
+ * @param user - The user profile.
+ * @param chains - The chains to check for embedded wallets.
+ * @returns The first embedded wallet from the verified credentials for the given chains.
+ */
 const findEmbeddedWalletFromVerifiedCredentials = (user, chains) => {
     var _a;
     const verifiedCredentials = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.filter(({ walletProvider }) => walletProvider === WalletProviderEnum.EmbeddedWallet);
+    let firstVerifiedCredential;
     if ((verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.length) && (chains === null || chains === void 0 ? void 0 : chains.length)) {
-        return verifiedCredentials.find(({ chain }) => chain && chains.includes(VerifiedCredentialNameToChainEnum[chain]));
+        firstVerifiedCredential = verifiedCredentials.find(({ chain }) => chain && chains.includes(VerifiedCredentialNameToChainEnum[chain]));
     }
-    return verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.shift();
+    return firstVerifiedCredential || (verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.shift());
 };
 
 export { findEmbeddedWalletFromVerifiedCredentials };

package/src/lib/utils/functions/updatePrimaryWalletId/updatePrimaryWalletId.cjs

@@ -32,6 +32,26 @@ const updatePrimaryWalletId = (walletId) => _tslib.__awaiter(void 0, void 0, voi
     const user$1 = user.getUser();
     if (user$1) {
         const environmentId = dynamicContextProps.getEnvironmentId();
+        // Get the last selected wallet for this user
+        const lastSelectedWalletCredential = user$1.verifiedCredentials.reduce((mostRecentSelectedCredential, credentialToCheck) => {
+            if (credentialToCheck.format !== 'blockchain' ||
+                !credentialToCheck.lastSelectedAt) {
+                return mostRecentSelectedCredential;
+            }
+            if (!mostRecentSelectedCredential ||
+                !mostRecentSelectedCredential.lastSelectedAt) {
+                return credentialToCheck;
+            }
+            return credentialToCheck.lastSelectedAt >
+                mostRecentSelectedCredential.lastSelectedAt
+                ? credentialToCheck
+                : mostRecentSelectedCredential;
+        }, null);
+        // No need to select the primary if it's already the last selected wallet
+        if (lastSelectedWalletCredential &&
+            lastSelectedWalletCredential.id === walletId) {
+            return;
+        }
         yield wallets.storeSelectedWallet({ environmentId, walletId });
     }
 });

package/src/lib/utils/functions/updatePrimaryWalletId/updatePrimaryWalletId.js

@@ -28,6 +28,26 @@ const updatePrimaryWalletId = (walletId) => __awaiter(void 0, void 0, void 0, fu
     const user = getUser();
     if (user) {
         const environmentId = getEnvironmentId();
+        // Get the last selected wallet for this user
+        const lastSelectedWalletCredential = user.verifiedCredentials.reduce((mostRecentSelectedCredential, credentialToCheck) => {
+            if (credentialToCheck.format !== 'blockchain' ||
+                !credentialToCheck.lastSelectedAt) {
+                return mostRecentSelectedCredential;
+            }
+            if (!mostRecentSelectedCredential ||
+                !mostRecentSelectedCredential.lastSelectedAt) {
+                return credentialToCheck;
+            }
+            return credentialToCheck.lastSelectedAt >
+                mostRecentSelectedCredential.lastSelectedAt
+                ? credentialToCheck
+                : mostRecentSelectedCredential;
+        }, null);
+        // No need to select the primary if it's already the last selected wallet
+        if (lastSelectedWalletCredential &&
+            lastSelectedWalletCredential.id === walletId) {
+            return;
+        }
         yield storeSelectedWallet({ environmentId, walletId });
     }
 });

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs

@@ -41,6 +41,7 @@ var unsetInitialWalletVerificationFlag = require('./unsetInitialWalletVerificati
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../functions/compareChains/compareChains.cjs');
+require('../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js

@@ -37,6 +37,7 @@ import { unsetInitialWalletVerificationFlag } from './unsetInitialWalletVerifica
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../functions/compareChains/compareChains.js';
+import '../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.cjs

@@ -40,6 +40,7 @@ var isConnectOnly = require('../helpers/isConnectOnly.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../functions/compareChains/compareChains.cjs');
+require('../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.js

@@ -36,6 +36,7 @@ import { isConnectOnly } from '../helpers/isConnectOnly.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../functions/compareChains/compareChains.js';
+import '../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';

package/src/lib/utils/hooks/authenticationHooks/useOtpVerificationRequest/useOtpVerificationRequest.cjs

@@ -42,6 +42,7 @@ require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs')
 var VerificationContext = require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../functions/compareChains/compareChains.cjs');
+require('../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 var useHandleVerificationRequired = require('../../useHandleVerificationRequired/useHandleVerificationRequired.cjs');
 require('bs58');

package/src/lib/utils/hooks/authenticationHooks/useOtpVerificationRequest/useOtpVerificationRequest.js

@@ -38,6 +38,7 @@ import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import { useVerification } from '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../functions/compareChains/compareChains.js';
+import '../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import { useHandleVerificationRequired } from '../../useHandleVerificationRequired/useHandleVerificationRequired.js';
 import 'bs58';

package/src/lib/utils/hooks/authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.cjs

@@ -34,6 +34,7 @@ var useVerifyWallet = require('../../useVerifyWallet/useVerifyWallet.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../functions/compareChains/compareChains.cjs');
+require('../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');

package/src/lib/utils/hooks/authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.js

@@ -30,6 +30,7 @@ import { useVerifyWallet } from '../../useVerifyWallet/useVerifyWallet.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../functions/compareChains/compareChains.js';
+import '../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';

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

@@ -40,6 +40,7 @@ require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../functions/compareChains/compareChains.cjs');
+require('../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');

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

@@ -36,6 +36,7 @@ import '../../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../functions/compareChains/compareChains.js';
+import '../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';

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

@@ -37,6 +37,7 @@ require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../functions/compareChains/compareChains.cjs');
+require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');

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

@@ -33,6 +33,7 @@ import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../functions/compareChains/compareChains.js';
+import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';

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

@@ -38,6 +38,7 @@ var useSignConnectOnlyUser = require('../authenticationHooks/useSignConnectOnlyU
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../functions/compareChains/compareChains.cjs');
+require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');

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

@@ -34,6 +34,7 @@ import { useSignConnectOnlyUser } from '../authenticationHooks/useSignConnectOnl
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../functions/compareChains/compareChains.js';
+import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';

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

@@ -40,6 +40,7 @@ require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../functions/compareChains/compareChains.cjs');
+require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 var useIsLoggedIn = require('../useIsLoggedIn/useIsLoggedIn.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');

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

@@ -36,6 +36,7 @@ import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../functions/compareChains/compareChains.js';
+import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import { useIsLoggedIn } from '../useIsLoggedIn/useIsLoggedIn.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';

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

@@ -38,6 +38,7 @@ require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../functions/compareChains/compareChains.cjs');
+require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');

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

@@ -34,6 +34,7 @@ import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../functions/compareChains/compareChains.js';
+import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';

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

@@ -39,6 +39,7 @@ require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../functions/compareChains/compareChains.cjs');
+require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');

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

@@ -35,6 +35,7 @@ import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../functions/compareChains/compareChains.js';
+import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';

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

@@ -38,6 +38,7 @@ require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../functions/compareChains/compareChains.cjs');
+require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 var useIsLoggedIn = require('../useIsLoggedIn/useIsLoggedIn.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');

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

@@ -34,6 +34,7 @@ import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../functions/compareChains/compareChains.js';
+import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import { useIsLoggedIn } from '../useIsLoggedIn/useIsLoggedIn.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';

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

@@ -37,6 +37,7 @@ require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../functions/compareChains/compareChains.cjs');
+require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');

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

@@ -33,6 +33,7 @@ import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../functions/compareChains/compareChains.js';
+import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';

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

@@ -40,8 +40,10 @@ require('../../../locale/locale.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
-require('../../functions/compareChains/compareChains.cjs');
+var smartWallet = require('../useWalletConnectors/utils/smartWallet/smartWallet.cjs');
+require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
+require('../../functions/compareChains/compareChains.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');
 require('@dynamic-labs/types');
@@ -168,14 +170,18 @@ const useDynamicWaas = () => {
         })));
         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();
-        const createdPrimaryWallet = refreshedUser === null || refreshedUser === void 0 ? void 0 : 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 === null || primaryWalletAccount === void 0 ? void 0 : primaryWalletAccount.accountAddress) === null || _c === void 0 ? void 0 : _c.toLowerCase());
-        });
-        if (createdPrimaryWallet) {
-            updatePrimaryWalletId.updatePrimaryWalletId(createdPrimaryWallet.id);
+        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);
+            }
         }
         setShowAuthFlow(false, { performMultiWalletChecks: false }); // close email otp pin modal
         return createdWalletAccounts;

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

@@ -36,8 +36,10 @@ import '../../../locale/locale.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
-import '../../functions/compareChains/compareChains.js';
+import { findSmartWallet } from '../useWalletConnectors/utils/smartWallet/smartWallet.js';
+import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../context/ThemeContext/ThemeContext.js';
+import '../../functions/compareChains/compareChains.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';
 import '@dynamic-labs/types';
@@ -164,14 +166,18 @@ const useDynamicWaas = () => {
         })));
         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();
-        const createdPrimaryWallet = refreshedUser === null || refreshedUser === void 0 ? void 0 : 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 === null || primaryWalletAccount === void 0 ? void 0 : primaryWalletAccount.accountAddress) === null || _c === void 0 ? void 0 : _c.toLowerCase());
-        });
-        if (createdPrimaryWallet) {
-            updatePrimaryWalletId(createdPrimaryWallet.id);
+        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);
+            }
         }
         setShowAuthFlow(false, { performMultiWalletChecks: false }); // close email otp pin modal
         return createdWalletAccounts;

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

@@ -38,6 +38,7 @@ require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 var findEmailOtpWalletConnector = require('../../../views/Passkey/utils/findEmailOtpWalletConnector/findEmailOtpWalletConnector.cjs');
 require('../../functions/compareChains/compareChains.cjs');
+require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');

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

@@ -34,6 +34,7 @@ import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import { findEmailOtpWalletConnector } from '../../../views/Passkey/utils/findEmailOtpWalletConnector/findEmailOtpWalletConnector.js';
 import '../../functions/compareChains/compareChains.js';
+import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';

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

@@ -39,6 +39,7 @@ require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../functions/compareChains/compareChains.cjs');
+require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 var useIsTurnkeyWallet = require('../useIsTurnkeyWallet/useIsTurnkeyWallet.cjs');

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

@@ -35,6 +35,7 @@ import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../functions/compareChains/compareChains.js';
+import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import { useIsTurnkeyWallet } from '../useIsTurnkeyWallet/useIsTurnkeyWallet.js';

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

@@ -38,6 +38,7 @@ require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../functions/compareChains/compareChains.cjs');
+require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');

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

@@ -34,6 +34,7 @@ import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../functions/compareChains/compareChains.js';
+import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';

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

@@ -39,6 +39,7 @@ require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../functions/compareChains/compareChains.cjs');
+require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 var useEmbeddedWalletSessionKeys = require('../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');

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

@@ -35,6 +35,7 @@ import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../functions/compareChains/compareChains.js';
+import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import { useEmbeddedWalletSessionKeys } from '../useEmbeddedWalletSessionKeys/useEmbeddedWalletSessionKeys.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';

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

@@ -38,6 +38,7 @@ require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs')
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../functions/compareChains/compareChains.cjs');
+require('../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');

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

@@ -34,6 +34,7 @@ import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../functions/compareChains/compareChains.js';
+import '../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';

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

@@ -38,6 +38,7 @@ require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs')
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../functions/compareChains/compareChains.cjs');
+require('../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');

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

@@ -34,6 +34,7 @@ import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../functions/compareChains/compareChains.js';
+import '../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';

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

@@ -37,6 +37,7 @@ require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs')
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../functions/compareChains/compareChains.cjs');
+require('../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');

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

@@ -33,6 +33,7 @@ import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../functions/compareChains/compareChains.js';
+import '../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';

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

@@ -37,6 +37,7 @@ require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../functions/compareChains/compareChains.cjs');
+require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');

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

@@ -33,6 +33,7 @@ import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../functions/compareChains/compareChains.js';
+import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';

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

@@ -38,6 +38,7 @@ require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs')
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../functions/compareChains/compareChains.cjs');
+require('../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');

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

@@ -34,6 +34,7 @@ import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../functions/compareChains/compareChains.js';
+import '../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';

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

@@ -37,6 +37,7 @@ require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../functions/compareChains/compareChains.cjs');
+require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('bs58');

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

@@ -33,6 +33,7 @@ import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../functions/compareChains/compareChains.js';
+import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import 'bs58';