@dynamic-labs/sdk-react-core 0.19.4 → 0.19.6

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

@@ -32,16 +32,13 @@ const SocialSignInSection = ({ sectionData, collapsedLayout, }) => {
         numOfItemsToDisplay: sectionData.numOfItemsToDisplay,
     };
     const isMagicEnabled = isProviderEnabled.isProviderEnabled(providers, sdkApi.ProviderEnum.MagicLink);
-    const isDynamicEnabled = isProviderEnabled.isProviderEnabled(providers, sdkApi.ProviderEnum.Dynamic) ||
-        isProviderEnabled.isProviderEnabled(providers, sdkApi.ProviderEnum.EmailOnly);
     if (isMagicEnabled &&
         ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.socialSignIn) === null || _b === void 0 ? void 0 : _b.signInProvider) ===
             sdkApi.SignInProviderEnum.MagicLink) {
         return jsxRuntime.jsx(MagicSocialSignIn.MagicSocialSignIn, Object.assign({}, componentProps));
     }
-    if (isDynamicEnabled &&
-        ((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.socialSignIn) === null || _c === void 0 ? void 0 : _c.signInProvider) ===
-            sdkApi.SignInProviderEnum.Dynamic) {
+    if (((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.socialSignIn) === null || _c === void 0 ? void 0 : _c.signInProvider) ===
+        sdkApi.SignInProviderEnum.Dynamic) {
         return jsxRuntime.jsx(DynamicSocialSignIn.DynamicSocialSignIn, Object.assign({}, componentProps));
     }
     return null;

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

@@ -28,16 +28,13 @@ const SocialSignInSection = ({ sectionData, collapsedLayout, }) => {
         numOfItemsToDisplay: sectionData.numOfItemsToDisplay,
     };
     const isMagicEnabled = isProviderEnabled(providers, ProviderEnum.MagicLink);
-    const isDynamicEnabled = isProviderEnabled(providers, ProviderEnum.Dynamic) ||
-        isProviderEnabled(providers, ProviderEnum.EmailOnly);
     if (isMagicEnabled &&
         ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.socialSignIn) === null || _b === void 0 ? void 0 : _b.signInProvider) ===
             SignInProviderEnum.MagicLink) {
         return jsx(MagicSocialSignIn, Object.assign({}, componentProps));
     }
