@dynamic-labs/sdk-react-core 1.0.0-alpha.7 → 1.0.0-alpha.9

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

@@ -26,11 +26,13 @@ var getUserWalletsFromVerifiedCredentials = require('../../functions/getUserWall
 var isEmbeddedWalletPresent = require('../../functions/isEmbeddedWalletPresent/isEmbeddedWalletPresent.cjs');
 var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
 var smartWallet = require('../useWalletConnectors/utils/smartWallet/smartWallet.cjs');
+var useCreateDynamicEmbeddedWalletMutation = require('../useCreateDynamicEmbeddedWalletMutation/useCreateDynamicEmbeddedWalletMutation.cjs');
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useEmbeddedWallet = () => {
-    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, wallets, internalSetShowAuthFlow, internalEvents, primaryWallet, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, walletConnectorOptions, internalSetShowAuthFlow, internalEvents, primaryWallet, environmentId, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
+    const { createDynamicEmbeddedWalletMutation } = useCreateDynamicEmbeddedWalletMutation.useCreateDynamicEmbeddedWalletMutation();
     const userHasEmbeddedWallet = () => {
         var _a;
         const jwt = (_a = getAuthToken.getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
@@ -39,36 +41,25 @@ const useEmbeddedWallet = () => {
         }
         return isEmbeddedWalletPresent.isEmbeddedWalletPresent(jwt);
     };
-    const createEmbeddedWallet = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _a;
-        const jwt = (_a = getAuthToken.getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
-        if (!jwt) {
-            throw new Error('User is not logged in');
-        }
-        if (!isTurnkeyEnabled.isTurnkeyEnabled(projectSettings)) {
-            throw new Error('Passkey embedded wallet is not enabled. Go to the dashboard and make sure to have both Turnkey/Passkey Embedded wallets and at least one EVM network enabled. Also, check if EthereumWalletConnectors is in the  DynamicContextProvider > settings > walletConnectors.');
-        }
-        const userWaletsCredentials = getUserWalletsFromVerifiedCredentials.getUserWalletsFromVerifiedCredentials(jwt);
-        // if user doesn't have a wallet yet, show the passkey view to create an embedded wallet
-        if (!(userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.length)) {
-            return startEmbeddedWalletCreationFlow();
-        }
-        internalSetShowAuthFlow(false);
-        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt);
-        // if user logged in with MM for example, just continue the flow
-        if (!embeddedWalletVerifiedCredential) {
-            return Promise.resolve(primaryWallet);
-        }
-        // if user already has embedded wallet, returns it
-        return returnEmbeddedWallet(jwt, embeddedWalletVerifiedCredential);
+    const startPregeneratedWalletCreationFlow = React.useCallback((jwt, decodedJwt) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        createDynamicEmbeddedWalletMutation({
+            authToken: jwt,
+            decodedJwt,
+            environmentId,
+            walletConnectorOptions,
+            withAuthenticator: false,
+        });
+        internalSetShowAuthFlow(false); // close email otp pin modal
+        return new Promise((resolve, reject) => {
+            internalEvents.current.once('embeddedWalletCreated', (wallet) => resolve(wallet));
+            internalEvents.current.once('embeddedWalletFailed', (error) => reject(error));
+        });
     }), [
-        internalEvents,
+        createDynamicEmbeddedWalletMutation,
+        environmentId,
+        walletConnectorOptions,
         internalSetShowAuthFlow,
-        onboardingOnlyJwt,
-        projectSettings,
-        setPrimaryWalletId,
-        setView,
-        wallets,
+        internalEvents,
     ]);
     const startEmbeddedWalletCreationFlow = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         internalSetShowAuthFlow(true);
@@ -88,18 +79,18 @@ const useEmbeddedWallet = () => {
         });
     });
     const returnEmbeddedWallet = (jwt, embeddedWalletVerifiedCredential) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _b, _c, _d;
+        var _a, _b, _c;
         const decodedJwt = decodeJwt.decodeJwt(jwt);
