@defra-fish/gafl-webapp-service 1.65.0-rc.0 → 1.65.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.65.0-rc.0",
+  "version": "1.65.0-rc.2",
   "description": "The websales frontend for the GAFL service",
   "type": "module",
   "engines": {
@@ -36,8 +36,8 @@
     "prepare": "gulp --gulpfile build/gulpfile.cjs"
   },
   "dependencies": {
-    "@defra-fish/business-rules-lib": "1.65.0-rc.0",
-    "@defra-fish/connectors-lib": "1.65.0-rc.0",
+    "@defra-fish/business-rules-lib": "1.65.0-rc.2",
+    "@defra-fish/connectors-lib": "1.65.0-rc.2",
     "@defra/hapi-gapi": "2.0.0",
     "@hapi/boom": "9.1.2",
     "@hapi/catbox-redis": "6.0.2",
@@ -79,5 +79,5 @@
       "./gafl-jest-matchers.js"
     ]
   },
-  "gitHead": "cdf9253964871c4afe0ff85d085364ffe4e890cf"
+  "gitHead": "2f8e3ec17ed29caf89f585324d8dd4b725ff4586"
 }

package/src/handlers/__tests__/cancel-recurring-payment-authentication-handler.spec.js

@@ -1,6 +1,5 @@
 import handler from '../cancel-recurring-payment-authentication-handler'
-import { CANCEL_RP_IDENTIFY, CANCEL_RP_DETAILS } from '../../uri.js'
-import { addLanguageCodeToUri } from '../../processors/uri-helper.js'
+import { CANCEL_RP_IDENTIFY, CANCEL_RP_DETAILS, CANCEL_RP_AGREEMENT_NOT_FOUND } from '../../uri.js'
 import { salesApi } from '@defra-fish/connectors-lib'
 
 jest.mock('../../processors/uri-helper.js')
@@ -19,7 +18,8 @@ jest.mock('@defra-fish/business-rules-lib', () => ({
 }))
 jest.mock('../../uri.js', () => ({
   CANCEL_RP_IDENTIFY: { page: 'cancel-rp-identify page', uri: Symbol('cancel-rp-identify-uri') },
-  CANCEL_RP_DETAILS: { uri: Symbol('cancel-rp-details-uri') }
+  CANCEL_RP_DETAILS: { uri: Symbol('cancel-rp-details-uri') },
+  CANCEL_RP_AGREEMENT_NOT_FOUND: { uri: Symbol('cancel-rp-agreement-not-found-uri') }
 }))
 jest.mock('../../processors/recurring-payments-write-cache.js')
 
@@ -52,22 +52,15 @@ const getSampleRequest = (payloadOverride = {}) => {
   }
 }
 
