@dynamic-labs/sdk-react-core 3.0.0-alpha.42 → 3.0.0-alpha.44

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

@@ -3,11 +3,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('../../../shared/utils/functions/lastAuthenticatedAccount/index.cjs');
-
 const createUserProfileFromSdkUser = (user) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
-    const wallet = index.lastAuthenticatedAccount(user);
     const kyc = {
         alias: (_a = user.alias) !== null && _a !== void 0 ? _a : undefined,
         btcWallet: (_b = user.btcWallet) !== null && _b !== void 0 ? _b : undefined,
@@ -30,7 +27,7 @@ const createUserProfileFromSdkUser = (user) => {
         team: (_u = user.team) !== null && _u !== void 0 ? _u : undefined,
         username: (_v = user.username) !== null && _v !== void 0 ? _v : undefined,
     };
-    const userProfile = Object.assign({ chain: wallet === null || wallet === void 0 ? void 0 : wallet.chain, ens: wallet === null || wallet === void 0 ? void 0 : wallet.nameService, environmentId: user.projectEnvironmentId, isAuthenticatedWithAWallet: (wallet === null || wallet === void 0 ? void 0 : wallet.format) === 'blockchain', lastVerifiedCredentialId: (_w = user.lastVerifiedCredentialId) !== null && _w !== void 0 ? _w : undefined, lists: user.lists, metadata: user.metadata, mfaBackupCodeAcknowledgement: user.mfaBackupCodeAcknowledgement, missingFields: user.missingFields, newUser: user.newUser, scope: user.scope, sessionId: (_x = user.sessionId) !== null && _x !== void 0 ? _x : 'missing-sessionId', userId: user.id, verifiedCredentials: user.verifiedCredentials || [], wallet: wallet === null || wallet === void 0 ? void 0 : wallet.walletName }, kyc);
+    const userProfile = Object.assign({ environmentId: user.projectEnvironmentId, lastVerifiedCredentialId: (_w = user.lastVerifiedCredentialId) !== null && _w !== void 0 ? _w : undefined, lists: user.lists, metadata: user.metadata, mfaBackupCodeAcknowledgement: user.mfaBackupCodeAcknowledgement, missingFields: user.missingFields, newUser: user.newUser, scope: user.scope, sessionId: (_x = user.sessionId) !== null && _x !== void 0 ? _x : 'missing-sessionId', userId: user.id, verifiedCredentials: user.verifiedCredentials || [] }, kyc);
     return userProfile;
 };
 

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

@@ -1,9 +1,6 @@
 'use client'
-import { lastAuthenticatedAccount } from '../../../shared/utils/functions/lastAuthenticatedAccount/index.js';
-
 const createUserProfileFromSdkUser = (user) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
-    const wallet = lastAuthenticatedAccount(user);
     const kyc = {
         alias: (_a = user.alias) !== null && _a !== void 0 ? _a : undefined,
         btcWallet: (_b = user.btcWallet) !== null && _b !== void 0 ? _b : undefined,
@@ -26,7 +23,7 @@ const createUserProfileFromSdkUser = (user) => {
         team: (_u = user.team) !== null && _u !== void 0 ? _u : undefined,
         username: (_v = user.username) !== null && _v !== void 0 ? _v : undefined,
     };
-    const userProfile = Object.assign({ chain: wallet === null || wallet === void 0 ? void 0 : wallet.chain, ens: wallet === null || wallet === void 0 ? void 0 : wallet.nameService, environmentId: user.projectEnvironmentId, isAuthenticatedWithAWallet: (wallet === null || wallet === void 0 ? void 0 : wallet.format) === 'blockchain', lastVerifiedCredentialId: (_w = user.lastVerifiedCredentialId) !== null && _w !== void 0 ? _w : undefined, lists: user.lists, metadata: user.metadata, mfaBackupCodeAcknowledgement: user.mfaBackupCodeAcknowledgement, missingFields: user.missingFields, newUser: user.newUser, scope: user.scope, sessionId: (_x = user.sessionId) !== null && _x !== void 0 ? _x : 'missing-sessionId', userId: user.id, verifiedCredentials: user.verifiedCredentials || [], wallet: wallet === null || wallet === void 0 ? void 0 : wallet.walletName }, kyc);
+    const userProfile = Object.assign({ environmentId: user.projectEnvironmentId, lastVerifiedCredentialId: (_w = user.lastVerifiedCredentialId) !== null && _w !== void 0 ? _w : undefined, lists: user.lists, metadata: user.metadata, mfaBackupCodeAcknowledgement: user.mfaBackupCodeAcknowledgement, missingFields: user.missingFields, newUser: user.newUser, scope: user.scope, sessionId: (_x = user.sessionId) !== null && _x !== void 0 ? _x : 'missing-sessionId', userId: user.id, verifiedCredentials: user.verifiedCredentials || [] }, kyc);
     return userProfile;
 };
 

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

