@dynamic-labs/sdk-react-core 0.19.0-alpha.25 → 0.19.0-alpha.26

package/CHANGELOG.md

@@ -1,4 +1,19 @@
 
+## [0.19.0-alpha.26](https://github.com/dynamic-labs/DynamicAuth/compare/v0.19.0-alpha.25...v0.19.0-alpha.26) (2023-10-25)
+
+
+### Features
+
+* allow filtering social providers for Dynamic Social with socialProvidersFilter ([#3707](https://github.com/dynamic-labs/DynamicAuth/issues/3707)) ([e4c16f3](https://github.com/dynamic-labs/DynamicAuth/commit/e4c16f359946e278a372cb8153242946d4887dcc))
+
+
+### Bug Fixes
+
+* only create embedded wallet if user have no wallet ([#3715](https://github.com/dynamic-labs/DynamicAuth/issues/3715)) ([728e01a](https://github.com/dynamic-labs/DynamicAuth/commit/728e01ab8b5931eaa6fb7877c23847ac85947f52))
+* Revert "fix(use-wallet-event-listener): handle switching wallet … ([#3699](https://github.com/dynamic-labs/DynamicAuth/issues/3699)) ([9b94737](https://github.com/dynamic-labs/DynamicAuth/commit/9b94737ecfa72cd047964254d806403b342433a1)), closes [#3626](https://github.com/dynamic-labs/DynamicAuth/issues/3626)
+* undefined network edge case ([#3667](https://github.com/dynamic-labs/DynamicAuth/issues/3667)) ([12d4236](https://github.com/dynamic-labs/DynamicAuth/commit/12d42363f69b1dfd5babe05142bd03c501f62e5f))
+* **useOnClickOutside:** prevent opening element on click while already open ([#3714](https://github.com/dynamic-labs/DynamicAuth/issues/3714)) ([1999dc5](https://github.com/dynamic-labs/DynamicAuth/commit/1999dc50b6e82eb5ee8d0919118e9dfbc39c2b67))
+
 ## [0.19.0-alpha.25](https://github.com/dynamic-labs/DynamicAuth/compare/v0.19.0-alpha.24...v0.19.0-alpha.25) (2023-10-25)
 
 

package/package.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "0.19.0-alpha.25";
+var version = "0.19.0-alpha.26";
 var dependencies = {
 	"@dynamic-labs/iconic": "0.1.34",
 	"@dynamic-labs/sdk-api": "0.0.291",

package/package.js

@@ -1,4 +1,4 @@
-var version = "0.19.0-alpha.25";
+var version = "0.19.0-alpha.26";
 var dependencies = {
 	"@dynamic-labs/iconic": "0.1.34",
 	"@dynamic-labs/sdk-api": "0.0.291",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "0.19.0-alpha.25",
+  "version": "0.19.0-alpha.26",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -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.25",
-    "@dynamic-labs/multi-wallet": "0.19.0-alpha.25",
-    "@dynamic-labs/rpc-providers": "0.19.0-alpha.25",
-    "@dynamic-labs/types": "0.19.0-alpha.25",
-    "@dynamic-labs/utils": "0.19.0-alpha.25",
-    "@dynamic-labs/wallet-book": "0.19.0-alpha.25",
-    "@dynamic-labs/wallet-connector-core": "0.19.0-alpha.25",
+    "@dynamic-labs/logger": "0.19.0-alpha.26",
+    "@dynamic-labs/multi-wallet": "0.19.0-alpha.26",
+    "@dynamic-labs/rpc-providers": "0.19.0-alpha.26",
+    "@dynamic-labs/types": "0.19.0-alpha.26",
+    "@dynamic-labs/utils": "0.19.0-alpha.26",
+    "@dynamic-labs/wallet-book": "0.19.0-alpha.26",
+    "@dynamic-labs/wallet-connector-core": "0.19.0-alpha.26",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/components/SocialSignIn/SocialSignIn.cjs

@@ -73,13 +73,18 @@ const SocialSignIn = ({ providers, onSelectProvider, isLoading, selectedProvider
     const [showCard, setShowCard] = React.useState(false);
     const closeCard = () => !isLoading && setShowCard(false);
     const numberOfEnabledSocialProviders = providers.length;
-    if (numberOfEnabledSocialProviders === 1) {
+    // Set default provider as the first available provider if
+    if (
+    // Default provider isn't within the providers
+    (defaultProvider && !providers.includes(defaultProvider)) ||
+        // Or there's only one provider
+        numberOfEnabledSocialProviders === 1) {
         // set first and only item in providers list as default provider
         [defaultProvider] = providers;
     }
     else {
-        // put default provider at the beggini of the list
-        providers.sort((p1, p2) => (p1 === defaultProvider ? -1 : 0));
+        // put default provider at the beginning of the list
+        providers.sort((p1) => (p1 === defaultProvider ? -1 : 0));
     }
     const defaultProviderOffset = defaultProvider ? 1 : 0;
     // display number of items set in prop, with a max limit of MAX_INLINE_ITEMS

package/src/lib/components/SocialSignIn/SocialSignIn.js

@@ -69,13 +69,18 @@ const SocialSignIn = ({ providers, onSelectProvider, isLoading, selectedProvider
     const [showCard, setShowCard] = useState(false);
     const closeCard = () => !isLoading && setShowCard(false);
     const numberOfEnabledSocialProviders = providers.length;
-    if (numberOfEnabledSocialProviders === 1) {
+    // Set default provider as the first available provider if
+    if (
+    // Default provider isn't within the providers
+    (defaultProvider && !providers.includes(defaultProvider)) ||
+        // Or there's only one provider
+        numberOfEnabledSocialProviders === 1) {
         // set first and only item in providers list as default provider
         [defaultProvider] = providers;
     }
     else {
-        // put default provider at the beggini of the list
-        providers.sort((p1, p2) => (p1 === defaultProvider ? -1 : 0));
+        // put default provider at the beginning of the list
+        providers.sort((p1) => (p1 === defaultProvider ? -1 : 0));
     }
     const defaultProviderOffset = defaultProvider ? 1 : 0;
     // display number of items set in prop, with a max limit of MAX_INLINE_ITEMS

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

@@ -6,24 +6,24 @@ var _tslib = require('../../../../_virtual/_tslib.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var useInternalDynamicContext = require('../DynamicContext/useInternalDynamicContext.cjs');
-var ViewContext = require('../ViewContext/ViewContext.cjs');
-require('@dynamic-labs/utils');
 require('@dynamic-labs/sdk-api');
-require('../../config/ApiEndpoint.cjs');
 var logger = require('../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
+var ViewContext = require('../ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
+require('@dynamic-labs/utils');
 require('../../utils/constants/colors.cjs');
 require('../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
+var getReferencedAccount = require('../../utils/functions/getReferencedAccount/getReferencedAccount.cjs');
+require('../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
-var getReferencedAccount = require('../../utils/functions/getReferencedAccount/getReferencedAccount.cjs');
 var useVerifyWallet = require('../../utils/hooks/useVerifyWallet/useVerifyWallet.cjs');
 require('react-dom');
+var useInternalDynamicContext = require('../DynamicContext/useInternalDynamicContext.cjs');
 require('../../components/ShadowDOM/ShadowDOM.cjs');
 require('../ThemeContext/ThemeContext.cjs');
 require('react-focus-lock');
@@ -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, primaryWallet, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setShowAuthFlow, wallets, setSelectedWalletConnector, walletUiUtils, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, setShowDynamicUserProfile, isAuthenticated, setPrimaryWalletId, secondaryWallets, sdkHasLoaded, authToken, connectWallet, primaryWallet, socialProvidersFilter = (providers) => providers, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { setView } = ViewContext.useViewContext();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
@@ -74,9 +74,9 @@ const SocialRedirectContextProvider = ({ children, }) => {
     });
     const signInProvider = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.socialSignIn) === null || _a === void 0 ? void 0 : _a.signInProvider;
     const enabledSocialProvidersInDb = (_c = (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.socialSignIn) === null || _b === void 0 ? void 0 : _b.providers) !== null && _c !== void 0 ? _c : [];
-    const enabledSocialProviders = (_d = enabledSocialProvidersInDb
+    const enabledSocialProviders = (_d = socialProvidersFilter(enabledSocialProvidersInDb
         .filter((provider) => provider.enabled)
-        .map((provider) => provider.provider)) !== null && _d !== void 0 ? _d : [];
+        .map((provider) => provider.provider))) !== null && _d !== void 0 ? _d : [];
     const socialWalletConnector = wallets
         .map(({ walletConnector }) => walletConnector)
         .find(walletConnectorCore.isSocialWalletConnector);

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

@@ -2,24 +2,24 @@ import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsx } from 'react/jsx-runtime';
 import { createContext, useState, useMemo, useCallback, useEffect, useContext } from 'react';
 import { isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { useInternalDynamicContext } from '../DynamicContext/useInternalDynamicContext.js';
-import { useViewContext } from '../ViewContext/ViewContext.js';
-import '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api';
-import '../../config/ApiEndpoint.js';
 import { logger } from '../../shared/logger.js';
 import '@dynamic-labs/iconic';
+import { useViewContext } from '../ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
+import '@dynamic-labs/utils';
 import '../../utils/constants/colors.js';
 import '../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
+import { getReferencedAccount } from '../../utils/functions/getReferencedAccount/getReferencedAccount.js';
+import '../../config/ApiEndpoint.js';
 import '@dynamic-labs/rpc-providers';
 import '../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
-import { getReferencedAccount } from '../../utils/functions/getReferencedAccount/getReferencedAccount.js';
 import { useVerifyWallet } from '../../utils/hooks/useVerifyWallet/useVerifyWallet.js';
 import 'react-dom';
+import { useInternalDynamicContext } from '../DynamicContext/useInternalDynamicContext.js';
 import '../../components/ShadowDOM/ShadowDOM.js';
 import '../ThemeContext/ThemeContext.js';
 import 'react-focus-lock';
@@ -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, primaryWallet, } = useInternalDynamicContext();
+    const { setShowAuthFlow, wallets, setSelectedWalletConnector, walletUiUtils, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, setShowDynamicUserProfile, isAuthenticated, setPrimaryWalletId, secondaryWallets, sdkHasLoaded, authToken, connectWallet, primaryWallet, socialProvidersFilter = (providers) => providers, } = useInternalDynamicContext();
     const { setErrorMessage } = useErrorContext();
     const { setView } = useViewContext();
     const verifyWallet = useVerifyWallet({
@@ -70,9 +70,9 @@ const SocialRedirectContextProvider = ({ children, }) => {
     });
     const signInProvider = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.socialSignIn) === null || _a === void 0 ? void 0 : _a.signInProvider;
     const enabledSocialProvidersInDb = (_c = (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.socialSignIn) === null || _b === void 0 ? void 0 : _b.providers) !== null && _c !== void 0 ? _c : [];
-    const enabledSocialProviders = (_d = enabledSocialProvidersInDb
+    const enabledSocialProviders = (_d = socialProvidersFilter(enabledSocialProvidersInDb
         .filter((provider) => provider.enabled)
-        .map((provider) => provider.provider)) !== null && _d !== void 0 ? _d : [];
+        .map((provider) => provider.provider))) !== null && _d !== void 0 ? _d : [];
     const socialWalletConnector = wallets
         .map(({ walletConnector }) => walletConnector)
         .find(isSocialWalletConnector);

package/src/lib/shared/utils/hooks/useOnClickOutside/index.cjs

@@ -16,11 +16,11 @@ const useOnClickOutside = (ref, handler) => {
             }
             handler(event);
         };
-        document.addEventListener('mousedown', listener);
         document.addEventListener('touchstart', listener);
+        document.addEventListener('click', listener);
         return () => {
-            document.removeEventListener('mousedown', listener);
             document.removeEventListener('touchstart', listener);
+            document.removeEventListener('click', listener);
         };
     }, [ref, handler]);
 };

package/src/lib/shared/utils/hooks/useOnClickOutside/index.js

@@ -12,11 +12,11 @@ const useOnClickOutside = (ref, handler) => {
             }
             handler(event);
         };
-        document.addEventListener('mousedown', listener);
         document.addEventListener('touchstart', listener);
+        document.addEventListener('click', listener);
         return () => {
-            document.removeEventListener('mousedown', listener);
             document.removeEventListener('touchstart', listener);
+            document.removeEventListener('click', listener);
         };
     }, [ref, handler]);
 };

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

@@ -0,0 +1,26 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('../../../context/ViewContext/ViewContext.cjs');
+require('react');
+require('../../../shared/logger.cjs');
+require('@dynamic-labs/wallet-book');
+require('@dynamic-labs/utils');
+require('../../constants/colors.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('viem');
+require('../../../shared/consts/index.cjs');
+
+// verifies if user has any type of wallet
+const getUserWalletsFromVerifiedCredentials = (jwt) => {
+    var _a;
+    const decodedJwt = decodeJwt.decodeJwt(jwt);
+    return (_a = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.filter(({ walletProvider }) => walletProvider);
+};
+
+exports.getUserWalletsFromVerifiedCredentials = getUserWalletsFromVerifiedCredentials;

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

@@ -0,0 +1 @@
+export declare const getUserWalletsFromVerifiedCredentials: (jwt: string) => import("@dynamic-labs/sdk-api").JwtVerifiedCredential[] | undefined;

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

@@ -0,0 +1,22 @@
+import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import 'react';
+import '../../../shared/logger.js';
+import '@dynamic-labs/wallet-book';
+import '@dynamic-labs/utils';
+import '../../constants/colors.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
+import 'viem';
+import '../../../shared/consts/index.js';
+
+// verifies if user has any type of wallet
+const getUserWalletsFromVerifiedCredentials = (jwt) => {
+    var _a;
+    const decodedJwt = decodeJwt(jwt);
+    return (_a = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.filter(({ walletProvider }) => walletProvider);
+};
+
+export { getUserWalletsFromVerifiedCredentials };

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

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

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

@@ -42,3 +42,4 @@ export * from './findTurnkeyWallet';
 export * from './isTestnet';
 export * from './getOrdinalNumber';
 export * from './getProviderByType';
+export * from './getUserWalletsFromVerifiedCredentials';

package/src/lib/utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.cjs

@@ -9,10 +9,9 @@ var isWalletLinked = require('../../../functions/isWalletLinked/isWalletLinked.c
 var ViewContext = require('../../../../context/ViewContext/ViewContext.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var errors = require('../../../constants/errors.cjs');
-var sortAccountsByPrimaryWallet = require('../../useWalletEventListeners/utils/sortAccountsByPrimaryWallet/sortAccountsByPrimaryWallet.cjs');
 
 const useSyncPrimaryWallet = (canSync = true) => {
-    const { setShowAuthFlow, isAuthenticated, authMode, computeConnectedStateForWallets, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showLockedWalletView, showWidgetStatePopup, multiWallet, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setShowAuthFlow, isAuthenticated, authMode, computeConnectedStateForWallets, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showLockedWalletView, showWidgetStatePopup, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const handlePrimaryWalletNotActive = React.useCallback((connectedAddress) => {
         if (!primaryWallet)
@@ -76,9 +75,7 @@ const useSyncPrimaryWallet = (canSync = true) => {
         primaryWallet.connector
             .getConnectedAccounts()
             .then((accounts) => {
-            const [connectedAddress] = multiWallet
-                ? accounts
-                : sortAccountsByPrimaryWallet.sortAccountsByPrimaryWallet(accounts, primaryWallet);
+            const [connectedAddress] = accounts;
             if (!connectedAddress) {
                 throw new utils.DynamicError('Missing wallet address', errors.MISSING_ADDRESS_ERROR);
             }

package/src/lib/utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.js

@@ -5,10 +5,9 @@ import { isWalletLinked } from '../../../functions/isWalletLinked/isWalletLinked
 import { useViewContext } from '../../../../context/ViewContext/ViewContext.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
 import { MISSING_ADDRESS_ERROR } from '../../../constants/errors.js';
-import { sortAccountsByPrimaryWallet } from '../../useWalletEventListeners/utils/sortAccountsByPrimaryWallet/sortAccountsByPrimaryWallet.js';
 
 const useSyncPrimaryWallet = (canSync = true) => {
-    const { setShowAuthFlow, isAuthenticated, authMode, computeConnectedStateForWallets, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showLockedWalletView, showWidgetStatePopup, multiWallet, } = useInternalDynamicContext();
+    const { setShowAuthFlow, isAuthenticated, authMode, computeConnectedStateForWallets, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showLockedWalletView, showWidgetStatePopup, } = useInternalDynamicContext();
     const { setView } = useViewContext();
     const handlePrimaryWalletNotActive = useCallback((connectedAddress) => {
         if (!primaryWallet)
@@ -72,9 +71,7 @@ const useSyncPrimaryWallet = (canSync = true) => {
         primaryWallet.connector
             .getConnectedAccounts()
             .then((accounts) => {
-            const [connectedAddress] = multiWallet
-                ? accounts
-                : sortAccountsByPrimaryWallet(accounts, primaryWallet);
+            const [connectedAddress] = accounts;
             if (!connectedAddress) {
                 throw new DynamicError('Missing wallet address', MISSING_ADDRESS_ERROR);
             }

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

@@ -24,10 +24,11 @@ var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnable
 var isEmbeddedWalletPresent = require('../../functions/isEmbeddedWalletPresent/isEmbeddedWalletPresent.cjs');
 var findEmbeddedWalletFromVerifiedCredentials = require('../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
 var findTurnkeyWallet = require('../../functions/findTurnkeyWallet/findTurnkeyWallet.cjs');
+var getUserWalletsFromVerifiedCredentials = require('../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.cjs');
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useEmbeddedWallet = () => {
-    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, wallets, internalSetShowAuthFlow, internalEvents, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, wallets, internalSetShowAuthFlow, internalEvents, primaryWallet, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const userHasEmbeddedWallet = () => {
         var _a;
@@ -46,9 +47,9 @@ const useEmbeddedWallet = () => {
         if (!isTurnkeyEnabled.isTurnkeyEnabled(projectSettings)) {
             throw new Error('Passkey embedded wallet is not enabled');
         }
-        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt);
-        // if user doesn't have an embedded wallet, show the passkey view to create wallet
-        if (!embeddedWalletVerifiedCredential) {
+        const userWaletsCredentials = getUserWalletsFromVerifiedCredentials.getUserWalletsFromVerifiedCredentials(jwt);
+        // if user doesn't have a wallet yet, show the passkey view to create an embedded wallet
+        if (!(userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.length)) {
             internalSetShowAuthFlow(true);
             setView('passkey-intro');
             return new Promise((resolve, reject) => {
@@ -56,14 +57,19 @@ const useEmbeddedWallet = () => {
                 internalEvents.current.once('embeddedWalletFailed', (error) => reject(error));
             });
         }
-        const decodedJwt = decodeJwt.decodeJwt(jwt);
+        internalSetShowAuthFlow(false);
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt);
         const turnkeyWallet = findTurnkeyWallet.findTurnkeyWallet(wallets);
+        // if user logged in with MM for example, just continue the flow
+        if (!embeddedWalletVerifiedCredential) {
+            return Promise.resolve(primaryWallet);
+        }
+        const decodedJwt = decodeJwt.decodeJwt(jwt);
         // if user already has embedded wallet, set it as primary wallet
         if (decodedJwt) {
             (_b = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _b === void 0 ? void 0 : _b.setVerifiedCredentials(decodedJwt.verifiedCredentials);
             setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
         }
-        internalSetShowAuthFlow(false);
         const passkeyWallet = {
             address: (yield ((_c = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _c === void 0 ? void 0 : _c.fetchPublicAddress())) || '',
             chain: ((_d = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _d === void 0 ? void 0 : _d.connectedChain) || '',

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

@@ -20,10 +20,11 @@ import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnab
 import { isEmbeddedWalletPresent } from '../../functions/isEmbeddedWalletPresent/isEmbeddedWalletPresent.js';
 import { findEmbeddedWalletFromVerifiedCredentials } from '../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
 import { findTurnkeyWallet } from '../../functions/findTurnkeyWallet/findTurnkeyWallet.js';
+import { getUserWalletsFromVerifiedCredentials } from '../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.js';
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useEmbeddedWallet = () => {
-    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, wallets, internalSetShowAuthFlow, internalEvents, } = useInternalDynamicContext();
+    const { projectSettings, onboardingOnlyJwt, setPrimaryWalletId, wallets, internalSetShowAuthFlow, internalEvents, primaryWallet, } = useInternalDynamicContext();
     const { setView } = useViewContext();
     const userHasEmbeddedWallet = () => {
         var _a;
@@ -42,9 +43,9 @@ const useEmbeddedWallet = () => {
         if (!isTurnkeyEnabled(projectSettings)) {
             throw new Error('Passkey embedded wallet is not enabled');
         }
-        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt);
-        // if user doesn't have an embedded wallet, show the passkey view to create wallet
-        if (!embeddedWalletVerifiedCredential) {
+        const userWaletsCredentials = getUserWalletsFromVerifiedCredentials(jwt);
+        // if user doesn't have a wallet yet, show the passkey view to create an embedded wallet
+        if (!(userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.length)) {
             internalSetShowAuthFlow(true);
             setView('passkey-intro');
             return new Promise((resolve, reject) => {
@@ -52,14 +53,19 @@ const useEmbeddedWallet = () => {
                 internalEvents.current.once('embeddedWalletFailed', (error) => reject(error));
             });
         }
-        const decodedJwt = decodeJwt(jwt);
+        internalSetShowAuthFlow(false);
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt);
         const turnkeyWallet = findTurnkeyWallet(wallets);
+        // if user logged in with MM for example, just continue the flow
+        if (!embeddedWalletVerifiedCredential) {
+            return Promise.resolve(primaryWallet);
+        }
+        const decodedJwt = decodeJwt(jwt);
         // if user already has embedded wallet, set it as primary wallet
         if (decodedJwt) {
             (_b = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _b === void 0 ? void 0 : _b.setVerifiedCredentials(decodedJwt.verifiedCredentials);
             setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
         }
-        internalSetShowAuthFlow(false);
         const passkeyWallet = {
             address: (yield ((_c = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _c === void 0 ? void 0 : _c.fetchPublicAddress())) || '',
             chain: ((_d = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _d === void 0 ? void 0 : _d.connectedChain) || '',

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

@@ -17,7 +17,6 @@ require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../../shared/consts/index.cjs');
 var useWalletConnectorEvent = require('../useWalletConnectorEvent/useWalletConnectorEvent.cjs');
-var sortAccountsByPrimaryWallet = require('./utils/sortAccountsByPrimaryWallet/sortAccountsByPrimaryWallet.cjs');
 
 const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
     const [loadingNetwork, setLoadingNetwork] = React.useState(true);
@@ -25,7 +24,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
     React.useEffect(() => {
         const fetchNetwork = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
             try {
-                if (!primaryWallet)
+                if (!(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector))
                     return;
                 const network = yield primaryWallet.connector.getNetwork();
                 setNetwork(network);
@@ -39,7 +38,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
             }
         });
         fetchNetwork();
-    }, [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id]);
+    }, [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector]);
     useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'disconnect', () => {
         logger.logger.debug('primary wallet disconnect');
         handleLogOut();
@@ -65,11 +64,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         // change the api here
         if (!primaryWallet)
             return;
-        // Sorts the accounts so that the primary wallet is always first
-        // when multiWallet is disabled to ensure we find the primary address
-        const [newAddress] = multiWallet
-            ? accounts
-            : sortAccountsByPrimaryWallet.sortAccountsByPrimaryWallet(accounts, primaryWallet);
+        const [newAddress] = accounts;
         const newWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
         if (authMode === 'connect-only') {
             refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);

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

@@ -13,7 +13,6 @@ import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../../shared/consts/index.js';
 import { useWalletConnectorEvent } from '../useWalletConnectorEvent/useWalletConnectorEvent.js';
-import { sortAccountsByPrimaryWallet } from './utils/sortAccountsByPrimaryWallet/sortAccountsByPrimaryWallet.js';
 
 const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
     const [loadingNetwork, setLoadingNetwork] = useState(true);
@@ -21,7 +20,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
     useEffect(() => {
         const fetchNetwork = () => __awaiter(void 0, void 0, void 0, function* () {
             try {
-                if (!primaryWallet)
+                if (!(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector))
                     return;
                 const network = yield primaryWallet.connector.getNetwork();
                 setNetwork(network);
@@ -35,7 +34,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
             }
         });
         fetchNetwork();
-    }, [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id]);
+    }, [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector]);
     useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'disconnect', () => {
         logger.debug('primary wallet disconnect');
         handleLogOut();
@@ -61,11 +60,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         // change the api here
         if (!primaryWallet)
             return;
-        // Sorts the accounts so that the primary wallet is always first
-        // when multiWallet is disabled to ensure we find the primary address
-        const [newAddress] = multiWallet
-            ? accounts
-            : sortAccountsByPrimaryWallet(accounts, primaryWallet);
+        const [newAddress] = accounts;
         const newWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));
         if (authMode === 'connect-only') {
             refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);

package/src/lib/views/LoginView/sections/SocialSignInSection/MagicSocialSignIn/MagicSocialSignIn.cjs

@@ -16,7 +16,7 @@ require('../../../../../utils/constants/colors.cjs');
 require('../../../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../../../../shared/consts/index.cjs');
-var useInternalDynamicContext = require('../../../../../context/DynamicContext/useInternalDynamicContext.cjs');
+require('../../../../../context/DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('../../../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../../../context/ThemeContext/ThemeContext.cjs');
@@ -61,15 +61,13 @@ var SocialSignIn = require('../../../../../components/SocialSignIn/SocialSignIn.
 var SocialRedirectContext = require('../../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 
 const MagicSocialSignIn = ({ defaultProvider, numOfItemsToDisplay, collapsedLayout, }) => {
-    const { socialProvidersFilter = (providers) => providers } = useInternalDynamicContext.useInternalDynamicContext();
     const { socialProvider, setSocialProvider, socialWalletConnector, enabledSocialProviders, } = SocialRedirectContext.useSocialRedirectContext();
-    const socialProviders = socialProvidersFilter(enabledSocialProviders);
     const { mutate: onClickProvider, isLoading } = useMutation.useMutation((provider) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         setSocialProvider(provider);
         yield (socialWalletConnector === null || socialWalletConnector === void 0 ? void 0 : socialWalletConnector.endSession());
         return socialWalletConnector === null || socialWalletConnector === void 0 ? void 0 : socialWalletConnector.connect(provider);
     }));
-    return (jsxRuntime.jsx(SocialSignIn.SocialSignIn, { onSelectProvider: onClickProvider, providers: socialProviders, selectedProvider: socialProvider, isLoading: isLoading, testId: 'magic-social-sign-in', defaultProvider: defaultProvider, numOfItemsToDisplay: numOfItemsToDisplay, collapsedLayout: collapsedLayout }));
+    return (jsxRuntime.jsx(SocialSignIn.SocialSignIn, { onSelectProvider: onClickProvider, providers: enabledSocialProviders, selectedProvider: socialProvider, isLoading: isLoading, testId: 'magic-social-sign-in', defaultProvider: defaultProvider, numOfItemsToDisplay: numOfItemsToDisplay, collapsedLayout: collapsedLayout }));
 };
 
 exports.MagicSocialSignIn = MagicSocialSignIn;

package/src/lib/views/LoginView/sections/SocialSignInSection/MagicSocialSignIn/MagicSocialSignIn.js

@@ -12,7 +12,7 @@ import '../../../../../utils/constants/colors.js';
 import '../../../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../../../../shared/consts/index.js';
-import { useInternalDynamicContext } from '../../../../../context/DynamicContext/useInternalDynamicContext.js';
+import '../../../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/multi-wallet';
 import '../../../../../components/ShadowDOM/ShadowDOM.js';
 import '../../../../../context/ThemeContext/ThemeContext.js';
@@ -57,15 +57,13 @@ import { SocialSignIn } from '../../../../../components/SocialSignIn/SocialSignI
 import { useSocialRedirectContext } from '../../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 
 const MagicSocialSignIn = ({ defaultProvider, numOfItemsToDisplay, collapsedLayout, }) => {
-    const { socialProvidersFilter = (providers) => providers } = useInternalDynamicContext();
     const { socialProvider, setSocialProvider, socialWalletConnector, enabledSocialProviders, } = useSocialRedirectContext();
-    const socialProviders = socialProvidersFilter(enabledSocialProviders);
     const { mutate: onClickProvider, isLoading } = useMutation((provider) => __awaiter(void 0, void 0, void 0, function* () {
         setSocialProvider(provider);
         yield (socialWalletConnector === null || socialWalletConnector === void 0 ? void 0 : socialWalletConnector.endSession());
         return socialWalletConnector === null || socialWalletConnector === void 0 ? void 0 : socialWalletConnector.connect(provider);
     }));
-    return (jsx(SocialSignIn, { onSelectProvider: onClickProvider, providers: socialProviders, selectedProvider: socialProvider, isLoading: isLoading, testId: 'magic-social-sign-in', defaultProvider: defaultProvider, numOfItemsToDisplay: numOfItemsToDisplay, collapsedLayout: collapsedLayout }));
+    return (jsx(SocialSignIn, { onSelectProvider: onClickProvider, providers: enabledSocialProviders, selectedProvider: socialProvider, isLoading: isLoading, testId: 'magic-social-sign-in', defaultProvider: defaultProvider, numOfItemsToDisplay: numOfItemsToDisplay, collapsedLayout: collapsedLayout }));
 };
 
 export { MagicSocialSignIn };

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

@@ -6,6 +6,7 @@ var React = require('react');
 var reactI18next = require('react-i18next');
 var sdkApi = require('@dynamic-labs/sdk-api');
 var useInternalDynamicContext = require('../../context/DynamicContext/useInternalDynamicContext.cjs');
+var SocialRedirectContext = require('../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
@@ -24,7 +25,9 @@ var index = require('../../utils/functions/getEnabledProviders/index.cjs');
 /* eslint-disable multiline-comment-style */
 const NUMBER_OF_WALLETS = 3;
 const useLoginView = () => {
+    var _a, _b, _c, _d;
     const { projectSettings, authorizationViewDisplayOrder, loginWithEmail, wallets, walletsFilter, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { enabledSocialProviders } = SocialRedirectContext.useSocialRedirectContext();
     /** Takes from wallets only those that can be selected in the wallet list by the user.
      * Should filter out embedded wallets
      * WHY: when we decide whether to show wallets or not, we need to know how many wallets
@@ -55,46 +58,51 @@ const useLoginView = () => {
      * build email and social view sections from project settings design.modal props - backwards compatibility
      * @returns SdkViewSection[]
      */
-    const getEmailViewSectionDefinition = () => {
-        var _a, _b, _c, _d;
+    const getEmailViewSectionDefinition = React.useCallback(() => {
+        var _a, _b;
         const loginViewSections = [
             {
                 type: sdkApi.SdkViewSectionType.Email,
             },
         ];
-        const enabledSocialProviders = (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.socialSignIn) === null || _a === void 0 ? void 0 : _a.providers) === null || _b === void 0 ? void 0 : _b.filter((provider) => provider.enabled);
         if (enabledSocialProviders === null || enabledSocialProviders === void 0 ? void 0 : enabledSocialProviders.length) {
-            loginViewSections.push({
+            const socialSection = {
                 numOfItemsToDisplay: 5,
                 type: sdkApi.SdkViewSectionType.Social,
-            });
-            if ((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _c === void 0 ? void 0 : _c.splitEmailAndSocial) {
+            };
+            loginViewSections.push(socialSection);
+            if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _a === void 0 ? void 0 : _a.splitEmailAndSocial) {
                 loginViewSections.splice(1, 0, {
                     label: t('dyn_login.separators.default'),
                     type: sdkApi.SdkViewSectionType.Separator,
                 });
-                loginViewSections[loginViewSections.length - 1].defaultItem =
-                    enabledSocialProviders[0].provider;
+                // eslint-disable-next-line prefer-destructuring
+                socialSection.defaultItem = enabledSocialProviders[0];
             }
         }
-        if ((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _d === void 0 ? void 0 : _d.socialAboveEmail) {
+        if ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _b === void 0 ? void 0 : _b.socialAboveEmail) {
             loginViewSections.reverse();
         }
         return loginViewSections;
-    };
+    }, [
+        enabledSocialProviders,
+        (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _a === void 0 ? void 0 : _a.socialAboveEmail,
+        (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _b === void 0 ? void 0 : _b.splitEmailAndSocial,
+        t,
+    ]);
     // TODO: https://linear.app/dynamic-labs/issue/GVTY-212/rethink-or-implement-toolkit-template-for-email-wallet-order
     /**
      * remove wallet view section from projectSettings?.sdk?.views if no wallet defined
      * @param sections
      * @returns
      */
-    const filterLoginViewSections = (sections) => {
+    const filterLoginViewSections = React.useCallback((sections) => {
         if (selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length) {
             return sections;
         }
         return sections.filter((section) => section.type !== 'wallet');
-    };
-    const addSeparator = (index, loginItem) => {
+    }, [selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length]);
+    const addSeparator = React.useCallback((index) => {
         // if not the first index, no separator is needed
         // if the first index but does not have wallets or providers,
         // it'll show only one view section - no separator is needed
@@ -107,12 +115,12 @@ const useLoginView = () => {
                 type: sdkApi.SdkViewSectionType.Separator,
             },
         ];
-    };
+    }, [hasEnabledProviders, selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length, t]);
     /**
      * build login view sections array from project settings design.modal props - backwards compatibility
      * @returns SdkViewSection[]
      */
-    const buildLoginSections = () => {
+    const buildLoginSections = React.useCallback(() => {
         let loginViewSections = [];
         authorizationViewDisplayOrder === null || authorizationViewDisplayOrder === void 0 ? void 0 : authorizationViewDisplayOrder.forEach((loginItem, index) => {
             var _a, _b;
@@ -139,7 +147,14 @@ const useLoginView = () => {
             }
         });
         return loginViewSections;
-    };
+    }, [
+        addSeparator,
+        authorizationViewDisplayOrder,
+        getEmailViewSectionDefinition,
+        (_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _c === void 0 ? void 0 : _c.modal) === null || _d === void 0 ? void 0 : _d.showWalletsButton,
+        projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers,
+        selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length,
+    ]);
     /**
      * returns the login view sections to be displayed in order from projectSettings?.sdk?.views
      * and has backwards compatibility with project settings design.modal props
@@ -156,7 +171,6 @@ const useLoginView = () => {
         return buildLoginSections();
     }, [
         projectSettings,
-        authorizationViewDisplayOrder,
         getEmailViewSectionDefinition,
         filterLoginViewSections,
         buildLoginSections,

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

@@ -1,7 +1,8 @@
-import { useMemo } from 'react';
+import { useMemo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { SdkViewType, SdkViewSectionType } from '@dynamic-labs/sdk-api';
 import { useInternalDynamicContext } from '../../context/DynamicContext/useInternalDynamicContext.js';
+import { useSocialRedirectContext } from '../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
@@ -20,7 +21,9 @@ import { getEnabledProviders } from '../../utils/functions/getEnabledProviders/i
 /* eslint-disable multiline-comment-style */
 const NUMBER_OF_WALLETS = 3;
 const useLoginView = () => {
+    var _a, _b, _c, _d;
     const { projectSettings, authorizationViewDisplayOrder, loginWithEmail, wallets, walletsFilter, } = useInternalDynamicContext();
+    const { enabledSocialProviders } = useSocialRedirectContext();
     /** Takes from wallets only those that can be selected in the wallet list by the user.
      * Should filter out embedded wallets
      * WHY: when we decide whether to show wallets or not, we need to know how many wallets
@@ -51,46 +54,51 @@ const useLoginView = () => {
      * build email and social view sections from project settings design.modal props - backwards compatibility
      * @returns SdkViewSection[]
      */
-    const getEmailViewSectionDefinition = () => {
-        var _a, _b, _c, _d;
+    const getEmailViewSectionDefinition = useCallback(() => {
+        var _a, _b;
         const loginViewSections = [
             {
                 type: SdkViewSectionType.Email,
             },
         ];
-        const enabledSocialProviders = (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.socialSignIn) === null || _a === void 0 ? void 0 : _a.providers) === null || _b === void 0 ? void 0 : _b.filter((provider) => provider.enabled);
         if (enabledSocialProviders === null || enabledSocialProviders === void 0 ? void 0 : enabledSocialProviders.length) {
-            loginViewSections.push({
+            const socialSection = {
                 numOfItemsToDisplay: 5,
                 type: SdkViewSectionType.Social,
-            });
-            if ((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _c === void 0 ? void 0 : _c.splitEmailAndSocial) {
+            };
+            loginViewSections.push(socialSection);
+            if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _a === void 0 ? void 0 : _a.splitEmailAndSocial) {
                 loginViewSections.splice(1, 0, {
                     label: t('dyn_login.separators.default'),
                     type: SdkViewSectionType.Separator,
                 });
-                loginViewSections[loginViewSections.length - 1].defaultItem =
-                    enabledSocialProviders[0].provider;
+                // eslint-disable-next-line prefer-destructuring
+                socialSection.defaultItem = enabledSocialProviders[0];
             }
         }
-        if ((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _d === void 0 ? void 0 : _d.socialAboveEmail) {
+        if ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _b === void 0 ? void 0 : _b.socialAboveEmail) {
             loginViewSections.reverse();
         }
         return loginViewSections;
-    };
+    }, [
+        enabledSocialProviders,
+        (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _a === void 0 ? void 0 : _a.socialAboveEmail,
+        (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) === null || _b === void 0 ? void 0 : _b.splitEmailAndSocial,
+        t,
+    ]);
     // TODO: https://linear.app/dynamic-labs/issue/GVTY-212/rethink-or-implement-toolkit-template-for-email-wallet-order
     /**
      * remove wallet view section from projectSettings?.sdk?.views if no wallet defined
      * @param sections
      * @returns
      */
-    const filterLoginViewSections = (sections) => {
+    const filterLoginViewSections = useCallback((sections) => {
         if (selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length) {
             return sections;
         }
         return sections.filter((section) => section.type !== 'wallet');
-    };
-    const addSeparator = (index, loginItem) => {
+    }, [selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length]);
+    const addSeparator = useCallback((index) => {
         // if not the first index, no separator is needed
         // if the first index but does not have wallets or providers,
         // it'll show only one view section - no separator is needed
@@ -103,12 +111,12 @@ const useLoginView = () => {
                 type: SdkViewSectionType.Separator,
             },
         ];
-    };
+    }, [hasEnabledProviders, selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length, t]);
     /**
      * build login view sections array from project settings design.modal props - backwards compatibility
      * @returns SdkViewSection[]
      */
-    const buildLoginSections = () => {
+    const buildLoginSections = useCallback(() => {
         let loginViewSections = [];
         authorizationViewDisplayOrder === null || authorizationViewDisplayOrder === void 0 ? void 0 : authorizationViewDisplayOrder.forEach((loginItem, index) => {
             var _a, _b;
@@ -135,7 +143,14 @@ const useLoginView = () => {
             }
         });
         return loginViewSections;
-    };
+    }, [
+        addSeparator,
+        authorizationViewDisplayOrder,
+        getEmailViewSectionDefinition,
+        (_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _c === void 0 ? void 0 : _c.modal) === null || _d === void 0 ? void 0 : _d.showWalletsButton,
+        projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers,
+        selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length,
+    ]);
     /**
      * returns the login view sections to be displayed in order from projectSettings?.sdk?.views
      * and has backwards compatibility with project settings design.modal props
@@ -152,7 +167,6 @@ const useLoginView = () => {
         return buildLoginSections();
     }, [
         projectSettings,
-        authorizationViewDisplayOrder,
         getEmailViewSectionDefinition,
         filterLoginViewSections,
         buildLoginSections,

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

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

package/src/lib/utils/hooks/useWalletEventListeners/utils/sortAccountsByPrimaryWallet/index.d.ts

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

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

@@ -1,9 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-
-const sortAccountsByPrimaryWallet = (accounts, primaryWallet) => [...accounts].sort((account) => walletConnectorCore.isSameAddress(account, primaryWallet.address, primaryWallet.chain) ? -1 : 1);
-
-exports.sortAccountsByPrimaryWallet = sortAccountsByPrimaryWallet;

package/src/lib/utils/hooks/useWalletEventListeners/utils/sortAccountsByPrimaryWallet/sortAccountsByPrimaryWallet.d.ts

@@ -1,2 +0,0 @@
-import { Wallet } from '../../../../../shared';
-export declare const sortAccountsByPrimaryWallet: (accounts: string[], primaryWallet: Wallet) => string[];

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

@@ -1,5 +0,0 @@
-import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
-
-const sortAccountsByPrimaryWallet = (accounts, primaryWallet) => [...accounts].sort((account) => isSameAddress(account, primaryWallet.address, primaryWallet.chain) ? -1 : 1);
-
-export { sortAccountsByPrimaryWallet };