From b3eb93c41dddf59fbfe7f0fb66b3fc76bcf7a8af Mon Sep 17 00:00:00 2001
From: ruizajtruss <ruizaj@truss.works>
Date: Wed, 10 Apr 2024 05:21:57 +0000
Subject: [PATCH] WIP: moved actuary radio group

---
 .../StateSubmission/Contacts/Contacts.tsx     | 75 +------------------
 .../RateDetails/V2/SingleRateFormFields.tsx   | 41 ++++++++++
 2 files changed, 43 insertions(+), 73 deletions(-)

diff --git a/services/app-web/src/pages/StateSubmission/Contacts/Contacts.tsx b/services/app-web/src/pages/StateSubmission/Contacts/Contacts.tsx
index abd8dd5436..bc5614265e 100644
--- a/services/app-web/src/pages/StateSubmission/Contacts/Contacts.tsx
+++ b/services/app-web/src/pages/StateSubmission/Contacts/Contacts.tsx
@@ -1,17 +1,11 @@
 import React, { useEffect } from 'react'
 import * as Yup from 'yup'
-import {
-    Form as UswdsForm,
-    FormGroup,
-    Fieldset,
-    Button,
-} from '@trussworks/react-uswds'
+import { Form as UswdsForm, Fieldset, Button } from '@trussworks/react-uswds'
 import {
     Formik,
     FormikErrors,
     FormikHelpers,
     FieldArray,
-    ErrorMessage,
     getIn,
     FieldArrayRenderProps,
 } from 'formik'
@@ -25,11 +19,7 @@ import {
     StateContact,
 } from '../../../common-code/healthPlanFormDataType'
 
-import {
-    ErrorSummary,
-    FieldRadio,
-    FieldTextInput,
-} from '../../../components/Form'
+import { ErrorSummary, FieldTextInput } from '../../../components/Form'
 
 import { useFocus } from '../../../hooks/useFocus'
 import { PageActions } from '../PageActions'
@@ -594,67 +584,6 @@ const Contacts = ({
                                                 </FieldArray>
                                             </fieldset>
                                         </SectionCard>
-
-                                        <SectionCard>
-                                            <fieldset className="usa-fieldset with-sections">
-                                                <h3>
-                                                    Actuaries' communication
-                                                    preference
-                                                </h3>
-
-                                                <legend className="srOnly">
-                                                    Actuarial communication
-                                                    preference
-                                                </legend>
-                                                <FormGroup
-                                                    error={showFieldErrors(
-                                                        errors.actuaryCommunicationPreference
-                                                    )}
-                                                >
-                                                    <Fieldset
-                                                        className={
-                                                            styles.radioGroup
-                                                        }
-                                                        legend="Communication preference between CMS Office of the Actuary (OACT) and all state’s actuaries (i.e. certifying actuaries and additional actuary contacts)"
-                                                    >
-                                                        <span
-                                                            className={
-                                                                styles.requiredOptionalText
-                                                            }
-                                                        >
-                                                            Required
-                                                        </span>
-                                                        {showFieldErrors(
-                                                            `True`
-                                                        ) && (
-                                                            <ErrorMessage
-                                                                name={`actuaryCommunicationPreference`}
-                                                                component="div"
-                                                                className="usa-error-message"
-                                                            />
-                                                        )}
-                                                        <FieldRadio
-                                                            id="OACTtoActuary"
-                                                            name="actuaryCommunicationPreference"
-                                                            label={`OACT can communicate directly with the state’s actuaries but should copy the state on all written communication and all appointments for verbal discussions.`}
-                                                            value={
-                                                                'OACT_TO_ACTUARY'
-                                                            }
-                                                            aria-required
-                                                        />
-                                                        <FieldRadio
-                                                            id="OACTtoState"
-                                                            name="actuaryCommunicationPreference"
-                                                            label={`OACT can communicate directly with the state, and the state will relay all written communication to their actuaries and set up time for any potential verbal discussions.`}
-                                                            value={
-                                                                'OACT_TO_STATE'
-                                                            }
-                                                            aria-required
-                                                        />
-                                                    </Fieldset>
-                                                </FormGroup>
-                                            </fieldset>
-                                        </SectionCard>
                                     </>
                                 )}
 
diff --git a/services/app-web/src/pages/StateSubmission/RateDetails/V2/SingleRateFormFields.tsx b/services/app-web/src/pages/StateSubmission/RateDetails/V2/SingleRateFormFields.tsx
index 2375f17171..3495057624 100644
--- a/services/app-web/src/pages/StateSubmission/RateDetails/V2/SingleRateFormFields.tsx
+++ b/services/app-web/src/pages/StateSubmission/RateDetails/V2/SingleRateFormFields.tsx
@@ -471,6 +471,47 @@ export const SingleRateFormFields = ({
                     fieldSetLegend="Certifying Actuary"
                 />
             </FormGroup>
+            <FormGroup
+                error={Boolean(
+                    showFieldErrors('actuaryCommunicationPreference')
+                )}
+            >
+                <Fieldset
+                    className={styles.radioGroup}
+                    legend="Actuaries' communication preference"
+                    role="radiogroup"
+                    aria-required
+                >
+                    <span
+                        className={styles.requiredOptionalText}
+                        style={{ marginBottom: '10px' }}
+                    >
+                        Required
+                    </span>
+                    <span className={styles.requiredOptionalText}>
+                        Communication preference between CMS Office of the
+                        Actuary (OACT) and all state’s actuaries (i.e.
+                        certifying actuaries and additional actuary contacts)
+                    </span>
+                    <PoliteErrorMessage>
+                        {showFieldErrors('actuaryCommunicationPreference')}
+                    </PoliteErrorMessage>
+                    <FieldRadio
+                        id={`OACTtoActuary-${index}`}
+                        name={`${fieldNamePrefix}.actuaryCommunicationPreference`}
+                        label={`OACT can communicate directly with the state's actuaries but should copy the state on all written communication and all appointments for verbal discussions.`}
+                        value={'OACT_TO_ACTUARY'}
+                        aria-required
+                    />
+                    <FieldRadio
+                        id={`OACTtoState-${index}`}
+                        name={`${fieldNamePrefix}.actuaryCommunicationPreference`}
+                        label={`OACT can communicate directly with the state, and the state will relay all written communication to their actuaries and set up time for any potential verbal discussions.`}
+                        value={'OACT_TO_STATE'}
+                        aria-required
+                    />
+                </Fieldset>
+            </FormGroup>
         </>
     )
 }