-        const turnkeyWallet = findTurnkeyWallet.findTurnkeyWallet(wallets);
+        const turnkeyWallet = findTurnkeyWallet.findTurnkeyWallet(walletConnectorOptions);
         // if user already has embedded wallet, set it as primary wallet
         if (decodedJwt) {
-            (_b = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _b === void 0 ? void 0 : _b.setVerifiedCredentials(decodedJwt.verifiedCredentials);
+            (_a = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _a === void 0 ? void 0 : _a.setVerifiedCredentials(decodedJwt.verifiedCredentials);
             const smartWallet$1 = smartWallet.findSmartWallet(embeddedWalletVerifiedCredential, decodedJwt.verifiedCredentials);
             if (smartWallet$1) {
                 yield smartWallet.initializeSmartWallet({
                     account: smartWallet$1,
                     verifiedCredentials: decodedJwt.verifiedCredentials,
-                    walletOptions: wallets,
+                    walletConnectorOptions,
                 });
                 setPrimaryWalletId(smartWallet$1.id);
             }
@@ -108,14 +99,47 @@ const useEmbeddedWallet = () => {
             }
         }
         const passkeyWallet = {
-            address: (yield ((_c = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _c === void 0 ? void 0 : _c.fetchPublicAddress())) || '',
-            chain: ((_d = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _d === void 0 ? void 0 : _d.connectedChain) || '',
+            address: (yield ((_b = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _b === void 0 ? void 0 : _b.fetchPublicAddress())) || '',
+            chain: ((_c = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _c === void 0 ? void 0 : _c.connectedChain) || '',
             connected: true,
             connector: (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) || {},
             id: embeddedWalletVerifiedCredential.id,
         };
         return Promise.resolve(passkeyWallet);
     });
+    const createEmbeddedWallet = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        var _d, _e, _f;
+        const jwt = (_d = getAuthToken.getAuthToken()) !== null && _d !== void 0 ? _d : onboardingOnlyJwt;
+        const decodedJwt = decodeJwt.decodeJwt(jwt);
+        if (!jwt || !decodedJwt) {
+            throw new Error('User is not logged in');
+        }
+        if (!isTurnkeyEnabled.isTurnkeyEnabled(projectSettings)) {
+            throw new Error('Passkey embedded wallet is not enabled. Go to the dashboard and make sure to have both Turnkey/Passkey Embedded wallets and at least one EVM network enabled. Also, check if EthereumWalletConnectors is in the  DynamicContextProvider > settings > walletConnectors.');
+        }
+        const userWaletsCredentials = getUserWalletsFromVerifiedCredentials.getUserWalletsFromVerifiedCredentials(jwt);
+        // if user doesn't have a wallet yet, show the passkey view to create an embedded wallet
+        if (!(userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.length)) {
+            if (((_f = (_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWalletSecurityMethods) === null || _e === void 0 ? void 0 : _e.length) !== null && _f !== void 0 ? _f : 0) === 0) {
+                return startPregeneratedWalletCreationFlow(jwt, decodedJwt);
+            }
+            return startEmbeddedWalletCreationFlow();
+        }
+        internalSetShowAuthFlow(false);
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt);
+        // if user logged in with MM for example, just continue the flow
+        if (!embeddedWalletVerifiedCredential) {
+            return Promise.resolve(primaryWallet);
+        }
+        // if user already has embedded wallet, returns it
+        return returnEmbeddedWallet(jwt, embeddedWalletVerifiedCredential);
+    }), [
+        internalSetShowAuthFlow,
+        onboardingOnlyJwt,
+        projectSettings,
+        startPregeneratedWalletCreationFlow,
+        primaryWallet,
+    ]);
     return {
         createEmbeddedWallet,
         userHasEmbeddedWallet,

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

@@ -1,5 +1,5 @@
 import { Wallet } from '../../../shared';
 export declare const useEmbeddedWallet: () => {
-    readonly createEmbeddedWallet: () => Promise<Wallet>;
+    readonly createEmbeddedWallet: () => Promise<Wallet | undefined>;
     readonly userHasEmbeddedWallet: () => boolean;
 };

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

@@ -22,11 +22,13 @@ import { getUserWalletsFromVerifiedCredentials } from '../../functions/getUserWa
 import { isEmbeddedWalletPresent } from '../../functions/isEmbeddedWalletPresent/isEmbeddedWalletPresent.js';
 import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 import { findSmartWallet, initializeSmartWallet } from '../useWalletConnectors/utils/smartWallet/smartWallet.js';
+import { useCreateDynamicEmbeddedWalletMutation } from '../useCreateDynamicEmbeddedWalletMutation/useCreateDynamicEmbeddedWalletMutation.js';
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useEmbeddedWallet = () => {
-    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, wallets, internalSetShowAuthFlow, internalEvents, primaryWallet, } = useInternalDynamicContext();
+    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, walletConnectorOptions, internalSetShowAuthFlow, internalEvents, primaryWallet, environmentId, } = useInternalDynamicContext();
     const { setView } = useViewContext();
