Merge pull request #548 from DTS-STN/stefan/move-one-name

Changed one-name messaging to info alert
DTS-STN · Nov 3, 2023 · 2f3568b · 2f3568b
2 parents 825bc19 + b18016d
commit 2f3568b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/pages/email.tsx b/src/pages/email.tsx
@@ -9,6 +9,7 @@ import * as Yup from 'yup'
 
 import ActionButton from '../components/ActionButton'
 import AlertBlock from '../components/AlertBlock'
+import AlertSection from '../components/AlertSection'
 import DateSelectField, {
   DateSelectFieldOnChangeEvent,
 } from '../components/DateSelectField'
@@ -211,6 +212,12 @@ const Email = () => {
               <li>{t('header-messages.list.item-4')}</li>
             </ul>
 
+            <AlertSection type="info" className="mb-5 max-w-prose">
+              <p>
+                <Trans i18nKey="one-name" ns="email" />
+              </p>
+            </AlertSection>
+
             {errorSummaryItems.length > 0 && (
               <ErrorSummary
                 id="error-summary-email-esrf"
@@ -261,7 +268,6 @@ const Email = () => {
               textRequired={t('common:required')}
               required
               helpMessage={t('surname.help-message')}
-              helpMessageSecondary={<Trans i18nKey="one-name" ns="email" />}
             />
             <DateSelectField
               id="dateOfBirth"

diff --git a/src/pages/status.tsx b/src/pages/status.tsx
@@ -18,6 +18,7 @@ import * as Yup from 'yup'
 
 import ActionButton from '../components/ActionButton'
 import AlertBlock from '../components/AlertBlock'
+import AlertSection from '../components/AlertSection'
 import CheckStatusInfo from '../components/CheckStatusInfo'
 import DateSelectField, {
   DateSelectFieldOnChangeEvent,
@@ -205,6 +206,12 @@ const Status = () => {
               <li>{t('header-messages.list.item-4')}</li>
             </ul>
 
+            <AlertSection type="info" className="mb-5 max-w-prose">
+              <p>
+                <Trans i18nKey="one-name" ns="status" />
+              </p>
+            </AlertSection>
+
             {errorSummaryItems.length > 0 && (
               <ErrorSummary
                 id="error-summary-get-status"
@@ -259,7 +266,6 @@ const Status = () => {
               textRequired={t('common:required')}
               required
               helpMessage={t('surname.help-message')}
-              helpMessageSecondary={<Trans i18nKey="one-name" ns="status" />}
             />
             <DateSelectField
               id="dateOfBirth"