@dynamic-labs/sdk-react-core 1.0.0-alpha.6 → 1.0.0-alpha.8

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 { logger } from '../../shared/logger.js';
@@ -15,15 +15,20 @@ import 'viem';
 import '@dynamic-labs/utils';
 import '../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
-import { getEnabledProviders } from '../../utils/functions/getEnabledProviders/index.js';
 import { isEmailProviderEnabled } from '../../utils/functions/isEmailProviderEnabled/isEmailProviderEnabled.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
@@ -105,78 +140,60 @@ const useLoginView = () => {
         }
         return sections.filter((section) => section.type !== 'wallet');
     }, [selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length, projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.chains]);
-    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) => {
+        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());
             }
         });
         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, bridgeChainsToConnect, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { onboardingImageUrl, selectedWalletConnector: walletConnector, connectedWallets, primaryWallet, isFullyConnected, setShowAuthFlow, bridgeChainsToConnect, } = 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, { currentNetwork: walletConnectorNetwork, 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] }))] })] }));
 };
 
 exports.NetworkNotSupported = NetworkNotSupported;

package/src/lib/views/NetworkNotSupported/NetworkNotSupported.js

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

package/src/lib/views/Passkey/PasskeyIntroView/PasskeyIntroView.cjs

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var reactI18next = require('react-i18next');
@@ -10,24 +9,23 @@ var utils = require('@dynamic-labs/utils');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../../config/ApiEndpoint.cjs');
-var logger = require('../../../shared/logger.cjs');
+var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('../../../context/ViewContext/ViewContext.cjs');
 var passkeyIntroIcon = require('../../../shared/assets/passkey-intro-icon.cjs');
 var questionMark = require('../../../shared/assets/question-mark.cjs');
