@defra/fcp-sfd-frontend-engine 0.15.0 → 0.17.0

package/dist/index.cjs

@@ -336,6 +336,77 @@ var formatNumber = (payloadNumber, changedNumber, originalNumber) => {
   }
   return originalNumber;
 };
+var sortErrorsBySectionOrder = (errors, orderedSectionsToFix, SECTION_FIELD_ORDER) => {
+  const sortedErrors = [];
+  for (const section of orderedSectionsToFix) {
+    const fieldsInSection = SECTION_FIELD_ORDER[section] || [];
+    for (const field of fieldsInSection) {
+      if (errors[field]) {
+        sortedErrors.push({
+          field,
+          ...errors[field]
+        });
+      }
+    }
+  }
+  return sortedErrors;
+};
+
+// src/presenters/address-presenter.js
+var addressChangeLink = (postcodeLookup, context) => {
+  if (context === "business") {
+    if (postcodeLookup) {
+      return "/business-address-change";
+    }
+    return "/business-address-enter";
+  }
+  if (context === "personal") {
+    if (postcodeLookup) {
+      return "/account-address-change";
+    }
+    return "/account-address-enter";
+  }
+  return null;
+};
+var addressBackLink = (postcodeLookup, context) => {
+  if (context === "business") {
+    if (postcodeLookup) {
+      return { href: "/business-address-select" };
+    }
+    return { href: "/business-address-enter" };
+  }
+  if (context === "personal") {
+    if (postcodeLookup) {
+      return { href: "/account-address-select" };
+    }
+    return { href: "/account-address-enter" };
+  }
+  return null;
+};
+var buildAddressLine = (parts) => {
+  return parts.filter(Boolean).join(", ") || null;
+};
+var buildStreetLine = (buildingRange, street) => {
+  return [buildingRange, street].filter(Boolean).join(" ") || null;
+};
+var formatLookupAddress = (lookup, city, country, postcode) => ({
+  address1: buildAddressLine([lookup.pafOrganisationName, lookup.flatName, lookup.buildingName]),
+  address2: buildStreetLine(lookup.buildingNumberRange, lookup.street),
+  address3: buildAddressLine([lookup.doubleDependentLocality, lookup.dependentLocality]),
+  county: lookup.county ?? null,
+  city: city ?? null,
+  country: country ?? null,
+  postcode: postcode ?? null
+});
+var formatManualAddress = (manual, city, country, postcode) => ({
+  address1: manual.line1 ?? null,
+  address2: manual.line2 ?? null,
+  address3: manual.line3 ?? null,
+  city: city ?? null,
+  county: manual.line4 ?? null,
+  country: country ?? null,
+  postcode: postcode ?? null
+});
 var formatDisplayAddress = (address) => {
   const { lookup, manual, postcode, country, city } = address;
   let addressLines = [];
@@ -371,30 +442,6 @@ var formatDisplayAddress = (address) => {
     country
   ];
 };
-var buildAddressLine = (parts) => {
-  return parts.filter(Boolean).join(", ") || null;
-};
-var buildStreetLine = (buildingRange, street) => {
-  return [buildingRange, street].filter(Boolean).join(" ") || null;
-};
-var formatLookupAddress = (lookup, city, country, postcode) => ({
-  address1: buildAddressLine([lookup.pafOrganisationName, lookup.flatName, lookup.buildingName]),
-  address2: buildStreetLine(lookup.buildingNumberRange, lookup.street),
-  address3: buildAddressLine([lookup.doubleDependentLocality, lookup.dependentLocality]),
-  county: lookup.county ?? null,
-  city: city ?? null,
-  country: country ?? null,
-  postcode: postcode ?? null
-});
-var formatManualAddress = (manual, city, country, postcode) => ({
-  address1: manual.line1 ?? null,
-  address2: manual.line2 ?? null,
-  address3: manual.line3 ?? null,
-  city: city ?? null,
-  county: manual.line4 ?? null,
-  country: country ?? null,
-  postcode: postcode ?? null
-});
 var formatOriginalAddress = (originalAddress) => {
   const { lookup, manual, city, country, postcode } = originalAddress;
   return lookup.uprn ? formatLookupAddress(lookup, city, country, postcode) : formatManualAddress(manual, city, country, postcode);
@@ -441,21 +488,6 @@ var formatDisplayAddresses = (addresses, previouslyPickedAddress) => {
   });
   return displayAddresses;
 };
