@dynamic-labs/sdk-react-core 2.1.2 → 2.1.4

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

@@ -34,6 +34,7 @@ const createOwnerWallet = (wallet, verifiedCredentials) => {
         connected: false,
         connector: eoaConnector,
         id: ownerAccount.id,
+        key: ownerAccount.walletName || eoaConnector.key,
     };
 };
 

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

@@ -30,6 +30,7 @@ const createOwnerWallet = (wallet, verifiedCredentials) => {
         connected: false,
         connector: eoaConnector,
         id: ownerAccount.id,
+        key: ownerAccount.walletName || eoaConnector.key,
     };
 };
 

package/src/lib/utils/functions/walletListBuilder/utils/applyMultiWalletFilters/applyMultiWalletFilters.cjs

@@ -0,0 +1,24 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var filterConnectedWallets = require('../filterConnectedWallets/filterConnectedWallets.cjs');
+var staticLinkedWalletFilter = require('../staticLinkedWalletFilter/staticLinkedWalletFilter.cjs');
+var filterWalletConnectWallets = require('../filterWalletConnectWallets/filterWalletConnectWallets.cjs');
+
+const applyMultiWalletFilters = ({ authMode, userWallets, walletOptions, }) => {
+    const walletList = filterWalletConnectWallets.filterWalletConnectWallets({
+        userWallets,
+        walletOptions,
+    });
+    if (authMode === 'connect-only') {
+        return filterConnectedWallets.filterConnectedWallets({
+            userWallets,
+            walletOptions: walletList,
+        });
+    }
+    return staticLinkedWalletFilter.staticWalletFilter(userWallets, walletList);
+};
+
+exports.applyMultiWalletFilters = applyMultiWalletFilters;

package/src/lib/utils/functions/walletListBuilder/utils/applyMultiWalletFilters/applyMultiWalletFilters.d.ts

@@ -0,0 +1,6 @@
+import { AuthModeType, Wallet, WalletOption } from '../../../../../shared';
+export declare const applyMultiWalletFilters: ({ authMode, userWallets, walletOptions, }: {
+    authMode: AuthModeType;
+    userWallets: Wallet[];
+    walletOptions: WalletOption[];
+}) => WalletOption[];

package/src/lib/utils/functions/walletListBuilder/utils/applyMultiWalletFilters/applyMultiWalletFilters.js

@@ -0,0 +1,20 @@
+'use client'
+import { filterConnectedWallets } from '../filterConnectedWallets/filterConnectedWallets.js';
+import { staticWalletFilter } from '../staticLinkedWalletFilter/staticLinkedWalletFilter.js';
+import { filterWalletConnectWallets } from '../filterWalletConnectWallets/filterWalletConnectWallets.js';
+
+const applyMultiWalletFilters = ({ authMode, userWallets, walletOptions, }) => {
+    const walletList = filterWalletConnectWallets({
+        userWallets,
+        walletOptions,
+    });
+    if (authMode === 'connect-only') {
+        return filterConnectedWallets({
+            userWallets,
+            walletOptions: walletList,
+        });
+    }
+    return staticWalletFilter(userWallets, walletList);
+};
+
+export { applyMultiWalletFilters };

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

@@ -0,0 +1 @@
+export * from './applyMultiWalletFilters';

package/src/lib/utils/functions/walletListBuilder/utils/filterConnectedWallets/filterConnectedWallets.cjs

@@ -8,8 +8,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
  * This is useful for connect-only multi-wallet, where we want users to only connect new wallets,
  * not additional accounts from the same wallet
  */
