diff --git a/client/src/components/common/AdministrationModal/SmtpPane.jsx b/client/src/components/common/AdministrationModal/SmtpPane.jsx index 9db6649f..2c0e9260 100644 --- a/client/src/components/common/AdministrationModal/SmtpPane.jsx +++ b/client/src/components/common/AdministrationModal/SmtpPane.jsx @@ -44,7 +44,7 @@ const SmtpPane = React.memo(() => { const [data, handleFieldChange] = useForm(() => ({ ...defaultData, smtpHost: defaultData.smtpHost || '', - smtpPort: defaultData.smtpPort || '', + smtpPort: defaultData.smtpPort === null ? '' : `${defaultData.smtpPort}`, smtpName: defaultData.smtpName || '', smtpSecure: defaultData.smtpSecure, smtpTlsRejectUnauthorized: defaultData.smtpTlsRejectUnauthorized, diff --git a/client/src/components/users/UserStep/UserStep.jsx b/client/src/components/users/UserStep/UserStep.jsx index de561600..0e043f87 100755 --- a/client/src/components/users/UserStep/UserStep.jsx +++ b/client/src/components/users/UserStep/UserStep.jsx @@ -19,6 +19,10 @@ import styles from './UserStep.module.scss'; const UserStep = React.memo(({ onClose }) => { const isLogouting = useSelector(selectors.selectIsLogouting); + const customerPanelUrl = useSelector( + (state) => selectors.selectBootstrap(state).customerPanelUrl, + ); + const withAdministration = useSelector( (state) => selectors.selectCurrentUser(state).role === UserRoles.ADMIN, ); @@ -67,12 +71,27 @@ const UserStep = React.memo(({ onClose }) => { })} {withAdministration && ( - - - {t('common.administration', { - context: 'title', - })} - + <> + + + {t('common.administration', { + context: 'title', + })} + + {customerPanelUrl && ( + + + {t('common.customerPanel', { + context: 'title', + })} + + )} + )}