Fix delete confirmation pages for household and income

src/main/resources/flows-config.yaml

@@ -195,6 +195,7 @@ flow:
         condition: HasIncome
       - name: householdAdditionalIncome
   householdIncomeByJob:
+    subflow: income
     nextScreens:
       - name: householdIncomeWho
   householdIncomeWho:
@@ -336,7 +337,7 @@ subflows:
     reviewScreen: householdList
     deleteConfirmationScreen: householdMemberDeleteConfirmation
   income:
-    entryScreen: householdIncomeByJob
+    entryScreen: householdIncome
     iterationStartScreen: householdIncomeWho
     reviewScreen: householdIncomeList
     deleteConfirmationScreen: householdIncomeDeleteConfirmation

src/main/resources/messages.properties

@@ -46,6 +46,8 @@ index.safe-and-secure=Safe and secure
 index.state-info=This website is an application tool authorized by the State of Maryland.
 footer.this-benefits-application-is=This benefits application is a service built by Code for America in partnership with the state of Maryland, on behalf of the people of Maryland.
 footer.privacy=Privacy Policy
+delete-confirmation-back-redirect.header=This entry has already been deleted
+delete-confirmation-back-redirect.button=Return to the previous screen
 
 # privacy page
 privacy.title=Our Privacy Policy
@@ -526,6 +528,8 @@ household-race-and-ethnicity.hispanic=Do they identify as Hispanic or Latino?
 # Household delete confirmation
 household-member-delete.title=Delete household member confirmation
 household-member-delete.header=Are you sure you want to delete {0} from your household?
+household-member-delete-confirmation.no=No, keep them
+household-member-delete-confirmation.yes=Yes, delete them
 
 # Special situations
 special-situations.title=Household Special Situations

src/main/resources/templates/mdBenefitsFlow/householdIncomeDeleteConfirmation.html

@@ -11,10 +11,10 @@
       <div class="grid">
         <div th:replace="~{fragments/goBack :: goBackLink}"></div>
         <main id="content" role="main" class="form-card spacing-above-35">
+          <th:block th:replace="~{fragments/icons :: 'deleteDocument'}"></th:block>
           <th:block th:if="${noEntryToDelete != null}">
             <th:block
                 th:replace="~{fragments/cardHeader :: cardHeader(header=#{delete-confirmation-back-redirect.header})}"/>
-            <b>hello</b>
             <div class="form-card__footer" th:with="subflowIsEmpty=${subflowIsEmpty != null}">
               <a class="button button--primary"
                  th:href="${subflowIsEmpty ? entryScreen : reviewScreen}"
@@ -23,12 +23,11 @@
           </th:block>
           <th:block th:if="${noEntryToDelete == null}">
             <div class="form-card__content">
-              <th:block th:replace="~{fragments/icons :: 'deleteDocument'}"></th:block>
-              <h1 class="h2"
-                  th:text="${title}"></h1>
+              <h1 class="h2" th:text="${title}"></h1>
             </div>
             <div class="form-card__footer">
-              <a class="button button--primary" th:href="'/flow/' + ${flow} + '/incomeReview'"
+              <a class="button button--primary"
+                 th:href="'/flow/' + ${flow} + '/householdIncomeList'"
                  th:text="#{income-delete-confirmation.no}"></a>
               <form method="post"
                     th:action="'/flow/' + ${flow} + '/' + ${subflow} + '/' + ${param.uuid} + '/delete'">

src/main/resources/templates/mdBenefitsFlow/householdMemberDeleteConfirmation.html

@@ -11,10 +11,10 @@
       <div class="grid">
         <div th:replace="~{fragments/goBack :: goBackLink}"></div>
         <main id="content" role="main" class="form-card spacing-above-35">
+          <th:block th:replace="~{'fragments/icons' :: 'deleteDocument'}"></th:block>
           <th:block th:if="${noEntryToDelete != null}">
             <th:block
                 th:replace="~{'fragments/cardHeader' :: cardHeader(header=#{delete-confirmation-back-redirect.header})}"/>
-            <b>hello</b>
             <div class="form-card__footer" th:with="subflowIsEmpty=${subflowIsEmpty != null}">
               <a class="button button--primary"
                  th:href="${subflowIsEmpty ? entryScreen : reviewScreen}"
@@ -23,18 +23,17 @@
           </th:block>
           <th:block th:if="${noEntryToDelete == null}">
             <div class="form-card__content">
-              <th:block th:replace="~{'fragments/icons' :: 'deleteDocument'}"></th:block>
               <h1 class="h2"
                   th:text="${title}"></h1>
             </div>
             <div class="form-card__footer">
               <a class="button button--primary" th:href="'/flow/' + ${flow} + '/householdList'"
-                 th:text="#{income-delete-confirmation.no}"></a>
+                 th:text="#{household-member-delete-confirmation.no}"></a>
               <form method="post"
                     th:action="'/flow/' + ${flow} + '/' + ${subflow} + '/' + ${param.uuid} + '/delete'">
                 <th:block th:replace="~{fragments/inputs/submitButton :: submitButton(
                   classes='button button--danger',
-                  text=#{income-delete-confirmation.yes})}"/>
+                  text=#{household-member-delete-confirmation.yes})}"/>
               </form>
             </div>
           </th:block>