-    if (isDynamicEnabled &&
-        ((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.socialSignIn) === null || _c === void 0 ? void 0 : _c.signInProvider) ===
-            SignInProviderEnum.Dynamic) {
+    if (((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.socialSignIn) === null || _c === void 0 ? void 0 : _c.signInProvider) ===
+        SignInProviderEnum.Dynamic) {
         return jsx(DynamicSocialSignIn, Object.assign({}, componentProps));
     }
     return null;

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

@@ -20,14 +20,19 @@ require('@dynamic-labs/utils');
 require('../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var isEmailProviderEnabled = require('../../utils/functions/isEmailProviderEnabled/isEmailProviderEnabled.cjs');
-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;
+    var _a, _b, _c, _d, _e, _f;
     const { projectSettings, authorizationViewDisplayOrder, loginWithEmail, wallets, walletsFilter, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { t } = reactI18next.useTranslation();
     const { enabledSocialProviders } = SocialRedirectContext.useSocialRedirectContext();
+    const hasSocialProvidersEnabled = Boolean(enabledSocialProviders === null || enabledSocialProviders === void 0 ? void 0 : enabledSocialProviders.length);
+    const hasEmailProviderEnabled = ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) === null || _a === void 0 ? void 0 : _a.length) &&
+        isEmailProviderEnabled.isEmailProviderEnabled(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers);
+    // is email only is set in the project settings when the "Email (Web2) only" is toggled on in the dashboard
+    const isEmailOnly = (_c = (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _b === void 0 ? void 0 : _b.modal) === null || _c === void 0 ? void 0 : _c.emailOnly;
     /** 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
@@ -35,61 +40,91 @@ const useLoginView = () => {
      * wallets and then display an empty wallet list (since turnkey doesn't render)
      */
     const selectableWallets = (walletsFilter ? walletsFilter(wallets) : wallets).filter(({ key }) => key !== 'turnkey');
-    const { t } = reactI18next.useTranslation();
-    const hasEnabledProviders = Boolean(index.getEnabledProviders(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers).length);
+    const separator = React.useMemo(() => ({
+        label: t('dyn_login.separators.default'),
+        type: sdkApi.SdkViewSectionType.Separator,
+    }), [t]);
     const isWalletOnly = React.useMemo(() => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         if (!projectSettings) {
             return false;
         }
-        // toolkit functionality overrides whatever is defined
-        if (!loginWithEmail) {
+        // if both loginWithEmail AND hasSocialProvidersEnabled are false, it's wallet only
+        if (!loginWithEmail && !hasSocialProvidersEnabled) {
             return true;
         }
         const loginView = (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.views) === null || _b === void 0 ? void 0 : _b.find((view) => view.type === sdkApi.SdkViewType.Login);
-        // backwards compatibility for those that didn't set up login view sessions
+        // backwards compatibility for those that didn't set up login view sections
         if (!((_c = loginView === null || loginView === void 0 ? void 0 : loginView.sections) === null || _c === void 0 ? void 0 : _c.length)) {
-            return (!((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) === null || _d === void 0 ? void 0 : _d.length) ||
-                !isEmailProviderEnabled.isEmailProviderEnabled(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers));
+            return !hasEmailProviderEnabled && !hasSocialProvidersEnabled;
         }
         return (loginView.sections.length === 1 && loginView.sections[0].type === 'wallet');
-    }, [projectSettings, loginWithEmail]);
+    }, [
+        projectSettings,
+        loginWithEmail,
+        hasSocialProvidersEnabled,
+        hasEmailProviderEnabled,
+        enabledSocialProviders === null || enabledSocialProviders === void 0 ? void 0 : enabledSocialProviders.length,
+    ]);
     /**
-     * build email and social view sections from project settings design.modal props - backwards compatibility
+     * build email from project settings design.modal props
      * @returns SdkViewSection[]
      */
     const getEmailViewSectionDefinition = React.useCallback(() => {
-        var _a, _b;
-        const loginViewSections = [
+        if (!hasEmailProviderEnabled)
+            return [];
+        return [
             {
                 type: sdkApi.SdkViewSectionType.Email,
             },
         ];
-        if (enabledSocialProviders === null || enabledSocialProviders === void 0 ? void 0 : enabledSocialProviders.length) {
-            const socialSection = {
+    }, [hasEmailProviderEnabled]);
+    /**
+     * build social from project settings design.modal props
+     * @returns SdkViewSection[]
+     */
+    const getSocialViewSectionDefinition = React.useCallback(() => {
+        if (!(enabledSocialProviders === null || enabledSocialProviders === void 0 ? void 0 : enabledSocialProviders.length))
+            return [];
+        return [
+            {
                 numOfItemsToDisplay: 5,
                 type: sdkApi.SdkViewSectionType.Social,
-            };
-            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,
-                });
-                // eslint-disable-next-line prefer-destructuring
-                socialSection.defaultItem = enabledSocialProviders[0];
-            }
-        }
-        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 === null || enabledSocialProviders === void 0 ? void 0 : enabledSocialProviders.length]);
+    const getWalletViewSectionDefinition = React.useCallback(() => {
+        var _a, _b;
+        if (!(selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length))
+            return [];
+        const numOfItemsToDisplay = ((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _a === void 0 ? void 0 : _a.modal) === null || _b === void 0 ? void 0 : _b.showWalletsButton)
+            ? 0
+            : NUMBER_OF_WALLETS;
+        return [
+            {
+                numOfItemsToDisplay,
+                type: sdkApi.SdkViewSectionType.Wallet,
+            },
+        ];
     }, [
-        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,
+        (_e = (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _d === void 0 ? void 0 : _d.modal) === null || _e === void 0 ? void 0 : _e.showWalletsButton,
+        selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length,
     ]);
+    const applyLoginModalSettings = React.useCallback((emailAndSocialSections) => {
+        if (emailAndSocialSections.length < 2) {
+            return emailAndSocialSections;
+        }
+        const { splitEmailAndSocial, socialAboveEmail } = (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) || {};
+        if (splitEmailAndSocial) {
+            emailAndSocialSections.splice(1, 0, separator);
+            // eslint-disable-next-line prefer-destructuring
+            emailAndSocialSections[2].defaultItem = enabledSocialProviders[0];
+        }
+        if (socialAboveEmail) {
+            emailAndSocialSections.reverse();
+        }
+        return emailAndSocialSections;
+    }, [enabledSocialProviders, projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal, separator]);
     // 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
@@ -102,78 +137,65 @@ const useLoginView = () => {
         }
         return sections.filter((section) => section.type !== 'wallet');
     }, [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
-        if (index !== 0 || !(selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length) || !hasEnabledProviders) {
-            return [];
-        }
-        return [
-            {
-                label: t('dyn_login.separators.default'),
-                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 = React.useCallback(() => {
-        let loginViewSections = [];
-        authorizationViewDisplayOrder === null || authorizationViewDisplayOrder === void 0 ? void 0 : authorizationViewDisplayOrder.forEach((loginItem, index) => {
-            var _a, _b;
-            if (loginItem === 'email' &&
-                (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) &&
-                isEmailProviderEnabled.isEmailProviderEnabled(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers)) {
-                loginViewSections = loginViewSections.concat(getEmailViewSectionDefinition(), 
-                // add separator if wallets defined
-                addSeparator(index));
+    const buildLoginSections = React.useCallback((buildOrder) => {
+        var _a;
+        const loginViewSections = [];
+        buildOrder === null || buildOrder === void 0 ? void 0 : buildOrder.forEach((loginItem) => {
+            // Add a separator if there are sections already
+            if (loginViewSections.length)
+                loginViewSections.push(separator);
+            if (loginItem === 'email') {
+                // In the past, the email and social sections were combined into one section,
+                // so we need to check for that case and add the social section if needed for backwards compatibility
+                // if email was just pushed to the loginViewSections array and social is not defined in the buildOrder,
+                // then we need to add social (if social is enabled)
+                const emailAndSocialSections = [
+                    ...getEmailViewSectionDefinition(),
+                    ...getSocialViewSectionDefinition(),
+                ];
+                loginViewSections.push(...applyLoginModalSettings(emailAndSocialSections));
             }
-            if (loginItem === 'wallet' && (selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length)) {
-                // if showWalletsButton is true, it should show "Connec with Wallet" button
-                const numOfItemsToDisplay = ((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _a === void 0 ? void 0 : _a.modal) === null || _b === void 0 ? void 0 : _b.showWalletsButton)
-                    ? 0
-                    : NUMBER_OF_WALLETS;
-                loginViewSections = loginViewSections.concat([
-                    {
-                        numOfItemsToDisplay,
-                        type: sdkApi.SdkViewSectionType.Wallet,
-                    },
-                ], 
-                // add separator if email providers defined
-                addSeparator(index));
+            if (loginItem === 'wallet') {
+                loginViewSections.push(...getWalletViewSectionDefinition());
             }
         });
+        // remove last separator
+        if (((_a = loginViewSections[loginViewSections.length - 1]) === null || _a === void 0 ? void 0 : _a.type) === 'separator') {
+            loginViewSections.pop();
+        }
         return loginViewSections;
     }, [
-        addSeparator,
-        authorizationViewDisplayOrder,
+        applyLoginModalSettings,
         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,
+        getSocialViewSectionDefinition,
+        getWalletViewSectionDefinition,
+        separator,
     ]);
     /**
      * returns the login view sections to be displayed in order from projectSettings?.sdk?.views
      * and has backwards compatibility with project settings design.modal props
      */
     const logingViewSections = React.useMemo(() => {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c;
         const loginView = (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.views) === null || _b === void 0 ? void 0 : _b.find((view) => view.type === sdkApi.SdkViewType.Login);
         if ((_c = loginView === null || loginView === void 0 ? void 0 : loginView.sections) === null || _c === void 0 ? void 0 : _c.length) {
             return filterLoginViewSections(loginView === null || loginView === void 0 ? void 0 : loginView.sections);
         }
-        if ((_e = (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _d === void 0 ? void 0 : _d.modal) === null || _e === void 0 ? void 0 : _e.emailOnly) {
-            return getEmailViewSectionDefinition();
+        let viewOrder = authorizationViewDisplayOrder;
+        if (isEmailOnly) {
+            viewOrder = ['email'];
         }
-        return buildLoginSections();
+        return buildLoginSections(viewOrder);
     }, [
-        projectSettings,
-        getEmailViewSectionDefinition,
-        filterLoginViewSections,
+        (_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _f === void 0 ? void 0 : _f.views,
+        authorizationViewDisplayOrder,
+        isEmailOnly,
         buildLoginSections,
+        filterLoginViewSections,
     ]);
     return {
         isWalletOnly,

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

@@ -1,6 +1,6 @@
 import { useMemo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
-import { SdkViewType, SdkViewSectionType } from '@dynamic-labs/sdk-api';
+import { SdkViewSectionType, SdkViewType } from '@dynamic-labs/sdk-api';
 import { useInternalDynamicContext } from '../../context/DynamicContext/useInternalDynamicContext.js';
 import { useSocialRedirectContext } from '../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../shared/logger.js';
@@ -16,14 +16,19 @@ import '@dynamic-labs/utils';
 import '../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { isEmailProviderEnabled } from '../../utils/functions/isEmailProviderEnabled/isEmailProviderEnabled.js';
-import { getEnabledProviders } from '../../utils/functions/getEnabledProviders/index.js';
 
 /* eslint-disable multiline-comment-style */
 const NUMBER_OF_WALLETS = 3;
 const useLoginView = () => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     const { projectSettings, authorizationViewDisplayOrder, loginWithEmail, wallets, walletsFilter, } = useInternalDynamicContext();
+    const { t } = useTranslation();
     const { enabledSocialProviders } = useSocialRedirectContext();
+    const hasSocialProvidersEnabled = Boolean(enabledSocialProviders === null || enabledSocialProviders === void 0 ? void 0 : enabledSocialProviders.length);
+    const hasEmailProviderEnabled = ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) === null || _a === void 0 ? void 0 : _a.length) &&
+        isEmailProviderEnabled(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers);
+    // is email only is set in the project settings when the "Email (Web2) only" is toggled on in the dashboard
+    const isEmailOnly = (_c = (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _b === void 0 ? void 0 : _b.modal) === null || _c === void 0 ? void 0 : _c.emailOnly;
     /** 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
@@ -31,61 +36,91 @@ const useLoginView = () => {
      * wallets and then display an empty wallet list (since turnkey doesn't render)
      */
     const selectableWallets = (walletsFilter ? walletsFilter(wallets) : wallets).filter(({ key }) => key !== 'turnkey');
-    const { t } = useTranslation();
-    const hasEnabledProviders = Boolean(getEnabledProviders(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers).length);
+    const separator = useMemo(() => ({
+        label: t('dyn_login.separators.default'),
+        type: SdkViewSectionType.Separator,
+    }), [t]);
     const isWalletOnly = useMemo(() => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         if (!projectSettings) {
             return false;
         }
-        // toolkit functionality overrides whatever is defined
-        if (!loginWithEmail) {
+        // if both loginWithEmail AND hasSocialProvidersEnabled are false, it's wallet only
+        if (!loginWithEmail && !hasSocialProvidersEnabled) {
             return true;
         }
         const loginView = (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.views) === null || _b === void 0 ? void 0 : _b.find((view) => view.type === SdkViewType.Login);
-        // backwards compatibility for those that didn't set up login view sessions
+        // backwards compatibility for those that didn't set up login view sections
         if (!((_c = loginView === null || loginView === void 0 ? void 0 : loginView.sections) === null || _c === void 0 ? void 0 : _c.length)) {
-            return (!((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) === null || _d === void 0 ? void 0 : _d.length) ||
-                !isEmailProviderEnabled(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers));
+            return !hasEmailProviderEnabled && !hasSocialProvidersEnabled;
         }
         return (loginView.sections.length === 1 && loginView.sections[0].type === 'wallet');
-    }, [projectSettings, loginWithEmail]);
+    }, [
+        projectSettings,
+        loginWithEmail,
+        hasSocialProvidersEnabled,
+        hasEmailProviderEnabled,
+        enabledSocialProviders === null || enabledSocialProviders === void 0 ? void 0 : enabledSocialProviders.length,
+    ]);
     /**
-     * build email and social view sections from project settings design.modal props - backwards compatibility
+     * build email from project settings design.modal props
      * @returns SdkViewSection[]
      */
     const getEmailViewSectionDefinition = useCallback(() => {
-        var _a, _b;
-        const loginViewSections = [
+        if (!hasEmailProviderEnabled)
+            return [];
+        return [
             {
                 type: SdkViewSectionType.Email,
             },
         ];
-        if (enabledSocialProviders === null || enabledSocialProviders === void 0 ? void 0 : enabledSocialProviders.length) {
-            const socialSection = {
+    }, [hasEmailProviderEnabled]);
+    /**
+     * build social from project settings design.modal props
+     * @returns SdkViewSection[]
+     */
+    const getSocialViewSectionDefinition = useCallback(() => {
+        if (!(enabledSocialProviders === null || enabledSocialProviders === void 0 ? void 0 : enabledSocialProviders.length))
+            return [];
+        return [
+            {
                 numOfItemsToDisplay: 5,
                 type: SdkViewSectionType.Social,
-            };
-            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,
-                });
-                // eslint-disable-next-line prefer-destructuring
-                socialSection.defaultItem = enabledSocialProviders[0];
-            }
-        }
-        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 === null || enabledSocialProviders === void 0 ? void 0 : enabledSocialProviders.length]);
+    const getWalletViewSectionDefinition = useCallback(() => {
+        var _a, _b;
+        if (!(selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length))
+            return [];
+        const numOfItemsToDisplay = ((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _a === void 0 ? void 0 : _a.modal) === null || _b === void 0 ? void 0 : _b.showWalletsButton)
+            ? 0
+            : NUMBER_OF_WALLETS;
+        return [
+            {
+                numOfItemsToDisplay,
+                type: SdkViewSectionType.Wallet,
+            },
+        ];
     }, [
-        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,
+        (_e = (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _d === void 0 ? void 0 : _d.modal) === null || _e === void 0 ? void 0 : _e.showWalletsButton,
+        selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length,
     ]);
+    const applyLoginModalSettings = useCallback((emailAndSocialSections) => {
+        if (emailAndSocialSections.length < 2) {
+            return emailAndSocialSections;
+        }
+        const { splitEmailAndSocial, socialAboveEmail } = (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal) || {};
+        if (splitEmailAndSocial) {
+            emailAndSocialSections.splice(1, 0, separator);
+            // eslint-disable-next-line prefer-destructuring
+            emailAndSocialSections[2].defaultItem = enabledSocialProviders[0];
+        }
+        if (socialAboveEmail) {
+            emailAndSocialSections.reverse();
+        }
+        return emailAndSocialSections;
+    }, [enabledSocialProviders, projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal, separator]);
     // 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
@@ -98,78 +133,65 @@ const useLoginView = () => {
         }
         return sections.filter((section) => section.type !== 'wallet');
     }, [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
-        if (index !== 0 || !(selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length) || !hasEnabledProviders) {
-            return [];
-        }
-        return [
-            {
-                label: t('dyn_login.separators.default'),
-                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 = useCallback(() => {
-        let loginViewSections = [];
-        authorizationViewDisplayOrder === null || authorizationViewDisplayOrder === void 0 ? void 0 : authorizationViewDisplayOrder.forEach((loginItem, index) => {
-            var _a, _b;
-            if (loginItem === 'email' &&
-                (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) &&
-                isEmailProviderEnabled(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers)) {
-                loginViewSections = loginViewSections.concat(getEmailViewSectionDefinition(), 
-                // add separator if wallets defined
-                addSeparator(index));
+    const buildLoginSections = useCallback((buildOrder) => {
+        var _a;
+        const loginViewSections = [];
+        buildOrder === null || buildOrder === void 0 ? void 0 : buildOrder.forEach((loginItem) => {
+            // Add a separator if there are sections already
+            if (loginViewSections.length)
+                loginViewSections.push(separator);
+            if (loginItem === 'email') {
+                // In the past, the email and social sections were combined into one section,
+                // so we need to check for that case and add the social section if needed for backwards compatibility
+                // if email was just pushed to the loginViewSections array and social is not defined in the buildOrder,
+                // then we need to add social (if social is enabled)
+                const emailAndSocialSections = [
+                    ...getEmailViewSectionDefinition(),
+                    ...getSocialViewSectionDefinition(),
+                ];
+                loginViewSections.push(...applyLoginModalSettings(emailAndSocialSections));
             }
-            if (loginItem === 'wallet' && (selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length)) {
-                // if showWalletsButton is true, it should show "Connec with Wallet" button
-                const numOfItemsToDisplay = ((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _a === void 0 ? void 0 : _a.modal) === null || _b === void 0 ? void 0 : _b.showWalletsButton)
-                    ? 0
-                    : NUMBER_OF_WALLETS;
-                loginViewSections = loginViewSections.concat([
-                    {
-                        numOfItemsToDisplay,
-                        type: SdkViewSectionType.Wallet,
-                    },
-                ], 
-                // add separator if email providers defined
-                addSeparator(index));
+            if (loginItem === 'wallet') {
+                loginViewSections.push(...getWalletViewSectionDefinition());
             }
         });
+        // remove last separator
+        if (((_a = loginViewSections[loginViewSections.length - 1]) === null || _a === void 0 ? void 0 : _a.type) === 'separator') {
+            loginViewSections.pop();
+        }
         return loginViewSections;
     }, [
-        addSeparator,
-        authorizationViewDisplayOrder,
+        applyLoginModalSettings,
         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,
+        getSocialViewSectionDefinition,
+        getWalletViewSectionDefinition,
+        separator,
     ]);
     /**
      * returns the login view sections to be displayed in order from projectSettings?.sdk?.views
      * and has backwards compatibility with project settings design.modal props
      */
     const logingViewSections = useMemo(() => {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c;
         const loginView = (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.views) === null || _b === void 0 ? void 0 : _b.find((view) => view.type === SdkViewType.Login);
         if ((_c = loginView === null || loginView === void 0 ? void 0 : loginView.sections) === null || _c === void 0 ? void 0 : _c.length) {
             return filterLoginViewSections(loginView === null || loginView === void 0 ? void 0 : loginView.sections);
         }
-        if ((_e = (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _d === void 0 ? void 0 : _d.modal) === null || _e === void 0 ? void 0 : _e.emailOnly) {
-            return getEmailViewSectionDefinition();
+        let viewOrder = authorizationViewDisplayOrder;
+        if (isEmailOnly) {
+            viewOrder = ['email'];
         }
-        return buildLoginSections();
+        return buildLoginSections(viewOrder);
     }, [
-        projectSettings,
-        getEmailViewSectionDefinition,
-        filterLoginViewSections,
+        (_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _f === void 0 ? void 0 : _f.views,
+        authorizationViewDisplayOrder,
+        isEmailOnly,
         buildLoginSections,
+        filterLoginViewSections,
     ]);
     return {
         isWalletOnly,

package/src/lib/views/NetworkNotSupported/NetworkNotSupported.cjs

@@ -68,7 +68,7 @@ var UserAddress = require('../../components/UserAddress/UserAddress.cjs');
 var SelectNetworkButton = require('../../components/SelectNetworkButton/SelectNetworkButton.cjs');
 
 const NetworkNotSupported = () => {
-    const { network, onboardingImageUrl, selectedWalletConnector: walletConnector, connectedWallets, primaryWallet, isFullyConnected, setShowAuthFlow, walletsToConnectByChain, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { onboardingImageUrl, selectedWalletConnector: walletConnector, connectedWallets, primaryWallet, isFullyConnected, setShowAuthFlow, walletsToConnectByChain, } = useInternalDynamicContext.useInternalDynamicContext();
     const { t } = reactI18next.useTranslation();
     // Refresh selectedWalletConnector network when primaryWallet or connectedWallets updates
     const { data: walletConnectorNetwork } = usePromise.usePromise(() => walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getNetwork(), { deps: [primaryWallet, walletConnector, connectedWallets] });
@@ -108,10 +108,13 @@ const NetworkNotSupported = () => {
         }
     });
     const evmNetworks = walletConnector.evmNetworks || [];
-    const _isSupportedNetwork = isSupportedNetwork.isSupportedNetwork({ network, walletConnector });
+    const _isSupportedNetwork = isSupportedNetwork.isSupportedNetwork({
+        network: walletConnectorNetwork,
+        walletConnector,
+    });
     return (jsxRuntime.jsxs("div", { className: 'network-not-supported', "data-testid": 'network-not-supported', children: [onboardingImageUrl && (jsxRuntime.jsx("img", { className: 'network-not-supported__main-img', src: onboardingImageUrl, alt: 'onboarding' })), !_isSupportedNetwork && (jsxRuntime.jsx(ErrorContainer.ErrorContainer, { variant: 'info', withIcon: false, className: 'network-not-supported__error--not-supported', children: t('dyn_network_not_supported.warning_message') })), jsxRuntime.jsxs("div", { className: classNames.classNames('network-not-supported__content-container', {
                     'network-not-supported__content-container--error': !_isSupportedNetwork,
-                }), children: [jsxRuntime.jsx("div", { className: 'network-not-supported__img-container', children: jsxRuntime.jsx(walletBook.WalletIcon, { style: { height: 64, width: 64 }, walletKey: walletConnector.key }) }), jsxRuntime.jsx(UserAddress.UserAddress, { walletConnector: walletConnector }), jsxRuntime.jsx("div", { className: 'network-not-supported__network-container', children: evmNetworks.length > 1 && (jsxRuntime.jsx(NetworkPicker.NetworkPicker, { evmNetworks: evmNetworks, connector: walletConnector, isNetworkPickerOpen: isNetworkPickerOpen, setIsNetworkPickerOpen: setIsNetworkPickerOpen, showNetworkName: true, buttonClassName: 'network-not-supported__network-picker-button', mainClassName: 'network-not-supported__network-picker' })) }), jsxRuntime.jsx("div", { className: 'network-not-supported__welcome-container', children: jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', children: t('dyn_network_not_supported.subtitle') }) }), evmNetworks.length === 1 && (jsxRuntime.jsx(SelectNetworkButton.SelectNetworkButton, { onClick: onSelectNetworkButtonClick, networkId: evmNetworks[0].networkId, networkName: evmNetworks[0].vanityName || evmNetworks[0].name, networkIconUrl: evmNetworks[0].iconUrls[0] }))] })] }));
+                }), children: [jsxRuntime.jsx("div", { className: 'network-not-supported__img-container', children: jsxRuntime.jsx(walletBook.WalletIcon, { style: { height: 64, width: 64 }, walletKey: walletConnector.key }) }), jsxRuntime.jsx(UserAddress.UserAddress, { walletConnector: walletConnector }), jsxRuntime.jsx("div", { className: 'network-not-supported__network-container', children: evmNetworks.length > 1 && (jsxRuntime.jsx(NetworkPicker.NetworkPicker, { evmNetworks: evmNetworks, currentNetwork: walletConnectorNetwork, connector: walletConnector, isNetworkPickerOpen: isNetworkPickerOpen, setIsNetworkPickerOpen: setIsNetworkPickerOpen, showNetworkName: true, buttonClassName: 'network-not-supported__network-picker-button', mainClassName: 'network-not-supported__network-picker' })) }), jsxRuntime.jsx("div", { className: 'network-not-supported__welcome-container', children: jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', children: t('dyn_network_not_supported.subtitle') }) }), evmNetworks.length === 1 && (jsxRuntime.jsx(SelectNetworkButton.SelectNetworkButton, { onClick: onSelectNetworkButtonClick, networkId: evmNetworks[0].networkId, networkName: evmNetworks[0].vanityName || evmNetworks[0].name, networkIconUrl: evmNetworks[0].iconUrls[0] }))] })] }));
 };
 
 exports.NetworkNotSupported = NetworkNotSupported;