+require('../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 var localStorage$1 = require('../../../utils/constants/localStorage.cjs');
 require('../../../utils/constants/colors.cjs');
 var localStorage = require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../../shared/consts/index.cjs');
+var getAuthToken = require('../../../utils/functions/getAuthToken/getAuthToken.cjs');
 require('@dynamic-labs/multi-wallet');
 require('@dynamic-labs/rpc-providers');
 require('../../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
-var createUserProfile = require('../../../utils/functions/createUserProfile/createUserProfile.cjs');
-var index$1 = require('../../../utils/functions/storeAuthToken/index.cjs');
-var smartWallet = require('../../../utils/hooks/useWalletConnectors/utils/smartWallet/smartWallet.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
@@ -56,6 +54,7 @@ require('yup');
 var ErrorContainer = require('../../../components/ErrorContainer/ErrorContainer.cjs');
 require('../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.cjs');
 require('@dynamic-labs/types');
+var useCreateDynamicEmbeddedWalletMutation = require('../../../utils/hooks/useCreateDynamicEmbeddedWalletMutation/useCreateDynamicEmbeddedWalletMutation.cjs');
 require('../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('formik');
@@ -65,7 +64,6 @@ var IconButton = require('../../../components/IconButton/IconButton.cjs');
 require('../../../components/Alert/Alert.cjs');
 require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 var getProperErrorMessage = require('../../../modals/SignMessageConfirmationModal/getProperErrorMessage.cjs');
-var useMutation = require('../../../utils/hooks/useMutation/useMutation.cjs');
 var TextButton = require('../../../components/TextButton/TextButton.cjs');
 require('../../../components/InlineWidget/InlineWidget.cjs');
 require('../../../components/MenuList/Dropdown/Dropdown.cjs');
@@ -73,60 +71,32 @@ require('../../../components/Popper/Popper/Popper.cjs');
 require('../../../components/Popper/PopperContext/PopperContext.cjs');
 require('react-focus-lock');
 var isPasskeyEnabled = require('../../../utils/functions/isPasskeyEnabled/isPasskeyEnabled.cjs');
-var createEmbeddedWalletWithPasskey = require('../utils/createEmbeddedWalletWithPasskey/createEmbeddedWalletWithPasskey.cjs');
-var findPasskeyEmailWalletConnector = require('../utils/findPasskeyEmailWalletConnector/findPasskeyEmailWalletConnector.cjs');
 var PasskeyDeviceIcon = require('../PasskeyDeviceIcon/PasskeyDeviceIcon.cjs');
 
-const PasskeyIntroView = ({ createEmbeddedWalletMutation = createEmbeddedWalletWithPasskey.createEmbeddedWalletWithPasskey, }) => {
-    const { user, wallets, setPrimaryWalletId, setUser, authToken, environmentId, handleLogOut, internalEvents, setShowAuthFlow, setCallback, } = useInternalDynamicContext.useInternalDynamicContext();
+const PasskeyIntroView = () => {
+    const { wallets, environmentId, handleLogOut, onboardingOnlyJwt } = useInternalDynamicContext.useInternalDynamicContext();
     const { setIsFooterExpanded } = index.useFooterAnimationContext();
     const { t } = reactI18next.useTranslation();
     const { data: passkeyEnabled } = usePromise.usePromise(isPasskeyEnabled.isPasskeyEnabled);
     // if passkey is not yet setup, but user logged in with email in a passkey env
     // it should be null to force user to setup passkey even after the a refresh
     React.useEffect(() => localStorage.LocalStorage.removeFromLS(localStorage$1.LAST_USED_WALLET), []);
-    const { mutate: createEmbeddedWalletWithPasskeyMutation, isLoading, error, } = useMutation.useMutation(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const { createDynamicEmbeddedWalletMutation, isLoading, error } = useCreateDynamicEmbeddedWalletMutation.useCreateDynamicEmbeddedWalletMutation();
+    const handleCreateEmbeddedWallet = () => {
         var _a;
-        const { embeddedWalletVerifiedCredential, jwt, decodedJwt, walletConnector, } = yield createEmbeddedWalletMutation({
-            authToken,
-            environmentId,
-            user,
-            walletConnector: findPasskeyEmailWalletConnector.findPasskeyEmailWalletConnector(wallets),
-        });
-        const passkeyWallet = {
-            address: (yield walletConnector.fetchPublicAddress()) || '',
-            chain: walletConnector.connectedChain || '',
-            connected: true,
-            connector: walletConnector,
-            id: embeddedWalletVerifiedCredential.id,
-        };
-        internalEvents.current.emit('embeddedWalletCreated', passkeyWallet);
-        const smartWallet$1 = smartWallet.findSmartWallet(embeddedWalletVerifiedCredential, decodedJwt.verifiedCredentials);
-        if (smartWallet$1) {
-            yield smartWallet.initializeSmartWallet({
-                account: smartWallet$1,
-                verifiedCredentials: decodedJwt.verifiedCredentials,
-                walletOptions: wallets,
-            });
-            setPrimaryWalletId(smartWallet$1.id);
+        const jwt = (_a = getAuthToken.getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
+        const decodedJwt = decodeJwt.decodeJwt(jwt);
+        if (!jwt || !decodedJwt) {
+            throw new Error('User is not logged in');
         }
-        else {
-            setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
-        }
-        index$1.storeAuthToken(jwt);
-        setUser(createUserProfile.createUserProfile(decodedJwt));
-        setShowAuthFlow(false);
-        const turnkeyVerifiedCredentials = (_a = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName }) => walletName === 'turnkey');
-        setCallback('embeddedWalletCreated', {
-            email: (turnkeyVerifiedCredentials === null || turnkeyVerifiedCredentials === void 0 ? void 0 : turnkeyVerifiedCredentials.email) || '',
-            verifiedCredential: turnkeyVerifiedCredentials,
+        createDynamicEmbeddedWalletMutation({
+            authToken: jwt,
+            decodedJwt,
+            environmentId,
+            wallets,
+            withAuthenticator: true,
         });
-    }), {
-        onFailure: (err) => {
-            logger.logger.error('Failed to create embedded wallet', err);
-            internalEvents.current.emit('embeddedWalletFailed', err);
-        },
-    });
+    };
     const errorText = React.useMemo(() => {
         if (!error) {
             return undefined;
@@ -137,7 +107,7 @@ const PasskeyIntroView = ({ createEmbeddedWalletMutation = createEmbeddedWalletW
         return getProperErrorMessage.getProperErrorMessage(error);
     }, [error]);
     const infoIconButton = (jsxRuntime.jsx(Tooltip.Tooltip, { content: t('dyn_passkey_intro.helper.tooltip'), className: 'header__tooltip', children: jsxRuntime.jsx(IconButton.IconButton, { type: 'button', "data-testid": 'info-button', onClick: () => setIsFooterExpanded((prev) => !prev), className: 'header__icon', children: jsxRuntime.jsx(questionMark.ReactComponent, {}) }) }, 'info-button'));
-    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(ModalHeader.ModalHeader, { trailing: infoIconButton, children: jsxRuntime.jsx(Typography.Typography, { as: 'h1', variant: 'title', color: 'primary', "data-testid": 'dynamic-auth-modal-heading', className: 'header__typography', children: t('dyn_passkey_intro.title') }) }), jsxRuntime.jsxs("div", { className: 'passkey-intro-view', children: [jsxRuntime.jsx("div", { className: 'passkey-intro-view__header', children: jsxRuntime.jsx(passkeyIntroIcon.ReactComponent, {}) }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'passkey-intro-view__subtitle', children: t('dyn_passkey_intro.subtitle') }), passkeyEnabled === false && (jsxRuntime.jsx(ErrorContainer.ErrorContainer, { children: t('dyn_passkey_intro.disabled') })), errorText && jsxRuntime.jsx(ErrorContainer.ErrorContainer, { children: errorText }), jsxRuntime.jsxs("div", { className: 'passkey-intro-view__actions', children: [jsxRuntime.jsx(Button.Button, { buttonVariant: 'brand-primary', buttonPadding: 'large', onClick: () => createEmbeddedWalletWithPasskeyMutation(), dataTestId: 'setup-passkey-button', loading: isLoading, disabled: isLoading || !passkeyEnabled, typographyProps: {
+    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(ModalHeader.ModalHeader, { trailing: infoIconButton, children: jsxRuntime.jsx(Typography.Typography, { as: 'h1', variant: 'title', color: 'primary', "data-testid": 'dynamic-auth-modal-heading', className: 'header__typography', children: t('dyn_passkey_intro.title') }) }), jsxRuntime.jsxs("div", { className: 'passkey-intro-view', children: [jsxRuntime.jsx("div", { className: 'passkey-intro-view__header', children: jsxRuntime.jsx(passkeyIntroIcon.ReactComponent, {}) }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'passkey-intro-view__subtitle', children: t('dyn_passkey_intro.subtitle') }), passkeyEnabled === false && (jsxRuntime.jsx(ErrorContainer.ErrorContainer, { children: t('dyn_passkey_intro.disabled') })), errorText && jsxRuntime.jsx(ErrorContainer.ErrorContainer, { children: errorText }), jsxRuntime.jsxs("div", { className: 'passkey-intro-view__actions', children: [jsxRuntime.jsx(Button.Button, { buttonVariant: 'brand-primary', buttonPadding: 'large', onClick: handleCreateEmbeddedWallet, dataTestId: 'setup-passkey-button', loading: isLoading, disabled: isLoading || !passkeyEnabled, typographyProps: {
                                     color: 'inherit',
                                 }, children: jsxRuntime.jsxs("div", { className: 'passkey-intro-view__inline-button', children: [jsxRuntime.jsx(PasskeyDeviceIcon.PasskeyDeviceIcon, {}), jsxRuntime.jsx(Typography.Typography, { children: t('dyn_passkey_intro.button') })] }) }), jsxRuntime.jsx(TextButton.TextButton, { "data-testid": 'setup-passkey-logout-button', className: 'passkey-intro-view__log-out', onClick: handleLogOut, children: t('dyn_passkey_intro.button_logout') })] })] })] }));
 };

package/src/lib/views/Passkey/PasskeyIntroView/PasskeyIntroView.d.ts

@@ -1,7 +1,2 @@
 import { FC } from 'react';
-import { createEmbeddedWalletWithPasskey } from '../utils';
-type PasskeyIntroViewProps = {
-    createEmbeddedWalletMutation?: typeof createEmbeddedWalletWithPasskey;
-};
-export declare const PasskeyIntroView: FC<PasskeyIntroViewProps>;
-export {};
+export declare const PasskeyIntroView: FC;

package/src/lib/views/Passkey/PasskeyIntroView/PasskeyIntroView.js

@@ -1,4 +1,3 @@
-import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -6,24 +5,23 @@ import { DynamicError } from '@dynamic-labs/utils';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import '@dynamic-labs/sdk-api';
 import '../../../config/ApiEndpoint.js';
-import { logger } from '../../../shared/logger.js';
+import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import '../../../context/ViewContext/ViewContext.js';
 import { ReactComponent as SvgPasskeyIntroIcon } from '../../../shared/assets/passkey-intro-icon.js';
 import { ReactComponent as SvgQuestionMark } from '../../../shared/assets/question-mark.js';
+import '../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import { LAST_USED_WALLET } from '../../../utils/constants/localStorage.js';
 import '../../../utils/constants/colors.js';
 import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../../shared/consts/index.js';
+import { getAuthToken } from '../../../utils/functions/getAuthToken/getAuthToken.js';
 import '@dynamic-labs/multi-wallet';
 import '@dynamic-labs/rpc-providers';
 import '../../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
-import { createUserProfile } from '../../../utils/functions/createUserProfile/createUserProfile.js';
-import { storeAuthToken } from '../../../utils/functions/storeAuthToken/index.js';
-import { findSmartWallet, initializeSmartWallet } from '../../../utils/hooks/useWalletConnectors/utils/smartWallet/smartWallet.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
@@ -52,6 +50,7 @@ import 'yup';
 import { ErrorContainer } from '../../../components/ErrorContainer/ErrorContainer.js';
 import '../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.js';
 import '@dynamic-labs/types';
+import { useCreateDynamicEmbeddedWalletMutation } from '../../../utils/hooks/useCreateDynamicEmbeddedWalletMutation/useCreateDynamicEmbeddedWalletMutation.js';
 import '../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import 'formik';
@@ -61,7 +60,6 @@ import { IconButton } from '../../../components/IconButton/IconButton.js';
 import '../../../components/Alert/Alert.js';
 import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import { getProperErrorMessage } from '../../../modals/SignMessageConfirmationModal/getProperErrorMessage.js';
-import { useMutation } from '../../../utils/hooks/useMutation/useMutation.js';
 import { TextButton } from '../../../components/TextButton/TextButton.js';
 import '../../../components/InlineWidget/InlineWidget.js';
 import '../../../components/MenuList/Dropdown/Dropdown.js';
@@ -69,60 +67,32 @@ import '../../../components/Popper/Popper/Popper.js';
 import '../../../components/Popper/PopperContext/PopperContext.js';
 import 'react-focus-lock';
 import { isPasskeyEnabled } from '../../../utils/functions/isPasskeyEnabled/isPasskeyEnabled.js';
-import { createEmbeddedWalletWithPasskey } from '../utils/createEmbeddedWalletWithPasskey/createEmbeddedWalletWithPasskey.js';
-import { findPasskeyEmailWalletConnector } from '../utils/findPasskeyEmailWalletConnector/findPasskeyEmailWalletConnector.js';
 import { PasskeyDeviceIcon } from '../PasskeyDeviceIcon/PasskeyDeviceIcon.js';
 
-const PasskeyIntroView = ({ createEmbeddedWalletMutation = createEmbeddedWalletWithPasskey, }) => {
-    const { user, wallets, setPrimaryWalletId, setUser, authToken, environmentId, handleLogOut, internalEvents, setShowAuthFlow, setCallback, } = useInternalDynamicContext();
+const PasskeyIntroView = () => {
+    const { wallets, environmentId, handleLogOut, onboardingOnlyJwt } = useInternalDynamicContext();
     const { setIsFooterExpanded } = useFooterAnimationContext();
     const { t } = useTranslation();
     const { data: passkeyEnabled } = usePromise(isPasskeyEnabled);
     // if passkey is not yet setup, but user logged in with email in a passkey env
     // it should be null to force user to setup passkey even after the a refresh
     useEffect(() => LocalStorage.removeFromLS(LAST_USED_WALLET), []);
-    const { mutate: createEmbeddedWalletWithPasskeyMutation, isLoading, error, } = useMutation(() => __awaiter(void 0, void 0, void 0, function* () {
+    const { createDynamicEmbeddedWalletMutation, isLoading, error } = useCreateDynamicEmbeddedWalletMutation();
+    const handleCreateEmbeddedWallet = () => {
         var _a;
-        const { embeddedWalletVerifiedCredential, jwt, decodedJwt, walletConnector, } = yield createEmbeddedWalletMutation({
-            authToken,
-            environmentId,
-            user,
-            walletConnector: findPasskeyEmailWalletConnector(wallets),
-        });
-        const passkeyWallet = {
-            address: (yield walletConnector.fetchPublicAddress()) || '',
-            chain: walletConnector.connectedChain || '',
-            connected: true,
-            connector: walletConnector,
-            id: embeddedWalletVerifiedCredential.id,
-        };
-        internalEvents.current.emit('embeddedWalletCreated', passkeyWallet);
-        const smartWallet = findSmartWallet(embeddedWalletVerifiedCredential, decodedJwt.verifiedCredentials);
-        if (smartWallet) {
-            yield initializeSmartWallet({
-                account: smartWallet,
-                verifiedCredentials: decodedJwt.verifiedCredentials,
-                walletOptions: wallets,
-            });
-            setPrimaryWalletId(smartWallet.id);
+        const jwt = (_a = getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
+        const decodedJwt = decodeJwt(jwt);
+        if (!jwt || !decodedJwt) {
+            throw new Error('User is not logged in');
         }
-        else {
-            setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
-        }
-        storeAuthToken(jwt);
-        setUser(createUserProfile(decodedJwt));
-        setShowAuthFlow(false);
-        const turnkeyVerifiedCredentials = (_a = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName }) => walletName === 'turnkey');
-        setCallback('embeddedWalletCreated', {
-            email: (turnkeyVerifiedCredentials === null || turnkeyVerifiedCredentials === void 0 ? void 0 : turnkeyVerifiedCredentials.email) || '',
-            verifiedCredential: turnkeyVerifiedCredentials,
+        createDynamicEmbeddedWalletMutation({
+            authToken: jwt,
+            decodedJwt,
+            environmentId,
+            wallets,
+            withAuthenticator: true,
         });
-    }), {
-        onFailure: (err) => {
-            logger.error('Failed to create embedded wallet', err);
-            internalEvents.current.emit('embeddedWalletFailed', err);
-        },
-    });
+    };
     const errorText = useMemo(() => {
         if (!error) {
             return undefined;
@@ -133,7 +103,7 @@ const PasskeyIntroView = ({ createEmbeddedWalletMutation = createEmbeddedWalletW
         return getProperErrorMessage(error);
     }, [error]);
     const infoIconButton = (jsx(Tooltip, { content: t('dyn_passkey_intro.helper.tooltip'), className: 'header__tooltip', children: jsx(IconButton, { type: 'button', "data-testid": 'info-button', onClick: () => setIsFooterExpanded((prev) => !prev), className: 'header__icon', children: jsx(SvgQuestionMark, {}) }) }, 'info-button'));
-    return (jsxs(Fragment, { children: [jsx(ModalHeader, { trailing: infoIconButton, children: jsx(Typography, { as: 'h1', variant: 'title', color: 'primary', "data-testid": 'dynamic-auth-modal-heading', className: 'header__typography', children: t('dyn_passkey_intro.title') }) }), jsxs("div", { className: 'passkey-intro-view', children: [jsx("div", { className: 'passkey-intro-view__header', children: jsx(SvgPasskeyIntroIcon, {}) }), jsx(Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'passkey-intro-view__subtitle', children: t('dyn_passkey_intro.subtitle') }), passkeyEnabled === false && (jsx(ErrorContainer, { children: t('dyn_passkey_intro.disabled') })), errorText && jsx(ErrorContainer, { children: errorText }), jsxs("div", { className: 'passkey-intro-view__actions', children: [jsx(Button, { buttonVariant: 'brand-primary', buttonPadding: 'large', onClick: () => createEmbeddedWalletWithPasskeyMutation(), dataTestId: 'setup-passkey-button', loading: isLoading, disabled: isLoading || !passkeyEnabled, typographyProps: {
+    return (jsxs(Fragment, { children: [jsx(ModalHeader, { trailing: infoIconButton, children: jsx(Typography, { as: 'h1', variant: 'title', color: 'primary', "data-testid": 'dynamic-auth-modal-heading', className: 'header__typography', children: t('dyn_passkey_intro.title') }) }), jsxs("div", { className: 'passkey-intro-view', children: [jsx("div", { className: 'passkey-intro-view__header', children: jsx(SvgPasskeyIntroIcon, {}) }), jsx(Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'passkey-intro-view__subtitle', children: t('dyn_passkey_intro.subtitle') }), passkeyEnabled === false && (jsx(ErrorContainer, { children: t('dyn_passkey_intro.disabled') })), errorText && jsx(ErrorContainer, { children: errorText }), jsxs("div", { className: 'passkey-intro-view__actions', children: [jsx(Button, { buttonVariant: 'brand-primary', buttonPadding: 'large', onClick: handleCreateEmbeddedWallet, dataTestId: 'setup-passkey-button', loading: isLoading, disabled: isLoading || !passkeyEnabled, typographyProps: {
                                     color: 'inherit',
                                 }, children: jsxs("div", { className: 'passkey-intro-view__inline-button', children: [jsx(PasskeyDeviceIcon, {}), jsx(Typography, { children: t('dyn_passkey_intro.button') })] }) }), jsx(TextButton, { "data-testid": 'setup-passkey-logout-button', className: 'passkey-intro-view__log-out', onClick: handleLogOut, children: t('dyn_passkey_intro.button_logout') })] })] })] }));
 };