+    const { createDynamicEmbeddedWalletMutation } = useCreateDynamicEmbeddedWalletMutation();
     const userHasEmbeddedWallet = () => {
         var _a;
         const jwt = (_a = getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
@@ -35,36 +37,25 @@ const useEmbeddedWallet = () => {
         }
         return isEmbeddedWalletPresent(jwt);
     };
-    const createEmbeddedWallet = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _a;
-        const jwt = (_a = getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
-        if (!jwt) {
-            throw new Error('User is not logged in');
-        }
-        if (!isTurnkeyEnabled(projectSettings)) {
-            throw new Error('Passkey embedded wallet is not enabled. Go to the dashboard and make sure to have both Turnkey/Passkey Embedded wallets and at least one EVM network enabled. Also, check if EthereumWalletConnectors is in the  DynamicContextProvider > settings > walletConnectors.');
-        }
-        const userWaletsCredentials = getUserWalletsFromVerifiedCredentials(jwt);
-        // if user doesn't have a wallet yet, show the passkey view to create an embedded wallet
-        if (!(userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.length)) {
-            return startEmbeddedWalletCreationFlow();
-        }
-        internalSetShowAuthFlow(false);
-        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt);
-        // if user logged in with MM for example, just continue the flow
-        if (!embeddedWalletVerifiedCredential) {
-            return Promise.resolve(primaryWallet);
-        }
-        // if user already has embedded wallet, returns it
-        return returnEmbeddedWallet(jwt, embeddedWalletVerifiedCredential);
+    const startPregeneratedWalletCreationFlow = useCallback((jwt, decodedJwt) => __awaiter(void 0, void 0, void 0, function* () {
+        createDynamicEmbeddedWalletMutation({
+            authToken: jwt,
+            decodedJwt,
+            environmentId,
+            walletConnectorOptions,
+            withAuthenticator: false,
+        });
+        internalSetShowAuthFlow(false); // close email otp pin modal
+        return new Promise((resolve, reject) => {
+            internalEvents.current.once('embeddedWalletCreated', (wallet) => resolve(wallet));
+            internalEvents.current.once('embeddedWalletFailed', (error) => reject(error));
+        });
     }), [
-        internalEvents,
+        createDynamicEmbeddedWalletMutation,
+        environmentId,
+        walletConnectorOptions,
         internalSetShowAuthFlow,
-        onboardingOnlyJwt,
-        projectSettings,
-        setPrimaryWalletId,
-        setView,
-        wallets,
+        internalEvents,
     ]);
     const startEmbeddedWalletCreationFlow = () => __awaiter(void 0, void 0, void 0, function* () {
         internalSetShowAuthFlow(true);
@@ -84,18 +75,18 @@ const useEmbeddedWallet = () => {
         });
     });
     const returnEmbeddedWallet = (jwt, embeddedWalletVerifiedCredential) => __awaiter(void 0, void 0, void 0, function* () {
-        var _b, _c, _d;
+        var _a, _b, _c;
         const decodedJwt = decodeJwt(jwt);
-        const turnkeyWallet = findTurnkeyWallet(wallets);
+        const turnkeyWallet = findTurnkeyWallet(walletConnectorOptions);
         // if user already has embedded wallet, set it as primary wallet
         if (decodedJwt) {
-            (_b = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _b === void 0 ? void 0 : _b.setVerifiedCredentials(decodedJwt.verifiedCredentials);
+            (_a = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _a === void 0 ? void 0 : _a.setVerifiedCredentials(decodedJwt.verifiedCredentials);
             const smartWallet = findSmartWallet(embeddedWalletVerifiedCredential, decodedJwt.verifiedCredentials);
             if (smartWallet) {
                 yield initializeSmartWallet({
                     account: smartWallet,
                     verifiedCredentials: decodedJwt.verifiedCredentials,
-                    walletOptions: wallets,
+                    walletConnectorOptions,
                 });
                 setPrimaryWalletId(smartWallet.id);
             }
@@ -104,14 +95,47 @@ const useEmbeddedWallet = () => {
             }
         }
         const passkeyWallet = {
-            address: (yield ((_c = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _c === void 0 ? void 0 : _c.fetchPublicAddress())) || '',
-            chain: ((_d = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _d === void 0 ? void 0 : _d.connectedChain) || '',
+            address: (yield ((_b = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _b === void 0 ? void 0 : _b.fetchPublicAddress())) || '',
+            chain: ((_c = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _c === void 0 ? void 0 : _c.connectedChain) || '',
             connected: true,
             connector: (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) || {},
             id: embeddedWalletVerifiedCredential.id,
         };
         return Promise.resolve(passkeyWallet);
     });
+    const createEmbeddedWallet = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+        var _d, _e, _f;
+        const jwt = (_d = getAuthToken()) !== null && _d !== void 0 ? _d : onboardingOnlyJwt;
+        const decodedJwt = decodeJwt(jwt);
+        if (!jwt || !decodedJwt) {
+            throw new Error('User is not logged in');
+        }
+        if (!isTurnkeyEnabled(projectSettings)) {
+            throw new Error('Passkey embedded wallet is not enabled. Go to the dashboard and make sure to have both Turnkey/Passkey Embedded wallets and at least one EVM network enabled. Also, check if EthereumWalletConnectors is in the  DynamicContextProvider > settings > walletConnectors.');
+        }
+        const userWaletsCredentials = getUserWalletsFromVerifiedCredentials(jwt);
+        // if user doesn't have a wallet yet, show the passkey view to create an embedded wallet
+        if (!(userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.length)) {
+            if (((_f = (_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWalletSecurityMethods) === null || _e === void 0 ? void 0 : _e.length) !== null && _f !== void 0 ? _f : 0) === 0) {
+                return startPregeneratedWalletCreationFlow(jwt, decodedJwt);
+            }
+            return startEmbeddedWalletCreationFlow();
+        }
+        internalSetShowAuthFlow(false);
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt);
+        // if user logged in with MM for example, just continue the flow
+        if (!embeddedWalletVerifiedCredential) {
+            return Promise.resolve(primaryWallet);
+        }
+        // if user already has embedded wallet, returns it
+        return returnEmbeddedWallet(jwt, embeddedWalletVerifiedCredential);
+    }), [
+        internalSetShowAuthFlow,
+        onboardingOnlyJwt,
+        projectSettings,
+        startPregeneratedWalletCreationFlow,
+        primaryWallet,
+    ]);
     return {
         createEmbeddedWallet,
         userHasEmbeddedWallet,

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

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

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

@@ -0,0 +1,37 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
+
+const useIsTurnkeyWallet = () => {
+    var _a;
+    const { primaryWallet, user } = useInternalDynamicContext.useInternalDynamicContext();
+    const getTurnkeyVerifiedCredential = () => {
+        if (!primaryWallet || !user) {
+            return undefined;
+        }
+        const isPrimaryWalletTurnkey = primaryWallet.connector.key.startsWith('turnkey');
+        if (!isPrimaryWalletTurnkey) {
+            return undefined;
+        }
+        const primaryWalletId = primaryWallet.id;
+        const turnkeyVC = user.verifiedCredentials.find((vc) => vc.id === primaryWalletId);
+        if (!turnkeyVC) {
+            return undefined;
+        }
+        return turnkeyVC;
+    };
+    const turnkeyVerifiedCredential = getTurnkeyVerifiedCredential();
+    const isTurnkeyWallet = Boolean(turnkeyVerifiedCredential);
+    const hasTurnkeyVerifiedCredentialAuthenticator = Boolean((_a = turnkeyVerifiedCredential === null || turnkeyVerifiedCredential === void 0 ? void 0 : turnkeyVerifiedCredential.walletProperties) === null || _a === void 0 ? void 0 : _a.isAuthenticatorAttached);
+    const isTurnkeyWalletWithoutAuthenticator = isTurnkeyWallet && !hasTurnkeyVerifiedCredentialAuthenticator;
+    return {
+        hasTurnkeyVerifiedCredentialAuthenticator,
+        isTurnkeyWallet,
+        isTurnkeyWalletWithoutAuthenticator,
+        turnkeyVerifiedCredential,
+    };
+};
+
+exports.useIsTurnkeyWallet = useIsTurnkeyWallet;

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

@@ -0,0 +1,6 @@
+export declare const useIsTurnkeyWallet: () => {
+    hasTurnkeyVerifiedCredentialAuthenticator: boolean;
+    isTurnkeyWallet: boolean;
+    isTurnkeyWalletWithoutAuthenticator: boolean;
+    turnkeyVerifiedCredential: import("@dynamic-labs/sdk-api").JwtVerifiedCredential | undefined;
+};

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

@@ -0,0 +1,33 @@
+import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
+
+const useIsTurnkeyWallet = () => {
+    var _a;
+    const { primaryWallet, user } = useInternalDynamicContext();
+    const getTurnkeyVerifiedCredential = () => {
+        if (!primaryWallet || !user) {
+            return undefined;
+        }
+        const isPrimaryWalletTurnkey = primaryWallet.connector.key.startsWith('turnkey');
+        if (!isPrimaryWalletTurnkey) {
+            return undefined;
+        }
+        const primaryWalletId = primaryWallet.id;
+        const turnkeyVC = user.verifiedCredentials.find((vc) => vc.id === primaryWalletId);
+        if (!turnkeyVC) {
+            return undefined;
+        }
+        return turnkeyVC;
+    };
+    const turnkeyVerifiedCredential = getTurnkeyVerifiedCredential();
+    const isTurnkeyWallet = Boolean(turnkeyVerifiedCredential);
+    const hasTurnkeyVerifiedCredentialAuthenticator = Boolean((_a = turnkeyVerifiedCredential === null || turnkeyVerifiedCredential === void 0 ? void 0 : turnkeyVerifiedCredential.walletProperties) === null || _a === void 0 ? void 0 : _a.isAuthenticatorAttached);
+    const isTurnkeyWalletWithoutAuthenticator = isTurnkeyWallet && !hasTurnkeyVerifiedCredentialAuthenticator;
+    return {
+        hasTurnkeyVerifiedCredentialAuthenticator,
+        isTurnkeyWallet,
+        isTurnkeyWalletWithoutAuthenticator,
+        turnkeyVerifiedCredential,
+    };
+};
+
+export { useIsTurnkeyWallet };

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

@@ -26,7 +26,7 @@ var useEmbeddedWallet = require('../useEmbeddedWallet/useEmbeddedWallet.cjs');
 
 // Hook exposed to customers and used internally to trigger passkey recovery
 const usePasskeyRecovery = () => {
-    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, wallets, internalSetShowAuthFlow, internalEvents, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, walletConnectorOptions, internalSetShowAuthFlow, internalEvents, } = useInternalDynamicContext.useInternalDynamicContext();
     const { userHasEmbeddedWallet } = useEmbeddedWallet.useEmbeddedWallet();
     const { setView } = ViewContext.useViewContext();
     const initPasskeyRecoveryProcess = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -57,7 +57,7 @@ const usePasskeyRecovery = () => {
         projectSettings,
         setPrimaryWalletId,
         setView,
-        wallets,
+        walletConnectorOptions,
     ]);
     return {
         initPasskeyRecoveryProcess,

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

@@ -22,7 +22,7 @@ import { useEmbeddedWallet } from '../useEmbeddedWallet/useEmbeddedWallet.js';
 
 // Hook exposed to customers and used internally to trigger passkey recovery
 const usePasskeyRecovery = () => {
-    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, wallets, internalSetShowAuthFlow, internalEvents, } = useInternalDynamicContext();
+    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, walletConnectorOptions, internalSetShowAuthFlow, internalEvents, } = useInternalDynamicContext();
     const { userHasEmbeddedWallet } = useEmbeddedWallet();
     const { setView } = useViewContext();
     const initPasskeyRecoveryProcess = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
@@ -53,7 +53,7 @@ const usePasskeyRecovery = () => {
         projectSettings,
         setPrimaryWalletId,
         setView,
-        wallets,
+        walletConnectorOptions,
     ]);
     return {
         initPasskeyRecoveryProcess,

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

@@ -38,7 +38,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
     const { setExistentAccountData } = AccountExistsContext.useAccountExistsContext();
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage, setError } = ErrorContext.useErrorContext();
-    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallets, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, } = useInternalDynamicContext.useInternalDynamicContext();
     // If the user is not already logged it means that we only need to verify
     // We need this boolean for the part of the logic where we already persisted a new authToken,
     // and need to distinguish between logic for verify or linking.
