PYIC-8987: Update re-use page (#2811)

Author: DanCorderIPV

browser-tests/functional-tests/functional.spec.ts

@@ -132,7 +132,7 @@ test.describe.parallel("Functional tests", () => {
     );
 
     const reuseIdentityPageHeaderLocator = await page.getByRole("heading", {
-      name: "You have already proved your identity",
+      name: "Confirm your details",
     });
     await expect(reuseIdentityPageHeaderLocator).toBeVisible();
 
@@ -179,9 +179,7 @@ test.describe.parallel("Functional tests", () => {
       getAuthoriseUrlForJourney("reuseJourneyKennethDecerqueira"),
     );
 
-    await page
-      .getByRole("heading", { name: "If your details are wrong" })
-      .click();
+    await page.getByText("If your details are wrong").click();
     await page.getByRole("link", { name: "update your details" }).click();
 
     // Check we are on the update-details page
@@ -222,9 +220,7 @@ test.describe.parallel("Functional tests", () => {
       getAuthoriseUrlForJourney("reuseJourneyKennethDecerqueira"),
     );
 
-    await page
-      .getByRole("heading", { name: "If your details are wrong" })
-      .click();
+    await page.getByText("If your details are wrong").click();
     await page.getByRole("link", { name: "update your details" }).click();
 
     await page.click("input[value='givenNames']");

browser-tests/snapshot-tests/snapshot.spec.ts-snapshots/page-ipv-reuse-cy-chromium-linux.jpeg

@@ -3,6 +3,7 @@
 // When it is run it generates translation-inconsistencies.json if there are any issues with the translation files. This
 // includes:
 // - Inconsistent translations from English to Welsh
+// - Translation text that isn't used on any pages
 // - Mismatched entries in the English and Welsh files
 // - Any untranslated text is put into a form suitable for sending to the translation team
 //

browser-tests/snapshot-tests/snapshot.spec.ts-snapshots/page-ipv-reuse-en-chromium-linux.jpeg

@@ -779,24 +779,21 @@
       }
     },
     "pageIpvReuse": {
-      "title": "Rydych wedi profi pwy ydych chi yn barod",
-      "header": "Rydych wedi profi pwy ydych chi yn barod",
-      "content": {
-        "paragraph1": "Rydych eisoes wedi profi eich hunaniaeth gyda GOV.UK One Login. Byddech wedi gwneud hyn ar-lein neu’n bersonol yn Swyddfa’r Post.",
-        "paragraph2": "Gallwch nawr barhau i’r gwasanaeth rydych angen ei ddefnyddio.",
-        "subHeading": "Gwirio eich manylion",
-        "paragraph3": "Fe wnaethoch gyflwyno’r manylion canlynol pan wnaethoch brofi eich hunaniaeth. Efallai y byddwch am wirio bod eich manylion yn dal yn gywir os nad ydych wedi mewngofnodi i GOV.UK One Login ers peth amser.",
-        "paragraph4": "Efallai y bydd rhai o’r manylion hyn yn cael eu defnyddio i lenwi’r ffurflenni yn awtomatig yn y gwasanaeth rydych angen ei ddefnyddio.",
-        "subHeading2": "Eich manylion",
+      "title": "Cadarnhau eich manylion",
+      "header": "Cadarnhau eich manylion",
+      "content": {
+        "paragraph1": "Rydych wedi cwblhau eich gwiriad hunaniaeth ar-lein neu mewn Swyddfa’r Post gan ddefnyddio’r manylion hyn:",
         "userDetailsInformation": {
           "fullName": "Enw llawn",
           "dateOfBirth": "Dyddiad geni",
           "currentAddress": "Cyfeiriad cartref presennol"
         },
+        "paragraph2": "Efallai y bydd rhai o’r manylion hyn yn cael eu defnyddio i lenwi’r ffurflenni yn awtomatig yn y gwasanaeth rydych angen ei ddefnyddio.",
         "updateUserDetailsInformation": {
           "updateDetailsLabel": "Os yw eich manylion yn anghywir",
-          "updateDetailsHtml": "<h4 class=\"govuk-heading-s\">Os yw’ch manylion wedi newid</h4> <p class=\"govuk-body\">Mae eich prawf hunaniaeth yn dal yn ddilys hyd yn oed os yw’ch manylion wedi newid.</p><p class=\"govuk-body\">Nid oes angen i chi ddiweddaru’ch manylion i barhau â’r gwasanaeth rydych angen ei ddefnyddio.</p><p class=\"govuk-body\"> Pan fyddwch yn parhau, bydd GOV.UK One Login yn rhannu eich manylion sydd wedi’u harbed gyda’r gwasanaeth.</p><p class=\"govuk-body\"> Os oes angen, gallwch <a class=\"govuk-link\" href=\"/ipv/journey/page-ipv-reuse/update-details\" rel=\"noopener noreferrer\">ddiweddaru eich manylion</a>.</p> <h4 class=\"govuk-heading-s\"> Os oes camgymeriad yn eich enw</h4> <p class=\"govuk-body\"> <a class=\"govuk-link\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"{{url}}\">Cysylltu â’r tîm GOV.UK One Login (agor mewn tab newydd)</a> os oes camgymeriad yn eich enw. Er enghraifft, os yw’ch enw gyda llythrennau ar goll neu gysylltnod.</p><p class=\"govuk-body\"> Peidiwch â cheisio diweddaru eich manylion na phrofi eich hunaniaeth eto oni bai bod tîm GOV.UK One Login wedi dweud wrthych i wneud hynny.</p> "
-        }
+          "updateDetailsHtml": "<p class=\"govuk-heading-s\">Os yw’ch manylion wedi newid</p> <p class=\"govuk-body\">Mae eich prawf hunaniaeth yn dal yn ddilys hyd yn oed os yw’ch manylion wedi newid.</p><p class=\"govuk-body\">Nid oes angen i chi ddiweddaru’ch manylion i barhau â’r gwasanaeth rydych angen ei ddefnyddio.</p><p class=\"govuk-body\"> Pan fyddwch yn parhau, bydd GOV.UK One Login yn rhannu eich manylion sydd wedi’u harbed gyda’r gwasanaeth.</p><p class=\"govuk-body\"> Os oes angen, gallwch <a class=\"govuk-link\" href=\"/ipv/journey/page-ipv-reuse/update-details\" rel=\"noopener noreferrer\">ddiweddaru eich manylion</a>.</p> <p class=\"govuk-heading-s\"> Os oes camgymeriad yn eich enw</p> <p class=\"govuk-body\"> <a class=\"govuk-link\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"{{url}}\">Cysylltu â’r tîm GOV.UK One Login (agor mewn tab newydd)</a> os oes camgymeriad yn eich enw. Er enghraifft, os yw’ch enw gyda llythrennau ar goll neu gysylltnod.</p><p class=\"govuk-body\"> Peidiwch â cheisio diweddaru eich manylion na phrofi eich hunaniaeth eto oni bai bod tîm GOV.UK One Login wedi dweud wrthych i wneud hynny.</p> "
+        },
+        "continueButton": "Cadarnhau a pharhau"
       }
     },
     "pageIpvPending": {

locales/check-translations.ts

@@ -796,24 +796,21 @@
       }
     },
     "pageIpvReuse": {
-      "title": "You have already proved your identity",
-      "header": "You have already proved your identity",
-      "content": {
-        "paragraph1": "You have already proved your identity with GOV.UK One Login. You would have done this online or in person at the Post Office.",
-        "paragraph2": "You can now continue to the service you need to use.",
-        "subHeading": "Check your details",
-        "paragraph3": "You submitted the following details when you proved your identity. You might want to check your details are still correct if you’ve not signed in to GOV.UK One Login in a while.",
-        "paragraph4": "Some of these details might be used to automatically fill in the forms within the service you need to use.",
-        "subHeading2": "Your details",
+      "title": "Confirm your details",
+      "header": "Confirm your details",
+      "content": {
+        "paragraph1": "You completed your identity check online or at a Post Office using these details:",
         "userDetailsInformation": {
           "fullName": "Full name",
           "dateOfBirth": "Date of birth",
           "currentAddress": "Current home address"
         },
+        "paragraph2": "Some of these details might be used to automatically fill in the forms within the service you need to use.",
         "updateUserDetailsInformation": {
           "updateDetailsLabel": "If your details are wrong",
-          "updateDetailsHtml": "<h4 class=\"govuk-heading-s\">If your details have changed</h4> <p class=\"govuk-body\">Your proof of identity is still valid even if your details have changed.</p><p class=\"govuk-body\"> You do not need to update your details to continue to the service you need to use.</p><p class=\"govuk-body\"> When you continue, GOV.UK One Login will share your saved details with the service. </p><p class=\"govuk-body\"> If you need to, you can <a class=\"govuk-link\" href=\"/ipv/journey/page-ipv-reuse/update-details\" rel=\"noopener noreferrer\">update your details</a>.</p> <h4 class=\"govuk-heading-s\"> If there is a mistake in your name</h4> <p class=\"govuk-body\"> <a class=\"govuk-link\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"{{url}}\">Contact the GOV.UK One Login team (opens in new tab)</a> if there is a mistake in your name. For example, if your name is missing letters or a hyphen.</p><p class=\"govuk-body\"> Do not try to update your details or prove your identity again unless the GOV.UK One Login team has told you to.</p>"
-        }
+          "updateDetailsHtml": "<p class=\"govuk-heading-s\">If your details have changed</p> <p class=\"govuk-body\">Your proof of identity is still valid even if your details have changed.</p><p class=\"govuk-body\"> You do not need to update your details to continue to the service you need to use.</p><p class=\"govuk-body\"> When you continue, GOV.UK One Login will share your saved details with the service. </p><p class=\"govuk-body\"> If you need to, you can <a class=\"govuk-link\" href=\"/ipv/journey/page-ipv-reuse/update-details\" rel=\"noopener noreferrer\">update your details</a>.</p> <p class=\"govuk-heading-s\"> If there is a mistake in your name</p> <p class=\"govuk-body\"> <a class=\"govuk-link\" target=\"_blank\" rel=\"noopener noreferrer\" href=\"{{url}}\">Contact the GOV.UK One Login team (opens in new tab)</a> if there is a mistake in your name. For example, if your name is missing letters or a hyphen.</p><p class=\"govuk-body\"> Do not try to update your details or prove your identity again unless the GOV.UK One Login team has told you to.</p>"
+        },
+        "continueButton": "Confirm and continue"
       }
     },
     "pageIpvPending": {

locales/cy/translation.json

@@ -14,13 +14,6 @@
     <h1 class="govuk-heading-l" id="header"
         data-page="{{ googleTagManagerPageId }}">{{ 'pages.pageIpvReuse.header' | translate }}</h1>
     <p class="govuk-body">{{ 'pages.pageIpvReuse.content.paragraph1' | translate }}</p>
-    <p class="govuk-body">{{ 'pages.pageIpvReuse.content.paragraph2' | translate }}</p>
-
-    <h2 class="govuk-heading-m">{{ 'pages.pageIpvReuse.content.subHeading' | translate }}</h2>
-    <p class="govuk-body">{{ 'pages.pageIpvReuse.content.paragraph3' | translate }}</p>
-    <p class="govuk-body">{{ 'pages.pageIpvReuse.content.paragraph4' | translate }}</p>
-
-    <h3 class="govuk-heading-s">{{ 'pages.pageIpvReuse.content.subHeading2' | translate }}</h3>
 
     {% set rows = [
         {
@@ -55,11 +48,13 @@
         rows: rows
     }) }}
 
+    <p class="govuk-body">{{ 'pages.pageIpvReuse.content.paragraph2' | translate }}</p>
+
     <details class="govuk-details">
       <summary class="govuk-details__summary">
-        <h3 class="govuk-!-margin-0 govuk-!-font-size-19 govuk-!-font-weight-regular govuk-details__summary-text">
+        <p class="govuk-!-margin-0 govuk-details__summary-text">
           {{ 'pages.pageIpvReuse.content.updateUserDetailsInformation.updateDetailsLabel' | translate }}
-        </h3>
+        </p>
       </summary>
       <div class="govuk-details__text">
         {{ 'pages.pageIpvReuse.content.updateUserDetailsInformation.updateDetailsHtml' | translate({ url: contactUsUrl }) | safe }}
@@ -75,12 +70,12 @@
         translations: translations.translation.progressButton,
         href: "/ipv/journey/" + pageId + "/next",
         errorPage: '/ipv/page/pyi-technical?spinnerTimeout',
-        text: ('general.buttons.continueToService' | translate),
+        text: ('pages.pageIpvReuse.content.continueButton' | translate),
         customDevErrorTimeout: customTimeout
       }) }}
     {% else %}
       {# Original button (control) #}
-      {{ journeyNextForm(pageId, csrfToken, 'general.buttons.continueToService' | translate ) }}
+      {{ journeyNextForm(pageId, csrfToken, 'pages.pageIpvReuse.content.continueButton' | translate ) }}
     {% endif %}
 
 {% endblock %}