-var sortErrorsBySectionOrder = (errors, orderedSectionsToFix, SECTION_FIELD_ORDER) => {
-  const sortedErrors = [];
-  for (const section of orderedSectionsToFix) {
-    const fieldsInSection = SECTION_FIELD_ORDER[section] || [];
-    for (const field of fieldsInSection) {
-      if (errors[field]) {
-        sortedErrors.push({
-          field,
-          ...errors[field]
-        });
-      }
-    }
-  }
-  return sortedErrors;
-};
 
 // src/presenters/business-details-presenter.js
 var getActionText = (value) => {
@@ -487,7 +519,9 @@ var presenters = {
   getActionText,
   formatCph,
   formatCphText,
-  formatBusinessAddress
+  formatBusinessAddress,
+  addressBackLink,
+  addressChangeLink
 };
 
 // src/utils/joi.js

package/dist/index.js

@@ -296,6 +296,77 @@ var formatNumber = (payloadNumber, changedNumber, originalNumber) => {
   }
   return originalNumber;
 };
+var sortErrorsBySectionOrder = (errors, orderedSectionsToFix, SECTION_FIELD_ORDER) => {
+  const sortedErrors = [];
+  for (const section of orderedSectionsToFix) {
+    const fieldsInSection = SECTION_FIELD_ORDER[section] || [];
+    for (const field of fieldsInSection) {
+      if (errors[field]) {
+        sortedErrors.push({
+          field,
+          ...errors[field]
+        });
+      }
+    }
+  }
+  return sortedErrors;
+};
+
+// src/presenters/address-presenter.js
+var addressChangeLink = (postcodeLookup, context) => {
+  if (context === "business") {
+    if (postcodeLookup) {
+      return "/business-address-change";
+    }
+    return "/business-address-enter";
+  }
+  if (context === "personal") {
+    if (postcodeLookup) {
+      return "/account-address-change";
+    }
+    return "/account-address-enter";
+  }
+  return null;
+};
+var addressBackLink = (postcodeLookup, context) => {
+  if (context === "business") {
+    if (postcodeLookup) {
+      return { href: "/business-address-select" };
+    }
+    return { href: "/business-address-enter" };
+  }
+  if (context === "personal") {
+    if (postcodeLookup) {
+      return { href: "/account-address-select" };
+    }
+    return { href: "/account-address-enter" };
+  }
+  return null;
+};
+var buildAddressLine = (parts) => {
+  return parts.filter(Boolean).join(", ") || null;
+};
+var buildStreetLine = (buildingRange, street) => {
+  return [buildingRange, street].filter(Boolean).join(" ") || null;
+};
+var formatLookupAddress = (lookup, city, country, postcode) => ({
+  address1: buildAddressLine([lookup.pafOrganisationName, lookup.flatName, lookup.buildingName]),
+  address2: buildStreetLine(lookup.buildingNumberRange, lookup.street),
+  address3: buildAddressLine([lookup.doubleDependentLocality, lookup.dependentLocality]),
+  county: lookup.county ?? null,
+  city: city ?? null,
+  country: country ?? null,
+  postcode: postcode ?? null
+});
+var formatManualAddress = (manual, city, country, postcode) => ({
+  address1: manual.line1 ?? null,
+  address2: manual.line2 ?? null,
+  address3: manual.line3 ?? null,
+  city: city ?? null,
+  county: manual.line4 ?? null,
+  country: country ?? null,
+  postcode: postcode ?? null
+});
 var formatDisplayAddress = (address) => {
   const { lookup, manual, postcode, country, city } = address;
   let addressLines = [];
@@ -331,30 +402,6 @@ var formatDisplayAddress = (address) => {
     country
   ];
 };