@@ -136,7 +136,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             setView('account-exists');
             return;
         }
-        if (connectedWallet && authMode === 'connect-only') {
+        if (connectedWallets.length && authMode === 'connect-only') {
             throw new utils.DynamicError(e.message);
         }
         goToInitialView();

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

@@ -34,7 +34,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
     const { setExistentAccountData } = useAccountExistsContext();
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage, setError } = useErrorContext();
-    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, } = useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallets, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, } = useInternalDynamicContext();
     // If the user is not already logged it means that we only need to verify
     // We need this boolean for the part of the logic where we already persisted a new authToken,
     // and need to distinguish between logic for verify or linking.
@@ -132,7 +132,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             setView('account-exists');
             return;
         }
-        if (connectedWallet && authMode === 'connect-only') {
+        if (connectedWallets.length && authMode === 'connect-only') {
             throw new DynamicError(e.message);
         }
         goToInitialView();

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

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

package/src/lib/utils/hooks/{useWallets/useWallets.cjs → useWalletConnectorOptions/useWalletConnectorOptions.cjs}

@@ -6,8 +6,8 @@ var React = require('react');
 var data = require('../../../views/WalletList/data.cjs');
 var verifyMagicIsSetup = require('./utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
 
-const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
-    const wallets = React.useMemo(() => {
+const useWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
+    const walletConnectorOptions = React.useMemo(() => {
         if (!projectSettings ||
             !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length ||
             !networkConfigurations)
@@ -42,11 +42,11 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference,
         networkConfigurations,
     ]);
     React.useEffect(() => {
-        if (!projectSettings || wallets.length === 0)
+        if (!projectSettings || walletConnectorOptions.length === 0)
             return;
-        verifyMagicIsSetup.verifyMagicIsSetup(projectSettings, wallets.map(({ walletConnector }) => walletConnector));
-    }, [wallets, projectSettings]);
-    return { wallets };
+        verifyMagicIsSetup.verifyMagicIsSetup(projectSettings, walletConnectorOptions.map(({ walletConnector }) => walletConnector));
+    }, [walletConnectorOptions, projectSettings]);
+    return { walletConnectorOptions };
 };
 
-exports.useWallets = useWallets;
+exports.useWalletConnectorOptions = useWalletConnectorOptions;

package/src/lib/utils/hooks/{useWallets/useWallets.d.ts → useWalletConnectorOptions/useWalletConnectorOptions.d.ts}

@@ -16,7 +16,7 @@ type Props = {
     walletUiUtils: WalletUiUtils<WalletConnector>;
     walletConnectorExtensions?: WalletConnectorExtension[];
 };
-export declare const useWallets: ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }: Props) => {
-    wallets: import("../../../shared").WalletOption[];
+export declare const useWalletConnectorOptions: ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }: Props) => {
+    walletConnectorOptions: import("../../../shared").WalletOption[];
 };
 export {};

