From 9a490c6244f17314deab137295daa936ea654517 Mon Sep 17 00:00:00 2001
From: Daniel Belcher <daniel.belcher.cs@gmail.com>
Date: Wed, 11 Sep 2024 07:59:32 -0700
Subject: [PATCH 1/2] qa 1

---
 lib/libs/webforms/G2C/v202401.ts                |  6 ++++--
 lib/packages/shared-types/forms.ts              |  2 ++
 react-app/src/components/RHF/FieldArray.tsx     | 13 ++++++++++++-
 react-app/src/components/RHF/RHFTextDisplay.tsx |  4 ++++
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/lib/libs/webforms/G2C/v202401.ts b/lib/libs/webforms/G2C/v202401.ts
index f9cc06939..e181e2e00 100644
--- a/lib/libs/webforms/G2C/v202401.ts
+++ b/lib/libs/webforms/G2C/v202401.ts
@@ -52,6 +52,7 @@ export const v202401: FormSchema = {
                 appendClassName: DefaultFieldGroupProps.appendClassName,
                 removeText: "Remove above population",
                 appendVariant: "default",
+                lastDivider: "border-primary border-b-[2px]",
               },
               fields: [
                 {
@@ -72,6 +73,7 @@ export const v202401: FormSchema = {
                   rhf: "Textarea",
                   label: "Eligibility group(s) included",
                   labelClassName: "font-bold text-black",
+                  props: { className: "w-[40rem]" },
                   rules: {
                     required: "* Required",
                     pattern: {
@@ -88,7 +90,7 @@ export const v202401: FormSchema = {
                     {
                       name: "inc-greater-than",
                       rhf: "Input",
-                      label: "Income greater than",
+                      label: "Income greater than ($)",
                       labelClassName: "text-black",
                       rules: {
                         required: "* Required",
@@ -102,7 +104,7 @@ export const v202401: FormSchema = {
                     {
                       name: "inc-lesser-than",
                       rhf: "Input",
-                      label: "Income less than or equal to",
+                      label: "Income less than or equal to ($)",
                       labelClassName: "text-black",
                       rules: {
                         required: "* Required",
diff --git a/lib/packages/shared-types/forms.ts b/lib/packages/shared-types/forms.ts
index 4414180dc..929e094da 100644
--- a/lib/packages/shared-types/forms.ts
+++ b/lib/packages/shared-types/forms.ts
@@ -147,6 +147,7 @@ export type RHFComponentMap = {
     removeText?: string;
     fieldArrayClassName?: string;
     divider?: boolean;
+    lastDivider?: string;
     appendClassName?: string;
     appendVariant?: "default" | "outline" | "ghost" | "secondary";
   };
@@ -189,6 +190,7 @@ export type FieldArrayProps<
   removeText?: string;
   fieldArrayClassName?: string;
   divider?: boolean;
+  lastDivider?: string;
   appendClassName?: string;
   appendVariant?: "default" | "outline" | "ghost" | "secondary";
 };
diff --git a/react-app/src/components/RHF/FieldArray.tsx b/react-app/src/components/RHF/FieldArray.tsx
index d83d17563..526df6f33 100644
--- a/react-app/src/components/RHF/FieldArray.tsx
+++ b/react-app/src/components/RHF/FieldArray.tsx
@@ -30,7 +30,10 @@ export const RHFFieldArray = <TFields extends FieldValues>(
       {fieldArr.fields.map((FLD, index) => {
         return (
           <div
-            className={cn("flex flex-row gap-5", props.fieldArrayClassName)}
+            className={cn(
+              "flex flex-row gap-5 mb-4",
+              props.fieldArrayClassName,
+            )}
             key={FLD.id}
           >
             {props.fields.map((SLOT, i) => {
@@ -70,6 +73,14 @@ export const RHFFieldArray = <TFields extends FieldValues>(
           </div>
         );
       })}
+      {props.lastDivider && (
+        <div
+          className={cn(
+            "w-full border-slate-300 border-b-[1px] my-4",
+            props.lastDivider,
+          )}
+        />
+      )}
       <div className={cn("flex items-center mt-3", props.appendClassName)}>
         <Button
           type="button"
diff --git a/react-app/src/components/RHF/RHFTextDisplay.tsx b/react-app/src/components/RHF/RHFTextDisplay.tsx
index 0fbf8ac5f..43d9071d5 100644
--- a/react-app/src/components/RHF/RHFTextDisplay.tsx
+++ b/react-app/src/components/RHF/RHFTextDisplay.tsx
@@ -31,6 +31,10 @@ export const RHFTextDisplay = (props: RHFTextDisplayProps) => {
         return <b className={t.classname}>{t.text}</b>;
       case "italic":
         return <i className={t.classname}>{t.text}</i>;
+      case "numberedSet":
+        return (
+          <span className={t.classname}>{`${t.text} ${props.index + 1}`}</span>
+        );
       case "link":
         return (
           <Link

From ff4fe66ae9a58e9efdb54a83c8c7dd08d395f263 Mon Sep 17 00:00:00 2001
From: Daniel Belcher <daniel.belcher.cs@gmail.com>
Date: Wed, 11 Sep 2024 14:09:41 -0700
Subject: [PATCH 2/2] fix: adjusting width of field

---
 lib/libs/webforms/G2C/v202401.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/libs/webforms/G2C/v202401.ts b/lib/libs/webforms/G2C/v202401.ts
index e181e2e00..d7bc447de 100644
--- a/lib/libs/webforms/G2C/v202401.ts
+++ b/lib/libs/webforms/G2C/v202401.ts
@@ -67,6 +67,12 @@ export const v202401: FormSchema = {
                   label: "Population name (optional)",
                   labelClassName: "text-black font-bold",
                   props: { className: "w-[40rem]" },
+                  rules: {
+                    pattern: {
+                      value: noLeadingTrailingWhitespace,
+                      message: "Must not have leading or trailing whitespace.",
+                    },
+                  },
                 },
                 {
                   name: "eligibile-group-list",
@@ -92,6 +98,7 @@ export const v202401: FormSchema = {
                       rhf: "Input",
                       label: "Income greater than ($)",
                       labelClassName: "text-black",
+                      formItemClassName: "w-60",
                       rules: {
                         required: "* Required",
                         pattern: {
@@ -106,6 +113,7 @@ export const v202401: FormSchema = {
                       rhf: "Input",
                       label: "Income less than or equal to ($)",
                       labelClassName: "text-black",
+                      formItemClassName: "w-64",
                       rules: {
                         required: "* Required",
                         pattern: {