@@ -82,3 +82,4 @@ export * from './logVerboseTroubleshootingMessage';
 export * from './getPlatformForConnector';
 export * from './isValidMfaRecoveryCode';
 export * from './fiatUtils';
+export * from './isAuthenticatedWithAWallet';

package/src/lib/utils/functions/isAuthenticatedWithAWallet/index.d.ts

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

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

@@ -0,0 +1,14 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var sdkApiCore = require('@dynamic-labs/sdk-api-core');
+
+const isAuthenticatedWithAWallet = (user) => {
+    const lastVerifiedCredential = user.verifiedCredentials.find((vc) => vc.id === user.lastVerifiedCredentialId);
+    return ((lastVerifiedCredential === null || lastVerifiedCredential === void 0 ? void 0 : lastVerifiedCredential.format) ===
+        sdkApiCore.JwtVerifiedCredentialFormatEnum.Blockchain);
+};
+
+exports.isAuthenticatedWithAWallet = isAuthenticatedWithAWallet;

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

@@ -0,0 +1,2 @@
+import { UserProfile } from '@dynamic-labs/types';
+export declare const isAuthenticatedWithAWallet: (user: UserProfile) => boolean;

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

@@ -0,0 +1,10 @@
+'use client'
+import { JwtVerifiedCredentialFormatEnum } from '@dynamic-labs/sdk-api-core';
+
+const isAuthenticatedWithAWallet = (user) => {
+    const lastVerifiedCredential = user.verifiedCredentials.find((vc) => vc.id === user.lastVerifiedCredentialId);
+    return ((lastVerifiedCredential === null || lastVerifiedCredential === void 0 ? void 0 : lastVerifiedCredential.format) ===
+        JwtVerifiedCredentialFormatEnum.Blockchain);
+};
+
+export { isAuthenticatedWithAWallet };

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

@@ -1,2 +1,2 @@
 import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
-export declare const isMultiAssetSupportedNetwork: (walletConnector: WalletConnector | null, network: string | number | undefined) => boolean;
+export declare const isMultiAssetSupportedNetwork: (walletConnector: WalletConnector | undefined, network: string | number | undefined) => boolean;

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

@@ -165,6 +165,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 connector: walletConnector,
                 id: storedConnectedWalletInfo.id,
                 isAuthenticated: false,
+                isPrimary: primaryWalletId === storedConnectedWalletInfo.id,
                 key: walletConnector.key,
                 network: walletNetwork,
             });
@@ -176,6 +177,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         disconnectWallet,
         setConnectedWallets,
         walletConnectorOptions,
+        primaryWalletId,
     ]);
     // Generate the connectedWallets list when connectedWalletsInfo (localStorage) or memoized wallet connector updates
     React.useEffect(() => {

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

@@ -161,6 +161,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 connector: walletConnector,
                 id: storedConnectedWalletInfo.id,
                 isAuthenticated: false,
+                isPrimary: primaryWalletId === storedConnectedWalletInfo.id,
                 key: walletConnector.key,
                 network: walletNetwork,
             });
@@ -172,6 +173,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         disconnectWallet,
         setConnectedWallets,
         walletConnectorOptions,
+        primaryWalletId,
     ]);
     // Generate the connectedWallets list when connectedWalletsInfo (localStorage) or memoized wallet connector updates
     useEffect(() => {

package/src/lib/utils/hooks/useEmbeddedWallet/useMPCEmbeddedWallet/useCoinbaseMPC/useCoinbaseMPC.cjs

@@ -112,6 +112,7 @@ const useCoinbaseMPC = () => {
             connector,
             id: embeddedWalletVerifiedCredential.id,
             isAuthenticated: true,
+            isPrimary: true,
             key: (_a = embeddedWalletVerifiedCredential.walletName) !== null && _a !== void 0 ? _a : connector.key,
         });
         return coinbaseMPCWallet;
@@ -178,6 +179,7 @@ const useCoinbaseMPC = () => {
                 connector,
                 id: newSelectedCredentialWallet.id,
                 isAuthenticated: true,
+                isPrimary: true,
                 key: (_c = newSelectedCredentialWallet.walletName) !== null && _c !== void 0 ? _c : connector.key,
             });
             dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, newSelectedCredentialWallet, updatedUser);

package/src/lib/utils/hooks/useEmbeddedWallet/useMPCEmbeddedWallet/useCoinbaseMPC/useCoinbaseMPC.js

@@ -108,6 +108,7 @@ const useCoinbaseMPC = () => {
             connector,
             id: embeddedWalletVerifiedCredential.id,
             isAuthenticated: true,
+            isPrimary: true,
             key: (_a = embeddedWalletVerifiedCredential.walletName) !== null && _a !== void 0 ? _a : connector.key,
         });
         return coinbaseMPCWallet;