package/src/lib/utils/hooks/{useWallets/useWallets.js → useWalletConnectorOptions/useWalletConnectorOptions.js}

@@ -2,8 +2,8 @@ import { useMemo, useEffect } from 'react';
 import { getWallets } from '../../../views/WalletList/data.js';
 import { verifyMagicIsSetup } from './utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
 
-const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
-    const wallets = useMemo(() => {
+const useWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
+    const walletConnectorOptions = useMemo(() => {
         if (!projectSettings ||
             !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length ||
             !networkConfigurations)
@@ -38,11 +38,11 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference,
         networkConfigurations,
     ]);
     useEffect(() => {
-        if (!projectSettings || wallets.length === 0)
+        if (!projectSettings || walletConnectorOptions.length === 0)
             return;
-        verifyMagicIsSetup(projectSettings, wallets.map(({ walletConnector }) => walletConnector));
-    }, [wallets, projectSettings]);
-    return { wallets };
+        verifyMagicIsSetup(projectSettings, walletConnectorOptions.map(({ walletConnector }) => walletConnector));
+    }, [walletConnectorOptions, projectSettings]);
+    return { walletConnectorOptions };
 };
 
-export { useWallets };
+export { useWalletConnectorOptions };

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

@@ -4,8 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
@@ -18,10 +18,10 @@ require('viem');
 require('../../../shared/consts/index.cjs');
 var isSameWalletName = require('../../functions/isSameWalletName/isSameWalletName.cjs');
 var useWalletsConnectionState = require('../useWalletsConnectionState/useWalletsConnectionState.cjs');
