Merge pull request #609 from hmrc/CTCP-4981

CTCP-4981: Revising error content.
hmrc · Feb 28, 2024 · 179755b · 179755b
2 parents 3c9d382 + 08b3fd1
commit 179755b
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 14 deletions.
diff --git a/app/views/NotFoundView.scala.html b/app/views/NotFoundView.scala.html
@@ -33,7 +33,7 @@
 
     <p class="govuk-body">@messages("pageNotFound.paragraph1")</p>
     <p class="govuk-body">@messages("pageNotFound.paragraph2")</p>
-    <p class="govuk-body">@messages("pageNotFound.paragraph3Start")
+    <p class="govuk-body">
         <a rel="noreferrer noopener" href=@config.nctsGuidanceUrl target="_blank" class="govuk-link" id="contact">@messages("pageNotFound.contactLink")</a>.
     </p>
 }
diff --git a/app/views/SessionExpiredView.scala.html b/app/views/SessionExpiredView.scala.html
@@ -34,7 +34,9 @@
     @formHelper(action = routes.SessionExpiredController.onSubmit(), Symbol("autoComplete") -> "off") {
         @heading(messages("session_expired.heading"))
 
-        <p class="govuk-body">@messages("session_expired.guidance")</p>
+        <p class="govuk-body">@messages("session_expired.paragraph1")</p>
+
+        <p class="govuk-body">@messages("session_expired.paragraph2")</p>
 
         @button(messageKey = "session_expired.button", attributes = Map("id" -> "submit"))
     }

diff --git a/app/views/TechnicalDifficultiesView.scala.html b/app/views/TechnicalDifficultiesView.scala.html
@@ -34,7 +34,7 @@
 
     <p class="govuk-body">@messages("technicalDifficulties.tryAgain")</p>
 
-    <p class="govuk-body">@messages("technicalDifficulties.contact")
+    <p class="govuk-body">
         <a class="govuk-link" rel="noreferrer noopener" href=@config.nctsEnquiriesUrl target="_blank" id="contact">@messages("technicalDifficulties.contact.link")</a>.
     </p>
 

diff --git a/conf/messages.en b/conf/messages.en
@@ -36,12 +36,12 @@ pageNotFound.title = Page not found
 pageNotFound.heading = Page not found
 pageNotFound.paragraph1 = If you typed the web address, check it is correct.
 pageNotFound.paragraph2 = If you pasted the web address, check you copied the entire address.
-pageNotFound.paragraph3Start = If the web address is correct or you selected a link or button,
-pageNotFound.contactLink = contact the New Computerised Transit System(NCTS) helpdesk if you need to speak to someone about your transit movement (opens in a new tab)
+pageNotFound.contactLink = Contact the New Computerised Transit System (NCTS) helpdesk if you need to speak to someone about your transit movements (opens in a new tab)
 
 session_expired.title = For your security, we signed you out
 session_expired.heading = For your security, we signed you out
-session_expired.guidance = We did not save your answers.
+session_expired.paragraph1 = We saved your answers. They will be available for 30 days.
+session_expired.paragraph2 = Sign in to view and send your declaration.
 session_expired.button = Sign in
 
 unauthorised.title = You cannot use this service
@@ -55,9 +55,8 @@ unauthorisedWithGroupAccess.paragraph = If you already have access, you must con
 technicalDifficulties.title = Sorry, there is a problem with the service
 technicalDifficulties.heading = Sorry, there is a problem with the service
 technicalDifficulties.tryAgain = Try again later.
-technicalDifficulties.savedAnswers = We saved your answers. They will be available for up to 28 days.
-technicalDifficulties.contact = You can
-technicalDifficulties.contact.link = contact the New Computerised Transit System helpdesk if you need to speak to someone about your transit movement(opens in a new tab).
+technicalDifficulties.savedAnswers = We saved your answers. They will be available for 30 days.
+technicalDifficulties.contact.link = Contact the New Computerised Transit System (NCTS) helpdesk if you need to speak to someone about your transit movements (opens in a new tab)
 
 # Pre- task list
 

diff --git a/test/views/NotFoundViewSpec.scala b/test/views/NotFoundViewSpec.scala
@@ -35,10 +35,10 @@ class NotFoundViewSpec extends ViewBehaviours {
 
   behave like pageWithContent("p", "If you typed the web address, check it is correct.")
   behave like pageWithContent("p", "If you pasted the web address, check you copied the entire address.")
-  behave like pageWithPartialContent("p", "If the web address is correct or you selected a link or button, ")
+
   behave like pageWithLink(
     "contact",
-    "contact the New Computerised Transit System(NCTS) helpdesk if you need to speak to someone about your transit movement (opens in a new tab)",
+    "Contact the New Computerised Transit System (NCTS) helpdesk if you need to speak to someone about your transit movements (opens in a new tab)",
     "https://www.gov.uk/guidance/submit-union-transit-declarations-through-ncts"
   )
 }
diff --git a/test/views/SessionExpiredViewSpec.scala b/test/views/SessionExpiredViewSpec.scala
@@ -35,7 +35,9 @@ class SessionExpiredViewSpec extends ViewBehaviours {
 
   behave like pageWithHeading()
 
-  behave like pageWithContent("p", "We did not save your answers.")
+  behave like pageWithContent("p", "We saved your answers. They will be available for 30 days.")
+
+  behave like pageWithContent("p", "Sign in to view and send your declaration.")
 
   behave like pageWithSubmitButton("Sign in")
 }
diff --git a/test/views/TechnicalDifficultiesViewSpec.scala b/test/views/TechnicalDifficultiesViewSpec.scala
@@ -37,10 +37,9 @@ class TechnicalDifficultiesViewSpec extends ViewBehaviours {
 
   behave like pageWithContent("p", "Try again later.")
 
-  behave like pageWithPartialContent("p", "You can ")
   behave like pageWithLink(
     "contact",
-    "contact the New Computerised Transit System helpdesk if you need to speak to someone about your transit movement(opens in a new tab).",
+    "Contact the New Computerised Transit System (NCTS) helpdesk if you need to speak to someone about your transit movements (opens in a new tab)",
     contactUrl
   )
 }