@dynamic-labs/sdk-react-core 4.40.0 → 4.40.2

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

@@ -7,7 +7,7 @@ var values = require('../../constants/values.cjs');
 var compareChains = require('../compareChains/compareChains.cjs');
 
 const findWalletOptionFor = (account, walletOptions) => {
-    const { walletName } = account;
+    const { walletName, chain } = account;
     if (walletName === 'turnkeyhd' || walletName === 'dynamicwaas') {
         const chain = account.chain
             ? values.VerifiedCredentialNameToChainEnum[account.chain]
@@ -19,14 +19,19 @@ const findWalletOptionFor = (account, walletOptions) => {
     // set to "unknown" if not found in wallet book. We need to use fallback connector for these wallets.
     // The "unknown" wallet connector is also legacy and should never be used.
     if (walletName !== 'unknown') {
-        const wallet = walletOptions.find((wallet) => wallet.key === walletName);
+        // The verified credential chain follows a different format than the wallet connector chain
+        // so we need first convert
+        const walletChain = chain
+            ? values.VerifiedCredentialNameToChainEnum[chain]
+            : undefined;
+        const wallet = walletOptions.find((wallet) => wallet.key === walletName &&
+            (!walletChain || wallet.walletConnector.connectedChain === walletChain));
         if (wallet)
             return wallet;
     }
     // If we cannot find the correct connector for the wallet, we default to the fallback
     // this way the wallet will appear in user wallets, but will not be able to be interacted with
     const fallbackOptions = walletOptions.filter((wallet) => wallet.key === 'fallbackconnector');
-    const { chain } = account;
     if (chain) {
         const unknownWallet = fallbackOptions.find(({ walletConnector }) => compareChains.compareChains(walletConnector.connectedChain, chain));
         if (unknownWallet)

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

@@ -3,7 +3,7 @@ import { VerifiedCredentialNameToChainEnum } from '../../constants/values.js';
 import { compareChains } from '../compareChains/compareChains.js';
 
 const findWalletOptionFor = (account, walletOptions) => {
-    const { walletName } = account;
+    const { walletName, chain } = account;
     if (walletName === 'turnkeyhd' || walletName === 'dynamicwaas') {
         const chain = account.chain
             ? VerifiedCredentialNameToChainEnum[account.chain]
@@ -15,14 +15,19 @@ const findWalletOptionFor = (account, walletOptions) => {
     // set to "unknown" if not found in wallet book. We need to use fallback connector for these wallets.
     // The "unknown" wallet connector is also legacy and should never be used.
     if (walletName !== 'unknown') {
-        const wallet = walletOptions.find((wallet) => wallet.key === walletName);
+        // The verified credential chain follows a different format than the wallet connector chain
+        // so we need first convert
+        const walletChain = chain
+            ? VerifiedCredentialNameToChainEnum[chain]
+            : undefined;
+        const wallet = walletOptions.find((wallet) => wallet.key === walletName &&
+            (!walletChain || wallet.walletConnector.connectedChain === walletChain));
         if (wallet)
             return wallet;
     }
     // If we cannot find the correct connector for the wallet, we default to the fallback
     // this way the wallet will appear in user wallets, but will not be able to be interacted with
     const fallbackOptions = walletOptions.filter((wallet) => wallet.key === 'fallbackconnector');
-    const { chain } = account;
     if (chain) {
         const unknownWallet = fallbackOptions.find(({ walletConnector }) => compareChains(walletConnector.connectedChain, chain));
         if (unknownWallet)

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

@@ -28,7 +28,10 @@ const groupWalletOptions = (walletGroups, walletOptionList) => {
         // Validate if there is any other wallet with the same group
         const isThereWalletOptionWithSameGroup = walletOptionList.some((walletOption) => {
             const isSameGroup = currentWalletOption.group === walletOption.group;
-            const isDifferentKey = currentWalletOption.key !== walletOption.key;
+            // Some WC wallets may have the same key on different chains, so we need to check that chain as well
+            const isDifferentKey = currentWalletOption.key !== walletOption.key ||
+                currentWalletOption.walletConnector.connectedChain !==
+                    walletOption.walletConnector.connectedChain;
             return isSameGroup && isDifferentKey;
         });
         // Avoid group creation if there only one wallet in group

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

@@ -24,7 +24,10 @@ const groupWalletOptions = (walletGroups, walletOptionList) => {
         // Validate if there is any other wallet with the same group
         const isThereWalletOptionWithSameGroup = walletOptionList.some((walletOption) => {
             const isSameGroup = currentWalletOption.group === walletOption.group;
-            const isDifferentKey = currentWalletOption.key !== walletOption.key;
+            // Some WC wallets may have the same key on different chains, so we need to check that chain as well
+            const isDifferentKey = currentWalletOption.key !== walletOption.key ||
+                currentWalletOption.walletConnector.connectedChain !==
+                    walletOption.walletConnector.connectedChain;
             return isSameGroup && isDifferentKey;
         });
         // Avoid group creation if there only one wallet in group

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

@@ -69,8 +69,11 @@ const walletListBuilder = ({ userWallets, multiWallet, numberOfWalletsToShow, in
             walletOptions: walletList,
         });
     }
-    let lastUsedWallet;
     const hasWalletFilter = Boolean(walletsFilter);
+    // This is an array because we might have multiple options with the same key
+    // this happens on WC wallets for different chains, because the WC wallet book entries for all chains
+    // is always in the EVM entry (for historical reasons) and therefore they all share the same EVM entry's key
+    const lastUsedWallets = [];
     const recommendedWalletsList = [];
     const installedWallets = [];
     const otherWallets = [];
@@ -78,13 +81,14 @@ const walletListBuilder = ({ userWallets, multiWallet, numberOfWalletsToShow, in
     const orderedInputList = orderAndFilterList(walletList, walletsFilter, isWalletConnectList, recommendedWalletKeys);
     orderedInputList.forEach((wallet) => {
         if (walletConnectorCore.isEmbeddedConnector(wallet.walletConnector) ||
-            !wallet.walletConnector.isAvailable)
+            !wallet.walletConnector.isAvailable) {
             return;
+        }
         if (recommendedWalletKeys === null || recommendedWalletKeys === void 0 ? void 0 : recommendedWalletKeys.includes(wallet.key)) {
             recommendedWalletsList.push(wallet);
         }
         else if (lastUsedWalletKey === wallet.key) {
-            lastUsedWallet = wallet;
+            lastUsedWallets.push(wallet);
         }
         else if (wallet.isInstalledOnBrowser) {
             installedWallets.push(wallet);
@@ -93,10 +97,9 @@ const walletListBuilder = ({ userWallets, multiWallet, numberOfWalletsToShow, in
             otherWallets.push(wallet);
         }
     });
-    const firstPriorityWallets = [...(lastUsedWallet ? [lastUsedWallet] : [])];
     const initialWalletsList = [
         ...recommendedWalletsList,
-        ...firstPriorityWallets,
+        ...lastUsedWallets,
         ...installedWallets,
         ...otherWallets,
     ];
@@ -106,7 +109,7 @@ const walletListBuilder = ({ userWallets, multiWallet, numberOfWalletsToShow, in
     // If a filter has been applied we want to add an offset to the number of wallets
     // to include the installed and last used wallets
     const updatedNumberOfWalletsToShow = showMoreWalletsWithFilter && hasWalletFilter
-        ? calculateWalletOffsetBasedOnInstalledAndLastUsedWallets(orderedInputList, firstPriorityWallets.concat(installedWallets), numberOfWalletsToShow)
+        ? calculateWalletOffsetBasedOnInstalledAndLastUsedWallets(orderedInputList, lastUsedWallets.concat(installedWallets), numberOfWalletsToShow)
         : numberOfWalletsToShow;
     const walletsList = listToDisplay(finalizedWalletList, searchFilter, isWalletConnectList, updatedNumberOfWalletsToShow, hasWalletFilter, loginWithEmail);
     return {
@@ -125,7 +128,11 @@ const orderAndFilterList = (walletList, walletsFilter, isWalletConnectList, reco
         return sortedWalletList;
     }
 };
-const KEEP_WALLETS_NAME_LIST = ['walletconnect', 'bitcoin.com wallet'];
+const KEEP_WALLETS_NAME_LIST = [
+    'walletconnect',
+    'walletconnect sol',
+    'bitcoin.com wallet',
+];
 const applySearchFilterToWalletOptionList = (rawSearchFilter, walletOptionList) => {
     const searchFilter = rawSearchFilter.trim().toLowerCase();
     const cleanName = (name) => {

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

@@ -65,8 +65,11 @@ const walletListBuilder = ({ userWallets, multiWallet, numberOfWalletsToShow, in
             walletOptions: walletList,
         });
     }
-    let lastUsedWallet;
     const hasWalletFilter = Boolean(walletsFilter);
+    // This is an array because we might have multiple options with the same key
+    // this happens on WC wallets for different chains, because the WC wallet book entries for all chains
+    // is always in the EVM entry (for historical reasons) and therefore they all share the same EVM entry's key
+    const lastUsedWallets = [];
     const recommendedWalletsList = [];
     const installedWallets = [];
     const otherWallets = [];
@@ -74,13 +77,14 @@ const walletListBuilder = ({ userWallets, multiWallet, numberOfWalletsToShow, in
     const orderedInputList = orderAndFilterList(walletList, walletsFilter, isWalletConnectList, recommendedWalletKeys);
     orderedInputList.forEach((wallet) => {
         if (isEmbeddedConnector(wallet.walletConnector) ||
-            !wallet.walletConnector.isAvailable)
+            !wallet.walletConnector.isAvailable) {
             return;
+        }
         if (recommendedWalletKeys === null || recommendedWalletKeys === void 0 ? void 0 : recommendedWalletKeys.includes(wallet.key)) {
             recommendedWalletsList.push(wallet);
         }
         else if (lastUsedWalletKey === wallet.key) {
-            lastUsedWallet = wallet;
+            lastUsedWallets.push(wallet);
         }
         else if (wallet.isInstalledOnBrowser) {
             installedWallets.push(wallet);
@@ -89,10 +93,9 @@ const walletListBuilder = ({ userWallets, multiWallet, numberOfWalletsToShow, in
             otherWallets.push(wallet);
         }
     });
-    const firstPriorityWallets = [...(lastUsedWallet ? [lastUsedWallet] : [])];
     const initialWalletsList = [
         ...recommendedWalletsList,
-        ...firstPriorityWallets,
+        ...lastUsedWallets,
         ...installedWallets,
         ...otherWallets,
     ];
@@ -102,7 +105,7 @@ const walletListBuilder = ({ userWallets, multiWallet, numberOfWalletsToShow, in
     // If a filter has been applied we want to add an offset to the number of wallets
     // to include the installed and last used wallets
     const updatedNumberOfWalletsToShow = showMoreWalletsWithFilter && hasWalletFilter
-        ? calculateWalletOffsetBasedOnInstalledAndLastUsedWallets(orderedInputList, firstPriorityWallets.concat(installedWallets), numberOfWalletsToShow)
+        ? calculateWalletOffsetBasedOnInstalledAndLastUsedWallets(orderedInputList, lastUsedWallets.concat(installedWallets), numberOfWalletsToShow)
         : numberOfWalletsToShow;
     const walletsList = listToDisplay(finalizedWalletList, searchFilter, isWalletConnectList, updatedNumberOfWalletsToShow, hasWalletFilter, loginWithEmail);
     return {
@@ -121,7 +124,11 @@ const orderAndFilterList = (walletList, walletsFilter, isWalletConnectList, reco
         return sortedWalletList;
     }
 };
-const KEEP_WALLETS_NAME_LIST = ['walletconnect', 'bitcoin.com wallet'];
+const KEEP_WALLETS_NAME_LIST = [
+    'walletconnect',
+    'walletconnect sol',
+    'bitcoin.com wallet',
+];
 const applySearchFilterToWalletOptionList = (rawSearchFilter, walletOptionList) => {
     const searchFilter = rawSearchFilter.trim().toLowerCase();
     const cleanName = (name) => {

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

@@ -124,7 +124,10 @@ const useSignConnectOnlyUser = () => {
             // We need this because in connect-only we don't want to show wallet-list
             // We don't want to show the back button in the pending signature view
             // because we don't want to go back to the wallet-list
-            setSelectedWalletConnectorKey(walletConnector.key);
+            setSelectedWalletConnectorKey({
+                chain: walletConnector.connectedChain,
+                key: walletConnector.key,
+            });
             pushView('pending-signature-without-back-button');
             setShowAuthFlow(true);
             // Wallet should be already connected at this point

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

@@ -120,7 +120,10 @@ const useSignConnectOnlyUser = () => {
             // We need this because in connect-only we don't want to show wallet-list
             // We don't want to show the back button in the pending signature view
             // because we don't want to go back to the wallet-list
-            setSelectedWalletConnectorKey(walletConnector.key);
+            setSelectedWalletConnectorKey({
+                chain: walletConnector.connectedChain,
+                key: walletConnector.key,
+            });
             pushView('pending-signature-without-back-button');
             setShowAuthFlow(true);
             // Wallet should be already connected at this point

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

@@ -137,7 +137,10 @@ const useConnectedWalletsNetworkValidation = () => {
         // This is required because NetworkNotSupported uses walletConnector to display wallet icon, address etc.
         if (connectedWalletWithInvalidNetwork.connector.key !==
             (selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key)) {
-            setSelectedWalletConnectorKey(connectedWalletWithInvalidNetwork.connector.key);
+            setSelectedWalletConnectorKey({
+                chain: connectedWalletWithInvalidNetwork.connector.connectedChain,
+                key: connectedWalletWithInvalidNetwork.connector.key,
+            });
         }
         const networkNotSupportedView = isProgrammableNetworkSwitchSupported.isProgrammableNetworkSwitchSupported(connectedWalletWithInvalidNetwork.connector)
             ? 'network-not-supported'

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

@@ -133,7 +133,10 @@ const useConnectedWalletsNetworkValidation = () => {
         // This is required because NetworkNotSupported uses walletConnector to display wallet icon, address etc.
         if (connectedWalletWithInvalidNetwork.connector.key !==
             (selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key)) {
-            setSelectedWalletConnectorKey(connectedWalletWithInvalidNetwork.connector.key);
+            setSelectedWalletConnectorKey({
+                chain: connectedWalletWithInvalidNetwork.connector.connectedChain,
+                key: connectedWalletWithInvalidNetwork.connector.key,
+            });
         }
         const networkNotSupportedView = isProgrammableNetworkSwitchSupported(connectedWalletWithInvalidNetwork.connector)
             ? 'network-not-supported'

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

@@ -17,7 +17,7 @@ var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
-require('../../constants/values.cjs');
+var values = require('../../constants/values.cjs');
 var hasPendingMfaAction = require('../../../shared/utils/functions/hasPendingMfaAction/hasPendingMfaAction.cjs');
 require('../../../shared/consts/index.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -162,7 +162,12 @@ const useSyncOnboardingFlow = ({ handler: headlessHandler, } = {}) => {
             setShowAuthFlow(true);
             const lastVerifiedCredential = userWithMissingInfo === null || userWithMissingInfo === void 0 ? void 0 : userWithMissingInfo.verifiedCredentials.find((vc) => vc.id === (userWithMissingInfo === null || userWithMissingInfo === void 0 ? void 0 : userWithMissingInfo.lastVerifiedCredentialId));
             if (lastVerifiedCredential === null || lastVerifiedCredential === void 0 ? void 0 : lastVerifiedCredential.walletName) {
-                setSelectedWalletConnectorKey(lastVerifiedCredential === null || lastVerifiedCredential === void 0 ? void 0 : lastVerifiedCredential.walletName);
+                setSelectedWalletConnectorKey({
+                    chain: (lastVerifiedCredential === null || lastVerifiedCredential === void 0 ? void 0 : lastVerifiedCredential.chain)
+                        ? values.VerifiedCredentialNameToChainEnum[lastVerifiedCredential.chain]
+                        : undefined,
+                    key: lastVerifiedCredential === null || lastVerifiedCredential === void 0 ? void 0 : lastVerifiedCredential.walletName,
+                });
             }
             switch (lastVerifiedCredential === null || lastVerifiedCredential === void 0 ? void 0 : lastVerifiedCredential.format) {
                 case sdkApiCore.JwtVerifiedCredentialFormatEnum.Email:

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

@@ -13,7 +13,7 @@ import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import '../../constants/colors.js';
-import '../../constants/values.js';
+import { VerifiedCredentialNameToChainEnum } from '../../constants/values.js';
 import { hasPendingMfaAction } from '../../../shared/utils/functions/hasPendingMfaAction/hasPendingMfaAction.js';
 import '../../../shared/consts/index.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
@@ -158,7 +158,12 @@ const useSyncOnboardingFlow = ({ handler: headlessHandler, } = {}) => {
             setShowAuthFlow(true);
             const lastVerifiedCredential = userWithMissingInfo === null || userWithMissingInfo === void 0 ? void 0 : userWithMissingInfo.verifiedCredentials.find((vc) => vc.id === (userWithMissingInfo === null || userWithMissingInfo === void 0 ? void 0 : userWithMissingInfo.lastVerifiedCredentialId));
             if (lastVerifiedCredential === null || lastVerifiedCredential === void 0 ? void 0 : lastVerifiedCredential.walletName) {
-                setSelectedWalletConnectorKey(lastVerifiedCredential === null || lastVerifiedCredential === void 0 ? void 0 : lastVerifiedCredential.walletName);
+                setSelectedWalletConnectorKey({
+                    chain: (lastVerifiedCredential === null || lastVerifiedCredential === void 0 ? void 0 : lastVerifiedCredential.chain)
+                        ? VerifiedCredentialNameToChainEnum[lastVerifiedCredential.chain]
+                        : undefined,
+                    key: lastVerifiedCredential === null || lastVerifiedCredential === void 0 ? void 0 : lastVerifiedCredential.walletName,
+                });
             }
             switch (lastVerifiedCredential === null || lastVerifiedCredential === void 0 ? void 0 : lastVerifiedCredential.format) {
                 case JwtVerifiedCredentialFormatEnum.Email:

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

@@ -45,7 +45,10 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
         if (!linkedSecondaryWallet) {
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
             if (isPrimaryWallet && primaryWallet) {
-                setSelectedWalletConnectorKey(primaryWallet.connector.key);
+                setSelectedWalletConnectorKey({
+                    chain: primaryWallet.connector.connectedChain,
+                    key: primaryWallet.connector.key,
+                });
             }
             return;
         }
@@ -105,7 +108,10 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
         }
         if (user && detectNewWalletsForLinking) {
             setMultiWalletWidgetState('detected_new_wallet');
-            setSelectedWalletConnectorKey(primaryWallet.connector.key);
+            setSelectedWalletConnectorKey({
+                chain: primaryWallet.connector.connectedChain,
+                key: primaryWallet.connector.key,
+            });
         }
     }, [
         detectNewWalletsForLinking,

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

@@ -41,7 +41,10 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
         if (!linkedSecondaryWallet) {
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
             if (isPrimaryWallet && primaryWallet) {
-                setSelectedWalletConnectorKey(primaryWallet.connector.key);
+                setSelectedWalletConnectorKey({
+                    chain: primaryWallet.connector.connectedChain,
+                    key: primaryWallet.connector.key,
+                });
             }
             return;
         }
@@ -101,7 +104,10 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
         }
         if (user && detectNewWalletsForLinking) {
             setMultiWalletWidgetState('detected_new_wallet');
-            setSelectedWalletConnectorKey(primaryWallet.connector.key);
+            setSelectedWalletConnectorKey({
+                chain: primaryWallet.connector.connectedChain,
+                key: primaryWallet.connector.key,
+            });
         }
     }, [
         detectNewWalletsForLinking,

package/src/lib/utils/hooks/useWalletItemActions/useHandleWalletItem/useHandleWalletItem.cjs

@@ -116,7 +116,10 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
         logger.logger.logVerboseTroubleshootingMessage('[handleCustodialWalletClick]', {
             twoStepAuthentication,
         });
-        setSelectedWalletConnectorKey(walletConnector.key);
+        setSelectedWalletConnectorKey({
+            chain: walletConnector.connectedChain,
+            key: walletConnector.key,
+        });
         return onCustodialWallet({
             requiresTwoStepAuthentication: twoStepAuthentication,
             walletConnector,
@@ -125,7 +128,10 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
     const handleMobileWalletClick = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _a;
         logger.logger.debug('handleMobileWalletClick', walletConnector);
-        setSelectedWalletConnectorKey(walletConnector.key);
+        setSelectedWalletConnectorKey({
+            chain: walletConnector.connectedChain,
+            key: walletConnector.key,
+        });
         // We need to set to LS when about to verify phantom wallet on mobile
         // because the deeplink interrupts this code execution and then redirects back on a new tab.
         // This resets all state (except for LS obviously). When we receive the phantom signature in this new tab,
@@ -153,12 +159,18 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
     });
     const handleInstalledExtensionClick = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         logger.logger.debug('handleInstalledExtensionClick', walletConnector);
-        setSelectedWalletConnectorKey(walletConnector.key);
+        setSelectedWalletConnectorKey({
+            chain: walletConnector.connectedChain,
+            key: walletConnector.key,
+        });
         return onInstalledExtension({ walletConnector });
     });
     const handleUninstalledClick = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         logger.logger.debug('handleUninstalledClick', walletConnector);
-        setSelectedWalletConnectorKey(walletConnector.key);
+        setSelectedWalletConnectorKey({
+            chain: walletConnector.connectedChain,
+            key: walletConnector.key,
+        });
         if (!walletConnector.canConnectViaQrCode) {
             replaceView('no-qr-not-installed');
         }
@@ -191,7 +203,10 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
             linkedWallets,
             walletConnectorKey: walletConnector.key,
         });
-        setSelectedWalletConnectorKey(walletConnector.key);
+        setSelectedWalletConnectorKey({
+            chain: walletConnector.connectedChain,
+            key: walletConnector.key,
+        });
         if (!activeAccountAlreadyLinked) {
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
             return;
@@ -246,7 +261,10 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
         // also this is only a feature in MM
         if (authMode$1 !== 'connect-only' && isMetamask) {
             try {
-                setSelectedWalletConnectorKey(walletConnector.key);
+                setSelectedWalletConnectorKey({
+                    chain: walletConnector.connectedChain,
+                    key: walletConnector.key,
+                });
                 pushView('pending-connect');
                 yield walletConnector.chooseAccountsToConnect();
             }

package/src/lib/utils/hooks/useWalletItemActions/useHandleWalletItem/useHandleWalletItem.js

@@ -112,7 +112,10 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
         logger.logVerboseTroubleshootingMessage('[handleCustodialWalletClick]', {
             twoStepAuthentication,
         });
-        setSelectedWalletConnectorKey(walletConnector.key);
+        setSelectedWalletConnectorKey({
+            chain: walletConnector.connectedChain,
+            key: walletConnector.key,
+        });
         return onCustodialWallet({
             requiresTwoStepAuthentication: twoStepAuthentication,
             walletConnector,
@@ -121,7 +124,10 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
     const handleMobileWalletClick = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
         logger.debug('handleMobileWalletClick', walletConnector);
-        setSelectedWalletConnectorKey(walletConnector.key);
+        setSelectedWalletConnectorKey({
+            chain: walletConnector.connectedChain,
+            key: walletConnector.key,
+        });
         // We need to set to LS when about to verify phantom wallet on mobile
         // because the deeplink interrupts this code execution and then redirects back on a new tab.
         // This resets all state (except for LS obviously). When we receive the phantom signature in this new tab,
@@ -149,12 +155,18 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
     });
     const handleInstalledExtensionClick = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
         logger.debug('handleInstalledExtensionClick', walletConnector);
-        setSelectedWalletConnectorKey(walletConnector.key);
+        setSelectedWalletConnectorKey({
+            chain: walletConnector.connectedChain,
+            key: walletConnector.key,
+        });
         return onInstalledExtension({ walletConnector });
     });
     const handleUninstalledClick = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
         logger.debug('handleUninstalledClick', walletConnector);
-        setSelectedWalletConnectorKey(walletConnector.key);
+        setSelectedWalletConnectorKey({
+            chain: walletConnector.connectedChain,
+            key: walletConnector.key,
+        });
         if (!walletConnector.canConnectViaQrCode) {
             replaceView('no-qr-not-installed');
         }
@@ -187,7 +199,10 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
             linkedWallets,
             walletConnectorKey: walletConnector.key,
         });
-        setSelectedWalletConnectorKey(walletConnector.key);
+        setSelectedWalletConnectorKey({
+            chain: walletConnector.connectedChain,
+            key: walletConnector.key,
+        });
         if (!activeAccountAlreadyLinked) {
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
             return;
@@ -242,7 +257,10 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
         // also this is only a feature in MM
         if (authMode !== 'connect-only' && isMetamask) {
             try {
-                setSelectedWalletConnectorKey(walletConnector.key);
+                setSelectedWalletConnectorKey({
+                    chain: walletConnector.connectedChain,
+                    key: walletConnector.key,
+                });
                 pushView('pending-connect');
                 yield walletConnector.chooseAccountsToConnect();
             }

package/src/lib/views/LoginView/sections/EmailSignInSection/LoginEmailForm.cjs

@@ -23,7 +23,6 @@ require('../../../../events/dynamicEvents.cjs');
 require('../../../../context/DynamicContext/DynamicContext.cjs');
 require('../../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 require('../../../../store/state/authMode/authMode.cjs');
-var useInternalDynamicContext = require('../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 var ErrorContext = require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
@@ -34,6 +33,7 @@ require('@dynamic-labs-sdk/client/core');
 require('../../../../client/client.cjs');
 require('@dynamic-labs-sdk/client');
 require('../../../../config/ApiEndpoint.cjs');
+var useProjectSettings = require('../../../../client/extension/projectSettings/useProjectSettings/useProjectSettings.cjs');
 require('@dynamic-labs/locale');
 require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
@@ -107,7 +107,7 @@ require('../../../../components/Popper/PopperContext/PopperContext.cjs');
 
 const LoginEmailForm = ({ isLoading, onSubmit, onSubmitError, currentEmail, className, style, }) => {
     var _a;
-    const { projectSettings } = useInternalDynamicContext.useInternalDynamicContext();
+    const projectSettings = useProjectSettings.useProjectSettings();
     const { view, pushView } = ViewContext.useViewContext();
     const { setVerificationUUID, setDisplayedDestination } = VerificationContext.useVerification();
     const { setError } = ErrorContext.useErrorContext();
@@ -148,7 +148,11 @@ const LoginEmailForm = ({ isLoading, onSubmit, onSubmitError, currentEmail, clas
         setVerificationUUID,
         setDisplayedDestination,
     ]);
-    if (!isEmailProviderEnabled.isEmailProviderEnabled(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers)) {
+    if (!projectSettings) {
+        logger.logger.debug('Failed to render EmailSignInSection - no project settings');
+        return null;
+    }
+    if (!isEmailProviderEnabled.isEmailProviderEnabled(projectSettings.providers)) {
         logger.logger.error('Failed to render EmailSignInSection - no sign in provider enabled');
         return null;
     }

package/src/lib/views/LoginView/sections/EmailSignInSection/LoginEmailForm.js

@@ -19,7 +19,6 @@ import '../../../../events/dynamicEvents.js';
 import '../../../../context/DynamicContext/DynamicContext.js';
 import '../../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
 import '../../../../store/state/authMode/authMode.js';
-import { useInternalDynamicContext } from '../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
 import { useErrorContext } from '../../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
@@ -30,6 +29,7 @@ import '@dynamic-labs-sdk/client/core';
 import '../../../../client/client.js';
 import '@dynamic-labs-sdk/client';
 import '../../../../config/ApiEndpoint.js';
+import { useProjectSettings } from '../../../../client/extension/projectSettings/useProjectSettings/useProjectSettings.js';
 import '@dynamic-labs/locale';
 import '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../../store/state/primaryWalletId/primaryWalletId.js';
@@ -103,7 +103,7 @@ import '../../../../components/Popper/PopperContext/PopperContext.js';
 
 const LoginEmailForm = ({ isLoading, onSubmit, onSubmitError, currentEmail, className, style, }) => {
     var _a;
-    const { projectSettings } = useInternalDynamicContext();
+    const projectSettings = useProjectSettings();
     const { view, pushView } = useViewContext();
     const { setVerificationUUID, setDisplayedDestination } = useVerification();
     const { setError } = useErrorContext();
@@ -144,7 +144,11 @@ const LoginEmailForm = ({ isLoading, onSubmit, onSubmitError, currentEmail, clas
         setVerificationUUID,
         setDisplayedDestination,
     ]);
-    if (!isEmailProviderEnabled(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers)) {
+    if (!projectSettings) {
+        logger.debug('Failed to render EmailSignInSection - no project settings');
+        return null;
+    }
+    if (!isEmailProviderEnabled(projectSettings.providers)) {
         logger.error('Failed to render EmailSignInSection - no sign in provider enabled');
         return null;
     }

package/src/lib/views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs

@@ -23,7 +23,6 @@ require('../../../../events/dynamicEvents.cjs');
 require('../../../../context/DynamicContext/DynamicContext.cjs');
 require('../../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 require('../../../../store/state/authMode/authMode.cjs');
-var useInternalDynamicContext = require('../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
@@ -38,6 +37,7 @@ require('@dynamic-labs-sdk/client/core');
 require('../../../../client/client.cjs');
 require('@dynamic-labs-sdk/client');
 require('../../../../config/ApiEndpoint.cjs');
+var useProjectSettings = require('../../../../client/extension/projectSettings/useProjectSettings/useProjectSettings.cjs');
 require('@dynamic-labs/locale');
 require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
@@ -113,7 +113,7 @@ require('../../../../components/Popper/PopperContext/PopperContext.cjs');
 
 const PhoneNumberSignInSection = ({ isLoading, onSubmit, onSubmitError, }) => {
     var _a, _b;
-    const { projectSettings } = useInternalDynamicContext.useInternalDynamicContext();
+    const projectSettings = useProjectSettings.useProjectSettings();
     const countriesWithVerification = React.useMemo(() => {
         const enabledCountries = getSupportedCountriesForVerificationFromProjectSettings.getSupportedCountriesForVerificationFromProjectSettings(projectSettings);
         // For login, we always want to use only countries with verification supported
@@ -138,6 +138,10 @@ const PhoneNumberSignInSection = ({ isLoading, onSubmit, onSubmitError, }) => {
         phone: phoneData.phone,
         setInvalidNumberMessage,
     });
+    if (!projectSettings) {
+        logger.logger.debug('Failed to render PhoneNumberSignInSection - no project settings');
+        return null;
+    }
     if (!isPhoneNumberProviderEnabled.isPhoneNumberProviderEnabled((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _a !== void 0 ? _a : [])) {
         logger.logger.error('Failed to render PhoneNumberSignInSection - no sign in provider enabled');
         return null;