-var createLinkedWalletsFromWalletOptions = require('./utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs');
 var reconnectSocialWallet = require('./reconnectSocialWallet.cjs');
+var createLinkedWalletsFromWalletOptions = require('./utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs');
 
-const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }) => {
+const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = React.useState(false);
     const linkedWallets = React.useMemo(() => {
         if (!authToken) {
@@ -30,9 +30,9 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         return createLinkedWalletsFromWalletOptions.createLinkedWalletsFromWalletOptions({
             authToken,
             primaryWalletId,
-            walletOptions: availableWallets,
+            walletConnectorOptions,
         });
-    }, [authToken, primaryWalletId, availableWallets]);
+    }, [authToken, primaryWalletId, walletConnectorOptions]);
     const walletsBasedOnAuthMode = React.useMemo(() => {
         // Before signing the first message we are using connected wallets list
         // This is because we want the first connected wallet to have events applied by useWalletEventListeners
@@ -64,8 +64,8 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
     }), [walletsBasedOnAuthMode]);
     const { connectedWalletMap, didConnectedStateLoad } = useWalletsConnectionState.useWalletsConnectionState(walletsBasedOnAuthMode);
     const wallets = React.useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[wallet.id]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
-    const getPrimaryWallet = React.useCallback(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
-    const getSecondaryWallets = React.useCallback(() => canHaveMultipleWalletsConnected
+    const primaryWallet = React.useMemo(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
+    const secondaryWallets = React.useMemo(() => canHaveMultipleWalletsConnected
         ? wallets.filter((wallet) => wallet.id !== primaryWalletId)
         : [], [primaryWalletId, wallets, canHaveMultipleWalletsConnected]);
     const getSelectedWallet = React.useCallback((walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -102,7 +102,6 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         }
         if (primaryWalletId === walletId)
             return;
-        const primaryWallet = getPrimaryWallet();
         if (checkIfAccountChangeIsRequired(primaryWallet, newPrimaryWallet)) {
             yield newPrimaryWallet.connector.connect();
             setPrimaryWalletId(walletId);
@@ -154,7 +153,7 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         authToken,
         checkIfAccountChangeIsRequired,
         checkIfShowQrCodeModal,
-        getPrimaryWallet,
+        primaryWallet,
         getSelectedWallet,
         primaryWalletId,
         setDesktopUri,
@@ -162,17 +161,13 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         setPrimaryWalletId,
         setQrcodeUri,
     ]);
-    const walletConnectors = wallets.map((wallet) => wallet.connector);
     return {
         didConnectedStateLoad,
-        getPrimaryWallet,
-        getSecondaryWallets,
-        primaryWallet: getPrimaryWallet(),
-        secondaryWallets: getSecondaryWallets(),
+        primaryWallet,
+        secondaryWallets,
         setPrimaryWallet,
         setShowQrcodeModal,
         showQrcodeModal,
-        walletConnectors,
         wallets,
     };
 };