-var buildAddressLine = (parts) => {
-  return parts.filter(Boolean).join(", ") || null;
-};
-var buildStreetLine = (buildingRange, street) => {
-  return [buildingRange, street].filter(Boolean).join(" ") || null;
-};
-var formatLookupAddress = (lookup, city, country, postcode) => ({
-  address1: buildAddressLine([lookup.pafOrganisationName, lookup.flatName, lookup.buildingName]),
-  address2: buildStreetLine(lookup.buildingNumberRange, lookup.street),
-  address3: buildAddressLine([lookup.doubleDependentLocality, lookup.dependentLocality]),
-  county: lookup.county ?? null,
-  city: city ?? null,
-  country: country ?? null,
-  postcode: postcode ?? null
-});
-var formatManualAddress = (manual, city, country, postcode) => ({
-  address1: manual.line1 ?? null,
-  address2: manual.line2 ?? null,
-  address3: manual.line3 ?? null,
-  city: city ?? null,
-  county: manual.line4 ?? null,
-  country: country ?? null,
-  postcode: postcode ?? null
-});
 var formatOriginalAddress = (originalAddress) => {
   const { lookup, manual, city, country, postcode } = originalAddress;
   return lookup.uprn ? formatLookupAddress(lookup, city, country, postcode) : formatManualAddress(manual, city, country, postcode);
@@ -401,21 +448,6 @@ var formatDisplayAddresses = (addresses, previouslyPickedAddress) => {
   });
   return displayAddresses;
 };
-var sortErrorsBySectionOrder = (errors, orderedSectionsToFix, SECTION_FIELD_ORDER) => {
-  const sortedErrors = [];
-  for (const section of orderedSectionsToFix) {
-    const fieldsInSection = SECTION_FIELD_ORDER[section] || [];
-    for (const field of fieldsInSection) {
-      if (errors[field]) {
-        sortedErrors.push({
-          field,
-          ...errors[field]
-        });
-      }
-    }
-  }
-  return sortedErrors;
-};
 
 // src/presenters/business-details-presenter.js
 var getActionText = (value) => {
@@ -447,7 +479,9 @@ var presenters = {
   getActionText,
   formatCph,
   formatCphText,
-  formatBusinessAddress
+  formatBusinessAddress,
+  addressBackLink,
+  addressChangeLink
 };
 
 // src/utils/joi.js

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/fcp-sfd-frontend-engine",
-  "version": "0.15.0",
+  "version": "0.17.0",
   "description": "Shared frontend engine used by both the internal and external frontend applications.",
   "main": "./dist/index.cjs",
   "exports": {
@@ -46,6 +46,7 @@
     "vitest": "4.1.10"
   },
   "dependencies": {
-    "joi": "18.2.3"
+    "joi": "18.2.3",
+    "osdatahub": "0.2.2"
   }
 }

package/src/presenters/address-presenter.js