@@ -174,6 +175,7 @@ const useCoinbaseMPC = () => {
                 connector,
                 id: newSelectedCredentialWallet.id,
                 isAuthenticated: true,
+                isPrimary: true,
                 key: (_c = newSelectedCredentialWallet.walletName) !== null && _c !== void 0 ? _c : connector.key,
             });
             dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, newSelectedCredentialWallet, updatedUser);

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.cjs

@@ -126,12 +126,13 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useD
  */
 const useSecureEnclaveEmbeddedWallet = () => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-    const { projectSettings, primaryWallet, user: user$1, environmentId, walletConnectorOptions, walletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { projectSettings, primaryWallet, user: user$1, environmentId, walletConnectorOptions, } = useInternalDynamicContext.useInternalDynamicContext();
     const { createTurnkeyWallet } = useTurnkey.useTurnkey();
     const { hasRecoveryEmail } = useIsTurnkeyWallet.useIsTurnkeyWallet();
     const { createRootElement } = useElementById.useElementById();
     const { isLoadingEmbeddedWallet, setIsLoadingEmbeddedWallet } = WalletContext.useWalletContext();
     const wallet = getEOAWallet.getEOAWallet(primaryWallet, (user$1 === null || user$1 === void 0 ? void 0 : user$1.verifiedCredentials) || []);
+    const primaryConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
     const userHasEmbeddedWallet = React.useCallback(() => hasEmbeddedWallet.hasEmbeddedWallet(user$1, 'turnkey'), [user$1]);
     const getWalletVersion = () => {
         if (walletConnectorCore.isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
@@ -347,9 +348,9 @@ const useSecureEnclaveEmbeddedWallet = () => {
     const isSessionKeySessionAAActive = ((_e = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _e === void 0 ? void 0 : _e.key) === 'zerodev' &&
         walletConnectorCore.isSessionKeyCompatibleWalletConnector((wallet === null || wallet === void 0 ? void 0 : wallet.connector).getEOAConnector()) &&
         ((_h = (_g = (_f = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _f === void 0 ? void 0 : _f.getEOAConnector()) === null || _g === void 0 ? void 0 : _g.sessionKeys) === null || _h === void 0 ? void 0 : _h.publicKey);
-    const isSessionKeySessionActive = (_k = Boolean(walletConnector &&
-        walletConnectorCore.isSessionKeyCompatibleWalletConnector(walletConnector) &&
-        ((_j = walletConnector.sessionKeys) === null || _j === void 0 ? void 0 : _j.publicKey))) !== null && _k !== void 0 ? _k : false;
+    const isSessionKeySessionActive = (_k = Boolean(primaryConnector &&
+        walletConnectorCore.isSessionKeyCompatibleWalletConnector(primaryConnector) &&
+        ((_j = primaryConnector.sessionKeys) === null || _j === void 0 ? void 0 : _j.publicKey))) !== null && _k !== void 0 ? _k : false;
     /**
      * Checks if the embedded wallet session is active
      * @returns boolean

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.js

@@ -122,12 +122,13 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
  */
 const useSecureEnclaveEmbeddedWallet = () => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-    const { projectSettings, primaryWallet, user, environmentId, walletConnectorOptions, walletConnector, } = useInternalDynamicContext();
+    const { projectSettings, primaryWallet, user, environmentId, walletConnectorOptions, } = useInternalDynamicContext();
     const { createTurnkeyWallet } = useTurnkey();
     const { hasRecoveryEmail } = useIsTurnkeyWallet();
     const { createRootElement } = useElementById();
     const { isLoadingEmbeddedWallet, setIsLoadingEmbeddedWallet } = useWalletContext();
     const wallet = getEOAWallet(primaryWallet, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
+    const primaryConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
     const userHasEmbeddedWallet = useCallback(() => hasEmbeddedWallet(user, 'turnkey'), [user]);
     const getWalletVersion = () => {
         if (isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
@@ -343,9 +344,9 @@ const useSecureEnclaveEmbeddedWallet = () => {
     const isSessionKeySessionAAActive = ((_e = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _e === void 0 ? void 0 : _e.key) === 'zerodev' &&
         isSessionKeyCompatibleWalletConnector((wallet === null || wallet === void 0 ? void 0 : wallet.connector).getEOAConnector()) &&
         ((_h = (_g = (_f = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _f === void 0 ? void 0 : _f.getEOAConnector()) === null || _g === void 0 ? void 0 : _g.sessionKeys) === null || _h === void 0 ? void 0 : _h.publicKey);
-    const isSessionKeySessionActive = (_k = Boolean(walletConnector &&
-        isSessionKeyCompatibleWalletConnector(walletConnector) &&
-        ((_j = walletConnector.sessionKeys) === null || _j === void 0 ? void 0 : _j.publicKey))) !== null && _k !== void 0 ? _k : false;
+    const isSessionKeySessionActive = (_k = Boolean(primaryConnector &&
+        isSessionKeyCompatibleWalletConnector(primaryConnector) &&
+        ((_j = primaryConnector.sessionKeys) === null || _j === void 0 ? void 0 : _j.publicKey))) !== null && _k !== void 0 ? _k : false;
     /**
      * Checks if the embedded wallet session is active
      * @returns boolean

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useTurnkey/useTurnkey.cjs

@@ -100,8 +100,9 @@ var useInternalDynamicContext = require('../../../../../context/DynamicContext/u
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useTurnkey = () => {
-    const { projectSettings, setPrimaryWalletId, walletConnectorOptions, walletConnector, setShowAuthFlow, environmentId, user, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { projectSettings, setPrimaryWalletId, walletConnectorOptions, setShowAuthFlow, environmentId, user, primaryWallet, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
+    const walletConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
     const { createDynamicEmbeddedWalletMutation } = useCreateDynamicEmbeddedWalletMutation.useCreateDynamicEmbeddedWalletMutation();
     const startHeadlessEmbeddedWalletCreationFlow = React.useCallback((chains, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         yield createDynamicEmbeddedWalletMutation({
@@ -147,6 +148,7 @@ const useTurnkey = () => {
         var _a, _b, _c, _d;
         const { chain } = embeddedWalletVerifiedCredential;
         const turnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByChain(walletConnectorOptions, chain);
+        let newPrimaryWalletId = null;
         // if user already has embedded wallet, set it as primary wallet
         if (user) {
             (_a = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _a === void 0 ? void 0 : _a.setVerifiedCredentials(user.verifiedCredentials);
@@ -157,12 +159,14 @@ const useTurnkey = () => {
                     verifiedCredentials: user.verifiedCredentials,
                     walletConnectorOptions,
                 });
-                setPrimaryWalletId(smartWallet$1.id);
+                newPrimaryWalletId = smartWallet$1.id;
             }
             else {
-                setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
+                newPrimaryWalletId = embeddedWalletVerifiedCredential.id;
             }
         }
+        if (newPrimaryWalletId)
+            setPrimaryWalletId(newPrimaryWalletId);
         /** It's not authenticated if it still hasn't created a passkey */
         const isAuthenticated = Boolean((_b = embeddedWalletVerifiedCredential.walletProperties) === null || _b === void 0 ? void 0 : _b.isAuthenticatorAttached);
         const passkeyWallet = new walletConnectorCore.Wallet({
@@ -171,6 +175,7 @@ const useTurnkey = () => {
             connector: (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) || {},
             id: embeddedWalletVerifiedCredential.id,
             isAuthenticated,
+            isPrimary: newPrimaryWalletId === embeddedWalletVerifiedCredential.id,
             key: embeddedWalletVerifiedCredential.walletName ||
                 (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector.key) ||
                 '',
@@ -223,6 +228,7 @@ const useTurnkey = () => {
                     connector: walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
                     isAuthenticated: Boolean((_h = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _h === void 0 ? void 0 : _h.isAuthenticatorAttached),
+                    isPrimary: true,
                     key: (_j = embeddedWalletVerifiedCredential.walletName) !== null && _j !== void 0 ? _j : walletConnector.key,
                 });
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useTurnkey/useTurnkey.js

@@ -96,8 +96,9 @@ import { useInternalDynamicContext } from '../../../../../context/DynamicContext
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useTurnkey = () => {
-    const { projectSettings, setPrimaryWalletId, walletConnectorOptions, walletConnector, setShowAuthFlow, environmentId, user, } = useInternalDynamicContext();
+    const { projectSettings, setPrimaryWalletId, walletConnectorOptions, setShowAuthFlow, environmentId, user, primaryWallet, } = useInternalDynamicContext();
     const { setView } = useViewContext();
+    const walletConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
     const { createDynamicEmbeddedWalletMutation } = useCreateDynamicEmbeddedWalletMutation();
     const startHeadlessEmbeddedWalletCreationFlow = useCallback((chains, options) => __awaiter(void 0, void 0, void 0, function* () {
         yield createDynamicEmbeddedWalletMutation({
@@ -143,6 +144,7 @@ const useTurnkey = () => {
         var _a, _b, _c, _d;
         const { chain } = embeddedWalletVerifiedCredential;
         const turnkeyWallet = findTurnkeyWalletByChain(walletConnectorOptions, chain);
+        let newPrimaryWalletId = null;
         // if user already has embedded wallet, set it as primary wallet
         if (user) {
             (_a = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _a === void 0 ? void 0 : _a.setVerifiedCredentials(user.verifiedCredentials);
@@ -153,12 +155,14 @@ const useTurnkey = () => {
                     verifiedCredentials: user.verifiedCredentials,
                     walletConnectorOptions,
                 });
-                setPrimaryWalletId(smartWallet.id);
+                newPrimaryWalletId = smartWallet.id;
             }
             else {
-                setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
+                newPrimaryWalletId = embeddedWalletVerifiedCredential.id;
             }
         }
+        if (newPrimaryWalletId)
+            setPrimaryWalletId(newPrimaryWalletId);
         /** It's not authenticated if it still hasn't created a passkey */
         const isAuthenticated = Boolean((_b = embeddedWalletVerifiedCredential.walletProperties) === null || _b === void 0 ? void 0 : _b.isAuthenticatorAttached);
         const passkeyWallet = new Wallet({
@@ -167,6 +171,7 @@ const useTurnkey = () => {
             connector: (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) || {},
             id: embeddedWalletVerifiedCredential.id,
             isAuthenticated,
+            isPrimary: newPrimaryWalletId === embeddedWalletVerifiedCredential.id,
             key: embeddedWalletVerifiedCredential.walletName ||
                 (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector.key) ||
                 '',
@@ -219,6 +224,7 @@ const useTurnkey = () => {
                     connector: walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
                     isAuthenticated: Boolean((_h = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _h === void 0 ? void 0 : _h.isAuthenticatorAttached),
+                    isPrimary: true,
                     key: (_j = embeddedWalletVerifiedCredential.walletName) !== null && _j !== void 0 ? _j : walletConnector.key,
                 });
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);

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

@@ -96,7 +96,8 @@ const useTokenBalances = ({ accountAddress, networkId, chainName = sdkApiCore.Ch
     const [tokenBalancesData, setTokenBalancesData] = React.useState(undefined);
     const [isLoading, setIsLoading] = React.useState(false);
     const [error, setError] = React.useState(undefined);
-    const { primaryWallet, environmentId, network, walletConnector, user } = useInternalDynamicContext.useInternalDynamicContext();
+    const { primaryWallet, environmentId, network, user } = useInternalDynamicContext.useInternalDynamicContext();
+    const walletConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
     const requestChainName = chainName !== null && chainName !== void 0 ? chainName : walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain;
     const requestAccount = accountAddress !== null && accountAddress !== void 0 ? accountAddress : primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
     const requestNetwork = networkId !== null && networkId !== void 0 ? networkId : network;

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

@@ -92,7 +92,8 @@ const useTokenBalances = ({ accountAddress, networkId, chainName = ChainEnum.Evm
     const [tokenBalancesData, setTokenBalancesData] = useState(undefined);
     const [isLoading, setIsLoading] = useState(false);
     const [error, setError] = useState(undefined);
-    const { primaryWallet, environmentId, network, walletConnector, user } = useInternalDynamicContext();
+    const { primaryWallet, environmentId, network, user } = useInternalDynamicContext();
+    const walletConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
     const requestChainName = chainName !== null && chainName !== void 0 ? chainName : walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain;
     const requestAccount = accountAddress !== null && accountAddress !== void 0 ? accountAddress : primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
     const requestNetwork = networkId !== null && networkId !== void 0 ? networkId : network;

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

@@ -131,6 +131,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
                 connector: wallet.walletConnector,
                 id: account.id,
                 isAuthenticated: true,
+                isPrimary: account.id === primaryWalletId,
                 key: (_a = account.walletName) !== null && _a !== void 0 ? _a : wallet.walletConnector.key,
             });
         }

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

@@ -127,6 +127,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
                 connector: wallet.walletConnector,
                 id: account.id,
                 isAuthenticated: true,
+                isPrimary: account.id === primaryWalletId,
                 key: (_a = account.walletName) !== null && _a !== void 0 ? _a : wallet.walletConnector.key,
             });
         }

package/src/lib/views/EmailVerification/EmailVerification.cjs

@@ -114,10 +114,11 @@ require('qrcode');
 const SECONDS_TO_RETRY = 15;
 const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _showRetryButton = true, showTransferMessage: _showTransferMessage = false, }) => {
     var _a, _b, _c, _d;
-    const { environmentId, handleLogOut, setPrimaryWalletId, setShowAuthFlow, projectSettings, user, userWithMissingInfo, walletConnectorOptions, walletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { environmentId, handleLogOut, setPrimaryWalletId, setShowAuthFlow, projectSettings, user, userWithMissingInfo, walletConnectorOptions, primaryWallet, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { error, setError, setErrorMessage } = ErrorContext.useErrorContext();
     const { loading, setLoading } = LoadingContext.useLoadingContext();
+    const walletConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
     const [showRetryButton, setShowRetryButton] = React.useState(_showRetryButton);
     const [showTransferMessage, setShowTransferMessage] = React.useState(_showTransferMessage);
     // Use a state to ensure UI is updated, but also a ref to access in effect cleanup
@@ -203,6 +204,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
                     connector: walletOption.walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
                     isAuthenticated: false,
+                    isPrimary: true,
                     key: (_k = embeddedWalletVerifiedCredential.walletName) !== null && _k !== void 0 ? _k : '',
                 });
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);

package/src/lib/views/EmailVerification/EmailVerification.js

@@ -110,10 +110,11 @@ import 'qrcode';
 const SECONDS_TO_RETRY = 15;
 const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _showRetryButton = true, showTransferMessage: _showTransferMessage = false, }) => {
     var _a, _b, _c, _d;
-    const { environmentId, handleLogOut, setPrimaryWalletId, setShowAuthFlow, projectSettings, user, userWithMissingInfo, walletConnectorOptions, walletConnector, } = useInternalDynamicContext();
+    const { environmentId, handleLogOut, setPrimaryWalletId, setShowAuthFlow, projectSettings, user, userWithMissingInfo, walletConnectorOptions, primaryWallet, } = useInternalDynamicContext();
     const { setView, goToInitialView } = useViewContext();
     const { error, setError, setErrorMessage } = useErrorContext();
     const { loading, setLoading } = useLoadingContext();
+    const walletConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
     const [showRetryButton, setShowRetryButton] = useState(_showRetryButton);
     const [showTransferMessage, setShowTransferMessage] = useState(_showTransferMessage);
     // Use a state to ensure UI is updated, but also a ref to access in effect cleanup
@@ -199,6 +200,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
                     connector: walletOption.walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
                     isAuthenticated: false,
+                    isPrimary: true,
                     key: (_k = embeddedWalletVerifiedCredential.walletName) !== null && _k !== void 0 ? _k : '',
                 });
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);

package/src/lib/views/LoginView/LoginViewSection/LoginViewSection.cjs

@@ -108,22 +108,26 @@ const LoginViewSection = ({ viewSection, index, walletCount, gotToWalletList, })
         case sdkApiCore.SdkViewSectionType.Phone:
             return (jsxRuntime.jsx(PhoneNumberSignInSection.PhoneNumberSignInSection, { onSubmit: () => setIsLoading(true), onSubmitError: () => setIsLoading(false), isLoading: isLoading }));
         case sdkApiCore.SdkViewSectionType.EmailAndPhone:
-            return (jsxRuntime.jsx(ToggleableSection.ToggleableSection, { sections: [
-                    {
-                        button: t('dyn_login.email_or_phone.use_phone'),
-                        buttonCopyKey: 'dyn_login.email_or_phone.use_phone',
-                        component: (jsxRuntime.jsx(LoginEmailForm.LoginEmailForm, { onSubmit: () => setIsLoading(true), onSubmitError: () => setIsLoading(false), isLoading: isLoading })),
-                        label: t('dyn_login.email_or_phone.prefer_phone'),
-                        labelCopyKey: 'dyn_login.email_or_phone.prefer_phone',
-                    },
-                    {
-                        button: t('dyn_login.email_or_phone.use_email'),
-                        buttonCopyKey: 'dyn_login.email_or_phone.use_email',
-                        component: (jsxRuntime.jsx(PhoneNumberSignInSection.PhoneNumberSignInSection, { onSubmit: () => setIsLoading(true), onSubmitError: () => setIsLoading(false), isLoading: isLoading })),
-                        label: t('dyn_login.email_or_phone.prefer_email'),
-                        labelCopyKey: 'dyn_login.email_or_phone.prefer_email',
-                    },
-                ] }));
+            // eslint-disable-next-line no-case-declarations
+            const sections = [
+                {
+                    button: t('dyn_login.email_or_phone.use_phone'),
+                    buttonCopyKey: 'dyn_login.email_or_phone.use_phone',
+                    component: (jsxRuntime.jsx(LoginEmailForm.LoginEmailForm, { onSubmit: () => setIsLoading(true), onSubmitError: () => setIsLoading(false), isLoading: isLoading })),
+                    label: t('dyn_login.email_or_phone.prefer_phone'),
+                    labelCopyKey: 'dyn_login.email_or_phone.prefer_phone',
+                },
+                {
+                    button: t('dyn_login.email_or_phone.use_email'),
+                    buttonCopyKey: 'dyn_login.email_or_phone.use_email',
+                    component: (jsxRuntime.jsx(PhoneNumberSignInSection.PhoneNumberSignInSection, { onSubmit: () => setIsLoading(true), onSubmitError: () => setIsLoading(false), isLoading: isLoading })),
+                    label: t('dyn_login.email_or_phone.prefer_email'),
+                    labelCopyKey: 'dyn_login.email_or_phone.prefer_email',
+                },
+            ];
+            if (viewSection.defaultItem === 'phone')
+                sections.reverse();
+            return jsxRuntime.jsx(ToggleableSection.ToggleableSection, { sections: sections });
         case sdkApiCore.SdkViewSectionType.Wallet:
             return (jsxRuntime.jsx(WalletSignInSection.WalletSignInSection, { numberOfItensToShow: viewSection.numOfItemsToDisplay || 0, onSubmit: () => {
                     // this view is just to show the back button

package/src/lib/views/LoginView/LoginViewSection/LoginViewSection.js

@@ -104,22 +104,26 @@ const LoginViewSection = ({ viewSection, index, walletCount, gotToWalletList, })
         case SdkViewSectionType.Phone:
             return (jsx(PhoneNumberSignInSection, { onSubmit: () => setIsLoading(true), onSubmitError: () => setIsLoading(false), isLoading: isLoading }));
         case SdkViewSectionType.EmailAndPhone:
-            return (jsx(ToggleableSection, { sections: [
-                    {
-                        button: t('dyn_login.email_or_phone.use_phone'),
-                        buttonCopyKey: 'dyn_login.email_or_phone.use_phone',
-                        component: (jsx(LoginEmailForm, { onSubmit: () => setIsLoading(true), onSubmitError: () => setIsLoading(false), isLoading: isLoading })),
-                        label: t('dyn_login.email_or_phone.prefer_phone'),
-                        labelCopyKey: 'dyn_login.email_or_phone.prefer_phone',
-                    },
-                    {
-                        button: t('dyn_login.email_or_phone.use_email'),
-                        buttonCopyKey: 'dyn_login.email_or_phone.use_email',
-                        component: (jsx(PhoneNumberSignInSection, { onSubmit: () => setIsLoading(true), onSubmitError: () => setIsLoading(false), isLoading: isLoading })),
-                        label: t('dyn_login.email_or_phone.prefer_email'),
-                        labelCopyKey: 'dyn_login.email_or_phone.prefer_email',
-                    },
-                ] }));
+            // eslint-disable-next-line no-case-declarations
+            const sections = [
+                {
+                    button: t('dyn_login.email_or_phone.use_phone'),
+                    buttonCopyKey: 'dyn_login.email_or_phone.use_phone',
+                    component: (jsx(LoginEmailForm, { onSubmit: () => setIsLoading(true), onSubmitError: () => setIsLoading(false), isLoading: isLoading })),
+                    label: t('dyn_login.email_or_phone.prefer_phone'),
+                    labelCopyKey: 'dyn_login.email_or_phone.prefer_phone',
+                },
+                {
+                    button: t('dyn_login.email_or_phone.use_email'),
+                    buttonCopyKey: 'dyn_login.email_or_phone.use_email',
+                    component: (jsx(PhoneNumberSignInSection, { onSubmit: () => setIsLoading(true), onSubmitError: () => setIsLoading(false), isLoading: isLoading })),
+                    label: t('dyn_login.email_or_phone.prefer_email'),
+                    labelCopyKey: 'dyn_login.email_or_phone.prefer_email',
+                },
+            ];
+            if (viewSection.defaultItem === 'phone')
+                sections.reverse();
+            return jsx(ToggleableSection, { sections: sections });
         case SdkViewSectionType.Wallet:
             return (jsx(WalletSignInSection, { numberOfItensToShow: viewSection.numOfItemsToDisplay || 0, onSubmit: () => {
                     // this view is just to show the back button

package/src/lib/views/LoginView/sections/ToggleableSection/ToggleableSection.d.ts

@@ -6,8 +6,7 @@ export type Section = {
     buttonCopyKey?: string;
     labelCopyKey?: string;
 };
-type ToggleableSectionProps = {
+export type ToggleableSectionProps = {
     sections: [Section, Section];
 };
 export declare const ToggleableSection: FC<ToggleableSectionProps>;
-export {};

package/src/lib/views/viewToComponentMap.d.ts

@@ -9,7 +9,7 @@ export declare const viewToComponentMap: {
     'chainalysis-blocked-wallet': () => JSX.Element;
     'collect-user-data': () => JSX.Element | null;
     'collect-user-data-login-no-wallet': import("react").FC<{
-        userIdentification: keyof import("@dynamic-labs/sdk-api-core").UserFields | "chain" | "ens" | "wallet" | "isAuthenticatedWithAWallet" | "environmentId" | "lastVerifiedCredentialId" | "lists" | "newUser" | "sessionId" | "userId" | "verifiedCredentials" | "scope" | "missingFields";
+        userIdentification: keyof import("@dynamic-labs/sdk-api-core").UserFields | "environmentId" | "lastVerifiedCredentialId" | "lists" | "newUser" | "sessionId" | "userId" | "verifiedCredentials" | "scope" | "missingFields";
         userIdentificationOverride?: string | undefined;
     }>;
     'create-password-view': import("react").FC<import("./CreatePasswordView/CreatePasswordView").CreatePasswordViewProps>;

package/src/lib/widgets/DynamicWidget/components/ActiveWalletInformation/ActiveWalletInformation.cjs

@@ -115,7 +115,7 @@ const ActiveWalletInformation = ({ isLoading = false, }) => {
     const [balanceIsExpanded, setBalanceIsExpanded] = React.useState(false);
     const [hasShadow, setHasShadow] = React.useState(false);
     const contentRef = React.useRef(null);
-    const { primaryWallet, network, projectSettings, user, walletConnector, authMode, showFiat, multiAsset, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { primaryWallet, network, projectSettings, user, authMode, showFiat, multiAsset, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setDynamicWidgetView } = DynamicWidgetContext.useWidgetContext();
     const { isTurnkeyWalletWithoutAuthenticator } = useIsTurnkeyWallet.useIsTurnkeyWallet();
     const { isLoading: isLoadingTokenBalances, tokenBalances, error: errorTokenBalances, } = useTokenBalances.useTokenBalances({
@@ -123,6 +123,7 @@ const ActiveWalletInformation = ({ isLoading = false, }) => {
         includeFiat: showFiat,
         includeNativeBalance: true,
     });
+    const primaryConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
     const filteredTokenBalances = (tokenBalances === null || tokenBalances === void 0 ? void 0 : tokenBalances.filter((token) => token.name)) || [];
     const address = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
     const nameService = useFetchNameService.useFetchNameService(address);
@@ -176,7 +177,7 @@ const ActiveWalletInformation = ({ isLoading = false, }) => {
         }
     };
     const enableMultiAsset = authMode === 'connect-and-sign' && multiAsset;
-    const isNetworkMultiAssetSupported = isMultiAssetSupportedNetwork.isMultiAssetSupportedNetwork(walletConnector, network);
+    const isNetworkMultiAssetSupported = isMultiAssetSupportedNetwork.isMultiAssetSupportedNetwork(primaryConnector, network);
     const isTooManyRequests = errorTokenBalances === 'Too many requests fetching balances';
     const showMultiAsset = !isTooManyRequests && isNetworkMultiAssetSupported && enableMultiAsset;
     filteredTokenBalances.sort((a, b) => ((b === null || b === void 0 ? void 0 : b.marketValue) || 0) - ((a === null || a === void 0 ? void 0 : a.marketValue) || 0));

package/src/lib/widgets/DynamicWidget/components/ActiveWalletInformation/ActiveWalletInformation.js

@@ -111,7 +111,7 @@ const ActiveWalletInformation = ({ isLoading = false, }) => {
     const [balanceIsExpanded, setBalanceIsExpanded] = useState(false);
     const [hasShadow, setHasShadow] = useState(false);
     const contentRef = useRef(null);
-    const { primaryWallet, network, projectSettings, user, walletConnector, authMode, showFiat, multiAsset, } = useInternalDynamicContext();
+    const { primaryWallet, network, projectSettings, user, authMode, showFiat, multiAsset, } = useInternalDynamicContext();
     const { setDynamicWidgetView } = useWidgetContext();
     const { isTurnkeyWalletWithoutAuthenticator } = useIsTurnkeyWallet();
     const { isLoading: isLoadingTokenBalances, tokenBalances, error: errorTokenBalances, } = useTokenBalances({
@@ -119,6 +119,7 @@ const ActiveWalletInformation = ({ isLoading = false, }) => {
         includeFiat: showFiat,
         includeNativeBalance: true,
     });
+    const primaryConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
     const filteredTokenBalances = (tokenBalances === null || tokenBalances === void 0 ? void 0 : tokenBalances.filter((token) => token.name)) || [];
     const address = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
     const nameService = useFetchNameService(address);
@@ -172,7 +173,7 @@ const ActiveWalletInformation = ({ isLoading = false, }) => {
         }
     };
     const enableMultiAsset = authMode === 'connect-and-sign' && multiAsset;
-    const isNetworkMultiAssetSupported = isMultiAssetSupportedNetwork(walletConnector, network);
+    const isNetworkMultiAssetSupported = isMultiAssetSupportedNetwork(primaryConnector, network);
     const isTooManyRequests = errorTokenBalances === 'Too many requests fetching balances';
     const showMultiAsset = !isTooManyRequests && isNetworkMultiAssetSupported && enableMultiAsset;
     filteredTokenBalances.sort((a, b) => ((b === null || b === void 0 ? void 0 : b.marketValue) || 0) - ((a === null || a === void 0 ? void 0 : a.marketValue) || 0));