-const getSampleResponseTooklkit = () => ({
-  redirectWithLanguageCode: jest.fn().mockReturnValue('redirected')
+const getSampleResponseToolkit = () => ({
+  redirectWithLanguageCode: jest.fn(() => 'redirected')
 })
 
-const invokeHandlerWithMocks = async ({ salesApiResponse, decoratedIdentifyUri } = {}) => {
-  if (typeof salesApiResponse !== 'undefined') {
+const invokeHandlerWithMocks = async ({ h = getSampleResponseToolkit(), salesApiResponse } = {}) => {
+  if (salesApiResponse) {
     salesApi.authenticateRecurringPayment.mockResolvedValueOnce(salesApiResponse)
   }
-  if (decoratedIdentifyUri) {
-    addLanguageCodeToUri.mockReturnValueOnce(decoratedIdentifyUri)
-  }
   const request = getSampleRequest()
-  const h = getSampleResponseTooklkit()
-  if (decoratedIdentifyUri) {
-    h.redirect = jest.fn().mockReturnValue('redirect-response')
-  }
   const result = await handler(request, h)
   return { request, h, result }
 }
@@ -106,13 +99,24 @@ describe('Cancel RP Authentication Handler', () => {
   })
 
   describe('Unsuccessful authentication - no match', () => {
-    it('redirects to the decorated identify URI', async () => {
-      const { h } = await invokeHandlerWithMocks({ salesApiResponse: null, decoratedIdentifyUri: 'decorated-identify-uri' })
-      expect(h.redirect).toHaveBeenCalledWith('decorated-identify-uri')
+    it('redirects to the CANCEL_RP_IDENTIFY.uri', async () => {
+      const { h } = await invokeHandlerWithMocks({ salesApiResponse: null })
+      expect(h.redirectWithLanguageCode).toHaveBeenCalledWith(CANCEL_RP_IDENTIFY.uri)
+    })
+
+    it('returns value of redirect', async () => {
+      const h = getSampleResponseToolkit()
+      const redirectResult = Symbol('redirected')
+      h.redirectWithLanguageCode.mockReturnValueOnce(redirectResult)
+      const { result } = await invokeHandlerWithMocks({
+        h,
+        salesApiResponse: null
+      })
+      expect(result).toBe(redirectResult)
     })
 
     it('sets page cache error and preserves payload', async () => {
-      const { request } = await invokeHandlerWithMocks({ salesApiResponse: null, decoratedIdentifyUri: 'decorated-identify-uri' })
+      const { request } = await invokeHandlerWithMocks({ salesApiResponse: null })
       expect(request.cache().helpers.page.setCurrentPermission).toHaveBeenCalledWith(
         CANCEL_RP_IDENTIFY.page,
         expect.objectContaining({
@@ -123,7 +127,7 @@ describe('Cancel RP Authentication Handler', () => {
     })
 
     it('marks status as unauthorised', async () => {
-      const { request } = await invokeHandlerWithMocks({ salesApiResponse: null, decoratedIdentifyUri: 'decorated-identify-uri' })
+      const { request } = await invokeHandlerWithMocks({ salesApiResponse: null })
       expect(request.cache().helpers.status.setCurrentPermission).toHaveBeenCalledWith(
         expect.objectContaining({ authentication: { authorised: false } })
       )
@@ -131,26 +135,23 @@ describe('Cancel RP Authentication Handler', () => {
   })
 
   describe('Unsuccessful authentication - no recurring payment agreement', () => {
-    it('redirects to the decorated identify URI', async () => {
+    it('redirects to the CANCEL_RP_AGREEMENT_NOT_FOUND.uri', async () => {
       const { h } = await invokeHandlerWithMocks({
         salesApiResponse: { permission: { id: 'perm-id' }, recurringPayment: null },
         decoratedIdentifyUri: 'decorated-identify-uri'
       })
-      expect(h.redirect).toHaveBeenCalledWith('decorated-identify-uri')
+      expect(h.redirectWithLanguageCode).toHaveBeenCalledWith(CANCEL_RP_AGREEMENT_NOT_FOUND.uri)
     })
 
-    it('sets page cache error for no RCP setup', async () => {
-      const { request } = await invokeHandlerWithMocks({
-        salesApiResponse: { permission: { id: 'perm-id' }, recurringPayment: null },
-        decoratedIdentifyUri: 'decorated-identify-uri'
+    it('returns value of redirect', async () => {
+      const h = getSampleResponseToolkit()
+      const redirectResult = Symbol('redirected')
+      h.redirectWithLanguageCode.mockReturnValueOnce(redirectResult)
+      const { result } = await invokeHandlerWithMocks({
+        h,
+        salesApiResponse: { permission: { id: 'perm-id' }, recurringPayment: null }
       })
-      expect(request.cache().helpers.page.setCurrentPermission).toHaveBeenCalledWith(
-        CANCEL_RP_IDENTIFY.page,
-        expect.objectContaining({
-          payload: expect.any(Object),
-          error: { recurringPayment: 'not-set-up' }
-        })
-      )
+      expect(result).toBe(redirectResult)
     })
 
     it('marks status as unauthorised', async () => {
@@ -165,18 +166,27 @@ describe('Cancel RP Authentication Handler', () => {
   })
 
   describe('Unsuccessful authentication - RCP cancelled', () => {
-    it('redirects to the decorated identify URI', async () => {
+    it('redirects to the CANCEL_RP_IDENTIFY.uri', async () => {
       const { h } = await invokeHandlerWithMocks({
-        salesApiResponse: { permission: { id: 'perm-id' }, recurringPayment: { id: 'rcp-id', status: 1, cancelledDate: '2024-01-01' } },
-        decoratedIdentifyUri: 'decorated-identify-uri'
+        salesApiResponse: { permission: { id: 'perm-id' }, recurringPayment: { id: 'rcp-id', status: 1, cancelledDate: '2024-01-01' } }
       })
-      expect(h.redirect).toHaveBeenCalledWith('decorated-identify-uri')
+      expect(h.redirectWithLanguageCode).toHaveBeenCalledWith(CANCEL_RP_IDENTIFY.uri)
+    })
+
+    it('returns value of redirect', async () => {
+      const h = getSampleResponseToolkit()
+      const redirectResult = Symbol('redirected')
+      h.redirectWithLanguageCode.mockReturnValueOnce(redirectResult)
+      const { result } = await invokeHandlerWithMocks({
+        h,
+        salesApiResponse: { permission: { id: 'perm-id' }, recurringPayment: { id: 'rcp-id', status: 1, cancelledDate: '2024-01-01' } }
+      })
+      expect(result).toBe(redirectResult)
     })
 
     it('sets page cache error for RCP cancelled', async () => {
       const { request } = await invokeHandlerWithMocks({
-        salesApiResponse: { permission: { id: 'perm-id' }, recurringPayment: { id: 'rcp-id', status: 1, cancelledDate: '2024-01-01' } },
-        decoratedIdentifyUri: 'decorated-identify-uri'
+        salesApiResponse: { permission: { id: 'perm-id' }, recurringPayment: { id: 'rcp-id', status: 1, cancelledDate: '2024-01-01' } }
       })
       expect(request.cache().helpers.page.setCurrentPermission).toHaveBeenCalledWith(
         CANCEL_RP_IDENTIFY.page,
@@ -189,8 +199,7 @@ describe('Cancel RP Authentication Handler', () => {
 
     it('marks status as unauthorised', async () => {
       const { request } = await invokeHandlerWithMocks({
-        salesApiResponse: { permission: { id: 'perm-id' }, recurringPayment: { id: 'rcp-id', status: 1, cancelledDate: '2024-01-01' } },
-        decoratedIdentifyUri: 'decorated-identify-uri'
+        salesApiResponse: { permission: { id: 'perm-id' }, recurringPayment: { id: 'rcp-id', status: 1, cancelledDate: '2024-01-01' } }
       })
       expect(request.cache().helpers.status.setCurrentPermission).toHaveBeenCalledWith(
         expect.objectContaining({ authentication: { authorised: false } })
@@ -207,7 +216,7 @@ describe('Cancel RP Authentication Handler', () => {
     request.cache().helpers.status.getCurrentPermission.mockReturnValueOnce({
       referenceNumber: 'A1B2C3'
     })
-    const h = getSampleResponseTooklkit()
+    const h = getSampleResponseToolkit()
     await handler(request, h)
     expect(salesApi.authenticateRecurringPayment).toHaveBeenCalledWith('A1B2C3', expect.anything(), expect.anything())
   })

package/src/handlers/cancel-recurring-payment-authentication-handler.js

@@ -1,26 +1,13 @@
-import { CANCEL_RP_IDENTIFY, CANCEL_RP_DETAILS } from '../../src/uri.js'
-import { addLanguageCodeToUri } from '../processors/uri-helper.js'
+import { CANCEL_RP_IDENTIFY, CANCEL_RP_DETAILS, CANCEL_RP_AGREEMENT_NOT_FOUND } from '../../src/uri.js'
 import { salesApi } from '@defra-fish/connectors-lib'
 import { validation } from '@defra-fish/business-rules-lib'
 import { setupCancelRecurringPaymentCacheFromAuthResult } from '../processors/recurring-payments-write-cache.js'
 import Joi from 'joi'
 
-const buildAuthFailure = (referenceNumber, payload, error) => ({
-  page: {
-    page: CANCEL_RP_IDENTIFY.page,
-    data: { payload, error }
-  },
-  status: {
-    referenceNumber,
-    authentication: { authorised: false }
-  },
-  redirectPath: CANCEL_RP_IDENTIFY.uri
-})
-
-const applyAuthFailure = async (request, h, failure) => {
-  await request.cache().helpers.page.setCurrentPermission(failure.page.page, failure.page.data)
-  await request.cache().helpers.status.setCurrentPermission(failure.status)
-  return h.redirect(addLanguageCodeToUri(request, failure.redirectPath))
+const applyAuthFailure = async (request, h, { pageData, redirectUri, statusData }) => {
+  await request.cache().helpers.page.setCurrentPermission(CANCEL_RP_IDENTIFY.page, pageData)
+  await request.cache().helpers.status.setCurrentPermission(statusData)
+  return h.redirectWithLanguageCode(redirectUri)
 }
 
 const cancelRecurringPaymentAuthenticationHandler = async (request, h) => {
@@ -36,16 +23,23 @@ const cancelRecurringPaymentAuthenticationHandler = async (request, h) => {
 
   const authenticationResult = await salesApi.authenticateRecurringPayment(referenceNumber, dateOfBirth, postcode)
 
-  const failures = error => applyAuthFailure(request, h, buildAuthFailure(referenceNumber, payload, error))
+  const context = {
+    pageData: { payload },
+    statusData: { referenceNumber, authentication: { authorised: false } },
+    redirectUri: CANCEL_RP_IDENTIFY.uri
+  }
 
   if (!authenticationResult) {
-    return failures({ referenceNumber: 'not-found' })
-  }
-  if (!authenticationResult.recurringPayment) {
-    return failures({ recurringPayment: 'not-set-up' })
+    context.pageData.error = { referenceNumber: 'not-found' }
+  } else if (!authenticationResult.recurringPayment) {
+    context.pageData.errorRedirect = true
+    context.redirectUri = CANCEL_RP_AGREEMENT_NOT_FOUND.uri
+  } else if (authenticationResult.recurringPayment.cancelledDate) {
+    context.pageData.error = { recurringPayment: 'rcp-cancelled' }
   }
-  if (authenticationResult.recurringPayment.cancelledDate) {
-    return failures({ recurringPayment: 'rcp-cancelled' })
+
+  if (context.pageData.error || context.pageData.errorRedirect) {
+    return applyAuthFailure(request, h, context)
   }
 
   await setupCancelRecurringPaymentCacheFromAuthResult(request, authenticationResult)

package/src/locales/cy.json

@@ -788,6 +788,22 @@
   "role_required_title": "Role required",
   "rp_cancel_complete_title": "Cancel your recurring card payment agreement - complete",
   "rp_cancel_confirm_title": "Cancel your recurring card payment agreement - confirm",
+  "rp_cancel_details_title": "Cancel your recurring card payment agreement - details",
+  "rp_cancel_identify_title": "Cancel your recurring card payment agreement - identify",
+  "rp_cancel_no_agreement_found_title": "Agreement not found - Cancel your recurring card payment",
+  "rp_cancel_no_agreement_found_heading": "There is no recurring card payment linked to this licence",
+  "rp_cancel_no_agreement_found_licence_will_not_renew_1": "Licence ending ",
+  "rp_cancel_no_agreement_found_licence_will_not_renew_2": " will not renew automatically.",
+  "rp_cancel_no_agreement_found_go_back_link": "Go back",
+  "rp_cancel_no_agreement_found_go_back_instruction": " to cancel the recurring card payment for a different licence.",
+  "rp_cancel_no_agreement_found_need_help_1": "If you need help email ",
+  "rp_cancel_no_agreement_found_need_help_email": "enquiries@environment-agency.gov.uk",
+  "rp_cancel_no_agreement_found_need_help_2": " or call 03708 506 506 (8am to 6pm, Monday to Friday, except public holidays). ",
+  "rp_cancel_no_agreement_found_call_charges_link": "View call charges (opens in new tab).",
+  "rp_cancel_confirm_accept": "Yes, cancel my recurring payment agreement",
+  "rp_cancel_confirm_body": "Your current licence will reman valid until it expires on ",
+  "rp_cancel_confirm_reject": "No, I've changed my mind",
+  "rp_cancel_confirm_title": "Confirm you want to cancel",
   "rp_cancel_details_last_purchased": "Last licence purchased",
   "rp_cancel_details_licence_holder": "Licence holder",
   "rp_cancel_details_licence_type": "Licence type",

package/src/locales/en.json

@@ -788,6 +788,22 @@
   "role_required_title": "Role required",
   "rp_cancel_complete_title": "Cancel your recurring card payment agreement - complete",
   "rp_cancel_confirm_title": "Cancel your recurring card payment agreement - confirm",
+  "rp_cancel_details_title": "Cancel your recurring card payment agreement - details",
+  "rp_cancel_identify_title": "Cancel your recurring card payment agreement - identify",
+  "rp_cancel_no_agreement_found_title": "Agreement not found - Cancel your recurring card payment",
+  "rp_cancel_no_agreement_found_heading": "There is no recurring card payment linked to this licence",
+  "rp_cancel_no_agreement_found_licence_will_not_renew_1": "Licence ending ",
+  "rp_cancel_no_agreement_found_licence_will_not_renew_2": " will not renew automatically.",
+  "rp_cancel_no_agreement_found_go_back_link": "Go back",
+  "rp_cancel_no_agreement_found_go_back_instruction": " to cancel the recurring card payment for a different licence.",
+  "rp_cancel_no_agreement_found_need_help_1": "If you need help email ",
+  "rp_cancel_no_agreement_found_need_help_email": "enquiries@environment-agency.gov.uk",
+  "rp_cancel_no_agreement_found_need_help_2": " or call 03708 506 506 (8am to 6pm, Monday to Friday, except public holidays). ",
+  "rp_cancel_no_agreement_found_call_charges_link": "View call charges (opens in new tab).",
+  "rp_cancel_confirm_accept": "Yes, cancel my recurring payment agreement",
+  "rp_cancel_confirm_body": "Your current licence will reman valid until it expires on ",
+  "rp_cancel_confirm_reject": "No, I've changed my mind",
+  "rp_cancel_confirm_title": "Confirm you want to cancel",
   "rp_cancel_details_last_purchased": "Last licence purchased",
   "rp_cancel_details_licence_holder": "Licence holder",
   "rp_cancel_details_licence_type": "Licence type",

package/src/pages/recurring-payments/cancel/{confirm/__tests__/route.test.js → agreement-not-found/__tests__/route.spec.js}

@@ -1,6 +1,5 @@
 import pageRoute from '../../../../../routes/page-route.js'
-import { CANCEL_RP_CONFIRM, CANCEL_RP_COMPLETE } from '../../../../../uri.js'
-import { addLanguageCodeToUri } from '../../../../../processors/uri-helper.js'
+import { CANCEL_RP_AGREEMENT_NOT_FOUND, CANCEL_RP_IDENTIFY } from '../../../../../uri.js'
 
 require('../route.js')
 // eslint-disable-next-line no-unused-vars
@@ -9,17 +8,27 @@ const [[_v, _p, validator, completion, getData]] = pageRoute.mock.calls
 jest.mock('../../../../../routes/page-route.js')
 jest.mock('../../../../../uri.js', () => ({
   ...jest.requireActual('../../../../../uri.js'),
-  CANCEL_RP_CONFIRM: { page: Symbol('cancel-rp-confirm-page'), uri: Symbol('cancel-rp-confirm-uri') },
-  CANCEL_RP_COMPLETE: { uri: Symbol('cancel-rp-complete-uri') }
+  CANCEL_RP_IDENTIFY: { page: Symbol('cancel-rp-identify-page') },
+  CANCEL_RP_AGREEMENT_NOT_FOUND: { page: Symbol('cancel-rp-agreement-not-found-page'), uri: Symbol('cancel-rp-agreement-not-found-uri') }
 }))
 jest.mock('../../../../../processors/uri-helper.js')
 
+const getSampleRequest = (referenceNumber = 'RP12345678') => ({
+  cache: jest.fn(() => ({
+    helpers: {
+      page: {
+        getCurrentPermission: jest.fn(() => ({ payload: { referenceNumber } }))
+      }
+    }
+  }))
+})
+
 describe('pageRoute receives expected arguments', () => {
-  it('passes CANCEL_RP_CONFIRM.page as the view name', () => {
+  it('passes CANCEL_RP_AGREEMENT_NOT_FOUND.page as the view name', () => {
     jest.isolateModules(() => {
       require('../route.js')
       expect(pageRoute).toHaveBeenCalledWith(
-        CANCEL_RP_CONFIRM.page,
+        CANCEL_RP_AGREEMENT_NOT_FOUND.page,
         expect.anything(),
         expect.anything(),
         expect.anything(),
@@ -28,12 +37,12 @@ describe('pageRoute receives expected arguments', () => {
     })
   })
 
-  it('passes CANCEL_RP_CONFIRM.uri as the path', () => {
+  it('passes CANCEL_RP_AGREEMENT_NOT_FOUND.uri as the path', () => {
     jest.isolateModules(() => {
       require('../route.js')
       expect(pageRoute).toHaveBeenCalledWith(
         expect.anything(),
-        CANCEL_RP_CONFIRM.uri,
+        CANCEL_RP_AGREEMENT_NOT_FOUND.uri,
         expect.anything(),
         expect.anything(),
         expect.anything()
@@ -81,26 +90,40 @@ describe('pageRoute receives expected arguments', () => {
   })
 })
 
-describe('completion function', () => {
-  beforeEach(jest.clearAllMocks)
-
-  it('calls addLanguageCodeToUri with request object', () => {
-    const sampleRequest = Symbol('sample request')
-    completion(sampleRequest)
-    expect(addLanguageCodeToUri).toHaveBeenCalledWith(sampleRequest, expect.anything())
+describe('getData', () => {
+  it('passes call charges link in list of urls', async () => {
+    expect(await getData(getSampleRequest())).toEqual(
+      expect.objectContaining({
+        links: expect.objectContaining({
+          callCharges: 'https://www.gov.uk/call-charges'
+        })
+      })
+    )
   })
 
-  it('calls addLanguageCodeToUri with CANCEL_RP_AUTHENTICATE uri', () => {
-    completion({})
-    expect(addLanguageCodeToUri).toHaveBeenCalledWith(expect.anything(), CANCEL_RP_COMPLETE.uri)
+  it('passes contact us email in list of urls', async () => {
+    expect(await getData(getSampleRequest())).toEqual(
+      expect.objectContaining({
+        links: expect.objectContaining({
+          contactUs: 'mailto:enquiries@environment-agency.gov.uk'
+        })
+      })
+    )
   })
 
-  it('returns the value of addLanguageCodeToUri', () => {
-    const expectedCompletionRedirect = Symbol('expected-completion-redirect')
-    addLanguageCodeToUri.mockReturnValueOnce(expectedCompletionRedirect)
-
-    const completionRedirect = completion({})
+  it('requests page data from CANCEL_RP_IDENTIFY page', async () => {
+    const request = getSampleRequest()
+    await getData(request)
+    const [{ value: pageCache }] = request.cache.mock.results
+    expect(pageCache.helpers.page.getCurrentPermission).toHaveBeenCalledWith(CANCEL_RP_IDENTIFY.page)
+  })
 
-    expect(completionRedirect).toBe(expectedCompletionRedirect)
+  it('passes reference number from CANCEL_RP_IDENTIFY page data', async () => {
+    const referenceNumber = 'RP87654321'
+    expect(await getData(getSampleRequest(referenceNumber))).toEqual(
+      expect.objectContaining({
+        referenceNumber
+      })
+    )
   })
 })

package/src/pages/recurring-payments/cancel/agreement-not-found/cancel-rp-agreement-not-found.njk

@@ -0,0 +1,15 @@
+{% extends "layout.njk" %}
+{% extends "standard-form.njk" %}
+
+{% set title = mssgs.rp_cancel_no_agreement_found_title %}
+
+{% block content %}
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+        <h1 class="govuk-heading-l">{{ mssgs.rp_cancel_no_agreement_found_heading }}</h1>
+        <p class="govuk-body">{{ mssgs.rp_cancel_no_agreement_found_licence_will_not_renew_1 }}{{ data.referenceNumber }}{{ mssgs.rp_cancel_no_agreement_found_licence_will_not_renew_2 }}</p>
+        <p class="govuk-body"><a class="govuk-link" href="{{ backRef }}">{{ mssgs.rp_cancel_no_agreement_found_go_back_link }}</a>{{ mssgs.rp_cancel_no_agreement_found_go_back_instruction }}</p>
+        <p class="govuk-body">{{ mssgs.rp_cancel_no_agreement_found_need_help_1 }}<a class="govuk-link" href="mailto:{{ data.links.contactUs }}">{{ mssgs.rp_cancel_no_agreement_found_need_help_email }}</a>{{ mssgs.rp_cancel_no_agreement_found_need_help_2 }}<a class="govuk-link" href="{{ data.links.callCharges }}" target="_blank">{{ mssgs.rp_cancel_no_agreement_found_call_charges_link }}</a></p>
+    </div>
+</div>
+{% endblock %}

package/src/pages/recurring-payments/cancel/agreement-not-found/route.js

@@ -0,0 +1,23 @@
+import pageRoute from '../../../../routes/page-route.js'
+import { CANCEL_RP_AGREEMENT_NOT_FOUND, CANCEL_RP_IDENTIFY } from '../../../../uri.js'
+
+const getData = async request => {
+  const {
+    payload: { referenceNumber }
+  } = await request.cache().helpers.page.getCurrentPermission(CANCEL_RP_IDENTIFY.page)
+  return {
+    referenceNumber,
+    links: {
+      callCharges: 'https://www.gov.uk/call-charges',
+      contactUs: 'mailto:enquiries@environment-agency.gov.uk'
+    }
+  }
+}
+
+export default pageRoute(
+  CANCEL_RP_AGREEMENT_NOT_FOUND.page,
+  CANCEL_RP_AGREEMENT_NOT_FOUND.uri,
+  () => {},
+  () => {},
+  getData
+)

package/src/pages/recurring-payments/cancel/confirm/__tests__/route.spec.js

@@ -0,0 +1,112 @@
+import pageRoute from '../../../../../routes/page-route.js'
+import { CANCEL_RP_CONFIRM, CANCEL_RP_COMPLETE, CANCEL_RP_IDENTIFY } from '../../../../../uri.js'
+import { addLanguageCodeToUri } from '../../../../../processors/uri-helper.js'
+import moment from 'moment-timezone'
+
+require('../route.js')
+
+// eslint-disable-next-line no-unused-vars
+const [[_v, _p, validator, completion, getData]] = pageRoute.mock.calls
+
+jest.mock('../../../../../routes/page-route.js')
+jest.mock('../../../../../uri.js', () => ({
+  ...jest.requireActual('../../../../../uri.js'),
+  CANCEL_RP_CONFIRM: { page: Symbol('cancel-rp-confirm-page'), uri: Symbol('cancel-rp-confirm-uri') },
+  CANCEL_RP_COMPLETE: { uri: Symbol('cancel-rp-complete-uri') },
+  CANCEL_RP_IDENTIFY: { uri: Symbol('cancel-rp-identify-uri') }
+}))
+jest.mock('../../../../../processors/uri-helper.js')
+jest.mock('moment-timezone')
+
+describe('pageRoute receives expected arguments', () => {
+  it('passes expected arguments to pageRoute', () => {
+    jest.isolateModules(() => {
+      require('../route.js')
+      expect(pageRoute).toHaveBeenCalledWith(
+        CANCEL_RP_CONFIRM.page,
+        CANCEL_RP_CONFIRM.uri,
+        expect.any(Function),
+        expect.any(Function),
+        expect.any(Function)
+      )
+    })
+  })
+})
+
+describe('completion function', () => {
+  beforeEach(jest.clearAllMocks)
+
+  it('calls addLanguageCodeToUri with request object', () => {
+    const sampleRequest = Symbol('sample request')
+    completion(sampleRequest)
+    expect(addLanguageCodeToUri).toHaveBeenCalledWith(sampleRequest, expect.anything())
+  })
+
+  it('calls addLanguageCodeToUri with CANCEL_RP_COMPLETE uri', () => {
+    completion({})
+    expect(addLanguageCodeToUri).toHaveBeenCalledWith(expect.anything(), CANCEL_RP_COMPLETE.uri)
+  })
+
+  it('returns the value of addLanguageCodeToUri', () => {
+    const expecetdUri = Symbol('cancel-rp-complete-uri')
+    addLanguageCodeToUri.mockReturnValueOnce(expecetdUri)
+
+    const completionRedirect = completion({})
+
+    expect(completionRedirect).toBe(expecetdUri)
+  })
+})
+
+describe('getData function', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+    moment.mockReturnValue({ format: jest.fn(() => '18th November, 2025') })
+  })
+
+  const mockRequest = () => {
+    const getCurrentPermission = jest.fn(() => ({ recurringPayment: { endDate: '2025-02-15' } }))
+
+    return {
+      locale: 'en',
+      cache: () => ({
+        helpers: {
+          transaction: {
+            getCurrentPermission
+          }
+        }
+      })
+    }
+  }
+
+  it('calls addLanguageCodeToUri with request object', async () => {
+    const request = mockRequest()
+    await getData(request)
+    expect(addLanguageCodeToUri).toHaveBeenCalledWith(request, expect.anything())
+  })
+
+  it('calls addLanguageCodeToUri with CANCEL_RP_IDENTIFY uri', async () => {
+    const request = mockRequest()
+    await getData(request)
+    expect(addLanguageCodeToUri).toHaveBeenCalledWith(expect.anything(), CANCEL_RP_IDENTIFY.uri)
+  })
+
+  it('cancelRpIdentify uri is equal to return of addLanguageCodeToUri for CANCEL_RP_IDENTIFY page', async () => {
+    const expectedUri = Symbol('expected-cancel-rp-identify-uri')
+    addLanguageCodeToUri.mockReturnValueOnce(expectedUri)
+
+    const data = await getData(mockRequest())
+
+    expect(data.uri).toEqual({
+      cancelRpIdentify: expectedUri
+    })
+  })
+
+  it('returns licenceExpiry in correct format', async () => {
+    const mockFormat = jest.fn().mockReturnValue('19th November, 2025')
+    moment.mockReturnValue({ format: mockFormat })
+
+    const data = await getData(mockRequest())
+
+    expect(data.licenceExpiry).toEqual('19th November, 2025')
+  })
+})

package/src/pages/recurring-payments/cancel/confirm/cancel-rp-confirm.njk

@@ -2,23 +2,42 @@
 
 {% from "button/macro.njk" import govukButton %}
 {% from "page-title.njk" import pageTitle %}
+{% from "fieldset/macro.njk" import govukFieldset %}
 
 {% set title = mssgs.rp_cancel_confirm_title %}
 {% block pageTitle %}{{ pageTitle(title, error, mssgs) }}{% endblock %}
 
 {% block content %}
-<div class="govuk-grid-row">
+  {% set legendHtml %}
+    <span class="govuk-caption-l">{{ mssgs.cancel_rp_identify_caption }}</span>
+    {{ title }}
+  {% endset %}
+
+  {% call govukFieldset({
+    legend: {
+      html: legendHtml,
+      classes: "govuk-fieldset__legend--l govuk-!-margin-bottom-3",
+      isPageHeading: true
+    }
+  }) %}
+
+  <p class="govuk-body-m">{{ mssgs.rp_cancel_confirm_body }}</p>
+
+  <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
         <form method="post" class="govuk-!-margin-bottom-6">
           {{ govukButton({
             attributes: { id: 'continue' },
             preventDoubleClick: true,
             name: "continue",
-            text: mssgs.continue,
+            text: mssgs.rp_cancel_confirm_accept,
             classes: "govuk-!-margin-top-1"
           }) }}
           {{ csrf() }}
         </form>
+        <p class="govuk-body no-print"><a class="govuk-link" href="{{ data.uri.cancelRpIdentify }}">{{ mssgs.rp_cancel_confirm_reject }}</a></p>
     </div>
-</div>
+  </div>
+
+  {% endcall %}
 {% endblock %}

package/src/pages/recurring-payments/cancel/confirm/route.js

@@ -1,11 +1,24 @@
 import pageRoute from '../../../../routes/page-route.js'
-import { CANCEL_RP_CONFIRM, CANCEL_RP_COMPLETE } from '../../../../uri.js'
+import { CANCEL_RP_COMPLETE, CANCEL_RP_CONFIRM, CANCEL_RP_IDENTIFY } from '../../../../uri.js'
 import { addLanguageCodeToUri } from '../../../../processors/uri-helper.js'
+import { cacheDateFormat } from '../../../../processors/date-and-time-display.js'
+import moment from 'moment-timezone'
+
+const getData = async request => {
+  const permission = await request.cache().helpers.transaction.getCurrentPermission()
+
+  return {
+    licenceExpiry: moment(permission.recurringPayment.endDate, cacheDateFormat, request.locale).format('Do MMMM, YYYY'),
+    uri: {
+      cancelRpIdentify: addLanguageCodeToUri(request, CANCEL_RP_IDENTIFY.uri)
+    }
+  }
+}
 
 export default pageRoute(
   CANCEL_RP_CONFIRM.page,
   CANCEL_RP_CONFIRM.uri,
   () => {},
   request => addLanguageCodeToUri(request, CANCEL_RP_COMPLETE.uri),
-  () => {}
+  getData
 )

package/src/routes/__tests__/__snapshots__/telesales-routes.spec.js.snap

@@ -100,6 +100,22 @@ Object {
       },
       "path": "/buy/cancel-recurring-payment/complete",
     },
+    Object {
+      "handler": [Function],
+      "method": "GET",
+      "path": "/buy/cancel-recurring-payment/agreement-not-found",
+    },
+    Object {
+      "handler": [Function],
+      "method": "POST",
+      "options": Object {
+        "validate": Object {
+          "failAction": [Function],
+          "payload": [Function],
+        },
+      },
+      "path": "/buy/cancel-recurring-payment/agreement-not-found",
+    },
   ],
 }
 `;

package/src/routes/journey-definition.js

@@ -33,7 +33,8 @@ import {
   CANCEL_RP_IDENTIFY,
   CANCEL_RP_DETAILS,
   CANCEL_RP_CONFIRM,
-  CANCEL_RP_COMPLETE
+  CANCEL_RP_COMPLETE,
+  CANCEL_RP_AGREEMENT_NOT_FOUND
 } from '../uri.js'
 
 import { CommonResults, CONTACT_SUMMARY_SEEN, ShowDigitalLicencePages } from '../constants.js'
@@ -455,7 +456,12 @@ export default [
     next: {
       [CommonResults.OK]: {
         page: CANCEL_RP_COMPLETE
-      }
+      },
+      backLink: CANCEL_RP_DETAILS.uri
     }
+  },
+  {
+    current: CANCEL_RP_AGREEMENT_NOT_FOUND,
+    backLink: CANCEL_RP_IDENTIFY.uri
   }
 ]

package/src/routes/telesales-routes.js

@@ -4,6 +4,7 @@ import cancelRPIdentify from '../pages/recurring-payments/cancel/identify/route.
 import cancelRPDetails from '../pages/recurring-payments/cancel/details/route.js'
 import cancelRPConfirm from '../pages/recurring-payments/cancel/confirm/route.js'
 import cancelRPComplete from '../pages/recurring-payments/cancel/complete/route.js'
+import cancelRPAgreementNotFound from '../pages/recurring-payments/cancel/agreement-not-found/route.js'
 
 const telesalesRoutes = [
   {
@@ -32,9 +33,6 @@ const telesalesRoutes = [
 ]
 
 if (process.env.SHOW_CANCELLATION_JOURNEY === 'true') {
-  telesalesRoutes.push(...cancelRPIdentify)
-  telesalesRoutes.push(...cancelRPDetails)
-  telesalesRoutes.push(...cancelRPConfirm)
-  telesalesRoutes.push(...cancelRPComplete)
+  telesalesRoutes.push(...cancelRPIdentify, ...cancelRPDetails, ...cancelRPConfirm, ...cancelRPComplete, ...cancelRPAgreementNotFound)
 }
 export default telesalesRoutes

package/src/uri.js

@@ -67,6 +67,10 @@ export const CANCEL_RP_AUTHENTICATE = { uri: '/buy/cancel-recurring-payment/auth
 export const CANCEL_RP_DETAILS = { uri: '/buy/cancel-recurring-payment/details', page: 'cancel-rp-details' }
 export const CANCEL_RP_CONFIRM = { uri: '/buy/cancel-recurring-payment/confirm', page: 'cancel-rp-confirm' }
 export const CANCEL_RP_COMPLETE = { uri: '/buy/cancel-recurring-payment/complete', page: 'cancel-rp-complete' }
+export const CANCEL_RP_AGREEMENT_NOT_FOUND = {
+  uri: '/buy/cancel-recurring-payment/agreement-not-found',
+  page: 'cancel-rp-agreement-not-found'
+}
 
 /**
  * These are informational static pages