From 05ef4459170dc911b3636fdc3bc5f0144ffc42f5 Mon Sep 17 00:00:00 2001
From: Chandra Y <cyemparala@tacc.utexas.edu>
Date: Wed, 13 Nov 2024 12:16:31 -0600
Subject: [PATCH] Fix merge issue and prettier

---
 .../EditExceptionModal/EditExceptionModal.tsx | 27 ++++++-------
 .../Admin/Exceptions/AdminExceptions.tsx      |  1 -
 .../Forms/Registrations/FormEntity.tsx        | 12 +++++-
 .../Forms/Registrations/RegistrationForm.tsx  | 38 +++++++++----------
 4 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/apcd-cms/src/client/src/components/Admin/EditExceptionModal/EditExceptionModal.tsx b/apcd-cms/src/client/src/components/Admin/EditExceptionModal/EditExceptionModal.tsx
index e25a85cc..a3e90fb9 100644
--- a/apcd-cms/src/client/src/components/Admin/EditExceptionModal/EditExceptionModal.tsx
+++ b/apcd-cms/src/client/src/components/Admin/EditExceptionModal/EditExceptionModal.tsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import {
   Modal,
   ModalBody,
-  ModalFooter,
+  ModalHeader,
   Label,
   FormGroup,
   Row,
@@ -219,6 +219,11 @@ const EditExceptionModal: React.FC<EditRecordModalProps> = ({
     setShowSuccessMessage(false);
     setShowErrorMessage(false);
   };
+  const closeBtn = (
+    <button className="close" onClick={onClose} type="button">
+      &times;
+    </button>
+  );
 
   return (
     <>
@@ -228,15 +233,9 @@ const EditExceptionModal: React.FC<EditRecordModalProps> = ({
         className="modal-dialog modal-lg"
         onClosed={dismissMessages}
       >
-        <div className="modal-header">
-          <h4 className="modal-title text-capitalize">
-            Edit Exception ID {exception.exception_id} for{' '}
-            {exception.entity_name}
-          </h4>
-          <button type="button" className="close" onClick={onClose}>
-            <span aria-hidden="true">&#xe912;</span>
-          </button>
-        </div>
+        <ModalHeader close={closeBtn}>
+          Edit Exception ID {exception.exception_id} for {exception.entity_name}
+        </ModalHeader>
         <ModalBody>
           <h4 className="modal-header">Edit Selected Exception</h4>
           <FormikProvider value={formik}>
@@ -245,9 +244,7 @@ const EditExceptionModal: React.FC<EditRecordModalProps> = ({
                 {exception.request_type == 'Threshold' && (
                   <Col md={4}>
                     <FormGroup>
-                      <Label
-                        for="approved_threshold"
-                      >
+                      <Label for="approved_threshold">
                         <strong>Approved Threshold</strong>
                       </Label>
                       <Field
@@ -279,9 +276,7 @@ const EditExceptionModal: React.FC<EditRecordModalProps> = ({
                 )}
                 <Col md={4}>
                   <FormGroup>
-                    <Label
-                      for="approved_expiration_date"
-                    >
+                    <Label for="approved_expiration_date">
                       <strong>Approved Expiration Date</strong>
                     </Label>
                     <Field
diff --git a/apcd-cms/src/client/src/components/Admin/Exceptions/AdminExceptions.tsx b/apcd-cms/src/client/src/components/Admin/Exceptions/AdminExceptions.tsx
index 1853d7e0..9ee8c3e0 100644
--- a/apcd-cms/src/client/src/components/Admin/Exceptions/AdminExceptions.tsx
+++ b/apcd-cms/src/client/src/components/Admin/Exceptions/AdminExceptions.tsx
@@ -105,7 +105,6 @@ export const AdminExceptions: React.FC = () => {
           {data?.selected_status || data?.selected_org ? (
             <button onClick={clearSelections}>Clear Options</button>
           ) : null}
-
         </div>
       </div>
       <table id="exceptionTable" className="exception-table">
diff --git a/apcd-cms/src/client/src/components/Forms/Registrations/FormEntity.tsx b/apcd-cms/src/client/src/components/Forms/Registrations/FormEntity.tsx
index 18685663..23954bdf 100644
--- a/apcd-cms/src/client/src/components/Forms/Registrations/FormEntity.tsx
+++ b/apcd-cms/src/client/src/components/Forms/Registrations/FormEntity.tsx
@@ -85,7 +85,11 @@ export const RegistrationEntity: React.FC<{ index: number }> = ({ index }) => {
             />
           </FormGroup>
         ))}
-        <ErrorMessage name={`entities.${index}.types_of_plans_hidden`} component="div" className={styles.isInvalid} />
+        <ErrorMessage
+          name={`entities.${index}.types_of_plans_hidden`}
+          component="div"
+          className={styles.isInvalid}
+        />
       </FormGroup>
 
       <h6>File Submission</h6>
@@ -151,7 +155,11 @@ export const RegistrationEntity: React.FC<{ index: number }> = ({ index }) => {
             />
           </FormGroup>
         ))}
-        <ErrorMessage name={`entities.${index}.types_of_files_hidden`} component="div" className={styles.isInvalid} />
+        <ErrorMessage
+          name={`entities.${index}.types_of_files_hidden`}
+          component="div"
+          className={styles.isInvalid}
+        />
       </FormGroup>
 
       <h6>
diff --git a/apcd-cms/src/client/src/components/Forms/Registrations/RegistrationForm.tsx b/apcd-cms/src/client/src/components/Forms/Registrations/RegistrationForm.tsx
index 106706a4..36280699 100644
--- a/apcd-cms/src/client/src/components/Forms/Registrations/RegistrationForm.tsx
+++ b/apcd-cms/src/client/src/components/Forms/Registrations/RegistrationForm.tsx
@@ -86,7 +86,7 @@ const validationSchema = Yup.object().shape({
         ) {
           return this.createError({
             message: 'Please select at least one plan type.',
-            path: this.path + ".types_of_plans_hidden"
+            path: this.path + '.types_of_plans_hidden',
           });
         }
         return true;
@@ -99,7 +99,7 @@ const validationSchema = Yup.object().shape({
         ) {
           return this.createError({
             message: 'Please select at least one claims file type (see above).',
-            path: this.path + ".types_of_files_hidden"
+            path: this.path + '.types_of_files_hidden',
           });
         }
         return true;
@@ -165,21 +165,21 @@ const initialValues: RegistrationFormValues = {
 };
 
 const initialTouched = {
-    on_behalf_of: true,
-    type: true,
-    entities: [
-      {
-        types_of_plans_commercial: true,
-        types_of_plans_medicare: true,
-        types_of_plans_medicaid: true,
-        types_of_files_eligibility_enrollment: true,
-        types_of_files_provider: true,
-        types_of_files_medical: true,
-        types_of_files_pharmacy: true,
-        types_of_files_dental: true,
-      }
-    ]
-}
+  on_behalf_of: true,
+  type: true,
+  entities: [
+    {
+      types_of_plans_commercial: true,
+      types_of_plans_medicare: true,
+      types_of_plans_medicaid: true,
+      types_of_files_eligibility_enrollment: true,
+      types_of_files_provider: true,
+      types_of_files_medical: true,
+      types_of_files_pharmacy: true,
+      types_of_files_dental: true,
+    },
+  ],
+};
 
 export const RegistrationForm: React.FC<{
   isEdit?: boolean;
@@ -329,8 +329,8 @@ export const RegistrationForm: React.FC<{
                     </Label>
                   </FormGroup>
                   <div className="help-text">
-                      Whether you submit on behalf of your own organization
-                      (Self) or another organization (Other)
+                    Whether you submit on behalf of your own organization (Self)
+                    or another organization (Other)
                   </div>
                 </FormGroup>
                 <TextFormField