diff --git a/striker-ui/components/GeneralInitForm.tsx b/striker-ui/components/GeneralInitForm.tsx index 7428d4a3..96479748 100644 --- a/striker-ui/components/GeneralInitForm.tsx +++ b/striker-ui/components/GeneralInitForm.tsx @@ -1,6 +1,5 @@ import { Grid as MUIGrid } from '@mui/material'; import { - FC, forwardRef, ReactNode, useCallback, @@ -13,7 +12,7 @@ import { import INPUT_TYPES from '../lib/consts/INPUT_TYPES'; import { REP_DOMAIN } from '../lib/consts/REG_EXP_PATTERNS'; -import FlexBox, { FlexBoxProps } from './FlexBox'; +import FlexBox from './FlexBox'; import InputWithRef, { InputForwardedRefContent } from './InputWithRef'; import isEmpty from '../lib/isEmpty'; import MessageBox, { Message } from './MessageBox'; @@ -28,7 +27,7 @@ import { InputTestBatches, TestInputFunctionOptions, } from '../types/TestInputFunction'; -import { BodyText } from './Text'; +import { BodyText, InlineMonoText } from './Text'; type GeneralInitFormValues = { adminPassword?: string; @@ -96,23 +95,6 @@ const buildHostName = ({ ? `${organizationPrefix}-striker${pad(hostNumber)}.${domainName}` : ''; -const ms = (text: ReactNode) => ( - -); - -const MessageChildren: FC = ({ ...flexBoxProps }) => ( - .inline-monospace-text': { - marginTop: '-.2em', - }, - }} - /> -); - const GeneralInitForm = forwardRef< GeneralInitFormForwardRefContent, { toggleSubmitDisabled?: ToggleSubmitDisabledFunction } @@ -205,12 +187,16 @@ const GeneralInitForm = forwardRef< onFailure: () => { setAdminPasswordInputMessage({ children: ( - - Admin password cannot contain single-quote ({ms("'")}), - double-quote ({ms('"')}), slash ({ms('/')}), backslash ( - {ms('\\')}), angle brackets ({ms('<>')}), curly brackets ( - {ms('{}')}). - + + Admin password cannot contain single-quote ( + + ), double-quote ( + ), slash ( + ), backslash ( + ), angle brackets ( + ), curly brackets ( + ). + ), }); }, @@ -231,7 +217,7 @@ const GeneralInitForm = forwardRef< { onFailure: () => { setConfirmAdminPasswordInputMessage({ - children: 'Admin password confirmation failed.', + children: "Confirmation doesn't match admin password.", }); }, test: ({ value }) => @@ -252,10 +238,11 @@ const GeneralInitForm = forwardRef< onFailure: () => { setDomainNameInputMessage({ children: ( - + Domain name can only contain lowercase alphanumeric, hyphen - ({ms('-')}), and dot ({ms('.')}) characters. - + ( + ), and dot () characters. + ), }); }, @@ -276,10 +263,11 @@ const GeneralInitForm = forwardRef< onFailure: () => { setHostNameInputMessage({ children: ( - + Host name can only contain lowercase alphanumeric, hyphen ( - {ms('-')}), and dot ({ms('.')}) characters. - + + ), and dot () characters. + ), }); },