@dynamic-labs/sdk-react-core 0.19.0-alpha.16 → 0.19.0-alpha.18

package/CHANGELOG.md

@@ -1,4 +1,23 @@
 
+## [0.19.0-alpha.18](https://github.com/dynamic-labs/DynamicAuth/compare/v0.19.0-alpha.17...v0.19.0-alpha.18) (2023-10-20)
+
+
+### Bug Fixes
+
+* allow overriding contracts on Wagmi Chains ([#3106](https://github.com/dynamic-labs/DynamicAuth/issues/3106)) ([1a809f3](https://github.com/dynamic-labs/DynamicAuth/commit/1a809f3c2880b6581b58fb277188eac3a39da89a))
+* await createEmbeddedWallet in useSocialAuth ([#3636](https://github.com/dynamic-labs/DynamicAuth/issues/3636)) ([6d5a6a6](https://github.com/dynamic-labs/DynamicAuth/commit/6d5a6a68c9adb79914fee4d4d17a47a3c79eec6d))
+* disconnect wallet if not able to query address ([#3304](https://github.com/dynamic-labs/DynamicAuth/issues/3304)) ([d6fe979](https://github.com/dynamic-labs/DynamicAuth/commit/d6fe97931e35d9d38cf8525b44fc78326780b9a7))
+* don't show user profile when reconnecting a primary social wallet ([#3614](https://github.com/dynamic-labs/DynamicAuth/issues/3614)) ([802243d](https://github.com/dynamic-labs/DynamicAuth/commit/802243d37963ca95d04373989e97d66e1753d8be))
+* dynamic widget showing connect when in connect-only and signing with email/social ([#3632](https://github.com/dynamic-labs/DynamicAuth/issues/3632)) ([850a229](https://github.com/dynamic-labs/DynamicAuth/commit/850a229a72669b0e16154feafaec9618c820a036))
+
+## [0.19.0-alpha.17](https://github.com/dynamic-labs/DynamicAuth/compare/v0.19.0-alpha.16...v0.19.0-alpha.17) (2023-10-19)
+
+
+### Bug Fixes
+
+* memoize createEmbeddedWallet so sync passkey is not called multiple times ([#3612](https://github.com/dynamic-labs/DynamicAuth/issues/3612)) ([11d53e9](https://github.com/dynamic-labs/DynamicAuth/commit/11d53e9bf3e7c4ceb4be7dede96e6facd07a6767))
+* revert any changes of the form of the wallet connector key ([#3608](https://github.com/dynamic-labs/DynamicAuth/issues/3608)) ([f0e2a89](https://github.com/dynamic-labs/DynamicAuth/commit/f0e2a8988047e7533cbfc52eee06d6752c5aa9c4))
+
 ## [0.19.0-alpha.16](https://github.com/dynamic-labs/DynamicAuth/compare/v0.19.0-alpha.15...v0.19.0-alpha.16) (2023-10-17)
 
 

package/package.cjs

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "0.19.0-alpha.16";
+var version = "0.19.0-alpha.18";
 var dependencies = {
 	"@dynamic-labs/iconic": "0.1.34",
-	"@dynamic-labs/sdk-api": "0.0.281",
+	"@dynamic-labs/sdk-api": "0.0.291",
 	"@hcaptcha/react-hcaptcha": "1.4.4",
 	"country-list": "2.3.0",
 	formik: "2.2.9",

package/package.js

@@ -1,7 +1,7 @@
-var version = "0.19.0-alpha.16";
+var version = "0.19.0-alpha.18";
 var dependencies = {
 	"@dynamic-labs/iconic": "0.1.34",
-	"@dynamic-labs/sdk-api": "0.0.281",
+	"@dynamic-labs/sdk-api": "0.0.291",
 	"@hcaptcha/react-hcaptcha": "1.4.4",
 	"country-list": "2.3.0",
 	formik: "2.2.9",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "0.19.0-alpha.16",
+  "version": "0.19.0-alpha.18",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@dynamic-labs/iconic": "0.1.34",
-    "@dynamic-labs/sdk-api": "0.0.281",
+    "@dynamic-labs/sdk-api": "0.0.291",
     "@hcaptcha/react-hcaptcha": "1.4.4",
     "country-list": "2.3.0",
     "formik": "2.2.9",
@@ -17,13 +17,13 @@
     "react-focus-lock": "2.9.2",
     "react-i18next": "^13.2.0",
     "yup": "0.32.11",
-    "@dynamic-labs/logger": "0.19.0-alpha.16",
-    "@dynamic-labs/multi-wallet": "0.19.0-alpha.16",
-    "@dynamic-labs/rpc-providers": "0.19.0-alpha.16",
-    "@dynamic-labs/types": "0.19.0-alpha.16",
-    "@dynamic-labs/utils": "0.19.0-alpha.16",
-    "@dynamic-labs/wallet-book": "0.19.0-alpha.16",
-    "@dynamic-labs/wallet-connector-core": "0.19.0-alpha.16",
+    "@dynamic-labs/logger": "0.19.0-alpha.18",
+    "@dynamic-labs/multi-wallet": "0.19.0-alpha.18",
+    "@dynamic-labs/rpc-providers": "0.19.0-alpha.18",
+    "@dynamic-labs/types": "0.19.0-alpha.18",
+    "@dynamic-labs/utils": "0.19.0-alpha.18",
+    "@dynamic-labs/wallet-book": "0.19.0-alpha.18",
+    "@dynamic-labs/wallet-connector-core": "0.19.0-alpha.18",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/components/SyncPasskeyFlow/SyncPasskeyFlow.cjs

@@ -22,7 +22,7 @@ require('../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/multi-wallet');
 require('@dynamic-labs/rpc-providers');
 require('../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
-var isPasskeyEmbeddedWalletEnabled = require('../../utils/functions/isPasskeyEmbeddedWalletEnabled/isPasskeyEmbeddedWalletEnabled.cjs');
+var isTurnkeyEnabled = require('../../utils/functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
 require('../../context/ErrorContext/ErrorContext.cjs');
 require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../context/AccountExistsContext/AccountExistsContext.cjs');
@@ -65,6 +65,7 @@ const SyncPasskeyFlow = () => {
     const lastUsedWallet = localStorage.LocalStorage.getFromLS(localStorage$1.LAST_USED_WALLET);
     const { createEmbeddedWallet } = useEmbeddedWallet.useEmbeddedWallet();
     React.useEffect(() => {
+        var _a;
         const createWallet = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
             try {
                 yield createEmbeddedWallet();
@@ -76,7 +77,8 @@ const SyncPasskeyFlow = () => {
         if (!user ||
             isProjectSettingsLoading ||
             !projectSettings ||
-            !isPasskeyEmbeddedWalletEnabled.isPasskeyEmbeddedWalletEnabled(projectSettings) ||
+            !isTurnkeyEnabled.isTurnkeyEnabled(projectSettings) ||
+            !((_a = projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.automaticEmbeddedWalletCreation) ||
             lastUsedWallet !== undefined //untill embedded wallet is generated it's undefined
         ) {
             return;
@@ -88,7 +90,6 @@ const SyncPasskeyFlow = () => {
         lastUsedWallet,
         authMode,
         user,
-        isPasskeyEmbeddedWalletEnabled.isPasskeyEmbeddedWalletEnabled,
         createEmbeddedWallet,
     ]);
     return jsxRuntime.jsx(jsxRuntime.Fragment, {});

package/src/lib/components/SyncPasskeyFlow/SyncPasskeyFlow.js

@@ -18,7 +18,7 @@ import '../../config/ApiEndpoint.js';
 import '@dynamic-labs/multi-wallet';
 import '@dynamic-labs/rpc-providers';
 import '../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
-import { isPasskeyEmbeddedWalletEnabled } from '../../utils/functions/isPasskeyEmbeddedWalletEnabled/isPasskeyEmbeddedWalletEnabled.js';
+import { isTurnkeyEnabled } from '../../utils/functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 import '../../context/ErrorContext/ErrorContext.js';
 import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../context/AccountExistsContext/AccountExistsContext.js';
@@ -61,6 +61,7 @@ const SyncPasskeyFlow = () => {
     const lastUsedWallet = LocalStorage.getFromLS(LAST_USED_WALLET);
     const { createEmbeddedWallet } = useEmbeddedWallet();
     useEffect(() => {
+        var _a;
         const createWallet = () => __awaiter(void 0, void 0, void 0, function* () {
             try {
                 yield createEmbeddedWallet();
@@ -72,7 +73,8 @@ const SyncPasskeyFlow = () => {
         if (!user ||
             isProjectSettingsLoading ||
             !projectSettings ||
-            !isPasskeyEmbeddedWalletEnabled(projectSettings) ||
+            !isTurnkeyEnabled(projectSettings) ||
+            !((_a = projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.automaticEmbeddedWalletCreation) ||
             lastUsedWallet !== undefined //untill embedded wallet is generated it's undefined
         ) {
             return;
@@ -84,7 +86,6 @@ const SyncPasskeyFlow = () => {
         lastUsedWallet,
         authMode,
         user,
-        isPasskeyEmbeddedWalletEnabled,
         createEmbeddedWallet,
     ]);
     return jsx(Fragment, {});

package/src/lib/context/DynamicContext/DynamicContext.cjs

@@ -202,8 +202,9 @@ const DynamicContextProvider = ({ children, theme, settings, locale: locale$1, }
         clearPrimaryWalletId,
         enableVisitTrackingOnConnectOnly,
         environmentId,
+        isBridgeFlow,
         onBeforeConnectSuccessConfirmation: eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onBeforeConnectSuccessConfirmation,
-        onUnlink: (wallet, connectedWalletsInfo) => handleDisconnectWallet.handleDisconnectWallet({
+        onUnlink: (connectedWalletsInfo, wallet) => handleDisconnectWallet.handleDisconnectWallet({
             connectedWalletsInfo,
             eventsCallbacks,
             setWalletsToConnectByChain,
@@ -398,7 +399,6 @@ const DynamicContextProvider = ({ children, theme, settings, locale: locale$1, }
             onConnectSuccess: eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onConnectSuccess,
             onEmailVerificationFailure,
             onEmailVerificationSuccess,
-            onEmbeddedWalletCreated: eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onEmbeddedWalletCreated,
             onLinkSuccess: eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onLinkSuccess,
             onUserProfileUpdate: eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onUserProfileUpdate,
         },

package/src/lib/context/DynamicContext/DynamicContext.js

@@ -198,8 +198,9 @@ const DynamicContextProvider = ({ children, theme, settings, locale, }) => {
         clearPrimaryWalletId,
         enableVisitTrackingOnConnectOnly,
         environmentId,
+        isBridgeFlow,
         onBeforeConnectSuccessConfirmation: eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onBeforeConnectSuccessConfirmation,
-        onUnlink: (wallet, connectedWalletsInfo) => handleDisconnectWallet({
+        onUnlink: (connectedWalletsInfo, wallet) => handleDisconnectWallet({
             connectedWalletsInfo,
             eventsCallbacks,
             setWalletsToConnectByChain,
@@ -394,7 +395,6 @@ const DynamicContextProvider = ({ children, theme, settings, locale, }) => {
             onConnectSuccess: eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onConnectSuccess,
             onEmailVerificationFailure,
             onEmailVerificationSuccess,
-            onEmbeddedWalletCreated: eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onEmbeddedWalletCreated,
             onLinkSuccess: eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onLinkSuccess,
             onUserProfileUpdate: eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onUserProfileUpdate,
         },

package/src/lib/context/DynamicContext/handleDisconnectWallet/handleDisconnectWallet.cjs

@@ -21,6 +21,19 @@ const handleDisconnectWallet = ({ wallet, connectedWalletsInfo, walletsByChain,
     var _a;
     const missingChains = getMissingChains.getMissingChains(walletsByChain, connectedWalletsInfo);
     setWalletsToConnectByChain(missingChains);
+    // there might not be a wallet to disconnect because
+    // the connectedWallets state may never have been initialized.
+    // this is because we asyncronously init the connectedWallets,
+    // and as part of the async init we fetch the address and network.
+    // if either of these fails, we consider the wallet disconnected,
+    // and call this function.
+    //
+    // ideally, we would syncronously populate connectedWallets
+    // based off the connectedWalletsInfo, and then async update it
+    // with the network and address from the wallet
+    if (!wallet) {
+        return;
+    }
     try {
         (_a = eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onDisconnect) === null || _a === void 0 ? void 0 : _a.call(eventsCallbacks, {
             walletConnector: wallet.connector,

package/src/lib/context/DynamicContext/handleDisconnectWallet/handleDisconnectWallet.d.ts

@@ -3,7 +3,7 @@ import { DynamicEventsCallbacks, Wallet } from '../../../shared';
 import { ConnectedWalletConnectorType } from '../../../utils/hooks/useConnectWallet/useConnectWallet';
 import { ChainsToConnect } from '../types';
 type HandleDisconnectWalletArgs = {
-    wallet: Wallet;
+    wallet?: Wallet;
     connectedWalletsInfo: ConnectedWalletConnectorType[];
     walletsByChain: ChainsToConnect[] | undefined;
     setWalletsToConnectByChain: Dispatch<SetStateAction<ChainsToConnect[] | undefined>>;

package/src/lib/context/DynamicContext/handleDisconnectWallet/handleDisconnectWallet.js

@@ -17,6 +17,19 @@ const handleDisconnectWallet = ({ wallet, connectedWalletsInfo, walletsByChain,
     var _a;
     const missingChains = getMissingChains(walletsByChain, connectedWalletsInfo);
     setWalletsToConnectByChain(missingChains);
+    // there might not be a wallet to disconnect because
+    // the connectedWallets state may never have been initialized.
+    // this is because we asyncronously init the connectedWallets,
+    // and as part of the async init we fetch the address and network.
+    // if either of these fails, we consider the wallet disconnected,
+    // and call this function.
+    //
+    // ideally, we would syncronously populate connectedWallets
+    // based off the connectedWalletsInfo, and then async update it
+    // with the network and address from the wallet
+    if (!wallet) {
+        return;
+    }
     try {
         (_a = eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onDisconnect) === null || _a === void 0 ? void 0 : _a.call(eventsCallbacks, {
             walletConnector: wallet.connector,

package/src/lib/context/SocialRedirectContext/SocialRedirectContext.cjs

@@ -62,7 +62,7 @@ require('../UserFieldEditorContext/UserFieldEditorContext.cjs');
 const SocialRedirectContext = React.createContext(undefined);
 const SocialRedirectContextProvider = ({ children, }) => {
     var _a, _b, _c, _d;
-    const { setShowAuthFlow, wallets, setSelectedWalletConnector, walletUiUtils, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, setShowDynamicUserProfile, isAuthenticated, setPrimaryWalletId, secondaryWallets, sdkHasLoaded, authToken, connectWallet, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setShowAuthFlow, wallets, setSelectedWalletConnector, walletUiUtils, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, setShowDynamicUserProfile, isAuthenticated, setPrimaryWalletId, secondaryWallets, sdkHasLoaded, authToken, connectWallet, primaryWallet, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { setView } = ViewContext.useViewContext();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
@@ -82,7 +82,10 @@ const SocialRedirectContextProvider = ({ children, }) => {
         .find(walletConnectorCore.isSocialWalletConnector);
     const [redirectStatus, setRedirectStatus] = React.useState('idle');
     const [socialProvider, setSocialProvider] = React.useState();
-    const wallet = secondaryWallets.find((wallet) => wallet.connector.key === (socialWalletConnector === null || socialWalletConnector === void 0 ? void 0 : socialWalletConnector.key));
+    const userWallets = primaryWallet
+        ? [primaryWallet, ...secondaryWallets]
+        : secondaryWallets;
+    const wallet = userWallets.find((wallet) => wallet.connector.key === (socialWalletConnector === null || socialWalletConnector === void 0 ? void 0 : socialWalletConnector.key));
     const socialAccount = React.useMemo(() => (wallet ? getReferencedAccount.getReferencedAccount(authToken, wallet.id) : undefined), [authToken, wallet]);
     const handleError = React.useCallback((message) => {
         logger.logger.error(message);
@@ -143,12 +146,32 @@ const SocialRedirectContextProvider = ({ children, }) => {
                     if (!socialAccount) {
                         throw new Error('Social account not found');
                     }
+                    /**
+                     * consider google: a user may have multiple google accounts.
+                     * we need to make sure they connected with the same google account
+                     * that they originally used to authenticate
+                     *
+                     * there are two known scenarios that we enter this branch:
+                     * 1. the user is reconnected a social wallet:
+                     *   a. the user signed in with social
+                     *   b. the user then linked another wallet (for ex: metamask)
+                     *   c. the user signed out
+                     *   d. the user signed in with metamask
+                     *   e. the user selects their social wallet as their primary wallet
+                     *   f. we need to reconnect the social wallet and put the user in the social oauth redirect flow
+                     *
+                     * 2. for an unknown reason, the magic search params get put back into the url and this component rerenders,
+                     *    causing us to think the user is reconnecting.
+                     *    see: https://dynamiclabsgroup.slack.com/archives/C0473MNEP0T/p1697503460754999
+                     */
                     if (socialAccount.oauthAccountId === session.oauthId) {
-                        // justification: socialAccount is defined if and only if wallet is also defined
-                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                        setPrimaryWalletId(wallet.id);
-                        setShowAuthFlow(false);
-                        setShowDynamicUserProfile(true);
+                        if ((wallet === null || wallet === void 0 ? void 0 : wallet.id) !== (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id)) {
+                            // justification: socialAccount is defined if and only if wallet is also defined
+                            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                            setPrimaryWalletId(wallet.id);
+                            setShowAuthFlow(false);
+                            setShowDynamicUserProfile(true);
+                        }
                     }
                     else {
                         yield socialWalletConnector.endSession();
@@ -200,6 +223,7 @@ const SocialRedirectContextProvider = ({ children, }) => {
         wallet,
         handleError,
         connectWallet,
+        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id,
     ]);
     return (jsxRuntime.jsx(SocialRedirectContext.Provider, { value: {
             enabledSocialProviders,

package/src/lib/context/SocialRedirectContext/SocialRedirectContext.js

@@ -58,7 +58,7 @@ import '../UserFieldEditorContext/UserFieldEditorContext.js';
 const SocialRedirectContext = createContext(undefined);
 const SocialRedirectContextProvider = ({ children, }) => {
     var _a, _b, _c, _d;
-    const { setShowAuthFlow, wallets, setSelectedWalletConnector, walletUiUtils, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, setShowDynamicUserProfile, isAuthenticated, setPrimaryWalletId, secondaryWallets, sdkHasLoaded, authToken, connectWallet, } = useInternalDynamicContext();
+    const { setShowAuthFlow, wallets, setSelectedWalletConnector, walletUiUtils, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, setShowDynamicUserProfile, isAuthenticated, setPrimaryWalletId, secondaryWallets, sdkHasLoaded, authToken, connectWallet, primaryWallet, } = useInternalDynamicContext();
     const { setErrorMessage } = useErrorContext();
     const { setView } = useViewContext();
     const verifyWallet = useVerifyWallet({
@@ -78,7 +78,10 @@ const SocialRedirectContextProvider = ({ children, }) => {
         .find(isSocialWalletConnector);
     const [redirectStatus, setRedirectStatus] = useState('idle');
     const [socialProvider, setSocialProvider] = useState();
-    const wallet = secondaryWallets.find((wallet) => wallet.connector.key === (socialWalletConnector === null || socialWalletConnector === void 0 ? void 0 : socialWalletConnector.key));
+    const userWallets = primaryWallet
+        ? [primaryWallet, ...secondaryWallets]
+        : secondaryWallets;
+    const wallet = userWallets.find((wallet) => wallet.connector.key === (socialWalletConnector === null || socialWalletConnector === void 0 ? void 0 : socialWalletConnector.key));
     const socialAccount = useMemo(() => (wallet ? getReferencedAccount(authToken, wallet.id) : undefined), [authToken, wallet]);
     const handleError = useCallback((message) => {
         logger.error(message);
@@ -139,12 +142,32 @@ const SocialRedirectContextProvider = ({ children, }) => {
                     if (!socialAccount) {
                         throw new Error('Social account not found');
                     }
+                    /**
+                     * consider google: a user may have multiple google accounts.
+                     * we need to make sure they connected with the same google account
+                     * that they originally used to authenticate
+                     *
+                     * there are two known scenarios that we enter this branch:
+                     * 1. the user is reconnected a social wallet:
+                     *   a. the user signed in with social
+                     *   b. the user then linked another wallet (for ex: metamask)
+                     *   c. the user signed out
+                     *   d. the user signed in with metamask
+                     *   e. the user selects their social wallet as their primary wallet
+                     *   f. we need to reconnect the social wallet and put the user in the social oauth redirect flow
+                     *
+                     * 2. for an unknown reason, the magic search params get put back into the url and this component rerenders,
+                     *    causing us to think the user is reconnecting.
+                     *    see: https://dynamiclabsgroup.slack.com/archives/C0473MNEP0T/p1697503460754999
+                     */
                     if (socialAccount.oauthAccountId === session.oauthId) {
-                        // justification: socialAccount is defined if and only if wallet is also defined
-                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                        setPrimaryWalletId(wallet.id);
-                        setShowAuthFlow(false);
-                        setShowDynamicUserProfile(true);
+                        if ((wallet === null || wallet === void 0 ? void 0 : wallet.id) !== (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id)) {
+                            // justification: socialAccount is defined if and only if wallet is also defined
+                            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                            setPrimaryWalletId(wallet.id);
+                            setShowAuthFlow(false);
+                            setShowDynamicUserProfile(true);
+                        }
                     }
                     else {
                         yield socialWalletConnector.endSession();
@@ -196,6 +219,7 @@ const SocialRedirectContextProvider = ({ children, }) => {
         wallet,
         handleError,
         connectWallet,
+        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id,
     ]);
     return (jsx(SocialRedirectContext.Provider, { value: {
             enabledSocialProviders,

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

@@ -35,7 +35,7 @@ export * from './getActiveOauthCredential';
 export * from './getSocialSignInProviderForProviderEnum';
 export * from './getSocialSignInProviderFromString';
 export * from './getOauthLoginUrl';
-export * from './isPasskeyEmbeddedWalletEnabled';
+export * from './isTurnkeyEnabled';
 export * from './isEmbeddedWalletPresent';
 export * from './findEmbeddedWalletFromVerifiedCredentials';
 export * from './findTurnkeyWallet';

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

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

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

@@ -0,0 +1,10 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var sdkApi = require('@dynamic-labs/sdk-api');
+var isProviderEnabled = require('../isProviderEnabled/isProviderEnabled.cjs');
+
+const isTurnkeyEnabled = (projectSettings) => { var _a; return isProviderEnabled.isProviderEnabled((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _a !== void 0 ? _a : [], sdkApi.ProviderEnum.Turnkey); };
+
+exports.isTurnkeyEnabled = isTurnkeyEnabled;

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

@@ -0,0 +1,2 @@
+import { ProjectSettings } from '@dynamic-labs/sdk-api';
+export declare const isTurnkeyEnabled: (projectSettings: ProjectSettings | undefined) => boolean;

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

@@ -0,0 +1,6 @@
+import { ProviderEnum } from '@dynamic-labs/sdk-api';
+import { isProviderEnabled } from '../isProviderEnabled/isProviderEnabled.js';
+
+const isTurnkeyEnabled = (projectSettings) => { var _a; return isProviderEnabled((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _a !== void 0 ? _a : [], ProviderEnum.Turnkey); };
+
+export { isTurnkeyEnabled };

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

@@ -26,8 +26,12 @@ const groupWalletOptions = (walletBook$1, walletOptionList) => {
             return (_a = output[existingGroupIndex].groupedWallets) === null || _a === void 0 ? void 0 : _a.push(currentWalletOption);
         }
         // Validate if there is any other wallet with the same group
-        const isThereWalletOptionWithSameGroup = walletOptionList.some((walletOption) => currentWalletOption.group === walletOption.group &&
-            currentWalletOption.key !== walletOption.key);
+        const isThereWalletOptionWithSameGroup = walletOptionList.some((walletOption) => {
+            var _a;
+            return currentWalletOption.group === walletOption.group &&
+                (((_a = walletOption.injectedConfig) === null || _a === void 0 ? void 0 : _a.length) ||
+                    currentWalletOption.key !== walletOption.key);
+        });
         // Avoid group creation if there only one wallet in group
         if (!isThereWalletOptionWithSameGroup) {
             return output.push(currentWalletOption);

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

@@ -22,8 +22,12 @@ const groupWalletOptions = (walletBook, walletOptionList) => {
             return (_a = output[existingGroupIndex].groupedWallets) === null || _a === void 0 ? void 0 : _a.push(currentWalletOption);
         }
         // Validate if there is any other wallet with the same group
-        const isThereWalletOptionWithSameGroup = walletOptionList.some((walletOption) => currentWalletOption.group === walletOption.group &&
-            currentWalletOption.key !== walletOption.key);
+        const isThereWalletOptionWithSameGroup = walletOptionList.some((walletOption) => {
+            var _a;
+            return currentWalletOption.group === walletOption.group &&
+                (((_a = walletOption.injectedConfig) === null || _a === void 0 ? void 0 : _a.length) ||
+                    currentWalletOption.key !== walletOption.key);
+        });
         // Avoid group creation if there only one wallet in group
         if (!isThereWalletOptionWithSameGroup) {
             return output.push(currentWalletOption);

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

@@ -23,9 +23,35 @@ var api = require('../../../data/api.cjs');
 require('@dynamic-labs/multi-wallet');
 var shouldManuallyReconnectOnRefresh = require('../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
 
-const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onUnlink, onBeforeConnectSuccessConfirmation, setShowAuthFlow, }) => {
+const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onUnlink, onBeforeConnectSuccessConfirmation, setShowAuthFlow, isBridgeFlow, }) => {
     const [connectedWalletsInfo, setConnectedWalletsInfo, removeConnectedWalletsInfo,] = useLocalStorage.useLocalStorage(localStorage.CONNECTED_WALLETS_INFO, []);
     const [connectedWallets, setConnectedWallets] = React.useState([]);
+    const unlinkConnectedWallet = React.useCallback((walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const walletToDisconnect = connectedWallets.find((wallet) => wallet.id === walletId);
+        yield (walletToDisconnect === null || walletToDisconnect === void 0 ? void 0 : walletToDisconnect.connector.endSession());
+        const updatedConnectedWalletsInfo = connectedWalletsInfo.filter((wallet) => wallet.id !== walletId);
+        setConnectedWalletsInfo(updatedConnectedWalletsInfo);
+        onUnlink(updatedConnectedWalletsInfo, walletToDisconnect);
+        if (walletId !== primaryWalletId) {
+            return;
+        }
+        const hasConnectedWallet = updatedConnectedWalletsInfo.length > 0;
+        if (isBridgeFlow || !hasConnectedWallet) {
+            clearPrimaryWalletId();
+        }
+        else {
+            setPrimaryWalletId(updatedConnectedWalletsInfo[0].id);
+        }
+    }), [
+        clearPrimaryWalletId,
+        connectedWallets,
+        connectedWalletsInfo,
+        isBridgeFlow,
+        onUnlink,
+        primaryWalletId,
+        setConnectedWalletsInfo,
+        setPrimaryWalletId,
+    ]);
     // The function to update and define the connectedWallets list.
     // It uses walletConnector to get the current wallet address and network
     // The address and network in the runtime are updated by the event listeners
@@ -36,14 +62,19 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         if (!walletConnectors.length) {
             return;
         }
-        const nextConnectedWallets = (yield Promise.all(connectedWalletsInfo.map((storedConnectedWalletInfo) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const updatedConnectedWallets = (yield Promise.all(connectedWalletsInfo.map((storedConnectedWalletInfo) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
             const walletConnector = walletConnectorCore.getWalletConnectorByKey(walletConnectors, storedConnectedWalletInfo.walletConnectorKey);
             if (!walletConnector) {
                 walletConnectorCore.logger.error('Could not find walletConnector: ' +
                     storedConnectedWalletInfo.walletConnectorKey);
-                return Promise.resolve(null);
+                yield unlinkConnectedWallet(storedConnectedWalletInfo.id);
+                return null;
             }
             const [walletAddress] = yield walletConnector.getConnectedAccounts();
+            if (!walletAddress) {
+                yield unlinkConnectedWallet(storedConnectedWalletInfo.id);
+                return null;
+            }
             const walletNetwork = yield walletConnector.getNetwork();
             const walletChain = walletConnector.connectedChain;
             const walletObject = {
@@ -54,14 +85,15 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 id: storedConnectedWalletInfo.id,
                 network: walletNetwork,
             };
-            return Promise.resolve(walletObject);
+            return walletObject;
         })))).filter((wallet) => Boolean(wallet));
-        setConnectedWallets(nextConnectedWallets);
-    }), [connectedWalletsInfo, wallets]);
+        setConnectedWallets(updatedConnectedWallets);
+    }), [connectedWalletsInfo, unlinkConnectedWallet, wallets]);
     // Generate the connectedWallets list when connectedWalletsInfo (localStorage) or memoized wallet connector updates
     React.useEffect(() => {
         updateConnectedWalletsList();
-    }, [updateConnectedWalletsList]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [connectedWalletsInfo, wallets]);
     const getNextIdAvailable = React.useCallback((currentWallets) => {
         const existingIds = currentWallets.map(({ id }) => id);
         const sortedIds = existingIds
@@ -85,15 +117,14 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
     const connectedWallet = connectedWallets[0] || null;
     // Keeps connected wallet data inside localStorage
     const applyConnectedWalletToStore = ({ walletId, walletConnectorKey, walletChain, provider, }) => {
-        const nextConnectedWalletsInfo = [...connectedWalletsInfo];
-        nextConnectedWalletsInfo.push({
+        const updatedConnectedWalletsInfo = [...connectedWalletsInfo];
+        updatedConnectedWalletsInfo.push({
             id: walletId,
             provider,
             walletChain,
             walletConnectorKey,
         });
-        setConnectedWalletsInfo(nextConnectedWalletsInfo);
-        return Promise.resolve();
+        setConnectedWalletsInfo(updatedConnectedWalletsInfo);
     };
     // Updates connected wallet (network and address) and verifies connected wallet connection
     const refreshConnectedWallet = (walletId, walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -171,20 +202,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 });
             }
         }
-        return Promise.resolve(publicWalletAddress);
-    });
-    const unlinkConnectedWallet = (walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const connectedWalletToUnlink = connectedWallets.find((wallet) => wallet.id === walletId);
-        if (!connectedWalletToUnlink) {
-            return;
-        }
-        yield connectedWalletToUnlink.connector.endSession();
-        const filteredWallets = connectedWalletsInfo.filter((wallet) => wallet.id !== walletId);
-        if (walletId === primaryWalletId) {
-            clearPrimaryWalletId();
-        }
-        setConnectedWalletsInfo(filteredWallets);
-        onUnlink(connectedWalletToUnlink, filteredWallets);
+        return publicWalletAddress;
     });
     const getConnectedWalletById = React.useCallback((walletId) => connectedWallets.find((wallet) => wallet.id === walletId), [connectedWallets]);
     return {

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

@@ -15,9 +15,10 @@ type Props = {
     primaryWalletId: string | undefined;
     setPrimaryWalletId: (walletId: string) => void;
     wallets: WalletOption[];
-    onUnlink: (wallet: Wallet, connectedWalletsInfo: ConnectedWalletConnectorType[]) => void;
+    onUnlink: (connectedWalletsInfo: ConnectedWalletConnectorType[], wallet?: Wallet) => void;
     onBeforeConnectSuccessConfirmation: OnBeforeConnectSuccessConfirmation | undefined;
     setShowAuthFlow: Dispatch<SetStateAction<boolean>>;
+    isBridgeFlow: boolean;
 };
 type UseConnectWalletValue = {
     connectWallet: (walletConnector: WalletConnector, fetchPublicAddressOpts?: FetchPublicAddressOpts, shouldCallCallback?: boolean) => Promise<string | undefined>;
@@ -29,5 +30,5 @@ type UseConnectWalletValue = {
     removeConnectedWalletsInfo: () => void;
     unlinkConnectedWallet: (walletId: string) => Promise<void>;
 };
-export declare const useConnectWallet: ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onUnlink, onBeforeConnectSuccessConfirmation, setShowAuthFlow, }: Props) => UseConnectWalletValue;
+export declare const useConnectWallet: ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onUnlink, onBeforeConnectSuccessConfirmation, setShowAuthFlow, isBridgeFlow, }: Props) => UseConnectWalletValue;
 export {};