HDPI-4465-correspondence-address-issues

package.json

@@ -94,7 +94,7 @@
     "zod-i18n-map": "2.27.0"
   },
   "devDependencies": {
-    "@axe-core/playwright": "4.11.2",
+    "@axe-core/playwright": "4.11.1",
     "@eslint/compat": "2.0.5",
     "@eslint/eslintrc": "3.3.5",
     "@eslint/js": "9.39.4",
@@ -136,7 +136,7 @@
     "eslint-plugin-jest": "28.14.0",
     "git-rev-sync": "3.0.2",
     "globals": "16.5.0",
-    "html-webpack-plugin": "5.6.7",
+    "html-webpack-plugin": "5.6.6",
     "husky": "9.1.7",
     "jest": "29.7.0",
     "jest-environment-jsdom": "30.3.0",

src/main/assets/locales/cy/respondToClaim/correspondenceAddress.json

@@ -1,7 +1,7 @@
 {
   "caption": "cyRespond to a property possession claim",
   "pageTitle": "cyYour postal address",
-  "legend": "cyIs your correspondence address ",
+  "legend": "cyIs your correspondence address {{ formattedAddressStr }}",
   "legendNa": "cyWhat’s your correspondence address?",
   "legend.hint": "cyThis is the address provided by Treetops Housing",
   "legend.hintNa": "cyYour correspondence address is your postal address.",

src/main/assets/locales/en/respondToClaim/correspondenceAddress.json

@@ -1,7 +1,7 @@
 {
   "caption": "Respond to a property possession claim",
   "pageTitle": "Your postal address",
-  "legend": "Is your correspondence address ",
+  "legend": "Is your correspondence address {{ formattedAddressStr }}",
   "legendNa": "What’s your correspondence address?",
   "legend.hint": "This is the address provided by Treetops Housing",
   "legend.hintNa": "Your correspondence address is your postal address.",

src/main/services/ccdCase.interface.ts

@@ -57,12 +57,12 @@ export interface CcdUserCases {
 
 /** Address shape used in CCD case data (property, defendant, etc.). */
 export interface CcdCaseAddress {
-  AddressLine1: string;
+  AddressLine1?: string;
   AddressLine2?: string;
   AddressLine3?: string;
-  PostTown: string;
+  PostTown?: string;
   County?: string;
-  PostCode: string;
+  PostCode?: string;
   Country?: string;
 }
 
@@ -91,6 +91,8 @@ export interface CcdClaimantEnteredDefendantDetails {
   nameKnown?: YesNoValue;
   firstName?: string;
   lastName?: string;
+  address?: CcdCaseAddress | Record<string, never>;
+  addressKnown?: YesNoValue;
 }
 
 /** Defendant party contact details (name/address known flags and values). */
@@ -108,6 +110,7 @@ export interface CcdDefendantParty {
 
 /** Defendant responses (e.g. receivedFreeLegalAdvice). */
 export interface CcdDefendantResponses {
+  correspondenceAddressConfirmation?: YesNoValue;
   tenancyTypeCorrect?: YesNoNotSureValue;
   tenancyType?: string;
   freeLegalAdvice?: string;

src/main/steps/respond-to-claim/correspondence-address/correspondenceAddress.njk

@@ -21,7 +21,6 @@
 
   <form method="post" action="{{ url }}" novalidate>
     {% set hasAddressErrors = errors['correspondenceAddressConfirm.addressLine1'] or errors['correspondenceAddressConfirm.townOrCity'] or errors['correspondenceAddressConfirm.postcode'] %}
-    {% set hasPrepopulatedAddress = correspondenceAddressLine1 or correspondenceAddressLine2 or correspondenceTownOrCity or correspondenceCounty or correspondencePostcode %}
     {% set postcodeFinderHtml %}
       <div class="postcode-container govuk-!-margin-top-4" data-address-component data-name-prefix="correspondence">
         <h2 class="govuk-heading-m">{{ labels.enterAddress }}</h2>
@@ -36,21 +35,21 @@
             <span class="govuk-visually-hidden">Error:</span> {{ clientErrors.postcodeNotFound }}
           </p>
           <div class="govuk-input__wrapper">
-            <input class="govuk-input govuk-input--width-10" 
-                    id="correspondence-lookupPostcode" 
-                    name="lookupPostcode" 
-                    type="text" 
+            <input class="govuk-input govuk-input--width-10"
+                    id="correspondence-lookupPostcode"
+                    name="lookupPostcode"
+                    type="text"
                     autocomplete="postal-code"
                     aria-describedby="correspondence-lookup-postcode-error correspondence-postcode-error"/>
-            <button class="govuk-button govuk-!-margin-left-2 govuk-!-margin-bottom-0" 
+            <button class="govuk-button govuk-!-margin-left-2 govuk-!-margin-bottom-0"
                     id="correspondence-findAddressBtn"
-                    data-module="govuk-button" 
+                    data-module="govuk-button"
                     type="button">
               {{ buttons.findAddress }}
             </button>
           </div>
         </div>
-        
+
         <div id="correspondence-addressSelectContainer" hidden>
           <div class="govuk-form-group govuk-!-margin-bottom-2" id="correspondence-selectedAddress-form-group">
             <label class="govuk-label" for="correspondence-selectedAddress">
@@ -64,14 +63,14 @@
             </select>
           </div>
         </div>
-        
+
         <input type="hidden" id="correspondence-addressesFoundFlag" name="addressesFoundFlag" value="false" />
-        
+
         {% set manualAddressFieldsHtml %}
           <p class="govuk-body">{{ labels.enterManuallySubText }}</p>
           <div class="address-form" id="correspondence-addressForm">
             <h2 class="govuk-heading-m govuk-!-margin-top-2">{{ labels.addressHeading }}</h2>
-            
+
             {{ govukInput({
             id: 'correspondence-addressLine1',
             name: 'correspondenceAddressConfirm.addressLine1',
@@ -142,18 +141,18 @@
           }) }}
           </div>
         {% endset %}
-        
+
         {{ govukDetails({
           summaryText: labels.enterManually,
           html: manualAddressFieldsHtml,
           id: "correspondence-enterManuallyDetails",
-          open: hasAddressErrors or hasPrepopulatedAddress
+          open: hasAddressErrors or isManualOpen
         }) }}
       </div>
     {% endset %}
 
-    
-    <span class="govuk-caption-xl">{{ caption or serviceName }}</span>
+
+    <span class="govuk-caption-l">{{ caption or serviceName }}</span>
     {% if isAddressKnown %}
     {% if subtitle %}<p class="govuk-body">{{ subtitle }}</p>{% endif %}
     {% for field in fields %}