@defra-fish/gafl-webapp-service 1.24.0-rc.9 → 1.24.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.24.0-rc.9",
+  "version": "1.24.0",
   "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.24.0-rc.9",
-    "@defra-fish/connectors-lib": "1.24.0-rc.9",
+    "@defra-fish/business-rules-lib": "1.24.0",
+    "@defra-fish/connectors-lib": "1.24.0",
     "@defra/hapi-gapi": "^1.1.0",
     "@hapi/boom": "^9.1.2",
     "@hapi/catbox-redis": "^6.0.2",
@@ -76,5 +76,5 @@
     "gulp-sourcemaps": "^3.0.0",
     "node-sass": "^6.0.1"
   },
-  "gitHead": "30a0f3e1da0e2947124285a37291cbc6fd85cd68"
+  "gitHead": "c138f45936dbae8ebb917599a53b6cf96c73aaa5"
 }

package/src/handlers/__tests__/error-handler.spec.js

@@ -1,34 +1,19 @@
 import { errorHandler } from '../error-handler.js'
 import { CLIENT_ERROR } from '../../uri.js'
 
-const mockView = jest.fn(() => ({
-  code: jest.fn()
-}))
-const h = {
-  view: mockView
-}
-
 describe('error-handler', () => {
   describe('errorHandler', () => {
     beforeEach(jest.clearAllMocks)
     it('should pass the referer to the view if it is present', async () => {
       const request = {
+        ...getMockRequest(),
         headers: {
           referer: 'http://example.com'
-        },
-        i18n: {
-          getCatalog: () => [],
-          getLocales: () => []
-        },
-        response: {
-          isBoom: true,
-          output: {
-            statusCode: 400
-          }
         }
       }
-      await errorHandler(request, h)
-      expect(mockView).toBeCalledWith(
+      const mockToolkit = getMockToolkit()
+      await errorHandler(request, mockToolkit)
+      expect(mockToolkit.view).toBeCalledWith(
         CLIENT_ERROR.page,
         expect.objectContaining({
           referer: 'http://example.com'
@@ -37,43 +22,22 @@ describe('error-handler', () => {
     })
 
     it('should not pass the referer to the view if it is not present', async () => {
-      const request = {
-        headers: {},
-        i18n: {
-          getCatalog: () => [],
-          getLocales: () => []
-        },
-        response: {
-          isBoom: true,
-          output: {
-            statusCode: 400
-          }
-        }
-      }
-      await errorHandler(request, h)
-      expect(mockView).toBeCalledWith(
+      const request = getMockRequest()
+      const mockToolkit = getMockToolkit()
+      await errorHandler(request, mockToolkit)
+      expect(mockToolkit.view).toBeCalledWith(
         CLIENT_ERROR.page,
         expect.not.objectContaining({
           referer: 'http://example.com'
         })
       )
     })
+
     it('should pass the catalog and language to the view if it is present', async () => {
-      const request = {
-        headers: {},
-        i18n: {
-          getCatalog: () => [],
-          getLocales: () => []
-        },
-        response: {
-          isBoom: true,
-          output: {
-            statusCode: 400
-          }
-        }
-      }
-      await errorHandler(request, h)
-      expect(mockView).toBeCalledWith(
+      const request = getMockRequest()
+      const mockToolkit = getMockToolkit()
+      await errorHandler(request, mockToolkit)
+      expect(mockToolkit.view).toBeCalledWith(
         CLIENT_ERROR.page,
         expect.objectContaining({
           mssgs: [],
@@ -81,5 +45,76 @@ describe('error-handler', () => {
         })
       )
     })
+
+    describe.each([
+      [true, { payment_id: 'abc123', href: 'gov.pay.url' }],
+      [true, { payment_id: 'def456', href: 'gov-pay-url' }],
+      [false, {}]
+    ])('includes correct data when paymentInProgress is %p', (paymentInProgress, payment) => {
+      it(`includes paymentInProgress flag with value set to ${paymentInProgress} to correspond to presence of payment_id ${payment.payment_id}`, async () => {
+        const request = getMockRequest(payment)
+        const mockToolkit = getMockToolkit()
+        await errorHandler(request, mockToolkit)
+        expect(mockToolkit.view).toHaveBeenCalledWith(
+          expect.any(String),
+          expect.objectContaining({
+            paymentInProgress
+          })
+        )
+      })
+
+      it(`${paymentInProgress ? 'includes' : 'excludes'} govpay url`, async () => {
+        const request = getMockRequest(payment)
+        const mockToolkit = getMockToolkit()
+        await errorHandler(request, mockToolkit)
+        if (paymentInProgress) {
+          expect(mockToolkit.view).toHaveBeenCalledWith(
+            expect.any(String),
+            expect.objectContaining({
+              uri: expect.objectContaining({
+                payment: payment.href
+              })
+            })
+          )
+        } else {
+          expect(mockToolkit.view).not.toHaveBeenCalledWith(
+            expect.any(String),
+            expect.objectContaining({
+              uri: expect.objectContaining({
+                payment: payment.href
+              })
+            })
+          )
+        }
+      })
+    })
+  })
+
+  const getMockToolkit = (view = jest.fn(() => ({ code: () => {} }))) => ({
+    view
+  })
+
+  const getMockRequest = (payment = {}) => ({
+    cache: () => ({
+      helpers: {
+        transaction: {
+          get: () =>
+            Promise.resolve({
+              payment
+            })
+        }
+      }
+    }),
+    headers: {},
+    i18n: {
+      getCatalog: () => [],
+      getLocales: () => []
+    },
+    response: {
+      isBoom: true,
+      output: {
+        statusCode: 400
+      }
+    }
   })
 })

package/src/handlers/error-handler.js

@@ -11,6 +11,8 @@ export const errorHandler = async (request, h) => {
   if (!request.response.isBoom) {
     return h.continue
   }
+  const transaction = await request.cache().helpers.transaction.get()
+  const paymentInProgress = transaction?.payment?.payment_id !== undefined
   const mssgs = request.i18n.getCatalog()
   const altLang = request.i18n.getLocales().filter(locale => locale !== request.i18n.getLocale())
   if (Math.floor(request.response.output.statusCode / 100) === 4) {
@@ -23,8 +25,14 @@ export const errorHandler = async (request, h) => {
         altLang,
         referer: request?.headers?.referer,
         clientError: request.response.output.payload,
+        paymentInProgress,
         path: request.path,
-        uri: { new: NEW_TRANSACTION.uri, controller: CONTROLLER.uri, agreed: AGREED.uri }
+        uri: {
+          new: NEW_TRANSACTION.uri,
+          controller: CONTROLLER.uri,
+          agreed: AGREED.uri,
+          ...(transaction?.payment?.href ? { payment: transaction.payment.href } : {})
+        }
       })
       .code(request.response.output.statusCode)
   } else {

package/src/locales/cy.json

@@ -1,58 +1,60 @@
 {
   "access_statement_ability_net_link": "AbilityNet",
-  "access_statement_ability_net": " has advice on making your device easier to use if you have a disability.",
-  "access_statement_body": "This service is run by the Environment Agency. We want as many people as possible to be able to use this website. For example, that means you should be able to:",
-  "access_statement_bulletpoint_1": "change colours, contrast levels and fonts",
-  "access_statement_bulletpoint_2": "zoom in up to 200% without the text spilling off the screen",
-  "access_statement_bulletpoint_3": "navigate most of the website using just a keyboard",
-  "access_statement_bulletpoint_4": "navigate most of the website using speech recognition software",
-  "access_statement_bulletpoint_5": "listen to most of the website using a screen reader (including the most recent versions of JAWS, NVDA and VoiceOver)",
-  "access_statement_burden_title": "Disproportionate burden",
-  "access_statement_compliance_body_1": "This service is partially compliant with the ",
-  "access_statement_compliance_body_2": " AA standard, due to the non-compliances listed.",
-  "access_statement_compliance_body_link": "Web Content Accessibility Guidelines version 2.1",
-  "access_statement_compliance_heading": "Compliance status",
-  "access_statement_enforcement_subheading": "Enforcement procedure",
-  "access_statement_enforcement_body": "The Equality and Human Rights Commission (EHRC) is responsible for enforcing the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018 (the 'accessibility regulations'). If you’re not happy with how we respond to your complaint, contact the ",
-  "access_statement_enforcement_link": "Equality Advisory and Support Service (EASS)",
-  "access_statement_how_subheading": "How accessible this website is",
+  "access_statement_ability_net_1": "Mae gan ",
+  "access_statement_ability_net_2": " gyngor ar sicrhau bod eich dyfais yn hawdd ei defnyddio os oes gennych anabledd.",
+  "access_statement_body": "Cynhelir y gwasanaeth hwn gan Asiantaeth yr Amgylchedd. Rydym am weld cymaint o bobl â phosib yn defnyddio’r wefan hon. Er enghraifft, mae hynny’n golygu y dylech fod yn gallu gwneud y canlynol:",
+  "access_statement_bulletpoint_1": "newid lliwiau, lefelau cyferbynnedd a ffontiau",
+  "access_statement_bulletpoint_2": "chwyddo mewn hyd at 200% heb i’r testun fynd oddi ar y sgrin",
+  "access_statement_bulletpoint_3": "gwe-lywio’r rhan fwyaf o’r wefan gan ddefnyddio bysellfwrdd yn unig",
+  "access_statement_bulletpoint_4": "gwe-lywio’r rhan fwyaf o’r wefan gan ddefnyddio meddalwedd adnabod llais",
+  "access_statement_bulletpoint_5": "gwrando ar y rhan fwyaf o’r wefan gan ddefnyddio darllenydd sgrin (gan gynnwys y fersiynau diweddaraf o JAWS, NVDA a VoiceOver)",
+  "access_statement_burden_title": "Baich anghymesurol",
+  "access_statement_compliance_body_1": "Mae’r wefan hon yn cydymffurfio’n rhannol â safon AA ",
+  "access_statement_compliance_body_2": " , yn sgil yr achosion o ddiffyg cydymffurfio sydd wedi’u rhestru isod.",
+  "access_statement_compliance_body_link": "fersiwn 2.1 o Ganllawiau Hygyrchedd Cynnwys Gwefannau (WCAG)",
+  "access_statement_compliance_heading": "Statws cydymffurfio",
+  "access_statement_enforcement_subheading": "Gweithdrefn gorfodi",
+  "access_statement_enforcement_body": "Mae’r Comisiwn Cydraddoldeb a Hawliau Dynol yn gyfrifol am orfodi Rheoliadau Hygyrchedd Cyrff Sector Cyhoeddus (Gwefannau ac Apiau Symudol (Rhif 2) 2018 (y ‘rheoliadau hygyrchedd’).  Os ydych yn anhapus â’r ffordd rydym yn ymateb i’ch cwyn, cysylltwch â’r ",
+  "access_statement_enforcement_link": "Gwasanaeth Cynghori a Chefnogi Cydraddoldeb (EASS)",
+  "access_statement_how_subheading": "Pa mor hygyrch yw’r wefan hon?",
   "access_statement_feedback_info_bulletpoint_1_link": "enquiries@environment-agency.gov.uk",
-  "access_statement_feedback_info_bulletpoint_1": "email: ",
-  "access_statement_feedback_info_bulletpoint_2_call": "call ",
+  "access_statement_feedback_info_bulletpoint_1": "e-bostio: ",
+  "access_statement_feedback_info_bulletpoint_2_call": "ffonio ",
   "access_statement_feedback_info_bulletpoint_2_link": "03708 506 506",
-  "access_statement_feedback_info_bulletpoint_2_times": " (Monday to Friday, 8am to 6pm)",
-  "access_statement_feedback_info": "If you need information on this website in a different format like accessible PDF, large print, easy read, audio recording or braille:",
-  "access_statement_feedback_subheading": "Feedback and contact information",
-  "access_statement_heading": "Accessibility statement for Get a rod fishing licence",
-  "access_statement_how_info_bulletpoint_1": "On the licence start date page, the calendar date picker is not accessible to those using keyboards or screen readers. Users with accessibility requirements are able to enter this date using the standard day, month and year fields.",
-  "access_statement_how_info_bulletpoint_2": "The historical calendar dates are too low in contrast",
-  "access_statement_how_info": "All users with access needs can complete the process of buying a fishing rod licence using this service. However we know that some parts of this website are not fully accessible:",
-  "access_statement_made_simple": "We have also made the website text as simple as possible to understand.",
-  "access_statement_nonaccess_body": "The content listed below is non-accessible for the following reasons.",
-  "access_statement_nonaccess_heading": "Non-accessible content",
-  "access_statement_noncompliance_body_1": "Users are not always notified when conditionally revealed content associated with a radio button or checkbox is expanded or collapsed. This fails ",
-  "access_statement_noncompliance_body_2": ". We will review this by the end of January 2022.",
-  "access_statement_noncompliance_body_link": "WCAG 2.1 success criterion 4.1.2 Name, Role, Value",
-  "access_statement_noncompliance_heading": "Non-compliance with the accessibility regulations",
-  "access_statement_none": "None.",
-  "access_statement_not_in_scope_title": "Content that’s not within the scope of the accessibility regulations",
-  "access_statement_prep_body_1": "This statement was prepared on 23 September 2020. It was last reviewed on 13 October 2021.",
-  "access_statement_prep_body_2": "The service was audited for accessibility by the Digital Accessibility Centre on 13 April 2021 and by the Department for the Environment Food and Rural Affairs’ web compliance team on 22 April 2021.",
-  "access_statement_prep_body_3": "We tested the most common steps for getting these types of licence:",
-  "access_statement_prep_body_4": "The non-compliant elements will be included in ongoing testing and fixing.",
-  "access_statement_prep_bulletpoint_1": "12 month: coarse and trout",
-  "access_statement_prep_bulletpoint_2": "12 month: salmon and sea trout ",
-  "access_statement_prep_bulletpoint_3": "junior",
-  "access_statement_prep_heading": "Preparation of this accessibility statement",
-  "access_statement_reporting_info": "We are always looking to improve the accessibility of this website. If you find any problems not listed on this page or think we’re not meeting accessibility requirements, contact:",
-  "access_statement_reporting_subheading": "Reporting accessibility problems with this website",
-  "access_statement_tech_body": "The Environment Agency is committed to making its website accessible, in accordance with the Public Sector Bodies (Websites and Mobile Applications) (No. 2) Accessibility Regulations 2018.",
-  "access_statement_tech_heading": "Technical information about this website’s accessibility",
+  "access_statement_feedback_info_bulletpoint_2_times": " (dydd Llun i ddydd Gwener, 8am tan 6pm)",
+  "access_statement_feedback_info": "Os oes arnoch angen gwybodaeth ar y wefan hon mewn fformat arall fel PDF hygyrch, print bras, fersiwn hawdd ei deall, recordiad sain neu Braille, cysylltwch drwy un o’r dulliau canlynol:",
+  "access_statement_feedback_subheading": "Adborth a manylion cyswllt",
+  "access_statement_heading": "Datganiad hygyrchedd ar gyfer cyflwyno cais am drwydded bysgota â gwialen",
+  "access_statement_how_info_bulletpoint_1": "Ar dudalen dyddiad dechrau’r drwydded, nid yw dewiswr dyddiad y calendr yn hygyrch i’r rheiny sy’n defnyddio bysellfyrddau neu ddarllenwyr sgrin. Gall defnyddwyr ag anghenion hygyrchedd nodi’r dyddiad hwn gan ddefnyddio’r meysydd diwrnod, mis a blwyddyn safonol.",
+  "access_statement_how_info_bulletpoint_2": "Mae’r dyddiadau calendr hanesyddol yn rhy isel o ran cyferbyniad",
+  "access_statement_how_info": "Gall yr holl ddefnyddwyr ag anghenion mynediad gwblhau’r broses o brynu trwydded gwialen bysgota trwy ddefnyddio’r gwasanaeth hwn. Fodd bynnag, rydym yn gwybod nad yw rhai rhannau o’r wefan hon yn gwbl hygyrch:",
+  "access_statement_made_simple": "Rydym hefyd wedi sicrhau bod y testun ar y wefan mor syml â phosib i’w ddeall.",
+  "access_statement_nonaccess_body": "Nid yw’r cynnwys a restrir isod yn hygyrch am y rhesymau canlynol.",
+  "access_statement_nonaccess_heading": "Cynnwys nad yw’n hygyrch",
+  "access_statement_noncompliance_body_1": "Nid yw defnyddwyr bob tro’n gwybod pan fo cynnwys amodol sy’n gysylltiedig â botwm radio neu flwch gwirio wedi’i ehangu neu ei gwympo. Mae hyn yn methu ",
+  "access_statement_noncompliance_body_2": ". Byddwn yn adolygu hyn erbyn diwedd mis Ionawr 2022. ",
+  "access_statement_noncompliance_body_link": "maen prawf llwyddiant 4.1.2: Enw, Rôl, Gwerth WCAG 2.1",
+  "access_statement_noncompliance_heading": "Diffyg cydymffurfio â’r rheoliadau hygyrchedd",
+  "access_statement_none": "Dim.",
+  "access_statement_not_in_scope_title": "Cynnwys nad o fewn cwmpas y rheoliadau hygyrchedd",
+  "access_statement_prep_body_1": "Paratowyd y datganiad hwn ar 23 Medi 2020. Fe’i hadolygwyd ddiwethaf ar 13 Hydref 2021.",
+  "access_statement_prep_body_2": "Archwiliwyd y gwasanaeth am hygyrchedd gan y Ganolfan Hygyrchedd Digidol ar 13 Ebrill 2021 a chan dîm cydymffurfedd gwe Adran yr Amgylchedd Bwyd a Materion Gwledig ar 22 Ebrill 2021.",
+  "access_statement_prep_body_3": "Gwnaethom brofi’r camau mwyaf cyffredin ar gyfer cyflwyno cais am y mathau hyn o drwydded:",
+  "access_statement_prep_body_4": "Caiff yr elfennau o ddiffyg cydymffurfio eu cynnwys mewn gwaith profi a thrwsio parhaus.",
+  "access_statement_prep_bulletpoint_1": "12 mis: pysgod bras a brithyllod",
+  "access_statement_prep_bulletpoint_2": "12 mis: eogiaid a brithyllod y môr",
+  "access_statement_prep_bulletpoint_3": "iau",
+  "access_statement_prep_heading": "Llunio’r datganiad hygyrchedd hwn",
+  "access_statement_reporting_info": "Rydym yn awyddus bob amser i wella hygyrchedd y wefan hon. Os ydych yn cael unrhyw broblemau nad ydynt wedi’u rhestru ar y dudalen hon neu os nad ydych yn meddwl ein bod yn bodloni gofynion hygyrchedd, cysylltwch drwy un o’r dulliau canlynol:",
+  "access_statement_reporting_subheading": "Adrodd am broblemau hygyrchedd gyda’r wefan hon",
+  "access_statement_tech_body": "Mae Asiantaeth yr Amgylchedd yn ymrwymedig i sicrhau bod ei gwefan yn hygyrch, yn unol â Rheoliadau Hygyrchedd Cyrff Sector Cyhoeddus (Gwefannau ac Apiau Symudol) (Rhif 2) 2018.",
+  "access_statement_tech_heading": "Gwybodaeth dechnegol am hygyrchedd y wefan hon",
   "access_statement_title": "Accessibility statement - GOV.UK",
-  "access_statement_visit_info_link": "office access and opening times",
-  "access_statement_visit_info_text_serivce": "We do not currently have a text relay service for people who are deaf, hearing impaired or have a speech impediment.",
-  "access_statement_visit_info": "See the Environment Agency’s ",
-  "access_statement_visit": "If you visit our offices and need assistance or a British Sign Language interpreter, you should contact us before you visit.",
+  "access_statement_visit_info_link": "mynediad ac oriau agor swyddfeydd",
+  "access_statement_visit_info_text_serivce": "Nid ydym yn darparu gwasanaeth cyfnewid testun i bobl sy’n fyddar, sydd â nam ar eu clyw, neu sydd â nam lleferydd ar hyn o bryd.",
+  "access_statement_visit_info_1": "Gweler ",
+  "access_statement_visit_info_2": " Asiantaeth yr Amgylchedd.",
+  "access_statement_visit": "Os ydych yn ymweld â’n swyddfeydd ac mae angen cymorth arnoch neu ddehonglydd Iaith Arwyddion Prydain, dylech gysylltu â ni cyn eich ymweliad.",
   "account_disabled_body_1": "You were successfully signed in but your account is not enabled in Microsoft Dynamics.",
   "account_disabled_title": "Account not enabled",
   "address_entry_content_and_postcode": "and postcode",
@@ -121,10 +123,14 @@
   "client_error_title_forbidden": "Forbidden",
   "client_error_title_not_found": "Page not found",
   "client_error_title_unauth": "Unauthorized",
+  "client_error_back_during_payment": "This happened because you either closed the browser or used the back button during payment.",
+  "client_error_continue_with_payment_pre": "To continue with the payment, ",
+  "client_error_continue_with_payment_link": "go back to GOV Pay.",
+  "client_error_payment_start_again_pre": "Or, if you wish, you can discard this licence and ",
   "concession_applied": "Consesiwn wedi’i gynnwys",
   "contact_summary_title": "Check the contact details",
-  "contact_us_body": "You can contact us by:",
-  "contact_us_heading": "Contact us",
+  "contact_us_body": "Gallwch gysylltu â ni drwy’r dulliau canlynol:",
+  "contact_us_heading": "Cysylltu â ni",
   "continue": "Parhau",
   "cookie_banner_close_ex": "cookie banner",
   "cookie_banner_close": "Close",
@@ -166,6 +172,7 @@
   "cookies_survey_body_link_3": "SmartSurvey cookies guide",
   "cookies_survey_subheading": "Our performance survey",
   "cookies_title": "Cookies - GOV.UK",
+  "cost": "Cost",
   "disability_concession_12_month": "Gall deiliaid trwydded 12 mis fod yn gymwys i gael consesiynau anabledd",
   "disability_concession_badge_error_msg": "Nodwch rif Bathodyn Glas deiliad y drwydded",
   "disability_concession_error_choose_option": "Dewiswch un o’r opsiynau.",
@@ -343,19 +350,19 @@
   "licence_start_title_other": "Pryd ddylai'r drwydded ddechrau?",
   "licence_start_title_you": "Pryd yr hoffech i'ch trwydded ddechrau?",
   "licence_start_today_or_within": "Gall y drwydded ddechrau heddiw neu unrhyw ddiwrnod o fewn y ",
-  "licence_summary_blue_badge_num": "Blue Badge number",
+  "licence_summary_blue_badge_num": "Rhif Bathodyn Glas",
   "licence_summary_change": "Newid",
-  "licence_summary_disability_concession": "Disability concession",
-  "licence_summary_dob": "Date of birth",
+  "licence_summary_disability_concession": "Consesiwn anabledd",
+  "licence_summary_dob": "Dyddiad geni",
   "licence_summary_immediately_after_expire": "Immediately after the current licence expires",
-  "licence_summary_length": "Length",
-  "licence_summary_minutes_after_payment": " minutes after payment",
-  "licence_summary_name": "Name",
-  "licence_summary_ni_num": "National Insurance number",
-  "licence_summary_none": "None",
-  "licence_summary_start_date": "Start date",
-  "licence_summary_title": "Check the licence details",
-  "licence_summary_type": "Type",
+  "licence_summary_length": "Hyd",
+  "licence_summary_minutes_after_payment": " munud yn dilyn taliad",
+  "licence_summary_name": "Enw",
+  "licence_summary_ni_num": "Rhif Yswiriant Gwladol",
+  "licence_summary_none": "Dim",
+  "licence_summary_start_date": "Dyddiad dechrau",
+  "licence_summary_title": "Gwiriwch fanylion y drwydded",
+  "licence_summary_type": "Math",
   "licence_type_12m": "12 mis",
   "licence_type_1d": "1 diwrnod",
   "licence_type_8d": "8 niwrnod",

package/src/locales/en.json

@@ -1,6 +1,7 @@
 {
   "access_statement_ability_net_link": "AbilityNet",
-  "access_statement_ability_net": " has advice on making your device easier to use if you have a disability.",
+  "access_statement_ability_net_1": " has advice on making your device easier to use if you have a disability.",
+  "access_statement_ability_net_2": " has advice on making your device easier to use if you have a disability.",
   "access_statement_body": "This service is run by the Environment Agency. We want as many people as possible to be able to use this website. For example, that means you should be able to:",
   "access_statement_bulletpoint_1": "change colours, contrast levels and fonts",
   "access_statement_bulletpoint_2": "zoom in up to 200% without the text spilling off the screen",
@@ -51,7 +52,8 @@
   "access_statement_title": "Accessibility statement - GOV.UK",
   "access_statement_visit_info_link": "office access and opening times",
   "access_statement_visit_info_text_serivce": "We do not currently have a text relay service for people who are deaf, hearing impaired or have a speech impediment.",
-  "access_statement_visit_info": "See the Environment Agency’s ",
+  "access_statement_visit_info_1": "See the Environment Agency’s ",
+  "access_statement_visit_info_2": ".",
   "access_statement_visit": "If you visit our offices and need assistance or a British Sign Language interpreter, you should contact us before you visit.",
   "account_disabled_body_1": "You were successfully signed in but your account is not enabled in Microsoft Dynamics.",
   "account_disabled_title": "Account not enabled",
@@ -121,6 +123,10 @@
   "client_error_title_forbidden": "Forbidden",
   "client_error_title_not_found": "Page not found",
   "client_error_title_unauth": "Unauthorized",
+  "client_error_back_during_payment": "This happened because you either closed the browser or used the back button during payment.",
+  "client_error_continue_with_payment_pre": "To continue with the payment, ",
+  "client_error_continue_with_payment_link": "go back to GOV Pay.",
+  "client_error_payment_start_again_pre": "Or, if you wish, you can discard this licence and ",
   "concession_applied": "Concession applied",
   "contact_summary_title": "Check the contact details",
   "contact_us_body": "You can contact us by:",
@@ -166,6 +172,7 @@
   "cookies_survey_body_link_3": "SmartSurvey cookies guide",
   "cookies_survey_subheading": "Our performance survey",
   "cookies_title": "Cookies - GOV.UK",
+  "cost": "Cost",
   "disability_concession_12_month": "12 month licence holders may be eligible for disability concessions",
   "disability_concession_badge_error_msg": "Enter the licence holder’s Blue Badge number",
   "disability_concession_error_choose_option": "Choose one of the options.",

package/src/pages/concessions/disability/route.js

@@ -17,9 +17,7 @@ const validator = Joi.object({
   }),
   'blue-badge-number': Joi.alternatives().conditional('disability-concession', {
     is: disabilityConcessionTypes.blueBadge,
-    then: Joi.string()
-      .max(25)
-      .required(),
+    then: Joi.string().max(25).required(),
     otherwise: Joi.string().empty('')
   })
 }).options({ abortEarly: false, allowUnknown: true })

package/src/pages/contact/address/select/route.js

@@ -20,10 +20,7 @@ export default pageRoute(
   ADDRESS_SELECT.page,
   ADDRESS_SELECT.uri,
   Joi.object({
-    address: Joi.number()
-      .integer()
-      .min(0)
-      .required()
+    address: Joi.number().integer().min(0).required()
   }).options({ abortEarly: false, allowUnknown: true }),
   nextPage,
   getData

package/src/pages/contact/contact/__tests__/result-function.spec.js

@@ -46,13 +46,13 @@ describe('contact > result-function', () => {
     })
 
     it('should return ok if renewal is false', async () => {
-      mockStatusCacheGet.mockImplementationOnce(() => ({ renewal: false }))
+      mockTransactionCacheGet.mockImplementationOnce(() => ({ isRenewal: false }))
       const result = await resultFunction(mockRequest)
       expect(result).toBe(CommonResults.OK)
     })
 
     it('should return summary if renewal is true', async () => {
-      mockStatusCacheGet.mockImplementationOnce(() => ({ renewal: true }))
+      mockTransactionCacheGet.mockImplementationOnce(() => ({ isRenewal: true }))
       const result = await resultFunction(mockRequest)
       expect(result).toBe(CommonResults.SUMMARY)
     })

package/src/pages/contact/contact/result-function.js

@@ -4,7 +4,7 @@ export default async request => {
   const status = await request.cache().helpers.status.getCurrentPermission()
   const transaction = await request.cache().helpers.transaction.getCurrentPermission()
 
-  return transaction.isLicenceForYou === false || status.fromSummary === CONTACT_SUMMARY_SEEN || status.renewal
+  return transaction.isLicenceForYou === false || status.fromSummary === CONTACT_SUMMARY_SEEN || transaction.isRenewal
     ? CommonResults.SUMMARY
     : CommonResults.OK
 }

package/src/pages/contact/contact/route.js

@@ -36,9 +36,7 @@ export const getData = async request => {
 }
 
 export const validator = Joi.object({
-  'how-contacted': Joi.string()
-    .valid('email', 'text', 'none')
-    .required(),
+  'how-contacted': Joi.string().valid('email', 'text', 'none').required(),
   email: Joi.alternatives().conditional('how-contacted', {
     is: 'email',
     then: validation.contact.createEmailValidator(Joi),

package/src/pages/contact/digital-licence/licence-confirmation-method/route.js

@@ -28,9 +28,7 @@ export const getData = async request => {
 }
 
 const validator = Joi.object({
-  'licence-confirmation-method': Joi.string()
-    .valid('email', 'text', 'none')
-    .required(),
+  'licence-confirmation-method': Joi.string().valid('email', 'text', 'none').required(),
   text: Joi.alternatives().conditional('licence-confirmation-method', {
     is: 'text',
     then: mobilePhoneValidator,

package/src/pages/contact/digital-licence/licence-fulfilment/route.js

@@ -18,9 +18,7 @@ export const getData = async request => {
 }
 
 const validator = Joi.object({
-  'licence-option': Joi.string()
-    .valid('digital', 'paper-licence')
-    .required()
+  'licence-option': Joi.string().valid('digital', 'paper-licence').required()
 }).options({ abortEarly: false, allowUnknown: true })
 
 export default pageRoute(LICENCE_FULFILMENT.page, LICENCE_FULFILMENT.uri, validator, nextPage, getData)

package/src/pages/errors/client-error.njk

@@ -18,20 +18,32 @@
 {% block content %}
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-            {% call govukFieldset({
-              legend: {
-                text: mssgs.client_error_content_msg,
-                classes: "govuk-fieldset__legend--l govuk-!-margin-bottom-6",
-                isPageHeading: true
-              }
-            }) %}
-            <p class="govuk-body-m">
-                {{ mssgs.client_error_content_you_can }}<a class="govuk-link" href="{{referer if referer else 'javascript:history.back()'}}">{{ mssgs.client_error_content_try_another }}</a>
-            </p>
-            <p class="govuk-body">
-                {{ mssgs.client_error_content_if_not_working }}<a class="govuk-link" href="{{ uri.new }}">{{ mssgs.client_error_content_start_again }}</a>{{ mssgs.client_error_content_sorry }}
-            </p>
-            {% endcall %}
+        {% call govukFieldset({
+            legend: {
+            text: mssgs.client_error_content_msg,
+            classes: "govuk-fieldset__legend--l govuk-!-margin-bottom-6",
+            isPageHeading: true
+            }
+        }) %}
+            {% if paymentInProgress %}
+                <p class="govuk-body-m">
+                    {{ mssgs.client_error_back_during_payment }}
+                </p>
+                <p class="govuk-body-m">
+                    {{ mssgs.client_error_continue_with_payment_pre }}<a class="govuk-link" href="{{ uri.payment }}">{{ mssgs.client_error_continue_with_payment_link }}</a>
+                </p>
+                <p class="govuk-body">
+                    {{ mssgs.client_error_payment_start_again_pre }}<a class="govuk-link" href="{{ uri.new }}">{{ mssgs.client_error_content_start_again }}</a>
+                </p>
+            {% else %}
+                <p class="govuk-body-m">
+                    {{ mssgs.client_error_content_you_can }}<a class="govuk-link" href="{{referer if referer else 'javascript:history.back()'}}">{{ mssgs.client_error_content_try_another }}</a>
+                </p>
+                <p class="govuk-body">
+                    {{ mssgs.client_error_content_if_not_working }}<a class="govuk-link" href="{{ uri.new }}">{{ mssgs.client_error_content_start_again }}</a>{{ mssgs.client_error_content_sorry }}
+                </p>
+            {% endif %}
+        {% endcall %}
      </div>
 </div>
 {% endblock %}

package/src/pages/guidance/accessibility-statement.njk

@@ -24,7 +24,7 @@
         </ul>
 
         <p class="govuk-body">{{ mssgs.access_statement_made_simple }}</p>
-        <p class="govuk-body"><a href="https://mcmw.abilitynet.org.uk/" class="govuk-link">{{ mssgs.access_statement_ability_net_link}}</a>{{ mssgs.access_statement_ability_net }}</p>
+        <p class="govuk-body">{{ mssgs.access_statement_ability_net_1 }}<a href="https://mcmw.abilitynet.org.uk/" class="govuk-link">{{ mssgs.access_statement_ability_net_link}}</a>{{ mssgs.access_statement_ability_net_2 }}</p>
 
         <h2 class="govuk-heading-m">{{ mssgs.access_statement_how_subheading }}</h2>
         <p class="govuk-body">{{ mssgs.access_statement_how_info }}</p>
@@ -58,7 +58,7 @@
             <li>{{ mssgs.facebook_bulletpoint }}<a href="https://www.facebook.com/environmentagency" class="govuk-link">{{ mssgs.facebook_bulletpoint_link }}</a></li>
         </ul>
         <p class="govuk-body">{{ mssgs.access_statement_visit }}</p>
-        <p class="govuk-body">{{ mssgs.access_statement_visit_info }}<a href="https://www.gov.uk/government/organisations/environment-agency/about/access-and-opening" class="govuk-link">{{ mssgs.access_statement_visit_info_link }}</a>{{ mssgs.period }}</p>
+        <p class="govuk-body">{{ mssgs.access_statement_visit_info_1 }}<a href="https://www.gov.uk/government/organisations/environment-agency/about/access-and-opening" class="govuk-link">{{ mssgs.access_statement_visit_info_link }}</a>{{ mssgs.access_statement_visit_info_2 }}</p>
         <p class="govuk-body">{{ mssgs.access_statement_visit_info_text_serivce }}</p>
 
         <h2 class="govuk-heading-m">{{ mssgs.access_statement_tech_heading }}</h2>

package/src/pages/licence-details/licence-for/route.js

@@ -4,9 +4,7 @@ import pageRoute from '../../../routes/page-route.js'
 import { nextPage } from '../../../routes/next-page.js'
 
 export const validator = Joi.object({
-  'licence-for': Joi.string()
-    .valid('you', 'someone-else')
-    .required()
+  'licence-for': Joi.string().valid('you', 'someone-else').required()
 }).options({ abortEarly: false, allowUnknown: true })
 
 const route = pageRoute(LICENCE_FOR.page, LICENCE_FOR.uri, validator, nextPage)