@@ -0,0 +1,272 @@
+/**
+ * Determines the correct link for changing an address.
+ *
+ * If the user previously selected an address from a postcode lookup, they will
+ * navigate to the address change page to choose a different address.
+ * Otherwise, they navigate to the manual address entry page.
+ *
+ * @param {boolean} postcodeLookup - Whether the user used a postcode lookup to find their address
+ * @param {string} context - The context for the address change ('business' or 'personal')
+ * @returns {string} The URL path for the address change page
+ */
+export const addressChangeLink = (postcodeLookup, context) => {
+  if (context === 'business') {
+    if (postcodeLookup) {
+      return '/business-address-change'
+    }
+    return '/business-address-enter'
+  }
+  if (context === 'personal') {
+    if (postcodeLookup) {
+      return '/account-address-change'
+    }
+    return '/account-address-enter'
+  }
+  return null
+}
+
+/**
+ * Generates the back link object for address-related pages.
+ *
+ * If the user used a postcode lookup, the back link returns to the address selection page.
+ * If they manually entered the address, the back link returns to the manual entry page.
+ *
+ * @param {boolean} postcodeLookup - Whether the user used a postcode lookup to find their address
+ * @param {string} context - The context for the address change ('business' or 'personal')
+ * @returns {Object} An object with an `href` property containing the back link URL
+ */
+export const addressBackLink = (postcodeLookup, context) => {
+  if (context === 'business') {
+    if (postcodeLookup) {
+      return { href: '/business-address-select' }
+    }
+    return { href: '/business-address-enter' }
+  }
+  if (context === 'personal') {
+    if (postcodeLookup) {
+      return { href: '/account-address-select' }
+    }
+    return { href: '/account-address-enter' }
+  }
+  return null
+}
+
+/**
+ * Combines address parts into a single line, joining non-empty values with commas.
+ *
+ * @private
+ */
+const buildAddressLine = (parts) => {
+  return parts.filter(Boolean).join(', ') || null
+}
+
+/**
+ * Combines building range and street into a single line, joining with a space.
+ *
+ * @private
+ */
+const buildStreetLine = (buildingRange, street) => {
+  return [buildingRange, street].filter(Boolean).join(' ') || null
+}
+
+/**
+ * Formats a lookup address (from address API) into a consistent flat structure.
+ *
+ * @private
+ */
+const formatLookupAddress = (lookup, city, country, postcode) => ({
+  address1: buildAddressLine([lookup.pafOrganisationName, lookup.flatName, lookup.buildingName]),
+  address2: buildStreetLine(lookup.buildingNumberRange, lookup.street),
+  address3: buildAddressLine([lookup.doubleDependentLocality, lookup.dependentLocality]),
+  county: lookup.county ?? null,
+  city: city ?? null,
+  country: country ?? null,
+  postcode: postcode ?? null
+})
+
+/**
+ * Formats a manually entered address into a consistent flat structure.
+ *
+ * @private
+ */
+const formatManualAddress = (manual, city, country, postcode) => ({
+  address1: manual.line1 ?? null,
+  address2: manual.line2 ?? null,
+  address3: manual.line3 ?? null,
+  city: city ?? null,
+  county: manual.line4 ?? null,
+  country: country ?? null,
+  postcode: postcode ?? null
+})
+
+/**
+ * Identify the correct address to use from the DAL response.
+ *
+ * An address lookup is where a user enters a postcode and selects an address
+ * returned from an API. Manual input is when a user chooses to type the address in themselves.
+ *
+ * If the UPRN is populated, the user has selected an address from the lookup.
+ * UPRN is only returned by the lookup API; manual addresses will always have `uprn = null`.
+ *
+ * If both a building number range and a street are present, they are combined into one line so they display together.
+ *
+ * City, postcode and country are always appended to the final address array.
+ *
+ * @param {Object} address - The complete address object
+ *
+ * @returns {string[]} An array of address fields (either from lookup or manual)
+ *
+ * @private
+ */
+export const formatDisplayAddress = (address) => {
+  const { lookup, manual, postcode, country, city } = address
+
+  let addressLines = []
+
+  if (lookup.uprn) {
+    // If the uprn is populated then the user has selected an address from the lookup
+    const buildingAndStreet = [
+      lookup.buildingNumberRange,
+      lookup.street
+    ].filter(Boolean).join(' ')
+
+    addressLines = [
+      lookup.pafOrganisationName,
+      lookup.flatName,
+      lookup.buildingName,
+      buildingAndStreet,
+      lookup.doubleDependentLocality,
+      lookup.dependentLocality,
+      city,
+      lookup.county
+    ]
+  } else {
+    // Otherwise the user manually entered the address
+    addressLines = [
+      manual.line1,
+      manual.line2,
+      manual.line3,
+      city,
+      manual.line4, // County
+      manual.line5
+    ]
+  }
+
+  return [
+    ...addressLines.filter(Boolean),
+    postcode,
+    country
+  ]
+}
+
+/**
+ * Formats an original address fetched from the DAL into a flattened structure
+ * suitable for display or form population on the `address-enter` pages.
+ *
+ * If the address contains a UPRN, it is treated as a lookup address;
+ * otherwise, it is treated as a manually entered address.
+ *
+ * @param {Object} originalAddress - The full address object from the DAL
+ *
+ * @returns {Object} A flattened address object with consistent keys
+ */
+export const formatOriginalAddress = (originalAddress) => {
+  const { lookup, manual, city, country, postcode } = originalAddress
+  return lookup.uprn
+    ? formatLookupAddress(lookup, city, country, postcode)
+    : formatManualAddress(manual, city, country, postcode)
+}
+
+/**
+ * Formats a changed address object into a consistent structure for form display.
+ *
+ * If the address includes a UPRN, it indicates the user selected it from an address lookup.
+ * In that case, the lookup fields are combined and mapped into the manual address format used by the form.
+ *
+ * If the address does not include a UPRN, it is assumed to be manually entered and returned as-is.
+ *
+ * @param {Object} changeBusinessAddress - The changed address object to format
+ *
+ * @returns {Object} A formatted address object with fields `address1`, `address2`, `address3`,
+ * `city`, `county`, `country`, and `postcode`.
+ */
+export const formatChangedAddress = (changeBusinessAddress) => {
+  if (!changeBusinessAddress.uprn) {
+    // manual address (no lookup used)
+    return changeBusinessAddress
+  }
+
+  const {
+    pafOrganisationName,
+    flatName,
+    buildingName,
+    buildingNumberRange,
+    street,
+    doubleDependentLocality,
+    dependentLocality,
+    city,
+    county,
+    country,
+    postcode
+  } = changeBusinessAddress
+
+  return {
+    address1: buildAddressLine([pafOrganisationName, flatName, buildingName]),
+    address2: buildStreetLine(buildingNumberRange, street),
+    address3: buildAddressLine([doubleDependentLocality, dependentLocality]),
+    city: city ?? null,
+    county: county ?? null,
+    country: country ?? null,
+    postcode: postcode ?? null
+  }
+}
+
+/**
+ * Formats a list of address objects for display in a dropdown menu.
+ *
+ * Each address object is transformed into an option with:
+ * - `value`: a concatenation of the address UPRN and displayAddress
+ * - `text`: the formatted display address string
+ * - `selected`: true only if it matches the previously picked address
+ *
+ * A summary option is prepended to the start of the list, showing how many
+ * addresses were found. This summary option is selected by default unless
+ * a previously picked address exists.
+ *
+ * This function is shared across presenters that display address selection
+ * lists (e.g. personal or business address flows).
+ *
+ * Note: The `value` combines `uprn` and `displayAddress` to ensure uniqueness.
+ * Some addresses (for example, postcode LL55 2NF) have been observed to share
+ * the same UPRN, which caused incorrect selections when UPRN alone was used.
+ * Concatenating both fields guarantees each dropdown option has a unique value.
+ *
+ * @param {Array<Object>} addresses - List of address objects with `uprn` and `displayAddress` properties
+ * @param {Object} [previouslyPickedAddress] - Optional object representing the address previously selected by the user
+ *
+ * @returns {Array<Object>} Array of formatted address options ready for display
+ */
+export const formatDisplayAddresses = (addresses, previouslyPickedAddress) => {
+  const displayAddresses = addresses.map(address => ({
+    value: `${address.uprn}${address.displayAddress}`,
+    text: address.displayAddress,
+    selected:
+      previouslyPickedAddress?.uprn === address.uprn &&
+      previouslyPickedAddress?.displayAddress === address.displayAddress
+  }))
+
+  // Check if any address is already selected
+  const hasSelectedAddress = displayAddresses.some(addr => addr.selected)
+
+  // Add a display summary option to the beginning of the list
+  // e.g. "18 addresses found"
+  const text = addresses.length === 1 ? '1 address found' : `${addresses.length} addresses found`
+
+  displayAddresses.unshift({
+    value: 'display',
+    text,
+    selected: !hasSelectedAddress
+  })
+
+  return displayAddresses
+}

