From 2fdf1d929ee05eff73f87da2e3c12f01fc73d78f Mon Sep 17 00:00:00 2001
From: Caleb <caleblpena@gmail.com>
Date: Wed, 6 Dec 2023 12:58:50 -0700
Subject: [PATCH] add individual headers for all questions

---
 src/Assets/questions.tsx                      | 31 +++++++++++-----
 .../QuestionComponentContainer.js             | 36 +++----------------
 src/Types/Questions.ts                        |  2 +-
 3 files changed, 28 insertions(+), 41 deletions(-)

diff --git a/src/Assets/questions.tsx b/src/Assets/questions.tsx
index 709527968..6e3125103 100644
--- a/src/Assets/questions.tsx
+++ b/src/Assets/questions.tsx
@@ -25,6 +25,7 @@ import type { QuestionName, Question } from '../Types/Questions.ts';
 const questions: Record<QuestionName, Question> = {
   zipcode: {
     name: 'zipcode',
+    header: <FormattedMessage id="qcc.tell-us-text" defaultMessage="Tell us where you live." />,
     question: <FormattedMessage id="questions.zipcode" defaultMessage="What is your zip code?" />,
     componentDetails: {
       componentType: 'Textfield',
@@ -59,10 +60,10 @@ const questions: Record<QuestionName, Question> = {
         },
       },
     ],
-    headerType: 'aboutHousehold',
   },
   householdSize: {
     name: 'householdSize',
+    header: <FormattedMessage id="qcc.about_household" defaultMessage="Tell us about your household" />,
     question: (
       <FormattedMessage
         id="questions.householdSize"
@@ -83,7 +84,6 @@ const questions: Record<QuestionName, Question> = {
       inputError: householdSizeHasError,
       inputHelperText: displayHouseholdSizeHelperText,
     },
-    headerType: 'aboutHousehold',
   },
   householdData: {
     name: 'householdData',
@@ -95,6 +95,7 @@ const questions: Record<QuestionName, Question> = {
   },
   hasExpenses: {
     name: 'hasExpenses',
+    header: <FormattedMessage id="qcc.about_household" defaultMessage="Tell us about your household" />,
     question: <FormattedMessage id="questions.hasExpenses" defaultMessage="Does your household have any expenses?" />,
     questionDescription: (
       <FormattedMessage
@@ -126,10 +127,10 @@ const questions: Record<QuestionName, Question> = {
         },
       },
     ],
-    headerType: 'aboutHousehold',
   },
   householdAssets: {
     name: 'householdAssets',
+    header: <FormattedMessage id="qcc.about_household" defaultMessage="Tell us about your household" />,
     question: (
       <FormattedMessage
         id="questions.householdAssets"
@@ -151,10 +152,15 @@ const questions: Record<QuestionName, Question> = {
       inputHelperText: displayHouseholdAssetsHelperText,
       dollarField: true,
     },
-    headerType: 'aboutHousehold',
   },
   hasBenefits: {
     name: 'hasBenefits',
+    header: (
+      <FormattedMessage
+        id="qcc.tell-us-final-text"
+        defaultMessage="Tell us some final information about your household."
+      />
+    ),
     question: (
       <FormattedMessage id="questions.hasBenefits" defaultMessage="Does your household currently have any benefits?" />
     ),
@@ -189,10 +195,15 @@ const questions: Record<QuestionName, Question> = {
         },
       },
     ],
-    headerType: 'aboutHousehold',
   },
   acuteHHConditions: {
     name: 'acuteHHConditions',
+    header: (
+      <FormattedMessage
+        id="qcc.tell-us-final-text"
+        defaultMessage="Tell us some final information about your household."
+      />
+    ),
     question: (
       <FormattedMessage
         id="questions.acuteHHConditions"
@@ -205,10 +216,10 @@ const questions: Record<QuestionName, Question> = {
       options: acuteConditionOptions,
       inputError: acuteHHConditionsHasError,
     },
-    headerType: 'aboutHousehold',
   },
   referralSource: {
     name: 'referralSource',
+    header: <FormattedMessage id="questions.referralSource" defaultMessage="Just one more question!" />,
     question: (
       <FormattedMessage id="questions.referralSource-subheader" defaultMessage="How did you hear about MyFriendBen?" />
     ),
@@ -249,10 +260,15 @@ const questions: Record<QuestionName, Question> = {
         },
       },
     ],
-    headerType: 'aboutHousehold',
   },
   signUpInfo: {
     name: 'signUpInfo',
+    header: (
+      <FormattedMessage
+        id="qcc.optional-sign-up-text"
+        defaultMessage="Optional: Sign up for benefits updates and/or paid feedback opportunities"
+      />
+    ),
     question: (
       <FormattedMessage id="questions.signUpInfo" defaultMessage="What would you like us to contact you about?" />
     ),
@@ -275,7 +291,6 @@ const questions: Record<QuestionName, Question> = {
         },
       },
     ],
-    headerType: 'signUpInfo',
   },
 };
 
diff --git a/src/Components/QuestionComponentContainer/QuestionComponentContainer.js b/src/Components/QuestionComponentContainer/QuestionComponentContainer.js
index 8ec7c22c6..bb266ef41 100644
--- a/src/Components/QuestionComponentContainer/QuestionComponentContainer.js
+++ b/src/Components/QuestionComponentContainer/QuestionComponentContainer.js
@@ -175,39 +175,11 @@ const QuestionComponentContainer = ({
   };
 
   const renderHeaderAndSubheader = () => {
-    if (matchingQuestion.headerType === 'signUpInfo') {
-      return (
-        <h1 className="sub-header">
-          <FormattedMessage
-            id="qcc.optional-sign-up-text"
-            defaultMessage="Optional: Sign up for benefits updates and/or paid feedback opportunities"
-          />
-        </h1>
-      );
-    } else if (matchingQuestion.headerType === 'aboutHousehold') {
-      if (matchingQuestion.name === 'hasBenefits' || matchingQuestion.name === 'acuteHHConditions') {
-        return (
-          <h1 className="sub-header">
-            <FormattedMessage
-              id="qcc.tell-us-final-text"
-              defaultMessage="Tell us some final information about your household."
-            />
-          </h1>
-        );
-      } else if (matchingQuestion.name === 'referralSource') {
-        return (
-          <h1 className="sub-header">
-            <FormattedMessage id="questions.referralSource" defaultMessage="Just one more question!" />
-          </h1>
-        );
-      } else {
-        return (
-          <h1 className="sub-header">
-            <FormattedMessage id="qcc.tell-us-text" defaultMessage="Tell us where you live." />
-          </h1>
-        );
-      }
+    if (matchingQuestion.header === undefined) {
+      return <></>;
     }
+
+    return <h1 className="sub-header">{matchingQuestion.header}</h1>;
   };
 
   return (
diff --git a/src/Types/Questions.ts b/src/Types/Questions.ts
index 731a0df5f..b5be6466f 100644
--- a/src/Types/Questions.ts
+++ b/src/Types/Questions.ts
@@ -133,6 +133,6 @@ export type Question = {
   question?: FormattedMessageType;
   questionDescription?: FormattedMessageType;
   componentDetails: ComponentDetails;
-  headerType?: string;
+  header?: FormattedMessageType;
   followUpQuestions?: Question[];
 };