-const filterConnectedWallets = ({ walletOptions, connectedWallets, }) => {
-    const connectedWalletKeys = new Set(connectedWallets.map((connectedWallet) => connectedWallet.connector.key));
+const filterConnectedWallets = ({ walletOptions, userWallets, }) => {
+    const connectedWalletKeys = new Set(userWallets.map((connectedWallet) => connectedWallet.connector.key));
     /**
      * Phantom and Phantom Ledger are the same wallet, so we have to filter both of them
      * if one is present, because the next connection will not work, it will just connect the

package/src/lib/utils/functions/walletListBuilder/utils/filterConnectedWallets/filterConnectedWallets.d.ts

@@ -4,7 +4,7 @@ import { Wallet, WalletOption } from '../../../../../shared';
  * This is useful for connect-only multi-wallet, where we want users to only connect new wallets,
  * not additional accounts from the same wallet
  */
-export declare const filterConnectedWallets: ({ walletOptions, connectedWallets, }: {
+export declare const filterConnectedWallets: ({ walletOptions, userWallets, }: {
     walletOptions: WalletOption[];
-    connectedWallets: Wallet[];
+    userWallets: Wallet[];
 }) => WalletOption[];

package/src/lib/utils/functions/walletListBuilder/utils/filterConnectedWallets/filterConnectedWallets.js

@@ -4,8 +4,8 @@
  * This is useful for connect-only multi-wallet, where we want users to only connect new wallets,
  * not additional accounts from the same wallet
  */
-const filterConnectedWallets = ({ walletOptions, connectedWallets, }) => {
-    const connectedWalletKeys = new Set(connectedWallets.map((connectedWallet) => connectedWallet.connector.key));
+const filterConnectedWallets = ({ walletOptions, userWallets, }) => {
+    const connectedWalletKeys = new Set(userWallets.map((connectedWallet) => connectedWallet.connector.key));
     /**
      * Phantom and Phantom Ledger are the same wallet, so we have to filter both of them
      * if one is present, because the next connection will not work, it will just connect the

package/src/lib/utils/functions/walletListBuilder/utils/filterWalletConnectWallets/filterWalletConnectWallets.cjs

@@ -0,0 +1,20 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+/**
+ * Used to filter out WalletConnect wallets if user has already a WalletConnect wallet connected/linked
+ * This is useful for multi-wallet on mobile, since WalletConnect doesn't work very well with multiwallet
+ */
+const filterWalletConnectWallets = ({ walletOptions, userWallets, }) => {
+    const hasWCWallet = userWallets.some((wallet) => wallet.connector.isWalletConnect);
+    // user doesn't have any WalletConnect wallet connected/linked, so we don't need to filter anything
+    if (!hasWCWallet) {
+        return walletOptions;
+    }
+    // filter out WalletConnect wallets
+    return walletOptions.filter((walletOption) => !walletOption.walletConnector.isWalletConnect);
+};
+
+exports.filterWalletConnectWallets = filterWalletConnectWallets;

package/src/lib/utils/functions/walletListBuilder/utils/filterWalletConnectWallets/filterWalletConnectWallets.d.ts

@@ -0,0 +1,9 @@
+import { Wallet, WalletOption } from '../../../../../shared';
+/**
+ * Used to filter out WalletConnect wallets if user has already a WalletConnect wallet connected/linked
+ * This is useful for multi-wallet on mobile, since WalletConnect doesn't work very well with multiwallet
+ */
+export declare const filterWalletConnectWallets: ({ walletOptions, userWallets, }: {
+    walletOptions: WalletOption[];
+    userWallets: Wallet[];
+}) => WalletOption[];

package/src/lib/utils/functions/walletListBuilder/utils/filterWalletConnectWallets/filterWalletConnectWallets.js

@@ -0,0 +1,16 @@
+'use client'
+/**
+ * Used to filter out WalletConnect wallets if user has already a WalletConnect wallet connected/linked
+ * This is useful for multi-wallet on mobile, since WalletConnect doesn't work very well with multiwallet
+ */
+const filterWalletConnectWallets = ({ walletOptions, userWallets, }) => {
+    const hasWCWallet = userWallets.some((wallet) => wallet.connector.isWalletConnect);
+    // user doesn't have any WalletConnect wallet connected/linked, so we don't need to filter anything
+    if (!hasWCWallet) {
+        return walletOptions;
+    }
+    // filter out WalletConnect wallets
+    return walletOptions.filter((walletOption) => !walletOption.walletConnector.isWalletConnect);
+};
+
+export { filterWalletConnectWallets };

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

@@ -0,0 +1 @@
+export * from './filterWalletConnectWallets';

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

@@ -6,8 +6,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var getCalculatedOffset = require('./utils/getCalculatedOffset/getCalculatedOffset.cjs');
 var groupWalletOptions = require('./utils/groupWalletOptions/groupWalletOptions.cjs');
-var filterConnectedWallets = require('./utils/filterConnectedWallets/filterConnectedWallets.cjs');
-var staticLinkedWalletFilter = require('./utils/staticLinkedWalletFilter/staticLinkedWalletFilter.cjs');
+var applyMultiWalletFilters = require('./utils/applyMultiWalletFilters/applyMultiWalletFilters.cjs');
 
 const PRIORITY_WALLET_LIST = [
     'metamask',
@@ -57,21 +56,19 @@ const sortedInputList = (inputList, recommendedWalletKeys) => {
         ...unsortedOtherWallets,
     ];
 };
-const walletListBuilder = ({ authMode, connectedWallets, linkedWallets, multiWallet, numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletKey, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, showMoreWalletsWithFilter, recommendedWallets, }) => {
+const walletListBuilder = ({ authMode, userWallets, multiWallet, numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletKey, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, showMoreWalletsWithFilter, recommendedWallets, }) => {
     let walletList = inputList;
     if (isWalletConnectList) {
         walletList = inputList.filter((wallet) => wallet.walletConnector.isWalletConnect &&
             wallet.key !== 'walletconnect');
     }
-    if (authMode === 'connect-only' && multiWallet) {
-        walletList = filterConnectedWallets.filterConnectedWallets({
-            connectedWallets,
+    if (multiWallet) {
+        walletList = applyMultiWalletFilters.applyMultiWalletFilters({
+            authMode,
+            userWallets,
             walletOptions: walletList,
         });
     }
-    if (authMode === 'connect-and-sign' && multiWallet) {
-        walletList = staticLinkedWalletFilter.staticWalletFilter(linkedWallets, walletList);
-    }
     let lastUsedWallet;
     const hasWalletFilter = Boolean(walletsFilter);
     const signWithEmailWallet = getSignWithEmailWallet(signWithEmailWalletName, walletList);

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

@@ -2,8 +2,7 @@ import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { AuthModeType, RecommendedWallet, Wallet, WalletOption } from '../../../shared/types';
 type BuilderParams = {
     authMode: AuthModeType;
-    connectedWallets: Wallet[];
-    linkedWallets: Wallet[];
+    userWallets: Wallet[];
     multiWallet: boolean;
     inputList: WalletOption[];
     isWalletConnectList: boolean;
@@ -24,7 +23,7 @@ type BuilderResult = {
 };
 export declare const PRIORITY_WALLET_LIST: string[];
 export declare const SIGN_IN_WITH_EMAIL_WALLET_NAME = "Sign In With Email";
-export declare const walletListBuilder: ({ authMode, connectedWallets, linkedWallets, multiWallet, numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletKey, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, showMoreWalletsWithFilter, recommendedWallets, }: BuilderParams) => BuilderResult;
+export declare const walletListBuilder: ({ authMode, userWallets, multiWallet, numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletKey, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, showMoreWalletsWithFilter, recommendedWallets, }: BuilderParams) => BuilderResult;
 /**
  * This calculation adds an offset to numberOfWalletsToShow so we will show the
  * intended wallets + installed and last used.

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

@@ -2,8 +2,7 @@
 import { isEmbeddedConnector } from '@dynamic-labs/wallet-connector-core';
 import { getCalculatedOffset } from './utils/getCalculatedOffset/getCalculatedOffset.js';
 import { groupWalletOptions } from './utils/groupWalletOptions/groupWalletOptions.js';
-import { filterConnectedWallets } from './utils/filterConnectedWallets/filterConnectedWallets.js';
-import { staticWalletFilter } from './utils/staticLinkedWalletFilter/staticLinkedWalletFilter.js';
+import { applyMultiWalletFilters } from './utils/applyMultiWalletFilters/applyMultiWalletFilters.js';
 
 const PRIORITY_WALLET_LIST = [
     'metamask',
@@ -53,21 +52,19 @@ const sortedInputList = (inputList, recommendedWalletKeys) => {
         ...unsortedOtherWallets,
     ];
 };
-const walletListBuilder = ({ authMode, connectedWallets, linkedWallets, multiWallet, numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletKey, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, showMoreWalletsWithFilter, recommendedWallets, }) => {
+const walletListBuilder = ({ authMode, userWallets, multiWallet, numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletKey, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, showMoreWalletsWithFilter, recommendedWallets, }) => {
     let walletList = inputList;
     if (isWalletConnectList) {
         walletList = inputList.filter((wallet) => wallet.walletConnector.isWalletConnect &&
             wallet.key !== 'walletconnect');
     }
-    if (authMode === 'connect-only' && multiWallet) {
-        walletList = filterConnectedWallets({
-            connectedWallets,
+    if (multiWallet) {
+        walletList = applyMultiWalletFilters({
+            authMode,
+            userWallets,
             walletOptions: walletList,
         });
     }
-    if (authMode === 'connect-and-sign' && multiWallet) {
-        walletList = staticWalletFilter(linkedWallets, walletList);
-    }
     let lastUsedWallet;
     const hasWalletFilter = Boolean(walletsFilter);
     const signWithEmailWallet = getSignWithEmailWallet(signWithEmailWalletName, walletList);

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

@@ -103,6 +103,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 connected: true,
                 connector: walletConnector,
                 id: storedConnectedWalletInfo.id,
+                key: walletConnector.key,
                 network: walletNetwork,
             };
             return walletObject;

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

@@ -99,6 +99,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 connected: true,
                 connector: walletConnector,
                 id: storedConnectedWalletInfo.id,
+                key: walletConnector.key,
                 network: walletNetwork,
             };
             return walletObject;

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

@@ -119,6 +119,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
                 connected: true,
                 connector: walletConnector,
                 id: embeddedWalletVerifiedCredential.id,
+                key: embeddedWalletVerifiedCredential.walletName || walletConnector.key,
             };
             const smartWallet$1 = smartWallet.findSmartWallet(embeddedWalletVerifiedCredential, updatedUser.verifiedCredentials);
             if (!smartWallet$1) {

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

@@ -115,6 +115,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
                 connected: true,
                 connector: walletConnector,
                 id: embeddedWalletVerifiedCredential.id,
+                key: embeddedWalletVerifiedCredential.walletName || walletConnector.key,
             };
             const smartWallet = findSmartWallet(embeddedWalletVerifiedCredential, updatedUser.verifiedCredentials);
             if (!smartWallet) {

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

@@ -14,9 +14,10 @@ require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
+var localStorage$1 = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
-require('../../../shared/utils/classes/storage/localStorage.cjs');
+var localStorage = require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -100,7 +101,7 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
  * }
  */
 const useEmbeddedWallet = () => {
-    const { user, projectSettings, primaryWalletId } = useInternalDynamicContext.useInternalDynamicContext();
+    const { user, projectSettings } = useInternalDynamicContext.useInternalDynamicContext();
     const { isTurnkeyWallet } = useIsTurnkeyWallet.useIsTurnkeyWallet();
     const { createEmbeddedWallet: createMPCWallet, canCreateMPCWallet, createPassword, revealEmbeddedWalletKey: reveaCoinbaseMPCEmbeddedWalletKey, } = useMPCEmbeddedWallet.useMPCEmbeddedWallet();
     const { createEmbeddedWallet: createTurnkeyEmbeddedWallet, createOrRestoreSession, createPasskey, revealEmbeddedWalletKey: revealTurnkeyEmbeddedWalletKey, getPasskeys, isSessionActive, sendOneTimeCode, } = useSecureEnclaveEmbeddedWallet.useSecureEnclaveEmbeddedWallet();
@@ -139,9 +140,10 @@ const useEmbeddedWallet = () => {
     });
     const shouldAutoCreateEmbeddedWallet = React.useCallback(() => {
         var _a, _b;
+        const hasPrimaryWallet = localStorage.LocalStorage.getFromLS(localStorage$1.PRIMARY_WALLET_ID);
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings) ||
             isCoinbaseWaasEnabled.isCoinbaseWaasEnabled(projectSettings);
-        if (!hasEmbeddedWalletProviderEnabled || primaryWalletId) {
+        if (!hasEmbeddedWalletProviderEnabled || hasPrimaryWallet) {
             return false;
         }
         // Turnkey specific rules
@@ -153,7 +155,7 @@ const useEmbeddedWallet = () => {
             return false;
         }
         return true;
-    }, [primaryWalletId, projectSettings]);
+    }, [projectSettings]);
     return {
         createEmbeddedWallet,
         createOrRestoreSession,

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

@@ -10,9 +10,10 @@ import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
+import { PRIMARY_WALLET_ID } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
 import '../../constants/values.js';
-import '../../../shared/utils/classes/storage/localStorage.js';
+import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
 import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
@@ -96,7 +97,7 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
  * }
  */
 const useEmbeddedWallet = () => {
-    const { user, projectSettings, primaryWalletId } = useInternalDynamicContext();
+    const { user, projectSettings } = useInternalDynamicContext();
     const { isTurnkeyWallet } = useIsTurnkeyWallet();
     const { createEmbeddedWallet: createMPCWallet, canCreateMPCWallet, createPassword, revealEmbeddedWalletKey: reveaCoinbaseMPCEmbeddedWalletKey, } = useMPCEmbeddedWallet();
     const { createEmbeddedWallet: createTurnkeyEmbeddedWallet, createOrRestoreSession, createPasskey, revealEmbeddedWalletKey: revealTurnkeyEmbeddedWalletKey, getPasskeys, isSessionActive, sendOneTimeCode, } = useSecureEnclaveEmbeddedWallet();
@@ -135,9 +136,10 @@ const useEmbeddedWallet = () => {
     });
     const shouldAutoCreateEmbeddedWallet = useCallback(() => {
         var _a, _b;
+        const hasPrimaryWallet = LocalStorage.getFromLS(PRIMARY_WALLET_ID);
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled(projectSettings) ||
             isCoinbaseWaasEnabled(projectSettings);
-        if (!hasEmbeddedWalletProviderEnabled || primaryWalletId) {
+        if (!hasEmbeddedWalletProviderEnabled || hasPrimaryWallet) {
             return false;
         }
         // Turnkey specific rules
@@ -149,7 +151,7 @@ const useEmbeddedWallet = () => {
             return false;
         }
         return true;
-    }, [primaryWalletId, projectSettings]);
+    }, [projectSettings]);
     return {
         createEmbeddedWallet,
         createOrRestoreSession,

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

@@ -92,6 +92,7 @@ const useCoinbaseMPC = () => {
     const { user, setPrimaryWalletId, walletConnectorOptions, environmentId, consumeNonce, displaySiweStatement, appName, siweStatement, handleLogOut, setShowAuthFlow, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setError } = ErrorContext.useErrorContext();
     const returnExistingCoinbaseMPCWallet = React.useCallback((validatedUser, connector, embeddedWalletVerifiedCredential) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        var _a;
         connector.setVerifiedCredentials(validatedUser.verifiedCredentials);
         setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
         const coinbaseMPCWallet = {
@@ -101,10 +102,11 @@ const useCoinbaseMPC = () => {
             connected: true,
             connector,
             id: embeddedWalletVerifiedCredential.id,
+            key: (_a = embeddedWalletVerifiedCredential.walletName) !== null && _a !== void 0 ? _a : connector.key,
         };
         return coinbaseMPCWallet;
     }), [setPrimaryWalletId]);
-    const linkCoinbaseMPCWallet = React.useCallback((_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ connector, backupCode, password, source, }) {
+    const linkCoinbaseMPCWallet = React.useCallback((_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ connector, backupCode, password, source, }) {
         const nonce = consumeNonce();
         if (nonce === undefined)
             throw new utils.DynamicError('Missing nonce');
@@ -145,6 +147,7 @@ const useCoinbaseMPC = () => {
         siweStatement,
     ]);
     const createNewCoinbaseMPCWallet = React.useCallback((connector, password) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        var _c;
         const initialWalletPassword = password
             ? password
             : generateRandomPassword.generateRandomPassword(DYNAMIC_PASSWORD_LENGTH);
@@ -166,6 +169,7 @@ const useCoinbaseMPC = () => {
                 connected: true,
                 connector,
                 id: newSelectedCredentialWallet.id,
+                key: (_c = newSelectedCredentialWallet.walletName) !== null && _c !== void 0 ? _c : connector.key,
             };
             dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, newSelectedCredentialWallet, getAuthToken.getAuthToken(), updatedUser);
             return coinbaseMPCWallet;
@@ -181,11 +185,11 @@ const useCoinbaseMPC = () => {
         return undefined;
     }), [linkCoinbaseMPCWallet, handleLogOut, setError]);
     const createCoinbaseMPCWallet = React.useCallback((...args_1) => _tslib.__awaiter(void 0, [...args_1], void 0, function* (chains = [sdkApiCore.ChainEnum.Evm], password) {
-        var _b;
+        var _d;
         if (!user) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
-        const connector = (_b = findCoinbaseMPCWallet.findCoinbaseMPCWallet(walletConnectorOptions)) === null || _b === void 0 ? void 0 : _b.walletConnector;
+        const connector = (_d = findCoinbaseMPCWallet.findCoinbaseMPCWallet(walletConnectorOptions)) === null || _d === void 0 ? void 0 : _d.walletConnector;
         if (!connector || !walletConnectorCore.isCoinbaseMpcWalletConnector(connector)) {
             const error = new utils.DynamicError('CoinbaseWaaSWalletConnectors not found');
             logger.logger.error('Failed to create embedded wallet', error);

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

@@ -88,6 +88,7 @@ const useCoinbaseMPC = () => {
     const { user, setPrimaryWalletId, walletConnectorOptions, environmentId, consumeNonce, displaySiweStatement, appName, siweStatement, handleLogOut, setShowAuthFlow, } = useInternalDynamicContext();
     const { setError } = useErrorContext();
     const returnExistingCoinbaseMPCWallet = useCallback((validatedUser, connector, embeddedWalletVerifiedCredential) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
         connector.setVerifiedCredentials(validatedUser.verifiedCredentials);
         setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
         const coinbaseMPCWallet = {
@@ -97,10 +98,11 @@ const useCoinbaseMPC = () => {
             connected: true,
             connector,
             id: embeddedWalletVerifiedCredential.id,
+            key: (_a = embeddedWalletVerifiedCredential.walletName) !== null && _a !== void 0 ? _a : connector.key,
         };
         return coinbaseMPCWallet;
     }), [setPrimaryWalletId]);
-    const linkCoinbaseMPCWallet = useCallback((_a) => __awaiter(void 0, [_a], void 0, function* ({ connector, backupCode, password, source, }) {
+    const linkCoinbaseMPCWallet = useCallback((_b) => __awaiter(void 0, [_b], void 0, function* ({ connector, backupCode, password, source, }) {
         const nonce = consumeNonce();
         if (nonce === undefined)
             throw new DynamicError('Missing nonce');
@@ -141,6 +143,7 @@ const useCoinbaseMPC = () => {
         siweStatement,
     ]);
     const createNewCoinbaseMPCWallet = useCallback((connector, password) => __awaiter(void 0, void 0, void 0, function* () {
+        var _c;
         const initialWalletPassword = password
             ? password
             : generateRandomPassword(DYNAMIC_PASSWORD_LENGTH);
@@ -162,6 +165,7 @@ const useCoinbaseMPC = () => {
                 connected: true,
                 connector,
                 id: newSelectedCredentialWallet.id,
+                key: (_c = newSelectedCredentialWallet.walletName) !== null && _c !== void 0 ? _c : connector.key,
             };
             dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, newSelectedCredentialWallet, getAuthToken(), updatedUser);
             return coinbaseMPCWallet;
@@ -177,11 +181,11 @@ const useCoinbaseMPC = () => {
         return undefined;
     }), [linkCoinbaseMPCWallet, handleLogOut, setError]);
     const createCoinbaseMPCWallet = useCallback((...args_1) => __awaiter(void 0, [...args_1], void 0, function* (chains = [ChainEnum.Evm], password) {
-        var _b;
+        var _d;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
-        const connector = (_b = findCoinbaseMPCWallet(walletConnectorOptions)) === null || _b === void 0 ? void 0 : _b.walletConnector;
+        const connector = (_d = findCoinbaseMPCWallet(walletConnectorOptions)) === null || _d === void 0 ? void 0 : _d.walletConnector;
         if (!connector || !isCoinbaseMpcWalletConnector(connector)) {
             const error = new DynamicError('CoinbaseWaaSWalletConnectors not found');
             logger.error('Failed to create embedded wallet', error);

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

@@ -161,11 +161,14 @@ const useTurnkey = () => {
             connected: true,
             connector: (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) || {},
             id: embeddedWalletVerifiedCredential.id,
+            key: embeddedWalletVerifiedCredential.walletName ||
+                (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector.key) ||
+                '',
         };
         return Promise.resolve(passkeyWallet);
     }), [setPrimaryWalletId, walletConnectorOptions, user]);
     const createTurnkeyWallet = React.useCallback((chains, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f, _g, _h;
+        var _e, _f, _g, _h, _j;
         if (!user) {
             throw new Error(errors.USER_NOT_LOGGED_IN);
         }
@@ -207,6 +210,7 @@ const useTurnkey = () => {
                     connected: true,
                     connector: walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
+                    key: (_j = embeddedWalletVerifiedCredential.walletName) !== null && _j !== void 0 ? _j : walletConnector.key,
                 };
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
                 dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, getAuthToken.getAuthToken(), user);

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

@@ -157,11 +157,14 @@ const useTurnkey = () => {
             connected: true,
             connector: (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) || {},
             id: embeddedWalletVerifiedCredential.id,
+            key: embeddedWalletVerifiedCredential.walletName ||
+                (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector.key) ||
+                '',
         };
         return Promise.resolve(passkeyWallet);
     }), [setPrimaryWalletId, walletConnectorOptions, user]);
     const createTurnkeyWallet = useCallback((chains, options) => __awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f, _g, _h;
+        var _e, _f, _g, _h, _j;
         if (!user) {
             throw new Error(USER_NOT_LOGGED_IN);
         }
@@ -203,6 +206,7 @@ const useTurnkey = () => {
                     connected: true,
                     connector: walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
+                    key: (_j = embeddedWalletVerifiedCredential.walletName) !== null && _j !== void 0 ? _j : walletConnector.key,
                 };
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
                 dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, getAuthToken(), user);

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

@@ -81,7 +81,7 @@ require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCa
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useNetworkNotSupported = () => {
-    const { selectedWalletConnector: walletConnector, setShowAuthFlow, bridgeChainsToConnect, bridgeOnboardingCompleted, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { selectedWalletConnector: walletConnector, setShowAuthFlow, bridgeChainsToConnect, bridgeOnboardingCompleted, isBridgeFlow, } = useInternalDynamicContext.useInternalDynamicContext();
     const { network: walletConnectorNetwork } = useWalletConnectorNetwork.useWalletConnectorNetwork(walletConnector);
     const finishConnectAndSign = useConnectAndSign.useConnectAndSign({
         shouldCallCallback: false,
@@ -95,15 +95,21 @@ const useNetworkNotSupported = () => {
         finishConnectAndSign({
             walletConnector: walletConnector,
         });
-        // there are two scenarios here, one in not connected state and the other one in connected state.
-        // previously we were calling setShowAuthFlow(false) in useHandleWalletsToConnect.
-        // now, we don't call it in network-not-supported view, so we need to handle that scenario and close modal here
-        // this should be gone, once we're done with the useConnectAndSign hook refactor.
-        // TODO: https://linear.app/dynamic-labs/issue/QNTM-117/break-useconnectandsign-hook-to-small-parts
-        if (bridgeOnboardingCompleted) {
+        // we're checking for bridgeChainsToConnect because in some scenarios,
+        // bridgeOnboardingCompleted might have not been set yet
+        if (!isBridgeFlow ||
+            bridgeOnboardingCompleted ||
+            !(bridgeChainsToConnect === null || bridgeChainsToConnect === void 0 ? void 0 : bridgeChainsToConnect.length)) {
             setShowAuthFlow(false);
         }
-    }, [walletConnectorNetwork, setShowAuthFlow, bridgeOnboardingCompleted]);
+    }, [
+        isBridgeFlow,
+        walletConnectorNetwork,
+        setShowAuthFlow,
+        bridgeOnboardingCompleted,
+        finishConnectAndSign,
+        bridgeChainsToConnect,
+    ]);
     return { currentNetwork: walletConnectorNetwork };
 };
 

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

@@ -77,7 +77,7 @@ import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCar
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useNetworkNotSupported = () => {
-    const { selectedWalletConnector: walletConnector, setShowAuthFlow, bridgeChainsToConnect, bridgeOnboardingCompleted, } = useInternalDynamicContext();
+    const { selectedWalletConnector: walletConnector, setShowAuthFlow, bridgeChainsToConnect, bridgeOnboardingCompleted, isBridgeFlow, } = useInternalDynamicContext();
     const { network: walletConnectorNetwork } = useWalletConnectorNetwork(walletConnector);
     const finishConnectAndSign = useConnectAndSign({
         shouldCallCallback: false,
@@ -91,15 +91,21 @@ const useNetworkNotSupported = () => {
         finishConnectAndSign({
             walletConnector: walletConnector,
         });
-        // there are two scenarios here, one in not connected state and the other one in connected state.
-        // previously we were calling setShowAuthFlow(false) in useHandleWalletsToConnect.
-        // now, we don't call it in network-not-supported view, so we need to handle that scenario and close modal here
-        // this should be gone, once we're done with the useConnectAndSign hook refactor.
-        // TODO: https://linear.app/dynamic-labs/issue/QNTM-117/break-useconnectandsign-hook-to-small-parts
-        if (bridgeOnboardingCompleted) {
+        // we're checking for bridgeChainsToConnect because in some scenarios,
+        // bridgeOnboardingCompleted might have not been set yet
+        if (!isBridgeFlow ||
+            bridgeOnboardingCompleted ||
+            !(bridgeChainsToConnect === null || bridgeChainsToConnect === void 0 ? void 0 : bridgeChainsToConnect.length)) {
             setShowAuthFlow(false);
         }
-    }, [walletConnectorNetwork, setShowAuthFlow, bridgeOnboardingCompleted]);
+    }, [
+        isBridgeFlow,
+        walletConnectorNetwork,
+        setShowAuthFlow,
+        bridgeOnboardingCompleted,
+        finishConnectAndSign,
+        bridgeChainsToConnect,
+    ]);
     return { currentNetwork: walletConnectorNetwork };
 };
 

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

@@ -112,7 +112,7 @@ const useSwitchWallet = () => {
             throw new Error(`Wallet with id ${walletId} not found`);
         }
         if (((_a = wallet.connector) === null || _a === void 0 ? void 0 : _a.key) === 'unknown') {
-            throw new Error('Cannot switch to wallet with unknown connector');
+            throw new Error("Cannot switch to this wallet, as it doesn't have an initialized wallet connector on this platform (desktop/mobile)");
         }
         const { connector } = wallet;
         const email = (_b = user === null || user === void 0 ? void 0 : user.verifiedCredentials.find((verifiedCredential) => verifiedCredential.format === 'email')) === null || _b === void 0 ? void 0 : _b.email;