package/src/presenters/base-presenter.js

@@ -37,227 +37,6 @@ export const formatNumber = (payloadNumber, changedNumber, originalNumber) => {
   return originalNumber
 }
 
-/**
- * Identify the correct address to use from the DAL response.
- *
- * An address lookup is where a user enters a postcode and selects an address
- * returned from an API. Manual input is when a user chooses to type the address in themselves.
- *
- * If the UPRN is populated, the user has selected an address from the lookup.
- * UPRN is only returned by the lookup API; manual addresses will always have `uprn = null`.
- *
- * If both a building number range and a street are present, they are combined into one line so they display together.
- *
- * City, postcode and country are always appended to the final address array.
- *
- * @param {Object} address - The complete address object
- *
- * @returns {string[]} An array of address fields (either from lookup or manual)
- *
- * @private
- */
-
-export const formatDisplayAddress = (address) => {
-  const { lookup, manual, postcode, country, city } = address
-
-  let addressLines = []
-
-  if (lookup.uprn) {
-    // If the uprn is populated then the user has selected an address from the lookup
-    const buildingAndStreet = [
-      lookup.buildingNumberRange,
-      lookup.street
-    ].filter(Boolean).join(' ')
-
-    addressLines = [
-      lookup.pafOrganisationName,
-      lookup.flatName,
-      lookup.buildingName,
-      buildingAndStreet,
-      lookup.doubleDependentLocality,
-      lookup.dependentLocality,
-      city,
-      lookup.county
-    ]
-  } else {
-    // Otherwise the user manually entered the address
-    addressLines = [
-      manual.line1,
-      manual.line2,
-      manual.line3,
-      city,
-      manual.line4, // County
-      manual.line5
-    ]
-  }
-
-  return [
-    ...addressLines.filter(Boolean),
-    postcode,
-    country
-  ]
-}
-
-/**
- * Combines address parts into a single line, joining non-empty values with commas.
- *
- * @private
- */
-const buildAddressLine = (parts) => {
-  return parts.filter(Boolean).join(', ') || null
-}
-
-/**
- * Combines building range and street into a single line, joining with a space.
- *
- * @private
- */
-const buildStreetLine = (buildingRange, street) => {
-  return [buildingRange, street].filter(Boolean).join(' ') || null
-}
-
-/**
- * Formats a lookup address (from address API) into a consistent flat structure.
- *
- * @private
- */
-const formatLookupAddress = (lookup, city, country, postcode) => ({
-  address1: buildAddressLine([lookup.pafOrganisationName, lookup.flatName, lookup.buildingName]),
-  address2: buildStreetLine(lookup.buildingNumberRange, lookup.street),
-  address3: buildAddressLine([lookup.doubleDependentLocality, lookup.dependentLocality]),
-  county: lookup.county ?? null,
-  city: city ?? null,
-  country: country ?? null,
-  postcode: postcode ?? null
-})
-
-/**
- * Formats a manually entered address into a consistent flat structure.
- *
- * @private
- */
-const formatManualAddress = (manual, city, country, postcode) => ({
-  address1: manual.line1 ?? null,
-  address2: manual.line2 ?? null,
-  address3: manual.line3 ?? null,
-  city: city ?? null,
-  county: manual.line4 ?? null,
-  country: country ?? null,
-  postcode: postcode ?? null
-})
-
-/**
- * Formats an original address fetched from the DAL into a flattened structure
- * suitable for display or form population on the `address-enter` pages.
- *
- * If the address contains a UPRN, it is treated as a lookup address;
- * otherwise, it is treated as a manually entered address.
- *
- * @param {Object} originalAddress - The full address object from the DAL
- *
- * @returns {Object} A flattened address object with consistent keys
- */
-export const formatOriginalAddress = (originalAddress) => {
-  const { lookup, manual, city, country, postcode } = originalAddress
-  return lookup.uprn
-    ? formatLookupAddress(lookup, city, country, postcode)
-    : formatManualAddress(manual, city, country, postcode)
-}
-
-/**
- * Formats a changed address object into a consistent structure for form display.
- *
- * If the address includes a UPRN, it indicates the user selected it from an address lookup.
- * In that case, the lookup fields are combined and mapped into the manual address format used by the form.
- *
- * If the address does not include a UPRN, it is assumed to be manually entered and returned as-is.
- *
- * @param {Object} changeBusinessAddress - The changed address object to format
- *
- * @returns {Object} A formatted address object with fields `address1`, `address2`, `address3`,
- * `city`, `county`, `country`, and `postcode`.
- */
-export const formatChangedAddress = (changeBusinessAddress) => {
-  if (!changeBusinessAddress.uprn) {
-    // manual address (no lookup used)
-    return changeBusinessAddress
-  }
-
-  const {
-    pafOrganisationName,
-    flatName,
-    buildingName,
-    buildingNumberRange,
-    street,
-    doubleDependentLocality,
-    dependentLocality,
-    city,
-    county,
-    country,
-    postcode
-  } = changeBusinessAddress
-
-  return {
-    address1: buildAddressLine([pafOrganisationName, flatName, buildingName]),
-    address2: buildStreetLine(buildingNumberRange, street),
-    address3: buildAddressLine([doubleDependentLocality, dependentLocality]),
-    city: city ?? null,
-    county: county ?? null,
-    country: country ?? null,
-    postcode: postcode ?? null
-  }
-}
-
-/**
- * Formats a list of address objects for display in a dropdown menu.
- *
- * Each address object is transformed into an option with:
- * - `value`: a concatenation of the address UPRN and displayAddress
- * - `text`: the formatted display address string
- * - `selected`: true only if it matches the previously picked address
- *
- * A summary option is prepended to the start of the list, showing how many
- * addresses were found. This summary option is selected by default unless
- * a previously picked address exists.
- *
- * This function is shared across presenters that display address selection
- * lists (e.g. personal or business address flows).
- *
- * Note: The `value` combines `uprn` and `displayAddress` to ensure uniqueness.
- * Some addresses (for example, postcode LL55 2NF) have been observed to share
- * the same UPRN, which caused incorrect selections when UPRN alone was used.
- * Concatenating both fields guarantees each dropdown option has a unique value.
- *
- * @param {Array<Object>} addresses - List of address objects with `uprn` and `displayAddress` properties
- * @param {Object} [previouslyPickedAddress] - Optional object representing the address previously selected by the user
- *
- * @returns {Array<Object>} Array of formatted address options ready for display
- */
-export const formatDisplayAddresses = (addresses, previouslyPickedAddress) => {
-  const displayAddresses = addresses.map(address => ({
-    value: `${address.uprn}${address.displayAddress}`,
-    text: address.displayAddress,
-    selected:
-      previouslyPickedAddress?.uprn === address.uprn &&
-      previouslyPickedAddress?.displayAddress === address.displayAddress
-  }))
-
-  // Check if any address is already selected
-  const hasSelectedAddress = displayAddresses.some(addr => addr.selected)
-
-  // Add a display summary option to the beginning of the list
-  // e.g. "18 addresses found"
-  const text = addresses.length === 1 ? '1 address found' : `${addresses.length} addresses found`
-
-  displayAddresses.unshift({
-    value: 'display',
-    text,
-    selected: !hasSelectedAddress
-  })
-
-  return displayAddresses
-}
-
 /**
  * Shared helper used by base presenters to sort validation errors so they
  * appear in the same order as the sections and fields shown on a Fix List page.

package/src/presenters/business-details-presenter.js

@@ -5,7 +5,7 @@
  * applications and are provided here to avoid duplication.
  */
 
-import { formatDisplayAddress } from './base-presenter.js'
+import { formatDisplayAddress } from './address-presenter.js'
 
 /**
  * Returns the action text for a summary-list row.

package/src/presenters/presenters.js

@@ -1,10 +1,6 @@
 import {
   formatBackLink,
   formatNumber,
-  formatDisplayAddress,
-  formatOriginalAddress,
-  formatChangedAddress,
-  formatDisplayAddresses,
   sortErrorsBySectionOrder
 } from './base-presenter.js'
 
@@ -15,6 +11,15 @@ import {
   formatBusinessAddress
 } from './business-details-presenter.js'
 
+import {
+  addressBackLink,
+  addressChangeLink,
+  formatDisplayAddress,
+  formatOriginalAddress,
+  formatChangedAddress,
+  formatDisplayAddresses
+} from './address-presenter.js'
+
 export const presenters = {
   formatBackLink,
   formatNumber,
@@ -26,5 +31,7 @@ export const presenters = {
   getActionText,
   formatCph,
   formatCphText,
-  formatBusinessAddress
+  formatBusinessAddress,
+  addressBackLink,
+  addressChangeLink
 }