From 0cbc3e9af49f0d70ae728deca7549f9c3aaa9240 Mon Sep 17 00:00:00 2001
From: James Dinh <jdinh@collabralink.com>
Date: Tue, 26 Nov 2024 12:54:32 -0800
Subject: [PATCH 01/10] add sections and questions and descriptions

---
 .../features/faq/content/oneMACFAQContent.tsx | 639 ++++++++----------
 1 file changed, 270 insertions(+), 369 deletions(-)

diff --git a/react-app/src/features/faq/content/oneMACFAQContent.tsx b/react-app/src/features/faq/content/oneMACFAQContent.tsx
index bb070ce089..bf30b2577b 100644
--- a/react-app/src/features/faq/content/oneMACFAQContent.tsx
+++ b/react-app/src/features/faq/content/oneMACFAQContent.tsx
@@ -32,8 +32,7 @@ export const oneMACFAQContent: FAQContent[] = [
         answerJSX: (
           <section>
             <p>
-              Check which system to submit your state plan in with this
-              crosswalk training document.
+              Check which system to submit your state plan in with this crosswalk training document.
             </p>
             <ul>
               <li>
@@ -55,8 +54,8 @@ export const oneMACFAQContent: FAQContent[] = [
         question: "What browsers can I use to access the system?",
         answerJSX: (
           <p>
-            The submission portal works best on Google Chrome (Version
-            91.0.4472.77 or later), Firefox (Version 89.0 or later).
+            The submission portal works best on Google Chrome (Version 91.0.4472.77 or later),
+            Firefox (Version 89.0 or later).
           </p>
         ),
       },
@@ -65,8 +64,7 @@ export const oneMACFAQContent: FAQContent[] = [
         question: "What should we do if we don’t receive a confirmation email?",
         answerJSX: (
           <p>
-            Refresh your inbox, check your SPAM filters, then contact the OneMAC
-            Help Desk{" "}
+            Refresh your inbox, check your SPAM filters, then contact the OneMAC Help Desk{" "}
             <a
               className="text-blue-800 underline hover:no-underline "
               href={`mailto:${helpDeskContact.email}`}
@@ -82,14 +80,12 @@ export const oneMACFAQContent: FAQContent[] = [
         question: "Is this considered the official state submission?",
         answerJSX: (
           <p>
-            Yes, as long as you have the electronic receipt (confirmation
-            email). Your submission is considered your official state submission
-            and will only be considered received by CMS if you have received the
-            electronic receipt. You should receive an email confirmation that
-            the formal action was received along with information about the 90th
-            day. If you do not receive a confirmation email for your SPA or
-            waiver submissions, please contact your state lead or your state’s
-            CMS lead for HCBS or managed care.
+            Yes, as long as you have the electronic receipt (confirmation email). Your submission is
+            considered your official state submission and will only be considered received by CMS if
+            you have received the electronic receipt. You should receive an email confirmation that
+            the formal action was received along with information about the 90th day. If you do not
+            receive a confirmation email for your SPA or waiver submissions, please contact your
+            state lead or your state’s CMS lead for HCBS or managed care.
           </p>
         ),
       },
@@ -100,22 +96,14 @@ export const oneMACFAQContent: FAQContent[] = [
           <table className="faq-table  border-collapse border border-gray-300 w-full">
             <thead>
               <tr>
-                <th className="border border-gray-300 px-4 py-2">
-                  OneMAC Role
-                </th>
-                <th className="border border-gray-300 px-4 py-2">
-                  System Utilization
-                </th>
-                <th className="border border-gray-300 px-4 py-2">
-                  Role Approver
-                </th>
+                <th className="border border-gray-300 px-4 py-2">OneMAC Role</th>
+                <th className="border border-gray-300 px-4 py-2">System Utilization</th>
+                <th className="border border-gray-300 px-4 py-2">Role Approver</th>
               </tr>
             </thead>
             <tbody>
               <tr>
-                <td className="border border-gray-300 px-4 py-2">
-                  CMS Read Only
-                </td>
+                <td className="border border-gray-300 px-4 py-2">CMS Read Only</td>
                 <td className="border border-gray-300 px-4 py-2">
                   Read only roles within OneMAC Micro
                 </td>
@@ -124,9 +112,7 @@ export const oneMACFAQContent: FAQContent[] = [
                 </td>
               </tr>
               <tr>
-                <td className="border border-gray-300 px-4 py-2">
-                  CMS Reviewer
-                </td>
+                <td className="border border-gray-300 px-4 py-2">CMS Reviewer</td>
                 <td className="border border-gray-300 px-4 py-2">
                   Can take action on packages within OneMAC Micro
                 </td>
@@ -135,48 +121,36 @@ export const oneMACFAQContent: FAQContent[] = [
                 </td>
               </tr>
               <tr>
+                <td className="border border-gray-300 px-4 py-2">CMS System Admin</td>
                 <td className="border border-gray-300 px-4 py-2">
-                  CMS System Admin
-                </td>
-                <td className="border border-gray-300 px-4 py-2">
-                  <span className="underline">Approves All</span> roles within
-                  IDM
-                </td>
-                <td className="border border-gray-300 px-4 py-2">
-                  IDM Tier 2 Helpdesk
+                  <span className="underline">Approves All</span> roles within IDM
                 </td>
+                <td className="border border-gray-300 px-4 py-2">IDM Tier 2 Helpdesk</td>
               </tr>
               <tr>
+                <td className="border border-gray-300 px-4 py-2">CMS Role Approver</td>
                 <td className="border border-gray-300 px-4 py-2">
-                  CMS Role Approver
-                </td>
-                <td className="border border-gray-300 px-4 py-2">
-                  <span className="underline">Approves All</span> roles within
-                  IDM
+                  <span className="underline">Approves All</span> roles within IDM
                 </td>
                 <td className="border border-gray-300 px-4 py-2">
                   CMS System Admin or CMS Role Approver{" "}
                 </td>
               </tr>
               <tr>
+                <td className="border border-gray-300 px-4 py-2">State Submitter</td>
                 <td className="border border-gray-300 px-4 py-2">
-                  State Submitter
-                </td>
-                <td className="border border-gray-300 px-4 py-2">
-                  State submitter role within OneMAC can submit, edit, and view
-                  packages for the state in which they are assigned
+                  State submitter role within OneMAC can submit, edit, and view packages for the
+                  state in which they are assigned
                 </td>
                 <td className="border border-gray-300 px-4 py-2">
                   State System Admin or CMS System Admin or CMS Role Approver
                 </td>
               </tr>
               <tr>
+                <td className="border border-gray-300 px-4 py-2">State System Admin</td>
                 <td className="border border-gray-300 px-4 py-2">
-                  State System Admin
-                </td>
-                <td className="border border-gray-300 px-4 py-2">
-                  State System Admin role can approve State Submitter roles for
-                  the state in which they are assigned
+                  State System Admin role can approve State Submitter roles for the state in which
+                  they are assigned
                 </td>
                 <td className="border border-gray-300 px-4 py-2">
                   CMS System Admin or CMS Role Approver
@@ -193,9 +167,7 @@ export const oneMACFAQContent: FAQContent[] = [
           <section>
             <p>
               We accept the following file formats under 80 MB in size.{" "}
-              <i>
-                Unfortunately, we are unable to accept .zip or compressed files.
-              </i>
+              <i>Unfortunately, we are unable to accept .zip or compressed files.</i>
             </p>
             <h3 className="text-bold pt-4 pb-4">Acceptable File Formats</h3>
             <table className="table-auto border-collapse border border-gray-300 w-full ">
@@ -205,9 +177,7 @@ export const oneMACFAQContent: FAQContent[] = [
                     <td className="pr-8 text-bold  border border-gray-300 px-4 py-2 ">
                       {extension}
                     </td>
-                    <td className="border border-gray-300 px-4 py-2">
-                      {description}
-                    </td>
+                    <td className="border border-gray-300 px-4 py-2">{description}</td>
                   </tr>
                 ))}
               </tbody>
@@ -220,28 +190,25 @@ export const oneMACFAQContent: FAQContent[] = [
         question: "Onboarding Materials",
         answerJSX: (
           <ul>
-              {[
-                [WelcometoOneMAC, "Welcome to OneMAC"],
-                [
-                  IDMInstructionsforOneMACUsers,
-                  "IDM Instructions for OneMAC Users",
-                ],
-                [OneMACIDMGuide, "OneMAC IDM Guide"],
-                [OneMACStateUserGuide, "OneMAC State User Guide"],
-                [OneMACCMSUserGuide, "OneMAC CMS User Guide"],
-              ].map(([file, label]) => (
-                <li key={label}>
-                  <a
-                    className="text-blue-800 underline hover:no-underline "
-                    href={file}
-                    rel="noopener noreferrer"
-                    target="_blank"
-                  >
-                    {label}
-                  </a>
-                </li>
-              ))}
-            </ul>
+            {[
+              [WelcometoOneMAC, "Welcome to OneMAC"],
+              [IDMInstructionsforOneMACUsers, "IDM Instructions for OneMAC Users"],
+              [OneMACIDMGuide, "OneMAC IDM Guide"],
+              [OneMACStateUserGuide, "OneMAC State User Guide"],
+              [OneMACCMSUserGuide, "OneMAC CMS User Guide"],
+            ].map(([file, label]) => (
+              <li key={label}>
+                <a
+                  className="text-blue-800 underline hover:no-underline "
+                  href={file}
+                  rel="noopener noreferrer"
+                  target="_blank"
+                >
+                  {label}
+                </a>
+              </li>
+            ))}
+          </ul>
         ),
       },
     ],
@@ -254,19 +221,16 @@ export const oneMACFAQContent: FAQContent[] = [
         question: "What format is used to enter a SPA ID?",
         answerJSX: (
           <>
-            Enter the State Plan Amendment transmittal number. Assign
-            consecutive numbers on a calendar year basis (e.g., 20-0001-XXXX,
-            20-0002-XXXX, etc.).
+            Enter the State Plan Amendment transmittal number. Assign consecutive numbers on a
+            calendar year basis (e.g., 20-0001-XXXX, 20-0002-XXXX, etc.).
             <br />
-            The Official Submission package SPA ID must follow the format
-            SS-YY-#### OR SS-YY-####-XXXX to include:
+            The Official Submission package SPA ID must follow the format SS-YY-#### OR
+            SS-YY-####-XXXX to include:
             <ul>
               <li>SS = 2 alpha character (State Abbreviation)</li>
               <li>YY = 2 numeric digits (Year)</li>
               <li>#### = 4 numeric digits (Serial number)</li>
-              <li>
-                XXXX = OPTIONAL, 4 characters alpha/numeric modifier (Suffix)
-              </li>
+              <li>XXXX = OPTIONAL, 4 characters alpha/numeric modifier (Suffix)</li>
             </ul>
           </>
         ),
@@ -291,12 +255,8 @@ export const oneMACFAQContent: FAQContent[] = [
             <table className="faq-table  border-collapse border border-gray-300 w-full ">
               <thead>
                 <tr>
-                  <th className="border border-gray-300 px-4 py-2">
-                    Attachment Name
-                  </th>
-                  <th className="border border-gray-300 px-4 py-2">
-                    Description
-                  </th>
+                  <th className="border border-gray-300 px-4 py-2">Attachment Name</th>
+                  <th className="border border-gray-300 px-4 py-2">Description</th>
                 </tr>
               </thead>
               <tbody>
@@ -307,26 +267,20 @@ export const oneMACFAQContent: FAQContent[] = [
                     </p>
                   </td>
                   <td className="border border-gray-300 px-4 py-2">
-                    CMS-179 template that contains specific information for SPA
-                    submission
+                    CMS-179 template that contains specific information for SPA submission
                   </td>
                 </tr>
                 <tr>
-                  <td className="border border-gray-300 px-4 py-2">
-                    SPA Pages*
-                  </td>
+                  <td className="border border-gray-300 px-4 py-2">SPA Pages*</td>
                   <td className="border border-gray-300 px-4 py-2">
                     Clean versions of the State Plan pages being amended
                   </td>
                 </tr>
                 <tr>
+                  <td className="border border-gray-300 px-4 py-2">Cover Letter</td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Cover Letter
-                  </td>
-                  <td className="border border-gray-300 px-4 py-2">
-                    Cover letter to CMS that could outline SPA submission.
-                    Please address the cover letter to: Center for Medicaid
-                    &amp; CHIP Services (CMCS)
+                    Cover letter to CMS that could outline SPA submission. Please address the cover
+                    letter to: Center for Medicaid &amp; CHIP Services (CMCS)
                   </td>
                 </tr>
                 <tr>
@@ -334,29 +288,22 @@ export const oneMACFAQContent: FAQContent[] = [
                     Document Demonstrating Good-Faith Tribal Engagement
                   </td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Emails forwarding tribal notice to tribal leaders and tribal
-                    contacts; and/or tribal face-to-face meeting agendas
-                    indicating SPA discussion
+                    Emails forwarding tribal notice to tribal leaders and tribal contacts; and/or
+                    tribal face-to-face meeting agendas indicating SPA discussion
                   </td>
                 </tr>
                 <tr>
+                  <td className="border border-gray-300 px-4 py-2">Existing State Plan Page(s)</td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Existing State Plan Page(s)
-                  </td>
-                  <td className="border border-gray-300 px-4 py-2">
-                    Current approved SPA page, could include track changes to
-                    reflect changes
+                    Current approved SPA page, could include track changes to reflect changes
                   </td>
                 </tr>
                 <tr>
+                  <td className="border border-gray-300 px-4 py-2">Public Notice</td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Public Notice
-                  </td>
-                  <td className="border border-gray-300 px-4 py-2">
-                    Notice to stakeholders and interested parties that outlines
-                    the changes being proposed by SPA, feedback received from
-                    PN, and copies of websites- notices, state register notices,
-                    or newspaper notices that includes the date notice was
+                    Notice to stakeholders and interested parties that outlines the changes being
+                    proposed by SPA, feedback received from PN, and copies of websites- notices,
+                    state register notices, or newspaper notices that includes the date notice was
                     posted
                   </td>
                 </tr>
@@ -365,25 +312,22 @@ export const oneMACFAQContent: FAQContent[] = [
                     Standard Funding Questions (SFQs)
                   </td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Word document of the funding questions required to be
-                    submitted with reimbursement SPAs
+                    Word document of the funding questions required to be submitted with
+                    reimbursement SPAs
                   </td>
                 </tr>
                 <tr>
+                  <td className="border border-gray-300 px-4 py-2">Tribal Consultation</td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Tribal Consultation
-                  </td>
-                  <td className="border border-gray-300 px-4 py-2">
-                    Document that outline the changes SPA is making and the
-                    impact that tribes can expect from the SPA
+                    Document that outline the changes SPA is making and the impact that tribes can
+                    expect from the SPA
                   </td>
                 </tr>
                 <tr>
                   <td className="border border-gray-300 px-4 py-2">Other</td>
                   <td className="border border-gray-300 px-4 py-2">
-                    UPLs, reimbursement methodology spreadsheet, Copies of
-                    legislation, any document that will assist in the review of
-                    SPA
+                    UPLs, reimbursement methodology spreadsheet, Copies of legislation, any document
+                    that will assist in the review of SPA
                   </td>
                 </tr>
               </tbody>
@@ -401,29 +345,22 @@ export const oneMACFAQContent: FAQContent[] = [
             <table className="faq-table border-collapse border border-gray-300 w-full">
               <thead>
                 <tr>
-                  <th className="border border-gray-300 px-4 py-2">
-                    Attachment Name
-                  </th>
-                  <th className="border border-gray-300 px-4 py-2">
-                    Description
-                  </th>
+                  <th className="border border-gray-300 px-4 py-2">Attachment Name</th>
+                  <th className="border border-gray-300 px-4 py-2">Description</th>
                 </tr>
               </thead>
               <tbody>
                 <tr>
+                  <td className="border border-gray-300 px-4 py-2">RAI Response Letter*</td>
                   <td className="border border-gray-300 px-4 py-2">
-                    RAI Response Letter*
-                  </td>
-                  <td className="border border-gray-300 px-4 py-2">
-                    Letter responding to RAI questions, any updated SPA pages,
-                    and other documentation requested by CMS in the RAI
+                    Letter responding to RAI questions, any updated SPA pages, and other
+                    documentation requested by CMS in the RAI
                   </td>
                 </tr>
                 <tr>
                   <td className="border border-gray-300 px-4 py-2">Other</td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Additional document(s) needed to process the Medicaid SPA
-                    RAI submission
+                    Additional document(s) needed to process the Medicaid SPA RAI submission
                   </td>
                 </tr>
               </tbody>
@@ -440,68 +377,50 @@ export const oneMACFAQContent: FAQContent[] = [
             <table className="faq-table  border-collapse border border-gray-300 w-full ">
               <tbody>
                 <tr>
-                  <th className="border border-gray-300 px-4 py-2">
-                    Attachment Name
-                  </th>
-                  <th className="border border-gray-300 px-4 py-2">
-                    Description
-                  </th>
+                  <th className="border border-gray-300 px-4 py-2">Attachment Name</th>
+                  <th className="border border-gray-300 px-4 py-2">Description</th>
                 </tr>
                 <tr>
+                  <td className="border border-gray-300 px-4 py-2">Current State Plan*</td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Current State Plan*
-                  </td>
-                  <td className="border border-gray-300 px-4 py-2">
-                    Current version of the CHIP state plan that details how the
-                    State operates its CHIP program
+                    Current version of the CHIP state plan that details how the State operates its
+                    CHIP program
                   </td>
                 </tr>
                 <tr>
+                  <td className="border border-gray-300 px-4 py-2">Amended State Plan Language*</td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Amended State Plan Language*
-                  </td>
-                  <td className="border border-gray-300 px-4 py-2">
-                    Redline version of proposed changes to the existing CHIP
-                    state plan pages. State to provide a redline version and a
-                    clean version of the CHIP state plan pages being amended.
+                    Redline version of proposed changes to the existing CHIP state plan pages. State
+                    to provide a redline version and a clean version of the CHIP state plan pages
+                    being amended.
                   </td>
                 </tr>
                 <tr>
+                  <td className="border border-gray-300 px-4 py-2">Cover Letter*</td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Cover Letter*
-                  </td>
-                  <td className="border border-gray-300 px-4 py-2">
-                    Cover letter to CMS with an authorized signature that
-                    outlines the purpose of the CHIP SPA submission
+                    Cover letter to CMS with an authorized signature that outlines the purpose of
+                    the CHIP SPA submission
                   </td>
                 </tr>
                 <tr>
+                  <td className="border border-gray-300 px-4 py-2">Budget Docs</td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Budget Docs
-                  </td>
-                  <td className="border border-gray-300 px-4 py-2">
-                    Updated 1-year budget if applicable of the State’s planned
-                    expenditures if the CHIP SPA submission has a significant
-                    impact on the approved budget
+                    Updated 1-year budget if applicable of the State’s planned expenditures if the
+                    CHIP SPA submission has a significant impact on the approved budget
                   </td>
                 </tr>
                 <tr>
+                  <td className="border border-gray-300 px-4 py-2">Public Notice</td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Public Notice
-                  </td>
-                  <td className="border border-gray-300 px-4 py-2">
-                    Process used by the State if applicable to accomplish
-                    involvement of the public that occurred specifically for
-                    this CHIP SPA submission
+                    Process used by the State if applicable to accomplish involvement of the public
+                    that occurred specifically for this CHIP SPA submission
                   </td>
                 </tr>
                 <tr>
+                  <td className="border border-gray-300 px-4 py-2">Tribal Consultation</td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Tribal Consultation
-                  </td>
-                  <td className="border border-gray-300 px-4 py-2">
-                    Consultation process with Indian Tribes if applicable that
-                    occurred specifically for this CHIP SPA submission
+                    Consultation process with Indian Tribes if applicable that occurred specifically
+                    for this CHIP SPA submission
                   </td>
                 </tr>
                 <tr>
@@ -525,12 +444,8 @@ export const oneMACFAQContent: FAQContent[] = [
             <table className="faq-table  border-collapse border border-gray-300 w-full">
               <thead>
                 <tr>
-                  <th className="border border-gray-300 px-4 py-2">
-                    Attachment Name
-                  </th>
-                  <th className="border border-gray-300 px-4 py-2">
-                    Description
-                  </th>
+                  <th className="border border-gray-300 px-4 py-2">Attachment Name</th>
+                  <th className="border border-gray-300 px-4 py-2">Description</th>
                 </tr>
               </thead>
               <tbody>
@@ -539,47 +454,36 @@ export const oneMACFAQContent: FAQContent[] = [
                     Revised Amended State Plan Language*
                   </td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Revision made to the amended state plan language of the CHIP
-                    SPA submission. State to provide a redline version and a
-                    clean version of the revised amended state plan pages
+                    Revision made to the amended state plan language of the CHIP SPA submission.
+                    State to provide a redline version and a clean version of the revised amended
+                    state plan pages
                   </td>
                 </tr>
                 <tr>
+                  <td className="border border-gray-300 px-4 py-2">Official RAI Response*</td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Official RAI Response*
-                  </td>
-                  <td className="border border-gray-300 px-4 py-2">
-                    Official response to CMS to support RAI inquiries for the
-                    CHIP SPA submission
+                    Official response to CMS to support RAI inquiries for the CHIP SPA submission
                   </td>
                 </tr>
                 <tr>
+                  <td className="border border-gray-300 px-4 py-2">Budget Docs</td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Budget Docs
-                  </td>
-                  <td className="border border-gray-300 px-4 py-2">
-                    Updated 1-year budget if applicable of the State’s planned
-                    expenditures if the CHIP SPA submission has a significant
-                    impact on the approved budget
+                    Updated 1-year budget if applicable of the State’s planned expenditures if the
+                    CHIP SPA submission has a significant impact on the approved budget
                   </td>
                 </tr>
                 <tr>
+                  <td className="border border-gray-300 px-4 py-2">Public Notice</td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Public Notice
-                  </td>
-                  <td className="border border-gray-300 px-4 py-2">
-                    Process used by the State if applicable to accomplish
-                    involvement of the public that occurred specifically for
-                    this CHIP SPA submission
+                    Process used by the State if applicable to accomplish involvement of the public
+                    that occurred specifically for this CHIP SPA submission
                   </td>
                 </tr>
                 <tr>
+                  <td className="border border-gray-300 px-4 py-2">Tribal Consultation</td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Tribal Consultation
-                  </td>
-                  <td className="border border-gray-300 px-4 py-2">
-                    Consultation process with Indian Tribes if applicable that
-                    occurred specifically for this CHIP SPA submission
+                    Consultation process with Indian Tribes if applicable that occurred specifically
+                    for this CHIP SPA submission
                   </td>
                 </tr>
                 <tr>
@@ -595,15 +499,76 @@ export const oneMACFAQContent: FAQContent[] = [
       },
       {
         anchorText: "public-health-emergency",
+        question: "Can I submit SPAs relating to the Public Health Emergency (PHE) in OneMAC?",
+        answerJSX: (
+          <p>
+            Yes, all PHE-related SPAs should be submitted through OneMAC by completing the Medicaid
+            SPA form.
+          </p>
+        ),
+      },
+      // Daniel to add sections before here:
+      {
+        anchorText: "abp-spa",
+        question: "Where can I download Medicaid Alternative Benefit Plan (ABP) SPA templates?",
+        answerJSX: (
+          <p>
+            Medicaid Alternative Benefit Plan (ABP) SPA templates can be downloaded at the links
+            below. After downloading and completing the templates you need, upload them as part of
+            the SPA submission.
+          </p>
+        ),
+      },
+      {
+        anchorText: "abp-implementation-guides-spa",
         question:
-          "Can I submit SPAs relating to the Public Health Emergency (PHE) in OneMAC?",
+          "Where can I download Medicaid Alternative Benefit Plan (ABP) SPA implementation guides?",
+        answerJSX: (
+          <p>
+            Medicaid Alternative Benefit Plan (ABP) SPA implementation guides can be downloaded at
+            the links below.
+          </p>
+        ),
+      },
+      {
+        anchorText: "public-health-emergency",
+        question: "Where can I download Medicaid Premiums and Cost Sharing (MPC) SPA templates?",
+        answerJSX: (
+          <p>
+            Medicaid Premiums and Cost Sharing (MPC) SPA templates can be downloaded at the links
+            below. After downloading and completing the templates you need, upload them as part of
+            the SPA submission.
+          </p>
+        ),
+      },
+      {
+        anchorText: "mpc-spa-implementation-guides",
+        question:
+          "Where can I download Medicaid Premiums and Cost Sharing (MPC) SPA implementation guides?",
+        answerJSX: (
+          <p>
+            Medicaid Premiums and Cost Sharing (MPC) SPA implementation guides can be downloaded at
+            the links below.
+          </p>
+        ),
+      },
+      {
+        anchorText: "chip-spa-templates",
+        question: "Where can I download CHIP eligibility SPA templates?",
         answerJSX: (
           <p>
-            Yes, all PHE-related SPAs should be submitted through OneMAC by
-            completing the Medicaid SPA form.
+            CHIP eligibility SPA templates can be downloaded at the links below. After downloading
+            and completing the templates you need, upload them as part of the SPA submission.
           </p>
         ),
       },
+      {
+        anchorText: "chip-spa-implentation-guides",
+        question: "Where can I download CHIP eligibility SPA implementation guides?",
+        answerJSX: (
+          <p>CHIP eligibility SPA implementation guides can be downloaded at the links below.</p>
+        ),
+      },
     ],
   },
   {
@@ -611,13 +576,12 @@ export const oneMACFAQContent: FAQContent[] = [
     qanda: [
       {
         anchorText: "initial-waiver-id-format",
-        question:
-          "What format is used to enter a 1915(b) Initial Waiver number?",
+        question: "What format is used to enter a 1915(b) Initial Waiver number?",
         answerJSX: (
           <>
             <p>
-              1915(b) Initial Waiver numbers must follow the format
-              SS-####.R00.00 or SS-#####.R00.00 to include:
+              1915(b) Initial Waiver numbers must follow the format SS-####.R00.00 or
+              SS-#####.R00.00 to include:
             </p>
             <ul>
               <li>SS = 2 character state abbreviation</li>
@@ -626,10 +590,9 @@ export const oneMACFAQContent: FAQContent[] = [
               <li>00 = amendment number (00 for initial)</li>
             </ul>
             <p>
-              State abbreviation is separated by dash (-) and later sections are
-              separated by periods (.). For example, the waiver number
-              KY-0003.R00.00 is a waiver for the state of Kentucky, with an
-              initial waiver number of 0003, no renewal number (R00), and no
+              State abbreviation is separated by dash (-) and later sections are separated by
+              periods (.). For example, the waiver number KY-0003.R00.00 is a waiver for the state
+              of Kentucky, with an initial waiver number of 0003, no renewal number (R00), and no
               amendment number (00).
             </p>
           </>
@@ -637,13 +600,12 @@ export const oneMACFAQContent: FAQContent[] = [
       },
       {
         anchorText: "waiver-renewal-id-format",
-        question:
-          "What format is used to enter a 1915(b) Waiver Renewal number?",
+        question: "What format is used to enter a 1915(b) Waiver Renewal number?",
         answerJSX: (
           <>
             <p>
-              1915(b) Waiver Renewal must follow the format SS-####.R##.00 or
-              SS-#####.R##.00 to include:
+              1915(b) Waiver Renewal must follow the format SS-####.R##.00 or SS-#####.R##.00 to
+              include:
             </p>
             <ul>
               <li>SS = 2 character state abbreviation</li>
@@ -652,10 +614,9 @@ export const oneMACFAQContent: FAQContent[] = [
               <li>00 = amendment number (00 for renewals)</li>
             </ul>
             <p>
-              State abbreviation is separated by dash (-) and later sections are
-              separated by periods (.). For example, the waiver number
-              KY-0003.R02.00 is a waiver for the state of Kentucky, with a
-              initial waiver number of 0003, a second renewal (R02), and no
+              State abbreviation is separated by dash (-) and later sections are separated by
+              periods (.). For example, the waiver number KY-0003.R02.00 is a waiver for the state
+              of Kentucky, with a initial waiver number of 0003, a second renewal (R02), and no
               amendment number (00).
             </p>
           </>
@@ -663,13 +624,12 @@ export const oneMACFAQContent: FAQContent[] = [
       },
       {
         anchorText: "waiver-amendment-id-format",
-        question:
-          "What format is used to enter a 1915(b) Waiver Amendment number?",
+        question: "What format is used to enter a 1915(b) Waiver Amendment number?",
         answerJSX: (
           <>
             <p>
-              1915(b) Waiver Amendment must follow the format SS-####.R##.## or
-              SS-#####.R##.## to include:
+              1915(b) Waiver Amendment must follow the format SS-####.R##.## or SS-#####.R##.## to
+              include:
             </p>
             <ul>
               <li>SS = 2 character state abbreviation</li>
@@ -678,20 +638,18 @@ export const oneMACFAQContent: FAQContent[] = [
               <li>## = amendment number (01)</li>
             </ul>
             <p>
-              State abbreviation is separated by dash (-) and later sections are
-              separated by periods (.). For example, the waiver number
-              KY-0003.R02.02 is a waiver for the state of Kentucky, with a
-              initial waiver number of 0003, a second renewal (R02), and a
-              second amendment (02). Amendments for initial waivers without
-              renewals should use “R00” as their renewal number.
+              State abbreviation is separated by dash (-) and later sections are separated by
+              periods (.). For example, the waiver number KY-0003.R02.02 is a waiver for the state
+              of Kentucky, with a initial waiver number of 0003, a second renewal (R02), and a
+              second amendment (02). Amendments for initial waivers without renewals should use
+              “R00” as their renewal number.
             </p>
           </>
         ),
       },
       {
         anchorText: "waiver-id-help",
-        question:
-          "Who can I contact to help me figure out the correct 1915(b) Waiver Number?",
+        question: "Who can I contact to help me figure out the correct 1915(b) Waiver Number?",
         answerJSX: (
           <p>
             Email{" "}
@@ -711,94 +669,79 @@ export const oneMACFAQContent: FAQContent[] = [
         answerJSX: (
           <>
             <p>
-              Waiver number must follow the format SS-####.R##.## or
-              SS-#####.R##.## to include:
+              Waiver number must follow the format SS-####.R##.## or SS-#####.R##.## to include:
             </p>
             <ul>
               <li>SS = 2 character state abbreviation</li>
               <li>##### = 4 or 5 digit waiver initial number</li>
-              <li>
-                R## = renewal number (R01, R02, ...) (Use R00 for waivers
-                without renewals)
-              </li>
+              <li>R## = renewal number (R01, R02, ...) (Use R00 for waivers without renewals)</li>
               <li>## = appendix K amendment number (01)</li>
             </ul>
             <p>
-              State abbreviation is followed by a dash (-). All other sections
-              are separated by periods (.). For example, the waiver number
-              KY-0003.R02.02 is a waiver for the state of Kentucky, with a
-              initial waiver number of 0003, the second renewal (R02) and the
-              second appendix K amendment (02). Initial waivers without renewals
-              should use “R00” as their renewal number.
+              State abbreviation is followed by a dash (-). All other sections are separated by
+              periods (.). For example, the waiver number KY-0003.R02.02 is a waiver for the state
+              of Kentucky, with a initial waiver number of 0003, the second renewal (R02) and the
+              second appendix K amendment (02). Initial waivers without renewals should use “R00” as
+              their renewal number.
             </p>
           </>
         ),
       },
       {
         anchorText: "waiverb-attachments",
-        question:
-          "What attachments are needed to submit a 1915(b) waiver action?",
+        question: "What attachments are needed to submit a 1915(b) waiver action?",
         answerJSX: (
           <>
             <p>
-              The regulations at 42 C.F.R. §430.25, 431.55 and 42 C.F.R.
-              §441.301 describe the requirements for submitting section 1915(b)
-              and 1915(c) waivers.
+              The regulations at 42 C.F.R. §430.25, 431.55 and 42 C.F.R. §441.301 describe the
+              requirements for submitting section 1915(b) and 1915(c) waivers.
             </p>
             <table className="faq-table border-collapse border border-gray-300 w-full">
               <thead>
                 <tr>
-                  <th className="border border-gray-300 px-4 py-2">
-                    Attachment Name
-                  </th>
-                  <th className="border border-gray-300 px-4 py-2">
-                    Description
-                  </th>
+                  <th className="border border-gray-300 px-4 py-2">Attachment Name</th>
+                  <th className="border border-gray-300 px-4 py-2">Description</th>
                 </tr>
               </thead>
               <tbody>
                 <tr>
                   <td className="border border-gray-300 px-4 py-2">
-                    1915(b)(4) FFS Selective Contracting (Streamlined) waiver
-                    application pre-print (Initial, Renewal, Amendment)
+                    1915(b)(4) FFS Selective Contracting (Streamlined) waiver application pre-print
+                    (Initial, Renewal, Amendment)
                   </td>
                   <td className="border border-gray-300 px-4 py-2">
-                    State submission of the 1915(b)(4) Waiver Fee-for-Service
-                    Selective Contracting Program preprint narrative (Sections
-                    A, B, and C)
+                    State submission of the 1915(b)(4) Waiver Fee-for-Service Selective Contracting
+                    Program preprint narrative (Sections A, B, and C)
                   </td>
                 </tr>
                 <tr>
                   <td className="border border-gray-300 px-4 py-2">
-                    1915(b) Comprehensive (Capitated) Waiver Application
-                    Pre-print (Initial, Renewal, Amendment)
+                    1915(b) Comprehensive (Capitated) Waiver Application Pre-print (Initial,
+                    Renewal, Amendment)
                   </td>
                   <td className="border border-gray-300 px-4 py-2">
-                    State submission of the 1915(b) preprint narrative (Sections
-                    A, B, C and D) (non-FFS Selective Contracting Waiver
-                    programs)
+                    State submission of the 1915(b) preprint narrative (Sections A, B, C and D)
+                    (non-FFS Selective Contracting Waiver programs)
                   </td>
                 </tr>
                 <tr>
                   <td className="border border-gray-300 px-4 py-2">
-                    1915(b) Comprehensive (Capitated) Waiver Cost effectiveness
-                    spreadsheets (Initial, Renewal, Amendment)
+                    1915(b) Comprehensive (Capitated) Waiver Cost effectiveness spreadsheets
+                    (Initial, Renewal, Amendment)
                   </td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Appendix D Cost Effectiveness Demonstration for 1915(b)
-                    Waivers only (not applicable to 1915(b)(4) Fee-for-Service
-                    Selective Contracting programs)
+                    Appendix D Cost Effectiveness Demonstration for 1915(b) Waivers only (not
+                    applicable to 1915(b)(4) Fee-for-Service Selective Contracting programs)
                   </td>
                 </tr>
                 <tr>
                   <td className="border border-gray-300 px-4 py-2">
-                    1915(b)(4) FFS Selective Contracting (Streamlined) and
-                    1915(b) Comprehensive (Capitated) Waiver Independent
-                    Assessment (first two renewals only)
+                    1915(b)(4) FFS Selective Contracting (Streamlined) and 1915(b) Comprehensive
+                    (Capitated) Waiver Independent Assessment (first two renewals only)
                   </td>
                   <td className="border border-gray-300 px-4 py-2">
-                    State submission of the findings from the Independent
-                    Assessment of their 1915(b) waiver program
+                    State submission of the findings from the Independent Assessment of their
+                    1915(b) waiver program
                   </td>
                 </tr>
                 <tr>
@@ -806,9 +749,8 @@ export const oneMACFAQContent: FAQContent[] = [
                     Tribal Consultation (Initial, Renewal, Amendment)
                   </td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Document that outlines the changes the waiver action is
-                    making and the impact that tribes can expect from the waiver
-                    action
+                    Document that outlines the changes the waiver action is making and the impact
+                    that tribes can expect from the waiver action
                   </td>
                 </tr>
                 <tr>
@@ -835,22 +777,15 @@ export const oneMACFAQContent: FAQContent[] = [
             <table className="faq-table border-collapse border border-gray-300 w-full">
               <thead>
                 <tr>
-                  <th className="border border-gray-300 px-4 py-2">
-                    Attachment Name
-                  </th>
-                  <th className="border border-gray-300 px-4 py-2">
-                    Description
-                  </th>
+                  <th className="border border-gray-300 px-4 py-2">Attachment Name</th>
+                  <th className="border border-gray-300 px-4 py-2">Description</th>
                 </tr>
               </thead>
               <tbody>
                 <tr>
+                  <td className="border border-gray-300 px-4 py-2">Waiver RAI Response*</td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Waiver RAI Response*
-                  </td>
-                  <td className="border border-gray-300 px-4 py-2">
-                    Official response to CMS to support RAI inquiries for the
-                    Waiver submission
+                    Official response to CMS to support RAI inquiries for the Waiver submission
                   </td>
                 </tr>
                 <tr>
@@ -867,33 +802,25 @@ export const oneMACFAQContent: FAQContent[] = [
       },
       {
         anchorText: "waiver-extension-id-format",
-        question:
-          "What format is used to enter a 1915(b) or 1915(c) Temporary Extension number?",
+        question: "What format is used to enter a 1915(b) or 1915(c) Temporary Extension number?",
         answerJSX: (
           <>
             <p>
-              Temporary extension numbers must follow the format
-              SS-####.R##.TE## or SS-#####.R##.TE## to include:
+              Temporary extension numbers must follow the format SS-####.R##.TE## or
+              SS-#####.R##.TE## to include:
             </p>
             <ul>
               <li>SS = 2 character state abbreviation</li>
               <li>####(#)= 4 or 5 digit initial waiver number</li>
-              <li>
-                R## = renewal number (R01, R02, ...) (Use R00 for waivers
-                without renewals)
-              </li>
-              <li>
-                TE## = temporary extension number, prefixed with a capital TE
-                (TE01)
-              </li>
+              <li>R## = renewal number (R01, R02, ...) (Use R00 for waivers without renewals)</li>
+              <li>TE## = temporary extension number, prefixed with a capital TE (TE01)</li>
             </ul>
             <p>
-              State abbreviation is separated by dash (-) and later sections are
-              separated by periods (.). For example, the waiver number
-              KY-0003.R02.TE02 is a waiver for the state of Kentucky, with a
-              initial waiver number of 0003, a second renewal (R02), and a
-              second temporary extension (02). Initial waivers without renewals
-              should use “R00” as their renewal number.
+              State abbreviation is separated by dash (-) and later sections are separated by
+              periods (.). For example, the waiver number KY-0003.R02.TE02 is a waiver for the state
+              of Kentucky, with a initial waiver number of 0003, a second renewal (R02), and a
+              second temporary extension (02). Initial waivers without renewals should use “R00” as
+              their renewal number.
             </p>
           </>
         ),
@@ -904,11 +831,10 @@ export const oneMACFAQContent: FAQContent[] = [
           "Why does the status of my Temporary Extension Request continue to show as 'Submitted'?",
         answerJSX: (
           <p>
-              Temporary Extensions Requests will only show a status of
-              ‘Submitted’ in the OneMAC system at this time. Their status does
-              not update regardless of where that request is in the Submission
-              Review process.
-            </p>
+            Temporary Extensions Requests will only show a status of ‘Submitted’ in the OneMAC
+            system at this time. Their status does not update regardless of where that request is in
+            the Submission Review process.
+          </p>
         ),
       },
       {
@@ -921,24 +847,17 @@ export const oneMACFAQContent: FAQContent[] = [
             <table className="faq-table border-collapse border border-gray-300 w-full">
               <thead>
                 <tr>
-                  <th className="border border-gray-300 px-4 py-2">
-                    Attachment Name
-                  </th>
-                  <th className="border border-gray-300 px-4 py-2">
-                    Description
-                  </th>
+                  <th className="border border-gray-300 px-4 py-2">Attachment Name</th>
+                  <th className="border border-gray-300 px-4 py-2">Description</th>
                 </tr>
               </thead>
               <tbody>
                 <tr>
+                  <td className="border border-gray-300 px-4 py-2">Waiver Extension Request*</td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Waiver Extension Request*
-                  </td>
-                  <td className="border border-gray-300 px-4 py-2">
-                    A formal letter addressed to Carrie Smith, Deputy Director
-                    of the Disabled and Elderly Health Program Group (DEHPG),
-                    requesting a temporary extension beyond the current approved
-                    waiver period.
+                    A formal letter addressed to Carrie Smith, Deputy Director of the Disabled and
+                    Elderly Health Program Group (DEHPG), requesting a temporary extension beyond
+                    the current approved waiver period.
                   </td>
                 </tr>
                 <tr>
@@ -962,24 +881,17 @@ export const oneMACFAQContent: FAQContent[] = [
             <table className="faq-table border-collapse border border-gray-300 w-full ">
               <thead>
                 <tr>
-                  <th className="border border-gray-300 px-4 py-2">
-                    Attachment Name
-                  </th>
-                  <th className="border border-gray-300 px-4 py-2">
-                    Description
-                  </th>
+                  <th className="border border-gray-300 px-4 py-2">Attachment Name</th>
+                  <th className="border border-gray-300 px-4 py-2">Description</th>
                 </tr>
               </thead>
               <tbody>
                 <tr>
+                  <td className="border border-gray-300 px-4 py-2">Waiver Extension Request*</td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Waiver Extension Request*
-                  </td>
-                  <td className="border border-gray-300 px-4 py-2">
-                    A formal letter addressed to George Failla, Director of the
-                    Division of HCBS Operations & Oversight requesting a
-                    temporary extension beyond the current approved waiver
-                    period.
+                    A formal letter addressed to George Failla, Director of the Division of HCBS
+                    Operations & Oversight requesting a temporary extension beyond the current
+                    approved waiver period.
                   </td>
                 </tr>
                 <tr>
@@ -996,12 +908,7 @@ export const oneMACFAQContent: FAQContent[] = [
       {
         anchorText: "appk",
         question: "Can I submit Appendix K amendments in OneMAC?",
-        answerJSX: (
-          <p>
-            Yes, you can submit Appendix K amendments in the 1915(c) Appendix K
-            form.
-          </p>
-        ),
+        answerJSX: <p>Yes, you can submit Appendix K amendments in the 1915(c) Appendix K form.</p>,
       },
       {
         anchorText: "appk-attachments",
@@ -1009,20 +916,15 @@ export const oneMACFAQContent: FAQContent[] = [
         answerJSX: (
           <>
             <p>
-              The regulations at 42 C.F.R. §430.25, 431.55 and 42 C.F.R.
-              §441.301 describe the requirements for submitting section 1915(b)
-              and 1915(c) waivers.
+              The regulations at 42 C.F.R. §430.25, 431.55 and 42 C.F.R. §441.301 describe the
+              requirements for submitting section 1915(b) and 1915(c) waivers.
             </p>
             <p>Note: “*” indicates a required attachment.</p>
             <table className="faq-table border-collapse border border-gray-300 w-full">
               <thead>
                 <tr>
-                  <th className="border border-gray-300 px-4 py-2">
-                    Attachment Name
-                  </th>
-                  <th className="border border-gray-300 px-4 py-2">
-                    Description
-                  </th>
+                  <th className="border border-gray-300 px-4 py-2">Attachment Name</th>
+                  <th className="border border-gray-300 px-4 py-2">Description</th>
                 </tr>
               </thead>
               <tbody>
@@ -1031,15 +933,14 @@ export const oneMACFAQContent: FAQContent[] = [
                     1915(c) Appendix K Amendment Waiver Template*
                   </td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Official amendments to 1915(c) waiver programs addressing or
-                    in response to Disasters or Emergencies.
+                    Official amendments to 1915(c) waiver programs addressing or in response to
+                    Disasters or Emergencies.
                   </td>
                 </tr>
                 <tr>
                   <td className="border border-gray-300 px-4 py-2">Other</td>
                   <td className="border border-gray-300 px-4 py-2">
-                    Supplemental documents for the 1915(c) Appendix K waiver
-                    amendment
+                    Supplemental documents for the 1915(c) Appendix K waiver amendment
                   </td>
                 </tr>
               </tbody>

From 6367411b20f1daca84749bef4851809c852ffef5 Mon Sep 17 00:00:00 2001
From: James Dinh <jdinh@collabralink.com>
Date: Tue, 26 Nov 2024 13:07:07 -0800
Subject: [PATCH 02/10] add subsections in prep for links

---
 .../src/features/faq/content/oneMACFAQContent.tsx  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/react-app/src/features/faq/content/oneMACFAQContent.tsx b/react-app/src/features/faq/content/oneMACFAQContent.tsx
index bf30b2577b..cbe793e894 100644
--- a/react-app/src/features/faq/content/oneMACFAQContent.tsx
+++ b/react-app/src/features/faq/content/oneMACFAQContent.tsx
@@ -566,7 +566,19 @@ export const oneMACFAQContent: FAQContent[] = [
         anchorText: "chip-spa-implentation-guides",
         question: "Where can I download CHIP eligibility SPA implementation guides?",
         answerJSX: (
-          <p>CHIP eligibility SPA implementation guides can be downloaded at the links below.</p>
+          <>
+            <p>CHIP eligibility SPA implementation guides can be downloaded at the links below.</p>
+
+            <p className="p-2">MAGI Eligibility & Methods</p>
+
+            <p className="p-2">XXI Medicaid Expansion</p>
+
+            <p className="p-2">Establish 2101(f) Group</p>
+
+            <p className="p-2">Eligibility Processing</p>
+
+            <p className="p-2">Non-Financial Eligibility</p>
+          </>
         ),
       },
     ],

From 6b720871e8da369fa1f2e6c74e142c48c7ad7088 Mon Sep 17 00:00:00 2001
From: James Dinh <jdinh@collabralink.com>
Date: Tue, 26 Nov 2024 13:08:36 -0800
Subject: [PATCH 03/10] Update oneMACFAQContent.tsx

---
 react-app/src/features/faq/content/oneMACFAQContent.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/react-app/src/features/faq/content/oneMACFAQContent.tsx b/react-app/src/features/faq/content/oneMACFAQContent.tsx
index cbe793e894..6dd6145821 100644
--- a/react-app/src/features/faq/content/oneMACFAQContent.tsx
+++ b/react-app/src/features/faq/content/oneMACFAQContent.tsx
@@ -509,7 +509,7 @@ export const oneMACFAQContent: FAQContent[] = [
       },
       // Daniel to add sections before here:
       {
-        anchorText: "abp-spa",
+        anchorText: "abp-spa-templates",
         question: "Where can I download Medicaid Alternative Benefit Plan (ABP) SPA templates?",
         answerJSX: (
           <p>
@@ -531,7 +531,7 @@ export const oneMACFAQContent: FAQContent[] = [
         ),
       },
       {
-        anchorText: "public-health-emergency",
+        anchorText: "mpc-spa-templates",
         question: "Where can I download Medicaid Premiums and Cost Sharing (MPC) SPA templates?",
         answerJSX: (
           <p>

From f02ce1fee878923165ae117aea6bdf400b19c203 Mon Sep 17 00:00:00 2001
From: Andie Swift <andie.swift5@gmail.com>
Date: Thu, 21 Nov 2024 15:36:45 -0600
Subject: [PATCH 04/10] added missing preview emails

---
 lib/libs/email/content/email-components.tsx   | 18 ++++--
 .../new-submission/emailTemplates/AppKCMS.tsx |  2 +-
 .../email/preview/CMS/CHIP_RAI_Response.tsx   | 59 -------------------
 .../email/preview/CMS/Waiver_Contracting.tsx  | 42 -------------
 .../{ => Initial Submissions}/CMS/AppK.tsx    |  6 +-
 .../CMS/CHIP_SPA.tsx                          |  0
 .../CMS/Medicaid_SPA.tsx                      |  6 +-
 .../CMS/Temp_Extension.tsx                    |  4 +-
 .../CMS/Waiver_Capitated.tsx                  |  4 +-
 .../{ => Initial Submissions}/State/AppK.tsx  |  6 +-
 .../State/CHIP_SPA.tsx                        |  0
 .../State/Medicaid_SPA.tsx                    |  6 +-
 .../State/Temp_Extension.tsx                  |  4 +-
 .../State/Waiver_Capitated.tsx                |  4 +-
 .../State/Waiver_Contracting.tsx              |  4 +-
 .../State}/Waiver_RAI_Response.tsx            | 31 +++++-----
 .../preview/Respond to Rai/CMS/CHIP_SPA.tsx   |  6 ++
 .../Respond to Rai/CMS/Medicaid_SPA.tsx       |  6 ++
 .../Respond to Rai/CMS/Waiver_Capitated.tsx   |  6 ++
 .../preview/Respond to Rai/State/CHIP_SPA.tsx |  6 ++
 .../Respond to Rai/State/Medicaid_SPA.tsx     |  5 ++
 .../Respond to Rai/State/Waiver_Capitated.tsx |  5 ++
 .../preview/State/Medicaid_RAI_Response.tsx   | 26 --------
 .../preview/Withdraw Package/CMS/CHIP_SPA.tsx |  6 ++
 .../Withdraw Package/CMS/Medicaid_SPA.tsx     |  6 ++
 .../Withdraw Package/CMS/Waiver_Capitated.tsx |  6 ++
 .../Withdraw Package/State/CHIP_SPA.tsx       |  6 ++
 .../Withdraw Package/State/Medicaid_SPA.tsx   |  6 ++
 .../State/Waiver_Capitated.tsx                |  6 ++
 .../email/preview/Withdraw Rai/CMS/AppK.tsx   |  9 +++
 .../preview/Withdraw Rai/CMS/CHIP_SPA.tsx     |  7 +++
 .../preview/Withdraw Rai/CMS/Medicaid_SPA.tsx |  7 +++
 .../Withdraw Rai/CMS/Waiver_Contracting.tsx   |  7 +++
 .../email/preview/Withdraw Rai/State/AppK.tsx |  9 +++
 .../preview/Withdraw Rai/State/CHIP_SPA.tsx   |  7 +++
 .../Withdraw Rai/State/Medicaid_SPA.tsx       |  7 +++
 .../Withdraw Rai/State/Waiver_Contracting.tsx |  7 +++
 .../State/Waiver_RAI_Response.tsx             |  0
 38 files changed, 180 insertions(+), 172 deletions(-)
 delete mode 100644 lib/libs/email/preview/CMS/CHIP_RAI_Response.tsx
 delete mode 100644 lib/libs/email/preview/CMS/Waiver_Contracting.tsx
 rename lib/libs/email/preview/{ => Initial Submissions}/CMS/AppK.tsx (70%)
 rename lib/libs/email/preview/{ => Initial Submissions}/CMS/CHIP_SPA.tsx (100%)
 rename lib/libs/email/preview/{ => Initial Submissions}/CMS/Medicaid_SPA.tsx (77%)
 rename lib/libs/email/preview/{ => Initial Submissions}/CMS/Temp_Extension.tsx (51%)
 rename lib/libs/email/preview/{ => Initial Submissions}/CMS/Waiver_Capitated.tsx (87%)
 rename lib/libs/email/preview/{ => Initial Submissions}/State/AppK.tsx (69%)
 rename lib/libs/email/preview/{ => Initial Submissions}/State/CHIP_SPA.tsx (100%)
 rename lib/libs/email/preview/{ => Initial Submissions}/State/Medicaid_SPA.tsx (78%)
 rename lib/libs/email/preview/{ => Initial Submissions}/State/Temp_Extension.tsx (52%)
 rename lib/libs/email/preview/{ => Initial Submissions}/State/Waiver_Capitated.tsx (89%)
 rename lib/libs/email/preview/{ => Initial Submissions}/State/Waiver_Contracting.tsx (86%)
 rename lib/libs/email/preview/{CMS => Initial Submissions/State}/Waiver_RAI_Response.tsx (62%)
 create mode 100644 lib/libs/email/preview/Respond to Rai/CMS/CHIP_SPA.tsx
 create mode 100644 lib/libs/email/preview/Respond to Rai/CMS/Medicaid_SPA.tsx
 create mode 100644 lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx
 create mode 100644 lib/libs/email/preview/Respond to Rai/State/CHIP_SPA.tsx
 create mode 100644 lib/libs/email/preview/Respond to Rai/State/Medicaid_SPA.tsx
 create mode 100644 lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx
 delete mode 100644 lib/libs/email/preview/State/Medicaid_RAI_Response.tsx
 create mode 100644 lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx
 create mode 100644 lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx
 create mode 100644 lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx
 create mode 100644 lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx
 create mode 100644 lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx
 create mode 100644 lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx
 create mode 100644 lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx
 create mode 100644 lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx
 create mode 100644 lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx
 create mode 100644 lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx
 create mode 100644 lib/libs/email/preview/Withdraw Rai/State/AppK.tsx
 create mode 100644 lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx
 create mode 100644 lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx
 create mode 100644 lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx
 rename lib/libs/email/preview/{ => Withdraw Rai}/State/Waiver_RAI_Response.tsx (100%)

diff --git a/lib/libs/email/content/email-components.tsx b/lib/libs/email/content/email-components.tsx
index 2672c53d37..a3bb356276 100644
--- a/lib/libs/email/content/email-components.tsx
+++ b/lib/libs/email/content/email-components.tsx
@@ -63,24 +63,30 @@ const EmailNav = ({ appEndpointUrl }: { appEndpointUrl: string }) => (
   </Section>
 );
 
-const LoginInstructions = ({ appEndpointURL }: { appEndpointURL: string }) => (
+const LoginInstructions = ({
+  appEndpointURL,
+  useThisLink,
+}: {
+  appEndpointURL: string;
+  useThisLink?: boolean;
+}) => (
   <ul style={{ marginLeft: "-20px" }}>
     <li>
       <Text style={styles.text.description}>
         The submission can be accessed in the OneMAC application at{" "}
-        <Link href={appEndpointURL}>{appEndpointURL}</Link>
+        <Link href={appEndpointURL}>{useThisLink ? "this link" : appEndpointURL}</Link>.
       </Text>
     </li>
     <li>
       <Text style={styles.text.description}>
-        If not logged in, click "Login" at the top and use your Enterprise User Administration (EUA)
-        credentials.
+        If you are not already logged in, please click the "Login" link at the top of the page and
+        log in using your Enterprise User Administration (EUA) credentials.
       </Text>
     </li>
     <li>
       <Text style={styles.text.description}>
-        After logging in, you'll see the submission listed on the dashboard. Click its ID number to
-        view details.
+        After you have logged in, you will be taken to the OneMAC application. The submission will
+        be listed on the dashboard page, and you can view its details by clicking on its ID number.
       </Text>
     </li>
   </ul>
diff --git a/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx b/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx
index 8d9ca87178..77bd96e6a9 100644
--- a/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx
+++ b/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx
@@ -22,7 +22,7 @@ export const AppKCMSEmail = ({ variables }: { variables: AppKEmailProps }) => {
       footerContent={<BasicFooter />}
     >
       <DetailsHeading />
-      <LoginInstructions appEndpointURL={variables.applicationEndpointUrl} />
+      <LoginInstructions appEndpointURL={variables.applicationEndpointUrl} useThisLink />
       <PackageDetails
         details={{
           "State or territory": variables.territory,
diff --git a/lib/libs/email/preview/CMS/CHIP_RAI_Response.tsx b/lib/libs/email/preview/CMS/CHIP_RAI_Response.tsx
deleted file mode 100644
index 4ac904510b..0000000000
--- a/lib/libs/email/preview/CMS/CHIP_RAI_Response.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import { ChipSpaCMSEmail } from "../../content/respondToRai/emailTemplates";
-import { emailTemplateValue } from "../../mock-data/respond-to-rai";
-
-export const ChipSpaCMSEmailPreview = () => {
-  return (
-    <ChipSpaCMSEmail
-      variables={{
-        ...emailTemplateValue,
-        id: "CO-24-1055-0001",
-        territory: "CO",
-        event: "respond-to-rai",
-        attachments: {
-          revisedAmendedStatePlanLanguage: {
-            files: [
-              {
-                filename: "CMS_Form_179_RAI_Response.pdf",
-                title: "CMS Form 179",
-                bucket: "test-bucket",
-                key: "cms-form-179.pdf",
-                uploadDate: Date.now(),
-              },
-            ],
-            label: "CMS Form 179",
-          },
-          officialRAIResponse: {
-            files: [
-              {
-                filename: "test.pdf",
-                title: "SPA Pages",
-                bucket: "test-bucket",
-                key: "spa-pages.pdf",
-                uploadDate: Date.now(),
-              },
-            ],
-            label: "SPA Pages",
-          },
-          budgetDocuments: {
-            files: [],
-            label: "Budget Documents",
-          },
-          publicNotice: {
-            files: [],
-            label: "Public Notice",
-          },
-          tribalConsultation: {
-            files: [],
-            label: "Tribal Consultation",
-          },
-          other: {
-            files: [],
-            label: "Other",
-          },
-        },
-      }}
-    />
-  );
-};
-
-export default ChipSpaCMSEmailPreview;
diff --git a/lib/libs/email/preview/CMS/Waiver_Contracting.tsx b/lib/libs/email/preview/CMS/Waiver_Contracting.tsx
deleted file mode 100644
index d66066b9f4..0000000000
--- a/lib/libs/email/preview/CMS/Waiver_Contracting.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Waiver1915bStateEmail } from "../../content/new-submission/emailTemplates/Waiver1915bState";
-import { emailTemplateValue } from "../../mock-data/new-submission";
-
-const Waiver1915bStateEmailPreview = () => {
-  return (
-    <Waiver1915bStateEmail
-      variables={{
-        ...emailTemplateValue,
-        attachments: {
-          b4WaiverApplication: {
-            label: "1915(b) Comprehensive (Contracting) Waiver Application Pre-print",
-            files: [
-              {
-                filename: "contracting-waiver-application.pdf",
-                title: "test.pdf",
-                bucket: "test",
-                key: "test",
-                uploadDate: Date.now(),
-              },
-              {
-                filename: "contracting-waiver-application-2.pdf",
-                title: "contracting-waiver-supporting-evidence.pdf",
-                bucket: "test",
-                key: "test2",
-                uploadDate: Date.now(),
-              },
-            ],
-          },
-
-          tribalConsultation: { label: "Tribal Consultation", files: [] },
-          other: { label: "Other", files: [] },
-        },
-        event: "contracting-initial",
-        id: "CO-1234.R21.00",
-        authority: "1915(b)",
-        actionType: "New",
-      }}
-    />
-  );
-};
-
-export default Waiver1915bStateEmailPreview;
diff --git a/lib/libs/email/preview/CMS/AppK.tsx b/lib/libs/email/preview/Initial Submissions/CMS/AppK.tsx
similarity index 70%
rename from lib/libs/email/preview/CMS/AppK.tsx
rename to lib/libs/email/preview/Initial Submissions/CMS/AppK.tsx
index dfe470a998..498163f57d 100644
--- a/lib/libs/email/preview/CMS/AppK.tsx
+++ b/lib/libs/email/preview/Initial Submissions/CMS/AppK.tsx	
@@ -1,6 +1,6 @@
-import { AppKCMSEmail } from "../../content/new-submission/emailTemplates";
-import { emailTemplateValue } from "../../mock-data/new-submission";
-import * as attachments from "../../mock-data/attachments";
+import { AppKCMSEmail } from "../../../content/new-submission/emailTemplates";
+import { emailTemplateValue } from "../../../mock-data/new-submission";
+import * as attachments from "../../../mock-data/attachments";
 const AppKCMSEmailPreview = () => {
   return (
     <AppKCMSEmail
diff --git a/lib/libs/email/preview/CMS/CHIP_SPA.tsx b/lib/libs/email/preview/Initial Submissions/CMS/CHIP_SPA.tsx
similarity index 100%
rename from lib/libs/email/preview/CMS/CHIP_SPA.tsx
rename to lib/libs/email/preview/Initial Submissions/CMS/CHIP_SPA.tsx
diff --git a/lib/libs/email/preview/CMS/Medicaid_SPA.tsx b/lib/libs/email/preview/Initial Submissions/CMS/Medicaid_SPA.tsx
similarity index 77%
rename from lib/libs/email/preview/CMS/Medicaid_SPA.tsx
rename to lib/libs/email/preview/Initial Submissions/CMS/Medicaid_SPA.tsx
index e09c594b02..b7e3c7340a 100644
--- a/lib/libs/email/preview/CMS/Medicaid_SPA.tsx
+++ b/lib/libs/email/preview/Initial Submissions/CMS/Medicaid_SPA.tsx	
@@ -1,7 +1,7 @@
-import { MedSpaCMSEmail } from "../../content/new-submission/emailTemplates/MedSpaCMS";
-import { emailTemplateValue } from "../../mock-data/new-submission";
+import { MedSpaCMSEmail } from "../../../content/new-submission/emailTemplates/MedSpaCMS";
+import { emailTemplateValue } from "../../../mock-data/new-submission";
 
-import * as attachments from "../../mock-data/attachments";
+import * as attachments from "../../../mock-data/attachments";
 
 export default () => {
   return (
diff --git a/lib/libs/email/preview/CMS/Temp_Extension.tsx b/lib/libs/email/preview/Initial Submissions/CMS/Temp_Extension.tsx
similarity index 51%
rename from lib/libs/email/preview/CMS/Temp_Extension.tsx
rename to lib/libs/email/preview/Initial Submissions/CMS/Temp_Extension.tsx
index decc99d301..3cafcc4b2e 100644
--- a/lib/libs/email/preview/CMS/Temp_Extension.tsx
+++ b/lib/libs/email/preview/Initial Submissions/CMS/Temp_Extension.tsx	
@@ -1,5 +1,5 @@
-import { TempExtCMSEmail } from "../../content/tempExtension/emailTemplates/TempExtCMS";
-import { emailTemplateValue } from "../../mock-data/temp-extension";
+import { TempExtCMSEmail } from "../../../content/tempExtension/emailTemplates/TempExtCMS";
+import { emailTemplateValue } from "../../../mock-data/temp-extension";
 
 const TempExtCMSPreview = () => {
   return (
diff --git a/lib/libs/email/preview/CMS/Waiver_Capitated.tsx b/lib/libs/email/preview/Initial Submissions/CMS/Waiver_Capitated.tsx
similarity index 87%
rename from lib/libs/email/preview/CMS/Waiver_Capitated.tsx
rename to lib/libs/email/preview/Initial Submissions/CMS/Waiver_Capitated.tsx
index 91d4546276..cf6af49366 100644
--- a/lib/libs/email/preview/CMS/Waiver_Capitated.tsx
+++ b/lib/libs/email/preview/Initial Submissions/CMS/Waiver_Capitated.tsx	
@@ -1,5 +1,5 @@
-import { Waiver1915bCMSEmail } from "../../content/new-submission/emailTemplates/Waiver1915bCMS";
-import { emailTemplateValue } from "../../mock-data/new-submission";
+import { Waiver1915bCMSEmail } from "lib/libs/email/content/new-submission/emailTemplates/Waiver1915bCMS";
+import { emailTemplateValue } from "../../../mock-data/new-submission";
 
 const Waiver1915bCMSEmailPreview = () => {
   return (
diff --git a/lib/libs/email/preview/State/AppK.tsx b/lib/libs/email/preview/Initial Submissions/State/AppK.tsx
similarity index 69%
rename from lib/libs/email/preview/State/AppK.tsx
rename to lib/libs/email/preview/Initial Submissions/State/AppK.tsx
index 98a1e1fc35..5c779ad74b 100644
--- a/lib/libs/email/preview/State/AppK.tsx
+++ b/lib/libs/email/preview/Initial Submissions/State/AppK.tsx	
@@ -1,6 +1,6 @@
-import { AppKStateEmail } from "../../content/new-submission/emailTemplates";
-import * as attachments from "../../mock-data/attachments";
-import { emailTemplateValue } from "../../mock-data/new-submission";
+import { AppKStateEmail } from "../../../content/new-submission/emailTemplates";
+import * as attachments from "../../../mock-data/attachments";
+import { emailTemplateValue } from "../../../mock-data/new-submission";
 
 const AppKStateEmailPreview = () => {
   return (
diff --git a/lib/libs/email/preview/State/CHIP_SPA.tsx b/lib/libs/email/preview/Initial Submissions/State/CHIP_SPA.tsx
similarity index 100%
rename from lib/libs/email/preview/State/CHIP_SPA.tsx
rename to lib/libs/email/preview/Initial Submissions/State/CHIP_SPA.tsx
diff --git a/lib/libs/email/preview/State/Medicaid_SPA.tsx b/lib/libs/email/preview/Initial Submissions/State/Medicaid_SPA.tsx
similarity index 78%
rename from lib/libs/email/preview/State/Medicaid_SPA.tsx
rename to lib/libs/email/preview/Initial Submissions/State/Medicaid_SPA.tsx
index 3e0a11568a..1f3a2e2132 100644
--- a/lib/libs/email/preview/State/Medicaid_SPA.tsx
+++ b/lib/libs/email/preview/Initial Submissions/State/Medicaid_SPA.tsx	
@@ -1,6 +1,6 @@
-import { MedSpaStateEmail } from "../../content/new-submission/emailTemplates";
-import { emailTemplateValue } from "../../mock-data/new-submission";
-import * as attachments from "../../mock-data/attachments";
+import { MedSpaStateEmail } from "../../../content/new-submission/emailTemplates";
+import { emailTemplateValue } from "../../../mock-data/new-submission";
+import * as attachments from "../../../mock-data/attachments";
 
 const MedSpaStateEmailPreview = () => {
   return (
diff --git a/lib/libs/email/preview/State/Temp_Extension.tsx b/lib/libs/email/preview/Initial Submissions/State/Temp_Extension.tsx
similarity index 52%
rename from lib/libs/email/preview/State/Temp_Extension.tsx
rename to lib/libs/email/preview/Initial Submissions/State/Temp_Extension.tsx
index f81a5555b5..3a56000dcd 100644
--- a/lib/libs/email/preview/State/Temp_Extension.tsx
+++ b/lib/libs/email/preview/Initial Submissions/State/Temp_Extension.tsx	
@@ -1,6 +1,6 @@
-import { emailTemplateValue } from "../../mock-data/temp-extension";
+import { emailTemplateValue } from "../../../mock-data/temp-extension";
 
-import { TempExtStateEmail } from "../../content/tempExtension/emailTemplates/TempExtState";
+import { TempExtStateEmail } from "../../../content/tempExtension/emailTemplates/TempExtState";
 
 const TempExtStatePreview = () => {
   return (
diff --git a/lib/libs/email/preview/State/Waiver_Capitated.tsx b/lib/libs/email/preview/Initial Submissions/State/Waiver_Capitated.tsx
similarity index 89%
rename from lib/libs/email/preview/State/Waiver_Capitated.tsx
rename to lib/libs/email/preview/Initial Submissions/State/Waiver_Capitated.tsx
index a283e39748..8d2c3e3870 100644
--- a/lib/libs/email/preview/State/Waiver_Capitated.tsx
+++ b/lib/libs/email/preview/Initial Submissions/State/Waiver_Capitated.tsx	
@@ -1,5 +1,5 @@
-import { Waiver1915bStateEmail } from "../../content/new-submission/emailTemplates/Waiver1915bState";
-import { emailTemplateValue } from "../../mock-data/new-submission";
+import { Waiver1915bStateEmail } from "../../../content/new-submission/emailTemplates/Waiver1915bState";
+import { emailTemplateValue } from "../../../mock-data/new-submission";
 
 const Waiver1915bStateEmailPreview = () => {
   return (
diff --git a/lib/libs/email/preview/State/Waiver_Contracting.tsx b/lib/libs/email/preview/Initial Submissions/State/Waiver_Contracting.tsx
similarity index 86%
rename from lib/libs/email/preview/State/Waiver_Contracting.tsx
rename to lib/libs/email/preview/Initial Submissions/State/Waiver_Contracting.tsx
index 7286168c51..e31c141bf7 100644
--- a/lib/libs/email/preview/State/Waiver_Contracting.tsx
+++ b/lib/libs/email/preview/Initial Submissions/State/Waiver_Contracting.tsx	
@@ -1,5 +1,5 @@
-import { Waiver1915bStateEmail } from "../../content/new-submission/emailTemplates/Waiver1915bState";
-import { emailTemplateValue } from "../../mock-data/new-submission";
+import { Waiver1915bStateEmail } from "../../../content/new-submission/emailTemplates/Waiver1915bState";
+import { emailTemplateValue } from "../../../mock-data/new-submission";
 
 const Waiver1915bStateEmailPreview = () => {
   return (
diff --git a/lib/libs/email/preview/CMS/Waiver_RAI_Response.tsx b/lib/libs/email/preview/Initial Submissions/State/Waiver_RAI_Response.tsx
similarity index 62%
rename from lib/libs/email/preview/CMS/Waiver_RAI_Response.tsx
rename to lib/libs/email/preview/Initial Submissions/State/Waiver_RAI_Response.tsx
index f306a7a54e..02c26d57b4 100644
--- a/lib/libs/email/preview/CMS/Waiver_RAI_Response.tsx
+++ b/lib/libs/email/preview/Initial Submissions/State/Waiver_RAI_Response.tsx	
@@ -1,9 +1,9 @@
-import { Waiver1915bCMSEmail } from "../../content/respondToRai/emailTemplates";
-import { emailTemplateValue } from "../../mock-data/respond-to-rai";
+import { Waiver1915bStateEmail } from "../../../content/respondToRai/emailTemplates";
+import { emailTemplateValue } from "../../../mock-data/respond-to-rai";
 
-const Waiver1915bCMSEmailPreview = () => {
+const Waiver1915bStateEmailPreview = () => {
   return (
-    <Waiver1915bCMSEmail
+    <Waiver1915bStateEmail
       variables={{
         ...emailTemplateValue,
         id: "CO-1234.R21.00",
@@ -13,25 +13,24 @@ const Waiver1915bCMSEmailPreview = () => {
           revisedAmendedStatePlanLanguage: {
             files: [
               {
-                filename: "revised-amended-state-plan-language.pdf",
-                title: "Revised Amended State Plan Language",
+                filename: "waiver-rai-response.pdf",
+                title: "Waiver RAI Response",
                 bucket: "test-bucket",
-                key: "revised-amended-state-plan-language.pdf",
+                key: "waiver-rai-response.pdf",
                 uploadDate: Date.now(),
               },
-            ],
-            label: "Revised Amended State Plan Language",
-          },
-          officialRAIResponse: {
-            files: [
               {
-                filename: "official-rai-response.pdf",
-                title: "Official RAI Response",
+                filename: "spa-pages.pdf",
+                title: "SPA Pages",
                 bucket: "test-bucket",
-                key: "official-rai-response.pdf",
+                key: "spa-pages.pdf",
                 uploadDate: Date.now(),
               },
             ],
+            label: "Revised Amended State Plan Language",
+          },
+          officialRAIResponse: {
+            files: [],
             label: "Official RAI Response",
           },
           budgetDocuments: {
@@ -56,4 +55,4 @@ const Waiver1915bCMSEmailPreview = () => {
   );
 };
 
-export default Waiver1915bCMSEmailPreview;
+export default Waiver1915bStateEmailPreview;
diff --git a/lib/libs/email/preview/Respond to Rai/CMS/CHIP_SPA.tsx b/lib/libs/email/preview/Respond to Rai/CMS/CHIP_SPA.tsx
new file mode 100644
index 0000000000..ef45e737a9
--- /dev/null
+++ b/lib/libs/email/preview/Respond to Rai/CMS/CHIP_SPA.tsx	
@@ -0,0 +1,6 @@
+import { ChipSpaCMSEmail } from "lib/libs/email/content/respondToRai/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai";
+
+export default () => {
+  return <ChipSpaCMSEmail variables={emailTemplateValue} />;
+};
diff --git a/lib/libs/email/preview/Respond to Rai/CMS/Medicaid_SPA.tsx b/lib/libs/email/preview/Respond to Rai/CMS/Medicaid_SPA.tsx
new file mode 100644
index 0000000000..c10eb3b141
--- /dev/null
+++ b/lib/libs/email/preview/Respond to Rai/CMS/Medicaid_SPA.tsx	
@@ -0,0 +1,6 @@
+import { MedSpaCMSEmail } from "../../../content/respondToRai/emailTemplates/MedSpaCMS";
+import { emailTemplateValue } from "../../../mock-data/respond-to-rai";
+
+export default () => {
+  return <MedSpaCMSEmail variables={emailTemplateValue} />;
+};
diff --git a/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx b/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx
new file mode 100644
index 0000000000..448694b194
--- /dev/null
+++ b/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx	
@@ -0,0 +1,6 @@
+import { Waiver1915bCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai";
+
+export default () => {
+  return <Waiver1915bCMSEmail variables={emailTemplateValue} />;
+};
diff --git a/lib/libs/email/preview/Respond to Rai/State/CHIP_SPA.tsx b/lib/libs/email/preview/Respond to Rai/State/CHIP_SPA.tsx
new file mode 100644
index 0000000000..e1b948f30e
--- /dev/null
+++ b/lib/libs/email/preview/Respond to Rai/State/CHIP_SPA.tsx	
@@ -0,0 +1,6 @@
+import { ChipSpaStateEmail } from "lib/libs/email/content/respondToRai/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai";
+
+export default () => {
+  return <ChipSpaStateEmail variables={emailTemplateValue} />;
+};
diff --git a/lib/libs/email/preview/Respond to Rai/State/Medicaid_SPA.tsx b/lib/libs/email/preview/Respond to Rai/State/Medicaid_SPA.tsx
new file mode 100644
index 0000000000..74b2bd7f27
--- /dev/null
+++ b/lib/libs/email/preview/Respond to Rai/State/Medicaid_SPA.tsx	
@@ -0,0 +1,5 @@
+import { MedSpaStateEmail } from "lib/libs/email/content/respondToRai/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai";
+export default () => {
+  return <MedSpaStateEmail variables={emailTemplateValue} />;
+};
diff --git a/lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx b/lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx
new file mode 100644
index 0000000000..8390c75076
--- /dev/null
+++ b/lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx	
@@ -0,0 +1,5 @@
+import { Waiver1915bStateEmail } from "lib/libs/email/content/respondToRai/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai";
+export default () => {
+  return <Waiver1915bStateEmail variables={emailTemplateValue} />;
+};
diff --git a/lib/libs/email/preview/State/Medicaid_RAI_Response.tsx b/lib/libs/email/preview/State/Medicaid_RAI_Response.tsx
deleted file mode 100644
index a860e31dba..0000000000
--- a/lib/libs/email/preview/State/Medicaid_RAI_Response.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import * as RAIResponse from "../../mock-data/respond-to-rai";
-import { MedSpaStateEmail } from "../../content/respondToRai/emailTemplates/MedSpaState";
-import * as attachments from "../../mock-data/attachments";
-
-export const MedSpaStateEmailPreview = () => {
-  return (
-    <MedSpaStateEmail
-      variables={{
-        ...RAIResponse.emailTemplateValue,
-        id: "CO-1234.R21.00",
-        territory: "CO",
-        event: "respond-to-rai",
-        attachments: {
-          revisedAmendedStatePlanLanguage: attachments.cmsForm179,
-          officialRAIResponse: attachments.spaPages,
-          budgetDocuments: attachments.other,
-          publicNotice: attachments.other,
-          tribalConsultation: attachments.other,
-          other: attachments.other,
-        },
-      }}
-    />
-  );
-};
-
-export default MedSpaStateEmailPreview;
diff --git a/lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx
new file mode 100644
index 0000000000..80d5aeca46
--- /dev/null
+++ b/lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx	
@@ -0,0 +1,6 @@
+import { ChipSpaCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
+
+export default () => {
+  return <ChipSpaCMSEmail variables={emailTemplateValue} />;
+};
diff --git a/lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx
new file mode 100644
index 0000000000..80d5aeca46
--- /dev/null
+++ b/lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx	
@@ -0,0 +1,6 @@
+import { ChipSpaCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
+
+export default () => {
+  return <ChipSpaCMSEmail variables={emailTemplateValue} />;
+};
diff --git a/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx b/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx
new file mode 100644
index 0000000000..d0fad31f2d
--- /dev/null
+++ b/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx	
@@ -0,0 +1,6 @@
+import { Waiver1915bCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
+
+export default () => {
+  return <Waiver1915bCMSEmail variables={emailTemplateValue} />;
+};
diff --git a/lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx
new file mode 100644
index 0000000000..cfb36ab8db
--- /dev/null
+++ b/lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx	
@@ -0,0 +1,6 @@
+import { ChipSpaStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
+
+export default () => {
+  return <ChipSpaStateEmail variables={emailTemplateValue} />;
+};
diff --git a/lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx
new file mode 100644
index 0000000000..6b9453d67f
--- /dev/null
+++ b/lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx	
@@ -0,0 +1,6 @@
+import { MedSpaStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
+
+export default () => {
+  return <MedSpaStateEmail variables={emailTemplateValue} />;
+};
diff --git a/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx b/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx
new file mode 100644
index 0000000000..e5740c5bdd
--- /dev/null
+++ b/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx	
@@ -0,0 +1,6 @@
+import { Waiver1915bStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
+
+export default () => {
+  return <Waiver1915bStateEmail variables={emailTemplateValue} />;
+};
diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx
new file mode 100644
index 0000000000..8730c8cd73
--- /dev/null
+++ b/lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx	
@@ -0,0 +1,9 @@
+import { AppKCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
+
+export const relatedEvent = {
+  submitterName: "George",
+  submitterEmail: "test@email.com",
+};
+
+export default () => <AppKCMSEmail relatedEvent={relatedEvent} variables={emailTemplateValue} />;
diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx
new file mode 100644
index 0000000000..01c1dfa417
--- /dev/null
+++ b/lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx	
@@ -0,0 +1,7 @@
+import { ChipSpaCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
+import { relatedEvent } from "./AppK";
+
+export default () => {
+  return <ChipSpaCMSEmail relatedEvent={relatedEvent} variables={emailTemplateValue} />;
+};
diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx
new file mode 100644
index 0000000000..30098cb7de
--- /dev/null
+++ b/lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx	
@@ -0,0 +1,7 @@
+import { MedSpaCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
+import { relatedEvent } from "./AppK";
+
+export default () => {
+  return <MedSpaCMSEmail relatedEvent={relatedEvent} variables={emailTemplateValue} />;
+};
diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx
new file mode 100644
index 0000000000..fde3ba4c3f
--- /dev/null
+++ b/lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx	
@@ -0,0 +1,7 @@
+import { Waiver1915bCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
+import { relatedEvent } from "./AppK";
+
+export default () => {
+  return <Waiver1915bCMSEmail relatedEvent={relatedEvent} variables={emailTemplateValue} />;
+};
diff --git a/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx b/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx
new file mode 100644
index 0000000000..8730c8cd73
--- /dev/null
+++ b/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx	
@@ -0,0 +1,9 @@
+import { AppKCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
+
+export const relatedEvent = {
+  submitterName: "George",
+  submitterEmail: "test@email.com",
+};
+
+export default () => <AppKCMSEmail relatedEvent={relatedEvent} variables={emailTemplateValue} />;
diff --git a/lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx
new file mode 100644
index 0000000000..cf16a27426
--- /dev/null
+++ b/lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx	
@@ -0,0 +1,7 @@
+import { ChipSpaStateEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
+import { relatedEvent } from "../CMS/AppK";
+
+export default () => {
+  return <ChipSpaStateEmail relatedEvent={relatedEvent} variables={emailTemplateValue} />;
+};
diff --git a/lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx
new file mode 100644
index 0000000000..50c7997d32
--- /dev/null
+++ b/lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx	
@@ -0,0 +1,7 @@
+import { MedSpaStateEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
+import { relatedEvent } from "../CMS/AppK";
+
+export default () => {
+  return <MedSpaStateEmail relatedEvent={relatedEvent} variables={emailTemplateValue} />;
+};
diff --git a/lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx b/lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx
new file mode 100644
index 0000000000..2b48235112
--- /dev/null
+++ b/lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx	
@@ -0,0 +1,7 @@
+import { Waiver1915bStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
+import { relatedEvent } from "../CMS/AppK";
+
+export default () => {
+  return <Waiver1915bStateEmail relatedEvent={relatedEvent} variables={emailTemplateValue} />;
+};
diff --git a/lib/libs/email/preview/State/Waiver_RAI_Response.tsx b/lib/libs/email/preview/Withdraw Rai/State/Waiver_RAI_Response.tsx
similarity index 100%
rename from lib/libs/email/preview/State/Waiver_RAI_Response.tsx
rename to lib/libs/email/preview/Withdraw Rai/State/Waiver_RAI_Response.tsx

From c30b37283da8329dae32147a71e7080a4fb1c252 Mon Sep 17 00:00:00 2001
From: Andie Swift <andie.swift5@gmail.com>
Date: Mon, 25 Nov 2024 13:13:18 -0600
Subject: [PATCH 05/10] in the middle of updating the text for these email
 templates

---
 lib/libs/email/content/email-components.tsx   | 28 ++++++++++++++++++-
 .../new-submission/emailTemplates/AppKCMS.tsx | 11 ++++----
 .../emailTemplates/AppKState.tsx              | 16 ++++-------
 .../{Waiver1915bCMS.tsx => WaiverCMS.tsx}     |  7 ++---
 .../{Waiver1915bState.tsx => WaiverState.tsx} |  7 +++--
 .../respondToRai/emailTemplates/index.tsx     |  4 +--
 lib/libs/email/content/respondToRai/index.tsx |  8 +++---
 .../preview/Initial Submissions/CMS/AppK.tsx  |  6 ++--
 .../Initial Submissions/State/AppK.tsx        | 18 ++++++------
 .../email/preview/Respond to Rai/CMS/AppK.tsx | 17 +++++++++++
 .../Respond to Rai/CMS/Waiver_Capitated.tsx   |  4 +--
 .../preview/Respond to Rai/State/AppK.tsx     | 19 +++++++++++++
 .../Respond to Rai/State/Waiver_Capitated.tsx |  4 +--
 13 files changed, 101 insertions(+), 48 deletions(-)
 rename lib/libs/email/content/respondToRai/emailTemplates/{Waiver1915bCMS.tsx => WaiverCMS.tsx} (91%)
 rename lib/libs/email/content/respondToRai/emailTemplates/{Waiver1915bState.tsx => WaiverState.tsx} (84%)
 create mode 100644 lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx
 create mode 100644 lib/libs/email/preview/Respond to Rai/State/AppK.tsx

diff --git a/lib/libs/email/content/email-components.tsx b/lib/libs/email/content/email-components.tsx
index a3bb356276..ad309e6534 100644
--- a/lib/libs/email/content/email-components.tsx
+++ b/lib/libs/email/content/email-components.tsx
@@ -92,6 +92,8 @@ const LoginInstructions = ({
   </ul>
 );
 
+const Divider = () => <Hr style={styles.divider} />;
+
 const DetailsHeading = () => (
   <div>
     <Hr style={styles.divider} />
@@ -160,7 +162,7 @@ const PackageDetails = ({ details }: { details: Record<string, ReactNode> }) =>
                 Summary:
               </Heading>
             </Text>
-            <Textarea>{value ?? "No additional information submitted"}</Textarea>
+            <Text>{value ?? "No additional information submitted"}</Text>
           </Row>
         );
       }
@@ -224,6 +226,29 @@ const ContactStateLead = ({ isChip }: { isChip?: boolean }) => (
   </Section>
 );
 
+export const SpamWarning = () => {
+  return (
+    <Section
+      style={{
+        ...styles.section.footer,
+        paddingLeft: "16px",
+        paddingRight: "16px",
+      }}
+    >
+      <br />
+      <p style={{ textAlign: "center" }}>
+        If the contents of this email seem suspicious, do not open them, and instead forward this
+        email to{" "}
+        <Link style={{ color: "#fff", textDecoration: "underline" }} href="mailto:SPAM@cms.hhs.gov">
+          SPAM@cms.hhs.gov
+        </Link>
+        .
+      </p>
+      <p style={{ textAlign: "center" }}>Thank you!</p>
+    </Section>
+  );
+};
+
 const EmailFooter = ({ children }: { children: React.ReactNode }) => (
   <Section style={styles.section.footer}>{children}</Section>
 );
@@ -284,6 +309,7 @@ export {
   EmailNav,
   LoginInstructions,
   DetailsHeading,
+  Divider,
   Attachments,
   PackageDetails,
   MailboxNotice,
diff --git a/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx b/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx
index 77bd96e6a9..9d8df50046 100644
--- a/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx
+++ b/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx
@@ -1,11 +1,10 @@
 import { Events, CommonEmailVariables } from "shared-types";
-
 import {
   LoginInstructions,
   PackageDetails,
-  BasicFooter,
-  DetailsHeading,
   Attachments,
+  SpamWarning,
+  Divider,
 } from "../../email-components";
 import { BaseEmailTemplate } from "../../email-templates";
 import { formatDate } from "shared-utils";
@@ -19,9 +18,9 @@ export const AppKCMSEmail = ({ variables }: { variables: AppKEmailProps }) => {
       previewText="Appendix K Amendment Submitted"
       heading="The OneMAC Submission Portal received a 1915(c) Appendix K Amendment Submission:"
       applicationEndpointUrl={variables.applicationEndpointUrl}
-      footerContent={<BasicFooter />}
+      footerContent={<SpamWarning />}
     >
-      <DetailsHeading />
+      <Divider />
       <LoginInstructions appEndpointURL={variables.applicationEndpointUrl} useThisLink />
       <PackageDetails
         details={{
@@ -30,7 +29,7 @@ export const AppKCMSEmail = ({ variables }: { variables: AppKEmailProps }) => {
           "Email Address": variables.submitterEmail,
           "Amendment Title": variables.title ?? null,
           "Waiver Amendment Number": variables.id,
-          "Waiver Authority": variables.seaActionType,
+          "Waiver Authority": variables.actionType,
           "Proposed Effective Date": formatDate(variables.proposedEffectiveDate),
           Summary: variables.additionalInformation,
         }}
diff --git a/lib/libs/email/content/new-submission/emailTemplates/AppKState.tsx b/lib/libs/email/content/new-submission/emailTemplates/AppKState.tsx
index aef0cdfc50..bd3f21d026 100644
--- a/lib/libs/email/content/new-submission/emailTemplates/AppKState.tsx
+++ b/lib/libs/email/content/new-submission/emailTemplates/AppKState.tsx
@@ -1,13 +1,7 @@
 import { Text } from "@react-email/components";
 import { CommonEmailVariables, Events } from "shared-types";
 import { formatNinetyDaysDate, formatDate } from "shared-utils";
-import {
-  PackageDetails,
-  ContactStateLead,
-  DetailsHeading,
-  Attachments,
-  MailboxNotice,
-} from "../../email-components";
+import { PackageDetails, ContactStateLead, Divider, MailboxNotice } from "../../email-components";
 import { BaseEmailTemplate } from "../../email-templates";
 import { styles } from "../../email-styles";
 
@@ -24,20 +18,20 @@ export const AppKStateEmail = (props: {
       applicationEndpointUrl={variables.applicationEndpointUrl}
       footerContent={<ContactStateLead />}
     >
-      <DetailsHeading />
+      <Divider />
       <PackageDetails
         details={{
           "State or territory": variables.territory,
           Name: variables.submitterName,
           "Email Address": variables.submitterEmail,
-          "Initial Waiver Numbers": variables.waiverIds.join(", "),
-          "Waiver Authority": variables.seaActionType,
+          "Initial Waiver Number": variables.id,
+          "Waiver Authority": variables.actionType,
           "Proposed Effective Date": formatDate(variables.proposedEffectiveDate),
           "90th Day Deadline": formatNinetyDaysDate(variables.timestamp),
           Summary: variables.additionalInformation,
         }}
       />
-      <Attachments attachments={variables.attachments} />
+      <Divider />
       <Text style={styles.text.description}>
         {`This response confirms the receipt of your Waiver request or your
         response to a Waiver Request for Additional Information (RAI). You can
diff --git a/lib/libs/email/content/respondToRai/emailTemplates/Waiver1915bCMS.tsx b/lib/libs/email/content/respondToRai/emailTemplates/WaiverCMS.tsx
similarity index 91%
rename from lib/libs/email/content/respondToRai/emailTemplates/Waiver1915bCMS.tsx
rename to lib/libs/email/content/respondToRai/emailTemplates/WaiverCMS.tsx
index 1c1cdb587c..114b270bfd 100644
--- a/lib/libs/email/content/respondToRai/emailTemplates/Waiver1915bCMS.tsx
+++ b/lib/libs/email/content/respondToRai/emailTemplates/WaiverCMS.tsx
@@ -2,15 +2,12 @@ import { CommonEmailVariables, Events } from "shared-types";
 import { Html, Container } from "@react-email/components";
 import { PackageDetails, LoginInstructions, BasicFooter } from "../../email-components";
 
-export const Waiver1915bCMSEmail = (props: {
+export const WaiverCMSEmail = (props: {
   variables: Events["RespondToRai"] & CommonEmailVariables;
 }) => {
   const variables = props.variables;
   return (
-    <Html
-      lang="en"
-      dir="ltr"
-    >
+    <Html lang="en" dir="ltr">
       <Container>
         <h3>
           The OneMAC Submission Portal received a {variables.authority} Waiver RAI Response
diff --git a/lib/libs/email/content/respondToRai/emailTemplates/Waiver1915bState.tsx b/lib/libs/email/content/respondToRai/emailTemplates/WaiverState.tsx
similarity index 84%
rename from lib/libs/email/content/respondToRai/emailTemplates/Waiver1915bState.tsx
rename to lib/libs/email/content/respondToRai/emailTemplates/WaiverState.tsx
index f7146100b7..7819f635f7 100644
--- a/lib/libs/email/content/respondToRai/emailTemplates/Waiver1915bState.tsx
+++ b/lib/libs/email/content/respondToRai/emailTemplates/WaiverState.tsx
@@ -1,16 +1,16 @@
 import { formatNinetyDaysDate } from "shared-utils";
 import { CommonEmailVariables, Events } from "shared-types";
 import { Text } from "@react-email/components";
-import { PackageDetails, MailboxNotice, ContactStateLead } from "../../email-components";
+import { PackageDetails, MailboxNotice, ContactStateLead, Divider } from "../../email-components";
 import { BaseEmailTemplate } from "../../email-templates";
 import { styles } from "../../email-styles";
 
-export const Waiver1915bStateEmail = (props: {
+export const WaiverStateEmail = (props: {
   variables: Events["RespondToRai"] & CommonEmailVariables;
 }) => {
   const variables = props.variables;
   const previewText = `Appendix K Amendment Submitted`;
-  const heading = "This response confirms the submission of your 1915(c) Waiver to CMS for review";
+  const heading = `This response confirms the submission of your ${variables.authority} RAI Response to CMS for review:`;
   return (
     <BaseEmailTemplate
       previewText={previewText}
@@ -29,6 +29,7 @@ export const Waiver1915bStateEmail = (props: {
           Summary: variables.additionalInformation,
         }}
       />
+      <Divider />
       <Text style={styles.text.description}>
         {`This response confirms the receipt of your Waiver request or your response to a Waiver
         Request for Additional Information (RAI). You can expect a formal response to your submittal
diff --git a/lib/libs/email/content/respondToRai/emailTemplates/index.tsx b/lib/libs/email/content/respondToRai/emailTemplates/index.tsx
index 9b6842c3cf..4b093e1dd4 100644
--- a/lib/libs/email/content/respondToRai/emailTemplates/index.tsx
+++ b/lib/libs/email/content/respondToRai/emailTemplates/index.tsx
@@ -2,5 +2,5 @@ export { MedSpaCMSEmail } from "./MedSpaCMS";
 export { MedSpaStateEmail } from "./MedSpaState";
 export { ChipSpaCMSEmail } from "./ChipSpaCMS";
 export { ChipSpaStateEmail } from "./ChipSpaState";
-export { Waiver1915bCMSEmail } from "./Waiver1915bCMS";
-export { Waiver1915bStateEmail } from "./Waiver1915bState";
+export { WaiverCMSEmail } from "./WaiverCMS";
+export { WaiverStateEmail } from "./WaiverState";
diff --git a/lib/libs/email/content/respondToRai/index.tsx b/lib/libs/email/content/respondToRai/index.tsx
index d140bc627d..133c1d2e05 100644
--- a/lib/libs/email/content/respondToRai/index.tsx
+++ b/lib/libs/email/content/respondToRai/index.tsx
@@ -5,8 +5,8 @@ import {
   MedSpaStateEmail,
   ChipSpaCMSEmail,
   ChipSpaStateEmail,
-  Waiver1915bCMSEmail,
-  Waiver1915bStateEmail,
+  WaiverCMSEmail,
+  WaiverStateEmail,
 } from "./emailTemplates";
 import { render } from "@react-email/render";
 
@@ -72,7 +72,7 @@ export const respondToRai: AuthoritiesWithUserTypesTemplate = {
           ...variables.emails.srtEmails,
         ],
         subject: `Waiver RAI Response for ${variables.id} Submitted`,
-        body: await render(<Waiver1915bCMSEmail variables={variables} />),
+        body: await render(<WaiverCMSEmail variables={variables} />),
       };
     },
     state: async (
@@ -82,7 +82,7 @@ export const respondToRai: AuthoritiesWithUserTypesTemplate = {
         to: [`${variables.submitterName} <${variables.submitterEmail}>`],
         cc: variables.allStateUsersEmails,
         subject: `Your Waiver Response for ${variables.id} has been submitted to CMS`,
-        body: await render(<Waiver1915bStateEmail variables={variables} />),
+        body: await render(<WaiverStateEmail variables={variables} />),
       };
     },
   },
diff --git a/lib/libs/email/preview/Initial Submissions/CMS/AppK.tsx b/lib/libs/email/preview/Initial Submissions/CMS/AppK.tsx
index 498163f57d..2b25f8f683 100644
--- a/lib/libs/email/preview/Initial Submissions/CMS/AppK.tsx	
+++ b/lib/libs/email/preview/Initial Submissions/CMS/AppK.tsx	
@@ -6,11 +6,11 @@ const AppKCMSEmailPreview = () => {
     <AppKCMSEmail
       variables={{
         ...emailTemplateValue,
+        event: "app-k",
         id: "CO-1234.R21.00",
-        waiverIds: ["CO-1234.R21.01", "CO-12345.R03.09", "CO-4567.R15.42"],
+        authority: "1915(c)",
         actionType: "Amend",
-        seaActionType: "amend",
-        state: "CO",
+        territory: "CO",
         title: "A Perfect Appendix K Amendment Title",
         attachments: {
           appk: attachments.appk,
diff --git a/lib/libs/email/preview/Initial Submissions/State/AppK.tsx b/lib/libs/email/preview/Initial Submissions/State/AppK.tsx
index 5c779ad74b..e50121319b 100644
--- a/lib/libs/email/preview/Initial Submissions/State/AppK.tsx	
+++ b/lib/libs/email/preview/Initial Submissions/State/AppK.tsx	
@@ -1,18 +1,18 @@
-import { AppKStateEmail } from "../../../content/new-submission/emailTemplates";
-import * as attachments from "../../../mock-data/attachments";
+import { AppKCMSEmail } from "../../../content/new-submission/emailTemplates";
 import { emailTemplateValue } from "../../../mock-data/new-submission";
+import * as attachments from "../../../mock-data/attachments";
 
-const AppKStateEmailPreview = () => {
+const AppKCMSEmailPreview = () => {
   return (
-    <AppKStateEmail
+    <AppKCMSEmail
       variables={{
         ...emailTemplateValue,
+        event: "app-k",
         id: "CO-1234.R21.00",
-        state: "CO",
-        waiverIds: ["1234-56768", "1234-56769"],
+        authority: "1915(c)",
         actionType: "Amend",
-        seaActionType: "amend",
-        title: "App K For The State - 2024",
+        territory: "CO",
+        title: "A Perfect Appendix K Amendment Title",
         attachments: {
           appk: attachments.appk,
           other: attachments.other,
@@ -22,4 +22,4 @@ const AppKStateEmailPreview = () => {
   );
 };
 
-export default AppKStateEmailPreview;
+export default AppKCMSEmailPreview;
diff --git a/lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx b/lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx
new file mode 100644
index 0000000000..43007918a4
--- /dev/null
+++ b/lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx	
@@ -0,0 +1,17 @@
+import { WaiverCMSEmail } from "lib/libs/email/content/respondToRai/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai";
+
+export default () => {
+  return (
+    <WaiverCMSEmail
+      variables={{
+        ...emailTemplateValue,
+        id: "CO-1234.R21.00",
+        authority: "1915(c)",
+        actionType: "Amend",
+        territory: "CO",
+        title: "A Perfect Appendix K Amendment Title",
+      }}
+    />
+  );
+};
diff --git a/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx b/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx
index 448694b194..6c7bbe3fdb 100644
--- a/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx	
+++ b/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx	
@@ -1,6 +1,6 @@
-import { Waiver1915bCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
+import { WaiverCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai";
 
 export default () => {
-  return <Waiver1915bCMSEmail variables={emailTemplateValue} />;
+  return <WaiverCMSEmail variables={emailTemplateValue} />;
 };
diff --git a/lib/libs/email/preview/Respond to Rai/State/AppK.tsx b/lib/libs/email/preview/Respond to Rai/State/AppK.tsx
new file mode 100644
index 0000000000..fd9f2f3b20
--- /dev/null
+++ b/lib/libs/email/preview/Respond to Rai/State/AppK.tsx	
@@ -0,0 +1,19 @@
+import { WaiverStateEmail } from "lib/libs/email/content/respondToRai/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai";
+
+const AppKStateEmailPreview = () => {
+  return (
+    <WaiverStateEmail
+      variables={{
+        ...emailTemplateValue,
+        id: "CO-1234.R21.00",
+        authority: "1915(c)",
+        actionType: "Amend",
+        territory: "CO",
+        title: "A Perfect Appendix K Amendment Title",
+      }}
+    />
+  );
+};
+
+export default AppKStateEmailPreview;
diff --git a/lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx b/lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx
index 8390c75076..e9b77f299a 100644
--- a/lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx	
+++ b/lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx	
@@ -1,5 +1,5 @@
-import { Waiver1915bStateEmail } from "lib/libs/email/content/respondToRai/emailTemplates";
+import { WaiverStateEmail } from "lib/libs/email/content/respondToRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai";
 export default () => {
-  return <Waiver1915bStateEmail variables={emailTemplateValue} />;
+  return <WaiverStateEmail variables={emailTemplateValue} />;
 };

From 626b6c33577f742204de023b5237887431424e42 Mon Sep 17 00:00:00 2001
From: Andie Swift <andie.swift5@gmail.com>
Date: Tue, 26 Nov 2024 10:44:18 -0600
Subject: [PATCH 06/10] verified all app k template lang

---
 lib/libs/email/content/email-components.tsx   | 33 ++++--------
 .../new-submission/emailTemplates/AppKCMS.tsx |  4 +-
 .../emailTemplates/AppKState.tsx              | 11 +++-
 .../respondToRai/emailTemplates/WaiverCMS.tsx | 54 +++++++++++--------
 .../emailTemplates/WaiverState.tsx            | 11 +++-
 .../emailTemplates/WaiverState.tsx}           | 12 +++--
 .../emailTemplates/index.tsx                  |  1 +
 .../content/withdrawConfirmation/index.tsx    |  2 +
 .../{Waiver1915bCMS.tsx => WaiverCMS.tsx}     |  8 +--
 .../emailTemplates/WaiverState.tsx            | 32 +++++++++++
 .../withdrawPackage/emailTemplates/index.tsx  |  4 +-
 .../withdrawRai/emailTemplates/AppKCMS.tsx    | 37 +++++++------
 .../withdrawRai/emailTemplates/AppKState.tsx  | 38 +++++++++++++
 .../withdrawRai/emailTemplates/index.tsx      |  1 +
 lib/libs/email/mock-data/withdraw-rai.ts      |  2 +-
 .../email/preview/Respond to Rai/CMS/AppK.tsx |  4 ++
 .../preview/Withdraw Package/CMS/AppK.tsx     |  6 +++
 .../Withdraw Package/CMS/Waiver_Capitated.tsx |  4 +-
 .../preview/Withdraw Package/State/AppK.tsx   |  6 +++
 .../State/Waiver_Capitated.tsx                |  4 +-
 .../email/preview/Withdraw Rai/State/AppK.tsx |  4 +-
 .../WithdrawConfirmation/State/AppK.tsx       |  6 +++
 22 files changed, 200 insertions(+), 84 deletions(-)
 rename lib/libs/email/content/{withdrawPackage/emailTemplates/Waiver1915bState.tsx => withdrawConfirmation/emailTemplates/WaiverState.tsx} (56%)
 create mode 100644 lib/libs/email/content/withdrawConfirmation/emailTemplates/index.tsx
 create mode 100644 lib/libs/email/content/withdrawConfirmation/index.tsx
 rename lib/libs/email/content/withdrawPackage/emailTemplates/{Waiver1915bCMS.tsx => WaiverCMS.tsx} (81%)
 create mode 100644 lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx
 create mode 100644 lib/libs/email/content/withdrawRai/emailTemplates/AppKState.tsx
 create mode 100644 lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx
 create mode 100644 lib/libs/email/preview/Withdraw Package/State/AppK.tsx
 create mode 100644 lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx

diff --git a/lib/libs/email/content/email-components.tsx b/lib/libs/email/content/email-components.tsx
index ad309e6534..a8edfdc3f6 100644
--- a/lib/libs/email/content/email-components.tsx
+++ b/lib/libs/email/content/email-components.tsx
@@ -170,7 +170,7 @@ const PackageDetails = ({ details }: { details: Record<string, ReactNode> }) =>
       return (
         <Row key={label + index}>
           <Column align="left" style={{ width: "50%" }}>
-            <Text style={styles.text.title}>{label}</Text>
+            <Text style={styles.text.title}>{label}:</Text>
           </Column>
           <Column>
             <Text style={styles.text.description}>{value ?? "Not provided"}</Text>
@@ -205,46 +205,35 @@ const SpamNotice = () => (
 );
 
 const ContactStateLead = ({ isChip }: { isChip?: boolean }) => (
-  <Section
-    style={{
-      ...styles.section.footer,
-      paddingLeft: "16px",
-      paddingRight: "16px",
-    }}
-  >
+  <Section>
+    <Divider />
     <Text style={{ fontSize: "14px" }}>
       If you have questions or did not expect this email, please contact{" "}
       <Link
         href={`mailto:${isChip ? EMAIL_CONFIG.CHIP_EMAIL : EMAIL_CONFIG.SPA_EMAIL}`}
-        style={{ color: "#fff", textDecoration: "underline" }}
+        style={{ textDecoration: "underline" }}
       >
         {isChip ? EMAIL_CONFIG.CHIP_EMAIL : EMAIL_CONFIG.SPA_EMAIL}
       </Link>{" "}
       or your state lead.
     </Text>
-    <Text>Thank you!</Text>
+    <Text>Thank you.</Text>
   </Section>
 );
 
 export const SpamWarning = () => {
   return (
-    <Section
-      style={{
-        ...styles.section.footer,
-        paddingLeft: "16px",
-        paddingRight: "16px",
-      }}
-    >
-      <br />
-      <p style={{ textAlign: "center" }}>
+    <Section>
+      <Divider />
+      <Text style={{ fontSize: "14px" }}>
         If the contents of this email seem suspicious, do not open them, and instead forward this
         email to{" "}
-        <Link style={{ color: "#fff", textDecoration: "underline" }} href="mailto:SPAM@cms.hhs.gov">
+        <Link style={{ textDecoration: "underline" }} href="mailto:SPAM@cms.hhs.gov">
           SPAM@cms.hhs.gov
         </Link>
         .
-      </p>
-      <p style={{ textAlign: "center" }}>Thank you!</p>
+      </Text>
+      <Text>Thank you.</Text>
     </Section>
   );
 };
diff --git a/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx b/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx
index 9d8df50046..a502e61984 100644
--- a/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx
+++ b/lib/libs/email/content/new-submission/emailTemplates/AppKCMS.tsx
@@ -3,6 +3,7 @@ import {
   LoginInstructions,
   PackageDetails,
   Attachments,
+  BasicFooter,
   SpamWarning,
   Divider,
 } from "../../email-components";
@@ -18,7 +19,7 @@ export const AppKCMSEmail = ({ variables }: { variables: AppKEmailProps }) => {
       previewText="Appendix K Amendment Submitted"
       heading="The OneMAC Submission Portal received a 1915(c) Appendix K Amendment Submission:"
       applicationEndpointUrl={variables.applicationEndpointUrl}
-      footerContent={<SpamWarning />}
+      footerContent={<BasicFooter />}
     >
       <Divider />
       <LoginInstructions appEndpointURL={variables.applicationEndpointUrl} useThisLink />
@@ -35,6 +36,7 @@ export const AppKCMSEmail = ({ variables }: { variables: AppKEmailProps }) => {
         }}
       />
       <Attachments attachments={variables.attachments} />
+      <SpamWarning />
     </BaseEmailTemplate>
   );
 };
diff --git a/lib/libs/email/content/new-submission/emailTemplates/AppKState.tsx b/lib/libs/email/content/new-submission/emailTemplates/AppKState.tsx
index bd3f21d026..e280cdccb2 100644
--- a/lib/libs/email/content/new-submission/emailTemplates/AppKState.tsx
+++ b/lib/libs/email/content/new-submission/emailTemplates/AppKState.tsx
@@ -1,7 +1,13 @@
 import { Text } from "@react-email/components";
 import { CommonEmailVariables, Events } from "shared-types";
 import { formatNinetyDaysDate, formatDate } from "shared-utils";
-import { PackageDetails, ContactStateLead, Divider, MailboxNotice } from "../../email-components";
+import {
+  PackageDetails,
+  BasicFooter,
+  ContactStateLead,
+  Divider,
+  MailboxNotice,
+} from "../../email-components";
 import { BaseEmailTemplate } from "../../email-templates";
 import { styles } from "../../email-styles";
 
@@ -16,7 +22,7 @@ export const AppKStateEmail = (props: {
       previewText={previewText}
       heading={heading}
       applicationEndpointUrl={variables.applicationEndpointUrl}
-      footerContent={<ContactStateLead />}
+      footerContent={<BasicFooter />}
     >
       <Divider />
       <PackageDetails
@@ -38,6 +44,7 @@ export const AppKStateEmail = (props: {
         expect a formal response to your submittal to be issued within 90 days,
         before ${formatNinetyDaysDate(variables.timestamp)}.`}
       </Text>
+      <ContactStateLead />
       <MailboxNotice type="Waiver" />
     </BaseEmailTemplate>
   );
diff --git a/lib/libs/email/content/respondToRai/emailTemplates/WaiverCMS.tsx b/lib/libs/email/content/respondToRai/emailTemplates/WaiverCMS.tsx
index 114b270bfd..3c86581a59 100644
--- a/lib/libs/email/content/respondToRai/emailTemplates/WaiverCMS.tsx
+++ b/lib/libs/email/content/respondToRai/emailTemplates/WaiverCMS.tsx
@@ -1,30 +1,40 @@
-import { CommonEmailVariables, Events } from "shared-types";
-import { Html, Container } from "@react-email/components";
-import { PackageDetails, LoginInstructions, BasicFooter } from "../../email-components";
+import { Events, CommonEmailVariables } from "shared-types";
+import {
+  LoginInstructions,
+  PackageDetails,
+  Attachments,
+  BasicFooter,
+  SpamWarning,
+  Divider,
+} from "../../email-components";
+import { BaseEmailTemplate } from "../../email-templates";
+import { formatDate } from "shared-utils";
 
 export const WaiverCMSEmail = (props: {
   variables: Events["RespondToRai"] & CommonEmailVariables;
 }) => {
   const variables = props.variables;
   return (
-    <Html lang="en" dir="ltr">
-      <Container>
-        <h3>
-          The OneMAC Submission Portal received a {variables.authority} Waiver RAI Response
-          Submission:
-        </h3>
-        <LoginInstructions appEndpointURL={variables.applicationEndpointUrl} />
-        <PackageDetails
-          details={{
-            "State or territory": variables.territory,
-            Name: variables.submitterName,
-            "Email Address": variables.submitterEmail,
-            "Waiver Number": variables.id,
-            Summary: variables.additionalInformation,
-          }}
-        />
-        <BasicFooter />
-      </Container>
-    </Html>
+    <BaseEmailTemplate
+      previewText="Appendix K Amendment Submitted"
+      heading={`The OneMAC Submission Portal received a ${variables.authority} Waiver RAI Response
+          Submission:`}
+      applicationEndpointUrl={variables.applicationEndpointUrl}
+      footerContent={<BasicFooter />}
+    >
+      <h3></h3>
+      <LoginInstructions appEndpointURL={variables.applicationEndpointUrl} />
+      <PackageDetails
+        details={{
+          "State or territory": variables.territory,
+          Name: variables.submitterName,
+          "Email Address": variables.submitterEmail,
+          "Waiver Number": variables.id,
+          Summary: variables.additionalInformation,
+        }}
+      />
+      <Attachments attachments={variables.attachments} />
+      <SpamWarning />
+    </BaseEmailTemplate>
   );
 };
diff --git a/lib/libs/email/content/respondToRai/emailTemplates/WaiverState.tsx b/lib/libs/email/content/respondToRai/emailTemplates/WaiverState.tsx
index 7819f635f7..c3cedc0163 100644
--- a/lib/libs/email/content/respondToRai/emailTemplates/WaiverState.tsx
+++ b/lib/libs/email/content/respondToRai/emailTemplates/WaiverState.tsx
@@ -1,7 +1,13 @@
 import { formatNinetyDaysDate } from "shared-utils";
 import { CommonEmailVariables, Events } from "shared-types";
 import { Text } from "@react-email/components";
-import { PackageDetails, MailboxNotice, ContactStateLead, Divider } from "../../email-components";
+import {
+  PackageDetails,
+  MailboxNotice,
+  BasicFooter,
+  ContactStateLead,
+  Divider,
+} from "../../email-components";
 import { BaseEmailTemplate } from "../../email-templates";
 import { styles } from "../../email-styles";
 
@@ -16,7 +22,7 @@ export const WaiverStateEmail = (props: {
       previewText={previewText}
       heading={heading}
       applicationEndpointUrl={variables.applicationEndpointUrl}
-      footerContent={<ContactStateLead />}
+      footerContent={<BasicFooter />}
     >
       <PackageDetails
         details={{
@@ -37,6 +43,7 @@ export const WaiverStateEmail = (props: {
         .
       </Text>
       <MailboxNotice type="Waiver" />
+      <ContactStateLead />
     </BaseEmailTemplate>
   );
 };
diff --git a/lib/libs/email/content/withdrawPackage/emailTemplates/Waiver1915bState.tsx b/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx
similarity index 56%
rename from lib/libs/email/content/withdrawPackage/emailTemplates/Waiver1915bState.tsx
rename to lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx
index 627c028c87..458b58293a 100644
--- a/lib/libs/email/content/withdrawPackage/emailTemplates/Waiver1915bState.tsx
+++ b/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx
@@ -1,21 +1,23 @@
 import { CommonEmailVariables, Events } from "shared-types";
-import { ContactStateLead } from "../../email-components";
+import { ContactStateLead, BasicFooter } from "../../email-components";
 import { BaseEmailTemplate } from "../../email-templates";
 
-export const Waiver1915bStateEmail = (props: {
+export const WaiverStateEmail = (props: {
   variables:
     | (Events["CapitatedInitial"] & CommonEmailVariables)
     | (Events["ContractingInitial"] & CommonEmailVariables);
 }) => {
   const variables = props.variables;
   const previewText = `Withdrawal of ${variables.authority} ${variables.id}`;
-  const heading = `This email is to confirm $ {variables.authority} Waiver ${variables.id} was withdrawn by ${variables.submitterName}. The review of ${variables.authority} Waiver ${variables.id} has concluded`;
+  const heading = `This email is to confirm ${variables.authority} Waiver ${variables.id} was withdrawn by ${variables.submitterName}. The review of ${variables.authority} Waiver ${variables.id} has concluded.`;
   return (
     <BaseEmailTemplate
       previewText={previewText}
       heading={heading}
       applicationEndpointUrl={variables.applicationEndpointUrl}
-      footerContent={<ContactStateLead />}
-    />
+      footerContent={<BasicFooter />}
+    >
+      <ContactStateLead />
+    </BaseEmailTemplate>
   );
 };
diff --git a/lib/libs/email/content/withdrawConfirmation/emailTemplates/index.tsx b/lib/libs/email/content/withdrawConfirmation/emailTemplates/index.tsx
new file mode 100644
index 0000000000..ee6d7fd211
--- /dev/null
+++ b/lib/libs/email/content/withdrawConfirmation/emailTemplates/index.tsx
@@ -0,0 +1 @@
+export { WaiverStateEmail } from "./WaiverState";
diff --git a/lib/libs/email/content/withdrawConfirmation/index.tsx b/lib/libs/email/content/withdrawConfirmation/index.tsx
new file mode 100644
index 0000000000..b88cfc4364
--- /dev/null
+++ b/lib/libs/email/content/withdrawConfirmation/index.tsx
@@ -0,0 +1,2 @@
+// TODO: Implement Logic for sending Package Withdraw confirmation emails after
+// they are aproved in seatool
diff --git a/lib/libs/email/content/withdrawPackage/emailTemplates/Waiver1915bCMS.tsx b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx
similarity index 81%
rename from lib/libs/email/content/withdrawPackage/emailTemplates/Waiver1915bCMS.tsx
rename to lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx
index 91a156a9de..b1a62ca989 100644
--- a/lib/libs/email/content/withdrawPackage/emailTemplates/Waiver1915bCMS.tsx
+++ b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx
@@ -1,8 +1,8 @@
 import { CommonEmailVariables, Events } from "shared-types";
-import { Attachments, PackageDetails, BasicFooter } from "../../email-components";
+import { SpamWarning, PackageDetails, BasicFooter } from "../../email-components";
 import { BaseEmailTemplate } from "../../email-templates";
 
-export const Waiver1915bCMSEmail = (props: {
+export const WaiverCMSEmail = (props: {
   variables:
     | (Events["CapitatedInitial"] & CommonEmailVariables)
     | (Events["ContractingInitial"] & CommonEmailVariables);
@@ -23,11 +23,11 @@ export const Waiver1915bCMSEmail = (props: {
           "State or territory": variables.territory,
           Name: variables.submitterName,
           Email: variables.submitterEmail,
-          [`${variables.authority} Package ID`]: variables.id,
+          "Waiver Number": variables.id,
           Summary: variables.additionalInformation,
         }}
       />
-      <Attachments attachments={variables.attachments as any} />
+      <SpamWarning />
     </BaseEmailTemplate>
   );
 };
diff --git a/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx
new file mode 100644
index 0000000000..95690f86a8
--- /dev/null
+++ b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx
@@ -0,0 +1,32 @@
+import { CommonEmailVariables, Events } from "shared-types";
+import { ContactStateLead, BasicFooter, PackageDetails } from "../../email-components";
+import { BaseEmailTemplate } from "../../email-templates";
+
+export const WaiverStateEmail = (props: {
+  variables:
+    | (Events["CapitatedInitial"] & CommonEmailVariables)
+    | (Events["ContractingInitial"] & CommonEmailVariables);
+}) => {
+  const variables = props.variables;
+  const previewText = `Withdrawal of ${variables.authority} ${variables.id}`;
+  const heading = `This is confirmation that you have requested to withdraw the package below. The package will no longer be considered for CMS review:`;
+  return (
+    <BaseEmailTemplate
+      previewText={previewText}
+      heading={heading}
+      applicationEndpointUrl={variables.applicationEndpointUrl}
+      footerContent={<BasicFooter />}
+    >
+      <PackageDetails
+        details={{
+          "State or territory": variables.territory,
+          Name: variables.submitterName,
+          "Email Address": variables.submitterEmail,
+          "Waiver Number": variables.id,
+          Summary: variables.additionalInformation,
+        }}
+      />
+      <ContactStateLead />
+    </BaseEmailTemplate>
+  );
+};
diff --git a/lib/libs/email/content/withdrawPackage/emailTemplates/index.tsx b/lib/libs/email/content/withdrawPackage/emailTemplates/index.tsx
index 9b6842c3cf..4b093e1dd4 100644
--- a/lib/libs/email/content/withdrawPackage/emailTemplates/index.tsx
+++ b/lib/libs/email/content/withdrawPackage/emailTemplates/index.tsx
@@ -2,5 +2,5 @@ export { MedSpaCMSEmail } from "./MedSpaCMS";
 export { MedSpaStateEmail } from "./MedSpaState";
 export { ChipSpaCMSEmail } from "./ChipSpaCMS";
 export { ChipSpaStateEmail } from "./ChipSpaState";
-export { Waiver1915bCMSEmail } from "./Waiver1915bCMS";
-export { Waiver1915bStateEmail } from "./Waiver1915bState";
+export { WaiverCMSEmail } from "./WaiverCMS";
+export { WaiverStateEmail } from "./WaiverState";
diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/AppKCMS.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/AppKCMS.tsx
index 6020b98627..6cc64eaaca 100644
--- a/lib/libs/email/content/withdrawRai/emailTemplates/AppKCMS.tsx
+++ b/lib/libs/email/content/withdrawRai/emailTemplates/AppKCMS.tsx
@@ -1,7 +1,7 @@
 import { CommonEmailVariables } from "shared-types";
 import { RaiWithdraw } from "shared-types";
-import { Html, Container } from "@react-email/components";
-import { WithdrawRAI, PackageDetails, BasicFooter } from "../../email-components";
+import { Attachments, PackageDetails, BasicFooter, SpamWarning } from "../../email-components";
+import { BaseEmailTemplate } from "../../email-templates";
 
 export const AppKCMSEmail = (props: {
   variables: RaiWithdraw & CommonEmailVariables;
@@ -9,20 +9,23 @@ export const AppKCMSEmail = (props: {
 }) => {
   const { variables, relatedEvent } = { ...props };
   return (
-    <Html lang="en" dir="ltr">
-      <Container>
-        <WithdrawRAI {...variables} />
-        <PackageDetails
-          details={{
-            "State or territory": variables.territory,
-            Name: relatedEvent.submitterName,
-            "Email Address": relatedEvent.submitterEmail,
-            "Waiver Number": variables.id,
-            Summary: variables.additionalInformation,
-          }}
-        />
-        <BasicFooter />
-      </Container>
-    </Html>
+    <BaseEmailTemplate
+      previewText="Withdraw Formal RAI Response for Waiver Package"
+      heading={`The OneMAC Submission Portal received a request to withdraw the Formal RAI Response. You are receiving this email notification as the Formal RAI for ${variables.id} was withdrawn by ${variables.submitterName} ${variables.submitterEmail}.`}
+      applicationEndpointUrl={variables.applicationEndpointUrl}
+      footerContent={<BasicFooter />}
+    >
+      <PackageDetails
+        details={{
+          "State or territory": variables.territory,
+          Name: relatedEvent.submitterName,
+          "Email Address": relatedEvent.submitterEmail,
+          "Waiver Number": variables.id,
+          Summary: variables.additionalInformation,
+        }}
+      />
+      <Attachments attachments={variables.attachments} />
+      <SpamWarning />
+    </BaseEmailTemplate>
   );
 };
diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/AppKState.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/AppKState.tsx
new file mode 100644
index 0000000000..dd4e117717
--- /dev/null
+++ b/lib/libs/email/content/withdrawRai/emailTemplates/AppKState.tsx
@@ -0,0 +1,38 @@
+import { CommonEmailVariables } from "shared-types";
+import { RaiWithdraw } from "shared-types";
+import {
+  PackageDetails,
+  BasicFooter,
+  MailboxNotice,
+  Divider,
+  ContactStateLead,
+} from "../../email-components";
+import { BaseEmailTemplate } from "../../email-templates";
+
+export const AppKStateEmail = (props: {
+  variables: RaiWithdraw & CommonEmailVariables;
+  relatedEvent: any;
+}) => {
+  const { variables, relatedEvent } = { ...props };
+  return (
+    <BaseEmailTemplate
+      previewText="Withdraw Formal RAI Response for Waiver Package"
+      heading={`The OneMAC Submission Portal received a request to withdraw the Formal RAI Response. You are receiving this email notification as the Formal RAI for ${variables.id} was withdrawn by ${variables.submitterName} ${variables.submitterEmail}.`}
+      applicationEndpointUrl={variables.applicationEndpointUrl}
+      footerContent={<BasicFooter />}
+    >
+      <PackageDetails
+        details={{
+          "State or territory": variables.territory,
+          Name: relatedEvent.submitterName,
+          "Email Address": relatedEvent.submitterEmail,
+          "Waiver Number": variables.id,
+          Summary: variables.additionalInformation,
+        }}
+      />
+      <Divider />
+      <MailboxNotice type="Waiver" />
+      <ContactStateLead />
+    </BaseEmailTemplate>
+  );
+};
diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/index.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/index.tsx
index c597a4a4ee..c414f4aa2b 100644
--- a/lib/libs/email/content/withdrawRai/emailTemplates/index.tsx
+++ b/lib/libs/email/content/withdrawRai/emailTemplates/index.tsx
@@ -5,3 +5,4 @@ export { ChipSpaStateEmail } from "./ChipSpaState";
 export { Waiver1915bCMSEmail } from "./Waiver1915bCMS";
 export { Waiver1915bStateEmail } from "./Waiver1915bState";
 export { AppKCMSEmail } from "./AppKCMS";
+export { AppKStateEmail } from "./AppKState";
diff --git a/lib/libs/email/mock-data/withdraw-rai.ts b/lib/libs/email/mock-data/withdraw-rai.ts
index c8916a2d1b..986b561367 100644
--- a/lib/libs/email/mock-data/withdraw-rai.ts
+++ b/lib/libs/email/mock-data/withdraw-rai.ts
@@ -32,7 +32,7 @@ export const emailTemplateValue = {
     },
   },
   additionalInformation:
-    "This some additional infornormaiton about the request to withdraw and what makes it important.",
+    "This some additional information about the request to withdraw and what makes it important.",
   submitterName: "George Harrison",
   submitterEmail: "george@example.com",
   timestamp: 1723390633663,
diff --git a/lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx b/lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx
index 43007918a4..4f4a9c4f1e 100644
--- a/lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx	
+++ b/lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx	
@@ -1,5 +1,6 @@
 import { WaiverCMSEmail } from "lib/libs/email/content/respondToRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai";
+import * as attachments from "../../../mock-data/attachments";
 
 export default () => {
   return (
@@ -11,6 +12,9 @@ export default () => {
         actionType: "Amend",
         territory: "CO",
         title: "A Perfect Appendix K Amendment Title",
+        attachments: {
+          other: attachments.other,
+        },
       }}
     />
   );
diff --git a/lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx b/lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx
new file mode 100644
index 0000000000..c84958cf8f
--- /dev/null
+++ b/lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx	
@@ -0,0 +1,6 @@
+import { WaiverCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
+
+export default () => {
+  return <WaiverCMSEmail variables={{ ...emailTemplateValue, id: "MD-6543.R67.32" }} />;
+};
diff --git a/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx b/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx
index d0fad31f2d..142775a748 100644
--- a/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx	
+++ b/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx	
@@ -1,6 +1,6 @@
-import { Waiver1915bCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
+import { WaiverCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
 
 export default () => {
-  return <Waiver1915bCMSEmail variables={emailTemplateValue} />;
+  return <WaiverCMSEmail variables={{ ...emailTemplateValue, id: "MD-5739.R00.00" }} />;
 };
diff --git a/lib/libs/email/preview/Withdraw Package/State/AppK.tsx b/lib/libs/email/preview/Withdraw Package/State/AppK.tsx
new file mode 100644
index 0000000000..423110e6d0
--- /dev/null
+++ b/lib/libs/email/preview/Withdraw Package/State/AppK.tsx	
@@ -0,0 +1,6 @@
+import { WaiverStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
+
+export default () => {
+  return <WaiverStateEmail variables={{ ...emailTemplateValue, id: "MD-6543.R67.32" }} />;
+};
diff --git a/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx b/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx
index e5740c5bdd..5e82c5feb9 100644
--- a/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx	
+++ b/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx	
@@ -1,6 +1,6 @@
-import { Waiver1915bStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
+import { WaiverStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
 
 export default () => {
-  return <Waiver1915bStateEmail variables={emailTemplateValue} />;
+  return <WaiverStateEmail variables={{ ...emailTemplateValue, id: "MD-5739.R00.00" }} />;
 };
diff --git a/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx b/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx
index 8730c8cd73..45ce74b77f 100644
--- a/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx	
+++ b/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx	
@@ -1,4 +1,4 @@
-import { AppKCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates";
+import { AppKStateEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
 
 export const relatedEvent = {
@@ -6,4 +6,4 @@ export const relatedEvent = {
   submitterEmail: "test@email.com",
 };
 
-export default () => <AppKCMSEmail relatedEvent={relatedEvent} variables={emailTemplateValue} />;
+export default () => <AppKStateEmail relatedEvent={relatedEvent} variables={emailTemplateValue} />;
diff --git a/lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx b/lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx
new file mode 100644
index 0000000000..607c537de2
--- /dev/null
+++ b/lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx
@@ -0,0 +1,6 @@
+import { WaiverStateEmail } from "lib/libs/email/content/withdrawConfirmation/emailTemplates";
+import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
+
+export default () => {
+  return <WaiverStateEmail variables={{ ...emailTemplateValue, id: "MD-6543.R67.32" }} />;
+};

From 414158dec1ef1a428173af75766a091b7ba15ec1 Mon Sep 17 00:00:00 2001
From: Andie Swift <andie.swift5@gmail.com>
Date: Tue, 26 Nov 2024 11:23:13 -0600
Subject: [PATCH 07/10] double checked all the templates are correct

---
 lib/libs/email/content/respondToRai/index.tsx | 28 ++++++++-
 .../emailTemplates/WaiverState.tsx            |  2 +-
 .../emailTemplates/WaiverState.tsx            | 10 +++-
 .../State/Waiver_RAI_Response.tsx             | 58 -------------------
 .../Respond to Rai/CMS/Waiver_Capitated.tsx   |  2 +-
 .../preview/Withdraw Package/CMS/AppK.tsx     |  2 +-
 .../preview/Withdraw Package/CMS/CHIP_SPA.tsx |  2 +-
 .../Withdraw Package/CMS/Medicaid_SPA.tsx     |  2 +-
 .../Withdraw Package/CMS/Waiver_Capitated.tsx |  2 +-
 .../preview/Withdraw Package/State/AppK.tsx   |  2 +-
 .../Withdraw Package/State/CHIP_SPA.tsx       |  2 +-
 .../Withdraw Package/State/Medicaid_SPA.tsx   |  2 +-
 .../State/Waiver_Capitated.tsx                |  2 +-
 .../email/preview/Withdraw Rai/CMS/AppK.tsx   |  2 +-
 .../preview/Withdraw Rai/CMS/CHIP_SPA.tsx     |  2 +-
 .../preview/Withdraw Rai/CMS/Medicaid_SPA.tsx |  2 +-
 .../Withdraw Rai/CMS/Waiver_Contracting.tsx   |  2 +-
 .../email/preview/Withdraw Rai/State/AppK.tsx |  2 +-
 .../preview/Withdraw Rai/State/CHIP_SPA.tsx   |  2 +-
 .../Withdraw Rai/State/Medicaid_SPA.tsx       |  2 +-
 .../Withdraw Rai/State/Waiver_Contracting.tsx |  2 +-
 .../State/Waiver_RAI_Response.tsx             | 58 -------------------
 .../WithdrawConfirmation/State/AppK.tsx       |  6 +-
 23 files changed, 59 insertions(+), 137 deletions(-)
 delete mode 100644 lib/libs/email/preview/Initial Submissions/State/Waiver_RAI_Response.tsx
 delete mode 100644 lib/libs/email/preview/Withdraw Rai/State/Waiver_RAI_Response.tsx

diff --git a/lib/libs/email/content/respondToRai/index.tsx b/lib/libs/email/content/respondToRai/index.tsx
index 133c1d2e05..7897104508 100644
--- a/lib/libs/email/content/respondToRai/index.tsx
+++ b/lib/libs/email/content/respondToRai/index.tsx
@@ -81,7 +81,33 @@ export const respondToRai: AuthoritiesWithUserTypesTemplate = {
       return {
         to: [`${variables.submitterName} <${variables.submitterEmail}>`],
         cc: variables.allStateUsersEmails,
-        subject: `Your Waiver Response for ${variables.id} has been submitted to CMS`,
+        subject: `Your 1915(b) RAI Response for ${variables.id} has been submitted to CMS`,
+        body: await render(<WaiverStateEmail variables={variables} />),
+      };
+    },
+  },
+  [Authority["1915c"]]: {
+    cms: async (
+      variables: Events["RespondToRai"] & CommonEmailVariables & { emails: EmailAddresses },
+    ) => {
+      return {
+        to: [
+          ...variables.emails.osgEmail,
+          ...variables.emails.dmcoEmail,
+          ...variables.emails.cpocEmail,
+          ...variables.emails.srtEmails,
+        ],
+        subject: `Waiver RAI Response for ${variables.id} Submitted`,
+        body: await render(<WaiverCMSEmail variables={variables} />),
+      };
+    },
+    state: async (
+      variables: Events["RespondToRai"] & CommonEmailVariables & { emails: EmailAddresses },
+    ) => {
+      return {
+        to: [`${variables.submitterName} <${variables.submitterEmail}>`],
+        cc: variables.allStateUsersEmails,
+        subject: `Your 1915(c) RAI Response for ${variables.id} has been submitted to CMS`,
         body: await render(<WaiverStateEmail variables={variables} />),
       };
     },
diff --git a/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx b/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx
index 458b58293a..5d7d3b5da2 100644
--- a/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx
+++ b/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx
@@ -9,7 +9,7 @@ export const WaiverStateEmail = (props: {
 }) => {
   const variables = props.variables;
   const previewText = `Withdrawal of ${variables.authority} ${variables.id}`;
-  const heading = `This email is to confirm ${variables.authority} Waiver ${variables.id} was withdrawn by ${variables.submitterName}. The review of ${variables.authority} Waiver ${variables.id} has concluded.`;
+  const heading = `This email is to confirm ${variables.authority} ${variables.id} was withdrawn by ${variables.submitterName}. The review of ${variables.authority} ${variables.id} has concluded.`;
   return (
     <BaseEmailTemplate
       previewText={previewText}
diff --git a/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx
index 95690f86a8..5d3ad0d359 100644
--- a/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx
+++ b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx
@@ -1,5 +1,11 @@
 import { CommonEmailVariables, Events } from "shared-types";
-import { ContactStateLead, BasicFooter, PackageDetails } from "../../email-components";
+import {
+  ContactStateLead,
+  BasicFooter,
+  PackageDetails,
+  MailboxNotice,
+  Divider,
+} from "../../email-components";
 import { BaseEmailTemplate } from "../../email-templates";
 
 export const WaiverStateEmail = (props: {
@@ -26,6 +32,8 @@ export const WaiverStateEmail = (props: {
           Summary: variables.additionalInformation,
         }}
       />
+      <Divider />
+      <MailboxNotice type="Waiver" />
       <ContactStateLead />
     </BaseEmailTemplate>
   );
diff --git a/lib/libs/email/preview/Initial Submissions/State/Waiver_RAI_Response.tsx b/lib/libs/email/preview/Initial Submissions/State/Waiver_RAI_Response.tsx
deleted file mode 100644
index 02c26d57b4..0000000000
--- a/lib/libs/email/preview/Initial Submissions/State/Waiver_RAI_Response.tsx	
+++ /dev/null
@@ -1,58 +0,0 @@
-import { Waiver1915bStateEmail } from "../../../content/respondToRai/emailTemplates";
-import { emailTemplateValue } from "../../../mock-data/respond-to-rai";
-
-const Waiver1915bStateEmailPreview = () => {
-  return (
-    <Waiver1915bStateEmail
-      variables={{
-        ...emailTemplateValue,
-        id: "CO-1234.R21.00",
-        territory: "CO",
-        event: "respond-to-rai",
-        attachments: {
-          revisedAmendedStatePlanLanguage: {
-            files: [
-              {
-                filename: "waiver-rai-response.pdf",
-                title: "Waiver RAI Response",
-                bucket: "test-bucket",
-                key: "waiver-rai-response.pdf",
-                uploadDate: Date.now(),
-              },
-              {
-                filename: "spa-pages.pdf",
-                title: "SPA Pages",
-                bucket: "test-bucket",
-                key: "spa-pages.pdf",
-                uploadDate: Date.now(),
-              },
-            ],
-            label: "Revised Amended State Plan Language",
-          },
-          officialRAIResponse: {
-            files: [],
-            label: "Official RAI Response",
-          },
-          budgetDocuments: {
-            files: [],
-            label: "Budget Documents",
-          },
-          publicNotice: {
-            files: [],
-            label: "Public Notice",
-          },
-          tribalConsultation: {
-            files: [],
-            label: "Tribal Consultation",
-          },
-          other: {
-            files: [],
-            label: "Other",
-          },
-        },
-      }}
-    />
-  );
-};
-
-export default Waiver1915bStateEmailPreview;
diff --git a/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx b/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx
index 6c7bbe3fdb..31eea9b2fc 100644
--- a/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx	
+++ b/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx	
@@ -1,4 +1,4 @@
-import { WaiverCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates";
+import { WaiverCMSEmail } from "lib/libs/email/content/respondToRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai";
 
 export default () => {
diff --git a/lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx b/lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx
index c84958cf8f..cafe300939 100644
--- a/lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx	
+++ b/lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx	
@@ -1,4 +1,4 @@
-import { WaiverCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
+import { WaiverCMSEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
 
 export default () => {
diff --git a/lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx
index 80d5aeca46..5cd374f405 100644
--- a/lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx	
+++ b/lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx	
@@ -1,4 +1,4 @@
-import { ChipSpaCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
+import { ChipSpaCMSEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
 
 export default () => {
diff --git a/lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx
index 80d5aeca46..5cd374f405 100644
--- a/lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx	
+++ b/lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx	
@@ -1,4 +1,4 @@
-import { ChipSpaCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
+import { ChipSpaCMSEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
 
 export default () => {
diff --git a/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx b/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx
index 142775a748..f3db5978f9 100644
--- a/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx	
+++ b/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx	
@@ -1,4 +1,4 @@
-import { WaiverCMSEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
+import { WaiverCMSEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
 
 export default () => {
diff --git a/lib/libs/email/preview/Withdraw Package/State/AppK.tsx b/lib/libs/email/preview/Withdraw Package/State/AppK.tsx
index 423110e6d0..24c2466e3d 100644
--- a/lib/libs/email/preview/Withdraw Package/State/AppK.tsx	
+++ b/lib/libs/email/preview/Withdraw Package/State/AppK.tsx	
@@ -1,4 +1,4 @@
-import { WaiverStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
+import { WaiverStateEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
 
 export default () => {
diff --git a/lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx
index cfb36ab8db..3fdb0fbdc0 100644
--- a/lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx	
+++ b/lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx	
@@ -1,4 +1,4 @@
-import { ChipSpaStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
+import { ChipSpaStateEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
 
 export default () => {
diff --git a/lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx
index 6b9453d67f..3aec3de8b5 100644
--- a/lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx	
+++ b/lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx	
@@ -1,4 +1,4 @@
-import { MedSpaStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
+import { MedSpaStateEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
 
 export default () => {
diff --git a/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx b/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx
index 5e82c5feb9..343e6932a5 100644
--- a/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx	
+++ b/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx	
@@ -1,4 +1,4 @@
-import { WaiverStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
+import { WaiverStateEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
 
 export default () => {
diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx
index 8730c8cd73..1279107093 100644
--- a/lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx	
+++ b/lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx	
@@ -1,4 +1,4 @@
-import { AppKCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates";
+import { AppKCMSEmail } from "lib/libs/email/content/withdrawRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
 
 export const relatedEvent = {
diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx
index 01c1dfa417..2a39f5d59c 100644
--- a/lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx	
+++ b/lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx	
@@ -1,4 +1,4 @@
-import { ChipSpaCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates";
+import { ChipSpaCMSEmail } from "lib/libs/email/content/withdrawRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
 import { relatedEvent } from "./AppK";
 
diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx
index 30098cb7de..d35e6b11b6 100644
--- a/lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx	
+++ b/lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx	
@@ -1,4 +1,4 @@
-import { MedSpaCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates";
+import { MedSpaCMSEmail } from "lib/libs/email/content/withdrawRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
 import { relatedEvent } from "./AppK";
 
diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx
index fde3ba4c3f..d40b93fb18 100644
--- a/lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx	
+++ b/lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx	
@@ -1,4 +1,4 @@
-import { Waiver1915bCMSEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates";
+import { Waiver1915bCMSEmail } from "lib/libs/email/content/withdrawRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
 import { relatedEvent } from "./AppK";
 
diff --git a/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx b/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx
index 45ce74b77f..f59b72bfff 100644
--- a/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx	
+++ b/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx	
@@ -1,4 +1,4 @@
-import { AppKStateEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates";
+import { AppKStateEmail } from "lib/libs/email/content/withdrawRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
 
 export const relatedEvent = {
diff --git a/lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx
index cf16a27426..397d56a5fc 100644
--- a/lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx	
+++ b/lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx	
@@ -1,4 +1,4 @@
-import { ChipSpaStateEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates";
+import { ChipSpaStateEmail } from "lib/libs/email/content/withdrawRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
 import { relatedEvent } from "../CMS/AppK";
 
diff --git a/lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx
index 50c7997d32..e7e841a90c 100644
--- a/lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx	
+++ b/lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx	
@@ -1,4 +1,4 @@
-import { MedSpaStateEmail } from "lib/libs/email/content/widthdrawRai/emailTemplates";
+import { MedSpaStateEmail } from "lib/libs/email/content/withdrawRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
 import { relatedEvent } from "../CMS/AppK";
 
diff --git a/lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx b/lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx
index 2b48235112..b801a221ae 100644
--- a/lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx	
+++ b/lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx	
@@ -1,4 +1,4 @@
-import { Waiver1915bStateEmail } from "lib/libs/email/content/widthdrawPackage/emailTemplates";
+import { Waiver1915bStateEmail } from "lib/libs/email/content/withdrawRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
 import { relatedEvent } from "../CMS/AppK";
 
diff --git a/lib/libs/email/preview/Withdraw Rai/State/Waiver_RAI_Response.tsx b/lib/libs/email/preview/Withdraw Rai/State/Waiver_RAI_Response.tsx
deleted file mode 100644
index 5f315d13f8..0000000000
--- a/lib/libs/email/preview/Withdraw Rai/State/Waiver_RAI_Response.tsx	
+++ /dev/null
@@ -1,58 +0,0 @@
-import { Waiver1915bStateEmail } from "../../content/respondToRai/emailTemplates";
-import { emailTemplateValue } from "../../mock-data/respond-to-rai";
-
-const Waiver1915bStateEmailPreview = () => {
-  return (
-    <Waiver1915bStateEmail
-      variables={{
-        ...emailTemplateValue,
-        id: "CO-1234.R21.00",
-        territory: "CO",
-        event: "respond-to-rai",
-        attachments: {
-          revisedAmendedStatePlanLanguage: {
-            files: [
-              {
-                filename: "waiver-rai-response.pdf",
-                title: "Waiver RAI Response",
-                bucket: "test-bucket",
-                key: "waiver-rai-response.pdf",
-                uploadDate: Date.now(),
-              },
-              {
-                filename: "spa-pages.pdf",
-                title: "SPA Pages",
-                bucket: "test-bucket",
-                key: "spa-pages.pdf",
-                uploadDate: Date.now(),
-              },
-            ],
-            label: "Revised Amended State Plan Language",
-          },
-          officialRAIResponse: {
-            files: [],
-            label: "Official RAI Response",
-          },
-          budgetDocuments: {
-            files: [],
-            label: "Budget Documents",
-          },
-          publicNotice: {
-            files: [],
-            label: "Public Notice",
-          },
-          tribalConsultation: {
-            files: [],
-            label: "Tribal Consultation",
-          },
-          other: {
-            files: [],
-            label: "Other",
-          },
-        },
-      }}
-    />
-  );
-};
-
-export default Waiver1915bStateEmailPreview;
diff --git a/lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx b/lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx
index 607c537de2..f1e03cb57a 100644
--- a/lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx
+++ b/lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx
@@ -2,5 +2,9 @@ import { WaiverStateEmail } from "lib/libs/email/content/withdrawConfirmation/em
 import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
 
 export default () => {
-  return <WaiverStateEmail variables={{ ...emailTemplateValue, id: "MD-6543.R67.32" }} />;
+  return (
+    <WaiverStateEmail
+      variables={{ ...emailTemplateValue, id: "MD-6543.R67.32", authority: "1915(c)" }}
+    />
+  );
 };

From 4538c73faa40417f4e9748c79b1d946144977804 Mon Sep 17 00:00:00 2001
From: Andie Swift <andie.swift5@gmail.com>
Date: Tue, 26 Nov 2024 11:37:58 -0600
Subject: [PATCH 08/10] verified all subject lines and added waivers where
 needed for index.tsx files

---
 .../content/withdrawConfirmation/index.tsx    | 28 +++++++++-
 .../email/content/withdrawPackage/index.tsx   | 53 ++++++++++++++++++-
 lib/libs/email/content/withdrawRai/index.tsx  |  2 +-
 3 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/lib/libs/email/content/withdrawConfirmation/index.tsx b/lib/libs/email/content/withdrawConfirmation/index.tsx
index b88cfc4364..7d341f4246 100644
--- a/lib/libs/email/content/withdrawConfirmation/index.tsx
+++ b/lib/libs/email/content/withdrawConfirmation/index.tsx
@@ -1,2 +1,26 @@
-// TODO: Implement Logic for sending Package Withdraw confirmation emails after
-// they are aproved in seatool
+import { Authority, CommonEmailVariables, EmailAddresses } from "shared-types";
+import { AuthoritiesWithUserTypesTemplate } from "../..";
+import { WaiverStateEmail } from "./emailTemplates";
+import { render } from "@react-email/render";
+
+export const withdrawConfirmation: AuthoritiesWithUserTypesTemplate = {
+  [Authority["1915b"]]: {
+    state: async (variables: any & CommonEmailVariables & { emails: EmailAddresses }) => {
+      return {
+        to: [`${variables.submitterName} <${variables.submitterEmail}>`], // TODO: change to all state users
+        subject: `1915(b) ${variables.id} Withdrawal Confirmation`,
+        body: await render(<WaiverStateEmail variables={variables} />),
+      };
+    },
+  },
+  [Authority["1915c"]]: {
+    state: async (variables: any & CommonEmailVariables & { emails: EmailAddresses }) => {
+      return {
+        to: [`${variables.submitterName} <${variables.submitterEmail}>`], // TODO: change to all state users
+        subject: `1915(c) ${variables.id} Withdrawal Confirmation`,
+        body: await render(<WaiverStateEmail variables={variables} />),
+      };
+    },
+  },
+  //   TODO: add CHIP & SPA Withdraw Confirmation Here
+};
diff --git a/lib/libs/email/content/withdrawPackage/index.tsx b/lib/libs/email/content/withdrawPackage/index.tsx
index 86b03271af..73dda36b4c 100644
--- a/lib/libs/email/content/withdrawPackage/index.tsx
+++ b/lib/libs/email/content/withdrawPackage/index.tsx
@@ -1,10 +1,12 @@
-import { Authority, CommonEmailVariables, EmailAddresses } from "shared-types";
+import { Events, Authority, CommonEmailVariables, EmailAddresses } from "shared-types";
 import { AuthoritiesWithUserTypesTemplate } from "../..";
 import {
   MedSpaCMSEmail,
   MedSpaStateEmail,
   ChipSpaCMSEmail,
   ChipSpaStateEmail,
+  WaiverCMSEmail,
+  WaiverStateEmail,
 } from "./emailTemplates";
 import { render } from "@react-email/render";
 
@@ -48,4 +50,53 @@ export const withdrawPackage: AuthoritiesWithUserTypesTemplate = {
       };
     },
   },
+  [Authority["1915b"]]: {
+    cms: async (
+      variables:
+        | (Events["CapitatedInitial"] & CommonEmailVariables & { emails: EmailAddresses })
+        | (Events["ContractingInitial"] & CommonEmailVariables & { emails: EmailAddresses }),
+    ) => {
+      return {
+        to: variables.emails.osgEmail,
+        subject: `Waiver Package ${variables.id} Withdraw Request`,
+        body: await render(<WaiverCMSEmail variables={variables} />),
+      };
+    },
+    state: async (
+      variables:
+        | (Events["CapitatedInitial"] & CommonEmailVariables & { emails: EmailAddresses })
+        | (Events["ContractingInitial"] & CommonEmailVariables & { emails: EmailAddresses }),
+    ) => {
+      return {
+        to: [`${variables.submitterName} <${variables.submitterEmail}>`], // TODO: change to ALL state users
+        subject: `Waiver Package ${variables.id} Withdraw Request`,
+        body: await render(<WaiverStateEmail variables={variables} />),
+      };
+    },
+  },
+
+  [Authority["1915c"]]: {
+    cms: async (
+      variables: Events["NewAppKSubmission"] & CommonEmailVariables & { emails: EmailAddresses },
+    ) => {
+      return {
+        to: [
+          ...variables.emails.osgEmail,
+          ...variables.emails.cpocEmail,
+          ...variables.emails.srtEmails,
+        ],
+        subject: `Waiver Package ${variables.id} Withdraw Request`,
+        body: await render(<WaiverCMSEmail variables={variables} />),
+      };
+    },
+    state: async (
+      variables: Events["NewAppKSubmission"] & CommonEmailVariables & { emails: EmailAddresses },
+    ) => {
+      return {
+        to: [`${variables.submitterName} <${variables.submitterEmail}>`], // TODO: change to ALL state users
+        subject: `Waiver Package ${variables.id} Withdraw Request`,
+        body: await render(<WaiverStateEmail variables={variables} />),
+      };
+    },
+  },
 };
diff --git a/lib/libs/email/content/withdrawRai/index.tsx b/lib/libs/email/content/withdrawRai/index.tsx
index 4ebdc11287..d2787d6d95 100644
--- a/lib/libs/email/content/withdrawRai/index.tsx
+++ b/lib/libs/email/content/withdrawRai/index.tsx
@@ -86,7 +86,7 @@ export const withdrawRai: AuthoritiesWithUserTypesTemplate = {
     state: async (variables: any & CommonEmailVariables & { emails: EmailAddresses }) => {
       const relatedEvent = await getLatestMatchingEvent(variables.id, Action.RESPOND_TO_RAI);
       return {
-        to: [`${variables.submitterName} <${variables.submitterEmail}>`],
+        to: [`${variables.submitterName} <${variables.submitterEmail}>`], // TODO: change to ALL state users
         cc: variables.allStateUsersEmails,
         subject: `Withdraw Formal RAI Response for Waiver Package ${variables.id}`,
         body: await render(

From 843c36ebe0cbb82bfd2ba8480edf255f0a1c94b6 Mon Sep 17 00:00:00 2001
From: Andie Swift <andie.swift5@gmail.com>
Date: Tue, 26 Nov 2024 17:32:59 -0600
Subject: [PATCH 09/10] fixed all TS errors in the emails folder

---
 .../respondToRai/emailTemplates/WaiverCMS.tsx |  2 --
 .../emailTemplates/WaiverState.tsx            |  3 ++-
 .../emailTemplates/MedSpaState.tsx            | 12 ++++-----
 .../emailTemplates/WaiverCMS.tsx              |  4 +--
 .../emailTemplates/WaiverState.tsx            |  4 +--
 .../withdrawRai/emailTemplates/AppKCMS.tsx    |  5 ++--
 .../withdrawRai/emailTemplates/AppKState.tsx  |  5 ++--
 .../withdrawRai/emailTemplates/ChipSpaCMS.tsx |  5 ++--
 .../emailTemplates/ChipSpaState.tsx           |  5 ++--
 .../withdrawRai/emailTemplates/MedSpaCMS.tsx  |  5 ++--
 .../emailTemplates/MedSpaState.tsx            |  5 ++--
 .../emailTemplates/Waiver1915bCMS.tsx         |  5 ++--
 .../emailTemplates/Waiver1915bState.tsx       |  5 ++--
 lib/libs/email/getAllStateUsers.test.ts       | 10 +++-----
 .../email/preview/Respond to Rai/CMS/AppK.tsx |  2 ++
 .../preview/Respond to Rai/CMS/CHIP_SPA.tsx   | 22 +++++++++++++++-
 .../Respond to Rai/CMS/Medicaid_SPA.tsx       | 22 +++++++++++++++-
 .../Respond to Rai/CMS/Waiver_Capitated.tsx   | 22 +++++++++++++++-
 .../preview/Respond to Rai/State/AppK.tsx     |  6 +++++
 .../preview/Respond to Rai/State/CHIP_SPA.tsx | 22 +++++++++++++++-
 .../Respond to Rai/State/Medicaid_SPA.tsx     | 23 ++++++++++++++++-
 .../Respond to Rai/State/Waiver_Capitated.tsx | 23 ++++++++++++++++-
 .../preview/Withdraw Package/CMS/AppK.tsx     | 17 ++++++++++++-
 .../preview/Withdraw Package/CMS/CHIP_SPA.tsx |  6 -----
 .../Withdraw Package/CMS/Medicaid_SPA.tsx     | 19 ++++++++++++--
 .../Withdraw Package/CMS/Waiver_Capitated.tsx | 17 ++++++++++++-
 .../preview/Withdraw Package/State/AppK.tsx   | 17 ++++++++++++-
 .../Withdraw Package/State/CHIP_SPA.tsx       |  6 -----
 .../Withdraw Package/State/Medicaid_SPA.tsx   | 17 ++++++++++++-
 .../State/Waiver_Capitated.tsx                | 17 ++++++++++++-
 .../email/preview/Withdraw Rai/CMS/AppK.tsx   | 25 ++++++++++++++++++-
 .../preview/Withdraw Rai/CMS/CHIP_SPA.tsx     | 24 +++++++++++++++++-
 .../preview/Withdraw Rai/CMS/Medicaid_SPA.tsx | 24 +++++++++++++++++-
 .../Withdraw Rai/CMS/Waiver_Contracting.tsx   | 24 +++++++++++++++++-
 .../email/preview/Withdraw Rai/State/AppK.tsx | 25 ++++++++++++++++++-
 .../preview/Withdraw Rai/State/CHIP_SPA.tsx   | 24 +++++++++++++++++-
 .../Withdraw Rai/State/Medicaid_SPA.tsx       | 24 +++++++++++++++++-
 .../Withdraw Rai/State/Waiver_Contracting.tsx | 24 +++++++++++++++++-
 .../WithdrawConfirmation/State/AppK.tsx       | 15 ++++++++++-
 lib/packages/shared-types/email.ts            |  3 +++
 40 files changed, 465 insertions(+), 80 deletions(-)
 delete mode 100644 lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx
 delete mode 100644 lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx

diff --git a/lib/libs/email/content/respondToRai/emailTemplates/WaiverCMS.tsx b/lib/libs/email/content/respondToRai/emailTemplates/WaiverCMS.tsx
index 3c86581a59..85ae4a9b26 100644
--- a/lib/libs/email/content/respondToRai/emailTemplates/WaiverCMS.tsx
+++ b/lib/libs/email/content/respondToRai/emailTemplates/WaiverCMS.tsx
@@ -5,10 +5,8 @@ import {
   Attachments,
   BasicFooter,
   SpamWarning,
-  Divider,
 } from "../../email-components";
 import { BaseEmailTemplate } from "../../email-templates";
-import { formatDate } from "shared-utils";
 
 export const WaiverCMSEmail = (props: {
   variables: Events["RespondToRai"] & CommonEmailVariables;
diff --git a/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx b/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx
index 5d7d3b5da2..8305473bd4 100644
--- a/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx
+++ b/lib/libs/email/content/withdrawConfirmation/emailTemplates/WaiverState.tsx
@@ -5,7 +5,8 @@ import { BaseEmailTemplate } from "../../email-templates";
 export const WaiverStateEmail = (props: {
   variables:
     | (Events["CapitatedInitial"] & CommonEmailVariables)
-    | (Events["ContractingInitial"] & CommonEmailVariables);
+    | (Events["ContractingInitial"] & CommonEmailVariables)
+    | (Events["NewAppKSubmission"] & CommonEmailVariables);
 }) => {
   const variables = props.variables;
   const previewText = `Withdrawal of ${variables.authority} ${variables.id}`;
diff --git a/lib/libs/email/content/withdrawPackage/emailTemplates/MedSpaState.tsx b/lib/libs/email/content/withdrawPackage/emailTemplates/MedSpaState.tsx
index 2c8e7ec682..02ea6f98bf 100644
--- a/lib/libs/email/content/withdrawPackage/emailTemplates/MedSpaState.tsx
+++ b/lib/libs/email/content/withdrawPackage/emailTemplates/MedSpaState.tsx
@@ -1,15 +1,13 @@
-import { CommonEmailVariables } from "shared-types";
-import { WithdrawPackage } from "shared-types";
+import { CommonEmailVariables, Events } from "shared-types";
 import { Container, Html } from "@react-email/components";
 import { ContactStateLead } from "../../email-components";
 
-export const MedSpaStateEmail = (props: { variables: WithdrawPackage & CommonEmailVariables }) => {
+export const MedSpaStateEmail = (props: {
+  variables: Events["WithdrawPackage"] & CommonEmailVariables;
+}) => {
   const variables = props.variables;
   return (
-    <Html
-      lang="en"
-      dir="ltr"
-    >
+    <Html lang="en" dir="ltr">
       <Container>
         <h3>
           This email is to confirm Medicaid SPA {variables.id} was withdrawn by
diff --git a/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx
index b1a62ca989..c12e12dcc7 100644
--- a/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx
+++ b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverCMS.tsx
@@ -3,9 +3,7 @@ import { SpamWarning, PackageDetails, BasicFooter } from "../../email-components
 import { BaseEmailTemplate } from "../../email-templates";
 
 export const WaiverCMSEmail = (props: {
-  variables:
-    | (Events["CapitatedInitial"] & CommonEmailVariables)
-    | (Events["ContractingInitial"] & CommonEmailVariables);
+  variables: Events["WithdrawPackage"] & CommonEmailVariables;
 }) => {
   const variables = props.variables;
   const previewText = `Withdrawal of ${variables.authority} ${variables.id}`;
diff --git a/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx
index 5d3ad0d359..1df8f622a1 100644
--- a/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx
+++ b/lib/libs/email/content/withdrawPackage/emailTemplates/WaiverState.tsx
@@ -9,9 +9,7 @@ import {
 import { BaseEmailTemplate } from "../../email-templates";
 
 export const WaiverStateEmail = (props: {
-  variables:
-    | (Events["CapitatedInitial"] & CommonEmailVariables)
-    | (Events["ContractingInitial"] & CommonEmailVariables);
+  variables: Events["WithdrawPackage"] & CommonEmailVariables;
 }) => {
   const variables = props.variables;
   const previewText = `Withdrawal of ${variables.authority} ${variables.id}`;
diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/AppKCMS.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/AppKCMS.tsx
index 6cc64eaaca..f7166624e3 100644
--- a/lib/libs/email/content/withdrawRai/emailTemplates/AppKCMS.tsx
+++ b/lib/libs/email/content/withdrawRai/emailTemplates/AppKCMS.tsx
@@ -1,10 +1,9 @@
-import { CommonEmailVariables } from "shared-types";
-import { RaiWithdraw } from "shared-types";
+import { CommonEmailVariables, Events } from "shared-types";
 import { Attachments, PackageDetails, BasicFooter, SpamWarning } from "../../email-components";
 import { BaseEmailTemplate } from "../../email-templates";
 
 export const AppKCMSEmail = (props: {
-  variables: RaiWithdraw & CommonEmailVariables;
+  variables: Events["RespondToRai"] & CommonEmailVariables;
   relatedEvent: any;
 }) => {
   const { variables, relatedEvent } = { ...props };
diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/AppKState.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/AppKState.tsx
index dd4e117717..076b921b54 100644
--- a/lib/libs/email/content/withdrawRai/emailTemplates/AppKState.tsx
+++ b/lib/libs/email/content/withdrawRai/emailTemplates/AppKState.tsx
@@ -1,5 +1,4 @@
-import { CommonEmailVariables } from "shared-types";
-import { RaiWithdraw } from "shared-types";
+import { CommonEmailVariables, Events } from "shared-types";
 import {
   PackageDetails,
   BasicFooter,
@@ -10,7 +9,7 @@ import {
 import { BaseEmailTemplate } from "../../email-templates";
 
 export const AppKStateEmail = (props: {
-  variables: RaiWithdraw & CommonEmailVariables;
+  variables: Events["RespondToRai"] & CommonEmailVariables;
   relatedEvent: any;
 }) => {
   const { variables, relatedEvent } = { ...props };
diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/ChipSpaCMS.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/ChipSpaCMS.tsx
index 4410648b60..fb4f92ca7a 100644
--- a/lib/libs/email/content/withdrawRai/emailTemplates/ChipSpaCMS.tsx
+++ b/lib/libs/email/content/withdrawRai/emailTemplates/ChipSpaCMS.tsx
@@ -1,10 +1,9 @@
-import { CommonEmailVariables } from "shared-types";
-import { RaiWithdraw } from "shared-types";
+import { CommonEmailVariables, Events } from "shared-types";
 import { Container, Html } from "@react-email/components";
 import { WithdrawRAI, PackageDetails, BasicFooter } from "../../email-components";
 
 export const ChipSpaCMSEmail = (props: {
-  variables: RaiWithdraw & CommonEmailVariables;
+  variables: Events["RespondToRai"] & CommonEmailVariables;
   relatedEvent: any;
 }) => {
   const { variables, relatedEvent } = { ...props };
diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/ChipSpaState.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/ChipSpaState.tsx
index b5ff5640c3..cc2e698395 100644
--- a/lib/libs/email/content/withdrawRai/emailTemplates/ChipSpaState.tsx
+++ b/lib/libs/email/content/withdrawRai/emailTemplates/ChipSpaState.tsx
@@ -1,10 +1,9 @@
-import { CommonEmailVariables } from "shared-types";
-import { RaiWithdraw } from "shared-types";
+import { CommonEmailVariables, Events } from "shared-types";
 import { Container, Html } from "@react-email/components";
 import { WithdrawRAI, PackageDetails, ContactStateLead } from "../../email-components";
 
 export const ChipSpaStateEmail = (props: {
-  variables: RaiWithdraw & CommonEmailVariables;
+  variables: Events["RespondToRai"] & CommonEmailVariables;
   relatedEvent: any;
 }) => {
   const { variables, relatedEvent } = { ...props };
diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/MedSpaCMS.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/MedSpaCMS.tsx
index 41efa6ec57..3c146895c4 100644
--- a/lib/libs/email/content/withdrawRai/emailTemplates/MedSpaCMS.tsx
+++ b/lib/libs/email/content/withdrawRai/emailTemplates/MedSpaCMS.tsx
@@ -1,10 +1,9 @@
-import { CommonEmailVariables } from "shared-types";
-import { RaiWithdraw } from "shared-types";
+import { CommonEmailVariables, Events } from "shared-types";
 import { Container, Html } from "@react-email/components";
 import { WithdrawRAI, PackageDetails, BasicFooter } from "../../email-components";
 
 export const MedSpaCMSEmail = (props: {
-  variables: RaiWithdraw & CommonEmailVariables;
+  variables: Events["RespondToRai"] & CommonEmailVariables;
   relatedEvent: any;
 }) => {
   const { variables, relatedEvent } = { ...props };
diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/MedSpaState.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/MedSpaState.tsx
index 945346b90d..c611f5afc7 100644
--- a/lib/libs/email/content/withdrawRai/emailTemplates/MedSpaState.tsx
+++ b/lib/libs/email/content/withdrawRai/emailTemplates/MedSpaState.tsx
@@ -1,10 +1,9 @@
-import { CommonEmailVariables } from "shared-types";
-import { RaiWithdraw } from "shared-types";
+import { CommonEmailVariables, Events } from "shared-types";
 import { Container, Html } from "@react-email/components";
 import { WithdrawRAI, PackageDetails, ContactStateLead } from "../../email-components";
 
 export const MedSpaStateEmail = (props: {
-  variables: RaiWithdraw & CommonEmailVariables;
+  variables: Events["RespondToRai"] & CommonEmailVariables;
   relatedEvent: any;
 }) => {
   const { variables, relatedEvent } = { ...props };
diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/Waiver1915bCMS.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/Waiver1915bCMS.tsx
index 2030fc9c84..cf38991ac2 100644
--- a/lib/libs/email/content/withdrawRai/emailTemplates/Waiver1915bCMS.tsx
+++ b/lib/libs/email/content/withdrawRai/emailTemplates/Waiver1915bCMS.tsx
@@ -1,10 +1,9 @@
-import { CommonEmailVariables } from "shared-types";
-import { RaiWithdraw } from "shared-types";
+import { CommonEmailVariables, Events } from "shared-types";
 import { Container, Html } from "@react-email/components";
 import { WithdrawRAI, PackageDetails, BasicFooter } from "../../email-components";
 
 export const Waiver1915bCMSEmail = (props: {
-  variables: RaiWithdraw & CommonEmailVariables;
+  variables: Events["RespondToRai"] & CommonEmailVariables;
   relatedEvent: any;
 }) => {
   const { variables, relatedEvent } = { ...props };
diff --git a/lib/libs/email/content/withdrawRai/emailTemplates/Waiver1915bState.tsx b/lib/libs/email/content/withdrawRai/emailTemplates/Waiver1915bState.tsx
index 0a407966a8..f6448e114b 100644
--- a/lib/libs/email/content/withdrawRai/emailTemplates/Waiver1915bState.tsx
+++ b/lib/libs/email/content/withdrawRai/emailTemplates/Waiver1915bState.tsx
@@ -1,5 +1,4 @@
-import { CommonEmailVariables } from "shared-types";
-import { RaiWithdraw } from "shared-types";
+import { CommonEmailVariables, Events } from "shared-types";
 import {
   WithdrawRAI,
   PackageDetails,
@@ -10,7 +9,7 @@ import {
 import { BaseEmailTemplate } from "../../email-templates";
 
 export const Waiver1915bStateEmail = (props: {
-  variables: RaiWithdraw & CommonEmailVariables;
+  variables: Events["RespondToRai"] & CommonEmailVariables;
   relatedEvent: any;
 }) => {
   const { variables, relatedEvent } = { ...props };
diff --git a/lib/libs/email/getAllStateUsers.test.ts b/lib/libs/email/getAllStateUsers.test.ts
index 4b4fb76dd7..5f1a2195ae 100644
--- a/lib/libs/email/getAllStateUsers.test.ts
+++ b/lib/libs/email/getAllStateUsers.test.ts
@@ -18,7 +18,7 @@ describe("getAllStateUsers", () => {
       },
     ]);
 
-    const result = await getAllStateUsers("CA");
+    const result = await getAllStateUsers({ userPoolId: "ID", state: "CA" });
     expect(result).toEqual([
       {
         firstName: "John",
@@ -32,16 +32,14 @@ describe("getAllStateUsers", () => {
   it("should return an empty array when no users are found", async () => {
     vi.mocked(getAllStateUsers).mockResolvedValue([]);
 
-    const result = await getAllStateUsers("CA");
+    const result = await getAllStateUsers({ userPoolId: "ID", state: "CA" });
     expect(result).toEqual([]);
   });
 
   it("should throw an error when there is an issue fetching users", async () => {
-    vi.mocked(getAllStateUsers).mockRejectedValue(
-      new Error("Error fetching users"),
-    );
+    vi.mocked(getAllStateUsers).mockRejectedValue(new Error("Error fetching users"));
 
-    await expect(getAllStateUsers("CA")).rejects.toThrow(
+    await expect(getAllStateUsers({ userPoolId: "ID", state: "CA" })).rejects.toThrow(
       "Error fetching users",
     );
   });
diff --git a/lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx b/lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx
index 4f4a9c4f1e..df81a450e7 100644
--- a/lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx	
+++ b/lib/libs/email/preview/Respond to Rai/CMS/AppK.tsx	
@@ -7,12 +7,14 @@ export default () => {
     <WaiverCMSEmail
       variables={{
         ...emailTemplateValue,
+        event: "respond-to-rai",
         id: "CO-1234.R21.00",
         authority: "1915(c)",
         actionType: "Amend",
         territory: "CO",
         title: "A Perfect Appendix K Amendment Title",
         attachments: {
+          raiResponseLetterWaiver: attachments.appk,
           other: attachments.other,
         },
       }}
diff --git a/lib/libs/email/preview/Respond to Rai/CMS/CHIP_SPA.tsx b/lib/libs/email/preview/Respond to Rai/CMS/CHIP_SPA.tsx
index ef45e737a9..46bb56a9b8 100644
--- a/lib/libs/email/preview/Respond to Rai/CMS/CHIP_SPA.tsx	
+++ b/lib/libs/email/preview/Respond to Rai/CMS/CHIP_SPA.tsx	
@@ -1,6 +1,26 @@
 import { ChipSpaCMSEmail } from "lib/libs/email/content/respondToRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai";
+import * as attachments from "../../../mock-data/attachments";
 
 export default () => {
-  return <ChipSpaCMSEmail variables={emailTemplateValue} />;
+  return (
+    <ChipSpaCMSEmail
+      variables={{
+        ...emailTemplateValue,
+        event: "respond-to-rai",
+        id: "CO-24-1234",
+        authority: "1915(c)",
+        actionType: "Amend",
+        territory: "CO",
+        attachments: {
+          revisedAmendedStatePlanLanguage: attachments.other,
+          officialRAIResponse: attachments.other,
+          budgetDocuments: attachments.budgetDocuments,
+          publicNotice: attachments.publicNotice,
+          tribalConsultation: attachments.tribalConsultation,
+          other: attachments.other,
+        },
+      }}
+    />
+  );
 };
diff --git a/lib/libs/email/preview/Respond to Rai/CMS/Medicaid_SPA.tsx b/lib/libs/email/preview/Respond to Rai/CMS/Medicaid_SPA.tsx
index c10eb3b141..911ff95ec0 100644
--- a/lib/libs/email/preview/Respond to Rai/CMS/Medicaid_SPA.tsx	
+++ b/lib/libs/email/preview/Respond to Rai/CMS/Medicaid_SPA.tsx	
@@ -1,6 +1,26 @@
 import { MedSpaCMSEmail } from "../../../content/respondToRai/emailTemplates/MedSpaCMS";
 import { emailTemplateValue } from "../../../mock-data/respond-to-rai";
+import * as attachments from "../../../mock-data/attachments";
 
 export default () => {
-  return <MedSpaCMSEmail variables={emailTemplateValue} />;
+  return (
+    <MedSpaCMSEmail
+      variables={{
+        ...emailTemplateValue,
+        event: "respond-to-rai",
+        id: "CO-1234.R21.00",
+        authority: "1915(c)",
+        actionType: "Amend",
+        territory: "CO",
+        attachments: {
+          revisedAmendedStatePlanLanguage: attachments.other,
+          officialRAIResponse: attachments.other,
+          budgetDocuments: attachments.budgetDocuments,
+          publicNotice: attachments.publicNotice,
+          tribalConsultation: attachments.tribalConsultation,
+          other: attachments.other,
+        },
+      }}
+    />
+  );
 };
diff --git a/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx b/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx
index 31eea9b2fc..d84e85af4b 100644
--- a/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx	
+++ b/lib/libs/email/preview/Respond to Rai/CMS/Waiver_Capitated.tsx	
@@ -1,6 +1,26 @@
 import { WaiverCMSEmail } from "lib/libs/email/content/respondToRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai";
+import * as attachments from "../../../mock-data/attachments";
 
 export default () => {
-  return <WaiverCMSEmail variables={emailTemplateValue} />;
+  return (
+    <WaiverCMSEmail
+      variables={{
+        ...emailTemplateValue,
+        event: "respond-to-rai",
+        id: "CO-1234.R21.00",
+        authority: "1915(c)",
+        actionType: "Amend",
+        territory: "CO",
+        attachments: {
+          revisedAmendedStatePlanLanguage: attachments.other,
+          officialRAIResponse: attachments.other,
+          budgetDocuments: attachments.budgetDocuments,
+          publicNotice: attachments.publicNotice,
+          tribalConsultation: attachments.tribalConsultation,
+          other: attachments.other,
+        },
+      }}
+    />
+  );
 };
diff --git a/lib/libs/email/preview/Respond to Rai/State/AppK.tsx b/lib/libs/email/preview/Respond to Rai/State/AppK.tsx
index fd9f2f3b20..0b6ba9ad40 100644
--- a/lib/libs/email/preview/Respond to Rai/State/AppK.tsx	
+++ b/lib/libs/email/preview/Respond to Rai/State/AppK.tsx	
@@ -1,16 +1,22 @@
 import { WaiverStateEmail } from "lib/libs/email/content/respondToRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai";
+import * as attachments from "../../../mock-data/attachments";
 
 const AppKStateEmailPreview = () => {
   return (
     <WaiverStateEmail
       variables={{
         ...emailTemplateValue,
+        event: "respond-to-rai",
         id: "CO-1234.R21.00",
         authority: "1915(c)",
         actionType: "Amend",
         territory: "CO",
         title: "A Perfect Appendix K Amendment Title",
+        attachments: {
+          raiResponseLetterWaiver: attachments.appk,
+          other: attachments.other,
+        },
       }}
     />
   );
diff --git a/lib/libs/email/preview/Respond to Rai/State/CHIP_SPA.tsx b/lib/libs/email/preview/Respond to Rai/State/CHIP_SPA.tsx
index e1b948f30e..6463b9781d 100644
--- a/lib/libs/email/preview/Respond to Rai/State/CHIP_SPA.tsx	
+++ b/lib/libs/email/preview/Respond to Rai/State/CHIP_SPA.tsx	
@@ -1,6 +1,26 @@
 import { ChipSpaStateEmail } from "lib/libs/email/content/respondToRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai";
+import * as attachments from "../../../mock-data/attachments";
 
 export default () => {
-  return <ChipSpaStateEmail variables={emailTemplateValue} />;
+  return (
+    <ChipSpaStateEmail
+      variables={{
+        ...emailTemplateValue,
+        event: "respond-to-rai",
+        id: "CO-24-1234",
+        authority: "1915(c)",
+        actionType: "Amend",
+        territory: "CO",
+        attachments: {
+          revisedAmendedStatePlanLanguage: attachments.other,
+          officialRAIResponse: attachments.other,
+          budgetDocuments: attachments.budgetDocuments,
+          publicNotice: attachments.publicNotice,
+          tribalConsultation: attachments.tribalConsultation,
+          other: attachments.other,
+        },
+      }}
+    />
+  );
 };
diff --git a/lib/libs/email/preview/Respond to Rai/State/Medicaid_SPA.tsx b/lib/libs/email/preview/Respond to Rai/State/Medicaid_SPA.tsx
index 74b2bd7f27..b301697b09 100644
--- a/lib/libs/email/preview/Respond to Rai/State/Medicaid_SPA.tsx	
+++ b/lib/libs/email/preview/Respond to Rai/State/Medicaid_SPA.tsx	
@@ -1,5 +1,26 @@
 import { MedSpaStateEmail } from "lib/libs/email/content/respondToRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai";
+import * as attachments from "../../../mock-data/attachments";
+
 export default () => {
-  return <MedSpaStateEmail variables={emailTemplateValue} />;
+  return (
+    <MedSpaStateEmail
+      variables={{
+        ...emailTemplateValue,
+        event: "respond-to-rai",
+        id: "CO-24-2200",
+        authority: "1915(c)",
+        actionType: "Amend",
+        territory: "CO",
+        attachments: {
+          revisedAmendedStatePlanLanguage: attachments.other,
+          officialRAIResponse: attachments.other,
+          budgetDocuments: attachments.budgetDocuments,
+          publicNotice: attachments.publicNotice,
+          tribalConsultation: attachments.tribalConsultation,
+          other: attachments.other,
+        },
+      }}
+    />
+  );
 };
diff --git a/lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx b/lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx
index e9b77f299a..dee55efa16 100644
--- a/lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx	
+++ b/lib/libs/email/preview/Respond to Rai/State/Waiver_Capitated.tsx	
@@ -1,5 +1,26 @@
 import { WaiverStateEmail } from "lib/libs/email/content/respondToRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/respond-to-rai";
+import * as attachments from "../../../mock-data/attachments";
+
 export default () => {
-  return <WaiverStateEmail variables={emailTemplateValue} />;
+  return (
+    <WaiverStateEmail
+      variables={{
+        ...emailTemplateValue,
+        event: "respond-to-rai",
+        id: "CO-1234.R21.00",
+        authority: "1915(c)",
+        actionType: "Amend",
+        territory: "CO",
+        attachments: {
+          revisedAmendedStatePlanLanguage: attachments.other,
+          officialRAIResponse: attachments.other,
+          budgetDocuments: attachments.budgetDocuments,
+          publicNotice: attachments.publicNotice,
+          tribalConsultation: attachments.tribalConsultation,
+          other: attachments.other,
+        },
+      }}
+    />
+  );
 };
diff --git a/lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx b/lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx
index cafe300939..acff1b1cbe 100644
--- a/lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx	
+++ b/lib/libs/email/preview/Withdraw Package/CMS/AppK.tsx	
@@ -1,6 +1,21 @@
 import { WaiverCMSEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
+import * as attachments from "../../../mock-data/attachments";
 
 export default () => {
-  return <WaiverCMSEmail variables={{ ...emailTemplateValue, id: "MD-6543.R67.32" }} />;
+  return (
+    <WaiverCMSEmail
+      variables={{
+        ...emailTemplateValue,
+        authority: "1915(c)",
+        event: "withdraw-package",
+        id: "CO-1234.R21.00",
+        actionType: "",
+        attachments: {
+          officialWithdrawalLetter: attachments.withdrawRequest,
+          supportingDocumentation: attachments.supportingDocumentation,
+        },
+      }}
+    />
+  );
 };
diff --git a/lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx
deleted file mode 100644
index 5cd374f405..0000000000
--- a/lib/libs/email/preview/Withdraw Package/CMS/CHIP_SPA.tsx	
+++ /dev/null
@@ -1,6 +0,0 @@
-import { ChipSpaCMSEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates";
-import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
-
-export default () => {
-  return <ChipSpaCMSEmail variables={emailTemplateValue} />;
-};
diff --git a/lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx
index 5cd374f405..0a2986bfdf 100644
--- a/lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx	
+++ b/lib/libs/email/preview/Withdraw Package/CMS/Medicaid_SPA.tsx	
@@ -1,6 +1,21 @@
-import { ChipSpaCMSEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates";
+import { MedSpaCMSEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
+import * as attachments from "../../../mock-data/attachments";
 
 export default () => {
-  return <ChipSpaCMSEmail variables={emailTemplateValue} />;
+  return (
+    <MedSpaCMSEmail
+      variables={{
+        ...emailTemplateValue,
+        authority: "Medicaid SPA",
+        event: "withdraw-package",
+        id: "CO-1234.R21.00",
+        actionType: "",
+        attachments: {
+          officialWithdrawalLetter: attachments.withdrawRequest,
+          supportingDocumentation: attachments.supportingDocumentation,
+        },
+      }}
+    />
+  );
 };
diff --git a/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx b/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx
index f3db5978f9..5b29b61081 100644
--- a/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx	
+++ b/lib/libs/email/preview/Withdraw Package/CMS/Waiver_Capitated.tsx	
@@ -1,6 +1,21 @@
 import { WaiverCMSEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
+import * as attachments from "../../../mock-data/attachments";
 
 export default () => {
-  return <WaiverCMSEmail variables={{ ...emailTemplateValue, id: "MD-5739.R00.00" }} />;
+  return (
+    <WaiverCMSEmail
+      variables={{
+        ...emailTemplateValue,
+        authority: "1915(b)",
+        event: "withdraw-package",
+        id: "CO-1234.R21.00",
+        actionType: "",
+        attachments: {
+          officialWithdrawalLetter: attachments.withdrawRequest,
+          supportingDocumentation: attachments.supportingDocumentation,
+        },
+      }}
+    />
+  );
 };
diff --git a/lib/libs/email/preview/Withdraw Package/State/AppK.tsx b/lib/libs/email/preview/Withdraw Package/State/AppK.tsx
index 24c2466e3d..dd42dccc48 100644
--- a/lib/libs/email/preview/Withdraw Package/State/AppK.tsx	
+++ b/lib/libs/email/preview/Withdraw Package/State/AppK.tsx	
@@ -1,6 +1,21 @@
 import { WaiverStateEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
+import * as attachments from "../../../mock-data/attachments";
 
 export default () => {
-  return <WaiverStateEmail variables={{ ...emailTemplateValue, id: "MD-6543.R67.32" }} />;
+  return (
+    <WaiverStateEmail
+      variables={{
+        ...emailTemplateValue,
+        authority: "1915(c)",
+        event: "withdraw-package",
+        id: "CO-1234.R21.00",
+        actionType: "",
+        attachments: {
+          officialWithdrawalLetter: attachments.withdrawRequest,
+          supportingDocumentation: attachments.supportingDocumentation,
+        },
+      }}
+    />
+  );
 };
diff --git a/lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx
deleted file mode 100644
index 3fdb0fbdc0..0000000000
--- a/lib/libs/email/preview/Withdraw Package/State/CHIP_SPA.tsx	
+++ /dev/null
@@ -1,6 +0,0 @@
-import { ChipSpaStateEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates";
-import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
-
-export default () => {
-  return <ChipSpaStateEmail variables={emailTemplateValue} />;
-};
diff --git a/lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx
index 3aec3de8b5..b0dae1ba0b 100644
--- a/lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx	
+++ b/lib/libs/email/preview/Withdraw Package/State/Medicaid_SPA.tsx	
@@ -1,6 +1,21 @@
 import { MedSpaStateEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
+import * as attachments from "../../../mock-data/attachments";
 
 export default () => {
-  return <MedSpaStateEmail variables={emailTemplateValue} />;
+  return (
+    <MedSpaStateEmail
+      variables={{
+        ...emailTemplateValue,
+        authority: "Medicaid SPA",
+        event: "withdraw-package",
+        id: "CO-1234.R21.00",
+        actionType: "",
+        attachments: {
+          officialWithdrawalLetter: attachments.withdrawRequest,
+          supportingDocumentation: attachments.supportingDocumentation,
+        },
+      }}
+    />
+  );
 };
diff --git a/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx b/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx
index 343e6932a5..fce69bda02 100644
--- a/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx	
+++ b/lib/libs/email/preview/Withdraw Package/State/Waiver_Capitated.tsx	
@@ -1,6 +1,21 @@
 import { WaiverStateEmail } from "lib/libs/email/content/withdrawPackage/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
+import * as attachments from "../../../mock-data/attachments";
 
 export default () => {
-  return <WaiverStateEmail variables={{ ...emailTemplateValue, id: "MD-5739.R00.00" }} />;
+  return (
+    <WaiverStateEmail
+      variables={{
+        ...emailTemplateValue,
+        authority: "1915(b)",
+        event: "withdraw-package",
+        id: "CO-1234.R21.00",
+        actionType: "",
+        attachments: {
+          officialWithdrawalLetter: attachments.withdrawRequest,
+          supportingDocumentation: attachments.supportingDocumentation,
+        },
+      }}
+    />
+  );
 };
diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx
index 1279107093..446bc18648 100644
--- a/lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx	
+++ b/lib/libs/email/preview/Withdraw Rai/CMS/AppK.tsx	
@@ -1,9 +1,32 @@
 import { AppKCMSEmail } from "lib/libs/email/content/withdrawRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
+import * as attachments from "../../../mock-data/attachments";
 
 export const relatedEvent = {
   submitterName: "George",
   submitterEmail: "test@email.com",
 };
 
-export default () => <AppKCMSEmail relatedEvent={relatedEvent} variables={emailTemplateValue} />;
+export default () => (
+  <AppKCMSEmail
+    relatedEvent={relatedEvent}
+    variables={{
+      ...emailTemplateValue,
+      origin: "mako",
+      event: "respond-to-rai",
+      id: "CO-1234.R21.00",
+      authority: "1915(c)",
+      actionType: "Amend",
+      territory: "CO",
+      title: "A Perfect Appendix K Amendment Title",
+      attachments: {
+        revisedAmendedStatePlanLanguage: attachments.other,
+        officialRAIResponse: attachments.other,
+        budgetDocuments: attachments.budgetDocuments,
+        publicNotice: attachments.publicNotice,
+        tribalConsultation: attachments.tribalConsultation,
+        other: attachments.other,
+      },
+    }}
+  />
+);
diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx
index 2a39f5d59c..28d294f177 100644
--- a/lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx	
+++ b/lib/libs/email/preview/Withdraw Rai/CMS/CHIP_SPA.tsx	
@@ -1,7 +1,29 @@
 import { ChipSpaCMSEmail } from "lib/libs/email/content/withdrawRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
 import { relatedEvent } from "./AppK";
+import * as attachments from "../../../mock-data/attachments";
 
 export default () => {
-  return <ChipSpaCMSEmail relatedEvent={relatedEvent} variables={emailTemplateValue} />;
+  return (
+    <ChipSpaCMSEmail
+      relatedEvent={relatedEvent}
+      variables={{
+        ...emailTemplateValue,
+        origin: "mako",
+        event: "respond-to-rai",
+        id: "CO-24-1234",
+        authority: "1915(c)",
+        actionType: "Amend",
+        territory: "CO",
+        attachments: {
+          revisedAmendedStatePlanLanguage: attachments.other,
+          officialRAIResponse: attachments.other,
+          budgetDocuments: attachments.budgetDocuments,
+          publicNotice: attachments.publicNotice,
+          tribalConsultation: attachments.tribalConsultation,
+          other: attachments.other,
+        },
+      }}
+    />
+  );
 };
diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx
index d35e6b11b6..0b718608ed 100644
--- a/lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx	
+++ b/lib/libs/email/preview/Withdraw Rai/CMS/Medicaid_SPA.tsx	
@@ -1,7 +1,29 @@
 import { MedSpaCMSEmail } from "lib/libs/email/content/withdrawRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
 import { relatedEvent } from "./AppK";
+import * as attachments from "../../../mock-data/attachments";
 
 export default () => {
-  return <MedSpaCMSEmail relatedEvent={relatedEvent} variables={emailTemplateValue} />;
+  return (
+    <MedSpaCMSEmail
+      relatedEvent={relatedEvent}
+      variables={{
+        ...emailTemplateValue,
+        origin: "mako",
+        event: "respond-to-rai",
+        id: "CO-24-1234",
+        authority: "1915(c)",
+        actionType: "Amend",
+        territory: "CO",
+        attachments: {
+          revisedAmendedStatePlanLanguage: attachments.other,
+          officialRAIResponse: attachments.other,
+          budgetDocuments: attachments.budgetDocuments,
+          publicNotice: attachments.publicNotice,
+          tribalConsultation: attachments.tribalConsultation,
+          other: attachments.other,
+        },
+      }}
+    />
+  );
 };
diff --git a/lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx b/lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx
index d40b93fb18..0fad0134ac 100644
--- a/lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx	
+++ b/lib/libs/email/preview/Withdraw Rai/CMS/Waiver_Contracting.tsx	
@@ -1,7 +1,29 @@
 import { Waiver1915bCMSEmail } from "lib/libs/email/content/withdrawRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
 import { relatedEvent } from "./AppK";
+import * as attachments from "../../../mock-data/attachments";
 
 export default () => {
-  return <Waiver1915bCMSEmail relatedEvent={relatedEvent} variables={emailTemplateValue} />;
+  return (
+    <Waiver1915bCMSEmail
+      relatedEvent={relatedEvent}
+      variables={{
+        ...emailTemplateValue,
+        origin: "mako",
+        event: "respond-to-rai",
+        id: "CO-24-1234",
+        authority: "1915(c)",
+        actionType: "Amend",
+        territory: "CO",
+        attachments: {
+          revisedAmendedStatePlanLanguage: attachments.other,
+          officialRAIResponse: attachments.other,
+          budgetDocuments: attachments.budgetDocuments,
+          publicNotice: attachments.publicNotice,
+          tribalConsultation: attachments.tribalConsultation,
+          other: attachments.other,
+        },
+      }}
+    />
+  );
 };
diff --git a/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx b/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx
index f59b72bfff..06f3ebebc2 100644
--- a/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx	
+++ b/lib/libs/email/preview/Withdraw Rai/State/AppK.tsx	
@@ -1,9 +1,32 @@
 import { AppKStateEmail } from "lib/libs/email/content/withdrawRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
+import * as attachments from "../../../mock-data/attachments";
 
 export const relatedEvent = {
   submitterName: "George",
   submitterEmail: "test@email.com",
 };
 
-export default () => <AppKStateEmail relatedEvent={relatedEvent} variables={emailTemplateValue} />;
+export default () => (
+  <AppKStateEmail
+    relatedEvent={relatedEvent}
+    variables={{
+      ...emailTemplateValue,
+      origin: "mako",
+      event: "respond-to-rai",
+      id: "CO-1234.R21.00",
+      authority: "1915(c)",
+      actionType: "Amend",
+      territory: "CO",
+      title: "A Perfect Appendix K Amendment Title",
+      attachments: {
+        revisedAmendedStatePlanLanguage: attachments.other,
+        officialRAIResponse: attachments.other,
+        budgetDocuments: attachments.budgetDocuments,
+        publicNotice: attachments.publicNotice,
+        tribalConsultation: attachments.tribalConsultation,
+        other: attachments.other,
+      },
+    }}
+  />
+);
diff --git a/lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx
index 397d56a5fc..795c92cd93 100644
--- a/lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx	
+++ b/lib/libs/email/preview/Withdraw Rai/State/CHIP_SPA.tsx	
@@ -1,7 +1,29 @@
 import { ChipSpaStateEmail } from "lib/libs/email/content/withdrawRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
 import { relatedEvent } from "../CMS/AppK";
+import * as attachments from "../../../mock-data/attachments";
 
 export default () => {
-  return <ChipSpaStateEmail relatedEvent={relatedEvent} variables={emailTemplateValue} />;
+  return (
+    <ChipSpaStateEmail
+      relatedEvent={relatedEvent}
+      variables={{
+        ...emailTemplateValue,
+        origin: "mako",
+        event: "respond-to-rai",
+        id: "CO-24-1234",
+        authority: "1915(c)",
+        actionType: "Amend",
+        territory: "CO",
+        attachments: {
+          revisedAmendedStatePlanLanguage: attachments.other,
+          officialRAIResponse: attachments.other,
+          budgetDocuments: attachments.budgetDocuments,
+          publicNotice: attachments.publicNotice,
+          tribalConsultation: attachments.tribalConsultation,
+          other: attachments.other,
+        },
+      }}
+    />
+  );
 };
diff --git a/lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx b/lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx
index e7e841a90c..d7d86b4a79 100644
--- a/lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx	
+++ b/lib/libs/email/preview/Withdraw Rai/State/Medicaid_SPA.tsx	
@@ -1,7 +1,29 @@
 import { MedSpaStateEmail } from "lib/libs/email/content/withdrawRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
 import { relatedEvent } from "../CMS/AppK";
+import * as attachments from "../../../mock-data/attachments";
 
 export default () => {
-  return <MedSpaStateEmail relatedEvent={relatedEvent} variables={emailTemplateValue} />;
+  return (
+    <MedSpaStateEmail
+      relatedEvent={relatedEvent}
+      variables={{
+        ...emailTemplateValue,
+        origin: "mako",
+        event: "respond-to-rai",
+        id: "CO-24-1234",
+        authority: "1915(c)",
+        actionType: "Amend",
+        territory: "CO",
+        attachments: {
+          revisedAmendedStatePlanLanguage: attachments.other,
+          officialRAIResponse: attachments.other,
+          budgetDocuments: attachments.budgetDocuments,
+          publicNotice: attachments.publicNotice,
+          tribalConsultation: attachments.tribalConsultation,
+          other: attachments.other,
+        },
+      }}
+    />
+  );
 };
diff --git a/lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx b/lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx
index b801a221ae..118687a8f6 100644
--- a/lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx	
+++ b/lib/libs/email/preview/Withdraw Rai/State/Waiver_Contracting.tsx	
@@ -1,7 +1,29 @@
 import { Waiver1915bStateEmail } from "lib/libs/email/content/withdrawRai/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/withdraw-rai";
 import { relatedEvent } from "../CMS/AppK";
+import * as attachments from "../../../mock-data/attachments";
 
 export default () => {
-  return <Waiver1915bStateEmail relatedEvent={relatedEvent} variables={emailTemplateValue} />;
+  return (
+    <Waiver1915bStateEmail
+      relatedEvent={relatedEvent}
+      variables={{
+        ...emailTemplateValue,
+        origin: "mako",
+        event: "respond-to-rai",
+        id: "CO-24-1234",
+        authority: "1915(c)",
+        actionType: "Amend",
+        territory: "CO",
+        attachments: {
+          revisedAmendedStatePlanLanguage: attachments.other,
+          officialRAIResponse: attachments.other,
+          budgetDocuments: attachments.budgetDocuments,
+          publicNotice: attachments.publicNotice,
+          tribalConsultation: attachments.tribalConsultation,
+          other: attachments.other,
+        },
+      }}
+    />
+  );
 };
diff --git a/lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx b/lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx
index f1e03cb57a..0d0873c68b 100644
--- a/lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx
+++ b/lib/libs/email/preview/WithdrawConfirmation/State/AppK.tsx
@@ -1,10 +1,23 @@
 import { WaiverStateEmail } from "lib/libs/email/content/withdrawConfirmation/emailTemplates";
 import { emailTemplateValue } from "lib/libs/email/mock-data/new-submission";
+import * as attachments from "../../../mock-data/attachments";
 
 export default () => {
   return (
     <WaiverStateEmail
-      variables={{ ...emailTemplateValue, id: "MD-6543.R67.32", authority: "1915(c)" }}
+      variables={{
+        ...emailTemplateValue,
+        event: "app-k",
+        id: "CO-1234.R21.00",
+        authority: "1915(c)",
+        actionType: "Amend",
+        territory: "CO",
+        title: "A Perfect Appendix K Amendment Title",
+        attachments: {
+          appk: attachments.appk,
+          other: attachments.other,
+        },
+      }}
     />
   );
 };
diff --git a/lib/packages/shared-types/email.ts b/lib/packages/shared-types/email.ts
index ca2f1f6713..19a8352162 100644
--- a/lib/packages/shared-types/email.ts
+++ b/lib/packages/shared-types/email.ts
@@ -12,8 +12,11 @@ export type EmailAddresses = {
 
 export interface CommonEmailVariables {
   id: string;
+  authority: string;
   territory: string;
   applicationEndpointUrl: string;
   actionType: string;
   allStateUsersEmails?: string[];
+  responseDate?: number;
+  title?: string; //Is this okay?
 }

From 422cf36f772d18e40b8d4151d9d37cda7500f91c Mon Sep 17 00:00:00 2001
From: James Dinh <jdinh@collabralink.com>
Date: Mon, 2 Dec 2024 07:38:34 -0800
Subject: [PATCH 10/10] Update oneMACFAQContent.tsx

---
 .../src/features/faq/content/oneMACFAQContent.tsx    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/react-app/src/features/faq/content/oneMACFAQContent.tsx b/react-app/src/features/faq/content/oneMACFAQContent.tsx
index 6dd6145821..55194a6e75 100644
--- a/react-app/src/features/faq/content/oneMACFAQContent.tsx
+++ b/react-app/src/features/faq/content/oneMACFAQContent.tsx
@@ -569,15 +569,17 @@ export const oneMACFAQContent: FAQContent[] = [
           <>
             <p>CHIP eligibility SPA implementation guides can be downloaded at the links below.</p>
 
-            <p className="p-2">MAGI Eligibility & Methods</p>
+            <div className="space-y-2 p-2">
+              <p>MAGI Eligibility & Methods</p>
 
-            <p className="p-2">XXI Medicaid Expansion</p>
+              <p>XXI Medicaid Expansion</p>
 
-            <p className="p-2">Establish 2101(f) Group</p>
+              <p>Establish 2101(f) Group</p>
 
-            <p className="p-2">Eligibility Processing</p>
+              <p>Eligibility Processing</p>
 
-            <p className="p-2">Non-Financial Eligibility</p>
+              <p>Non-Financial Eligibility</p>
+            </div>
           </>
         ),
       },