FPET-763: Start page content changes

src/main/steps/eligibility/start/content.test.ts

@@ -6,79 +6,51 @@ import { generateContent } from './content';
 jest.mock('../../../app/form/validation');
 
 const enContent = {
-  title: 'Apply to adopt a child placed in your care',
+  title: 'Before you start',
   line1:
-    'You can apply to adopt a child who\'s in your care following a <a class="govuk-link" href="https://www.gov.uk/child-adoption/applying-for-an-adoption-court-order">court placement order.</a>',
+    'This online service can only be used to apply for post placement adoptions. This means adopting a child who has been placed in your care by a local authority. To adopt a step-child, a child from overseas or a baby that has been willingly given up by the birth parents, you must <a class="govuk-link" href="https://www.gov.uk/government/publications/form-a58-application-for-an-adoption-order-section-46-adoption-and-children-act-2002">apply for an adoption order.</a>',
   line2:
     'You can start your application at any time however, the child must have lived with you for at least 10 weeks before you can submit it.',
-  line3:
-    "You can save your progress in the application by selecting 'save as draft'. This saves your answers so you can continue working on the application at a later date. You can only submit once all sections are complete.",
-  heading1: 'Before you start',
   subheading1: 'Details about you',
-  line4: 'You need to provide details about yourself and any second applicant.',
-  line5:
+  line3: 'You need to provide details about yourself and any second applicant.',
+  line4:
     "Some of the information is needed for the Adoption Register and adoption certificate which will replace the child's birth certificate.",
-  line6:
+  line5:
     "You will be asked for information that is on the child's placement order. This includes the name of the local authority who placed the child in your care and the court which made the order. Your social worker or adoption agency will have this information.",
-  line7: 'You will be asked for some personal information. This does not affect your application to adopt.',
-  line8: 'The information you provide is only seen by the court and relevant adoption agencies or authorities.',
+  line6: 'You will be asked for some personal information. This does not affect your application to adopt.',
   subheading2: 'What to expect',
-  line9:
-    'The court processing fee for an application is £MOCK_AMOUNT. Payment is due once the application is complete and ready to submit to the court.',
-  line10:
+  line7:
     "We will notify your local authority of your application. They will provide details to the court about the child you wish to adopt. This includes information about their birth parents and any siblings. If you don't receive an email confirming this has been done within 10 working days, contact your social worker.",
-  line11:
+  line8:
     "Once your application and the information from your local authority is submitted, it can take up to 6 weeks before the court contacts you about a first hearing date. You do not have to attend any of the hearing dates. Some of the child's birth relatives can also be present at court hearings. Your social worker can discuss these hearings with you.",
-  subheading3: 'Applying for more than one child',
-  line12:
-    "If you're applying for more than one child, you must submit a new application for each child. You will not be charged if you submit these before midnight on the day of your first application. If you submit after the day of the first application, you will be charged another £183. For this reason we recommend you begin the applications early and have everything you need.",
-  line13: 'You must sign in using the same email address and password used in your first application.',
-  startnow: 'Start now',
+  continue: 'Continue',
 };
 
 const cyContent = {
-  title: 'Gwneud cais i fabwysiadu plentyn a osodwyd yn eich gofal',
+  title: 'Cyn ichi ddechrau',
   line1:
-    'Gallwch wneud cais i fabwysiadu plentyn sydd yn eich gofal yn dilyn <a class="govuk-link" href="https://www.gov.uk/child-adoption/applying-for-an-adoption-court-order">gorchymyn lleoli gan y llys.</a>',
+    'Gellir defnyddio’r gwasanaeth ar-lein hwn i wneud ceisiadau mabwysiadu ar ôl lleoliad yn unig. Mae hyn yn golygu mabwysiadu plentyn sydd wedi cael ei roi dan eich gofal gan awdurdod lleol. <a class="govuk-link" href="https://www.gov.uk/government/publications/form-a58-application-for-an-adoption-order-section-46-adoption-and-children-act-2002">Rhaid i chi wneud cais am orchymyn mabwysiadu</a> i fabwysiadu llysblentyn, plentyn o dramor neu faban y mae ei rieni wedi cytuno i’w roi i ffwrdd.',
   line2:
     "Gallwch ddechrau eich cais ar unrhyw adeg fodd bynnag, mae'n rhaid i'r plentyn fod wedi byw gyda chi am o leiaf 10 wythnos cyn y gallwch gyflwyno’r cais.",
-  line3:
-    "Gallwch gadw eich cais drwy ddewis 'save as draft'. Bydd hyn yn cadw eich atebion fel y gallwch barhau i weithio ar y cais yn hwyrach ymlaen. Dim ond unwaith y bydd pob adran wedi'i chwblhau y gallwch ei gyflwyno.",
-  heading1: 'Cyn i chi ddechrau ',
   subheading1: 'Manylion amdanoch chi',
-  line4: 'Mae angen i chi ddarparu manylion amdanoch chi eich hun ac unrhyw ail geisydd. ',
-  line5:
+  line3: 'Mae angen i chi ddarparu manylion amdanoch chi eich hun ac unrhyw ail geisydd. ',
+  line4:
     "Mae angen rhywfaint o'r wybodaeth ar gyfer y Gofrestr Mabwysiadu a'r dystysgrif fabwysiadu a fydd yn disodli tystysgrif geni’r plentyn.",
-  line6:
+  line5:
     "Gofynnir i chi am wybodaeth sydd ar orchymyn lleoli’r plentyn. Mae hyn yn cynnwys enw'r awdurdod lleol a osododd y plentyn yn eich gofal a'r llys a wnaeth y gorchymyn. Bydd gan eich gweithiwr cymdeithasol neu'ch asiantaeth fabwysiadu'r wybodaeth hon.",
-  line7: 'Fe ofynnir am rywfaint o wybodaeth bersonol gennych. Nid yw hyn yn effeithio ar eich cais i fabwysiadu.',
-  line8:
-    'Dim ond y llys ac asiantaethau neu awdurdodau mabwysiadu perthnasol fydd yn gweld yr wybodaeth y byddwch yn ei darparu.',
+  line6: 'Fe ofynnir am rywfaint o wybodaeth bersonol gennych. Nid yw hyn yn effeithio ar eich cais i fabwysiadu.',
   subheading2: "Beth i'w ddisgwyl",
-  line9:
-    'Ffi prosesu’r llys ar gyfer gwneud cais yw £183. Mae’r taliad yn ddyledus unwaith y bydd y cais wedi’i gwblhau ac yn barod i’w gyflwyno i’r llys.',
-  line10:
+  line7:
     'Byddwn yn hysbysu eich awdurdod lleol am eich cais. Byddant yn rhoi manylion i’r llys am y plentyn rydych yn dymuno ei fabwysiadu. Mae hyn yn cynnwys gwybodaeth am eu rhieni biolegol ac unrhyw frodyr/chwiorydd. Os na chewch neges e-bost yn cadarnhau bod hyn wedi’i wneud o fewn 10 diwrnod gwaith, cysylltwch â’ch gweithiwr cymdeithasol.',
-  line11:
+  line8:
     'Unwaith y bydd eich cais a’r wybodaeth gan eich awdurdod lleol wedi’u cyflwyno, gall gymryd hyd at 6 wythnos cyn i’r llys gysylltu â chi gyda manylion dyddiad y gwrandawiad cyntaf. Nid oes rhaid i chi fynychu unrhyw un o’r gwrandawiadau llys. Gall rhai o berthnasau biolegol y plentyn hefyd fod yn bresennol yn y gwrandawiadau llys. Gall eich gweithiwr cymdeithasol drafod y gwrandawiadau hyn gyda chi.',
-  subheading3: 'Gwneud cais i fabwysiadu mwy nag un plentyn',
-  line12:
-    'Os ydych chi’n gwneud cais i fabwysiadu mwy nag un plentyn, mae’n rhaid i chi gyflwyno cais newydd ar gyfer pob plentyn. Ni chodir ffi arall arnoch os byddwch yn cyflwyno’r ceisiadau hyn cyn hanner nos ar ddyddiad cyflwyno’ch cais cyntaf. Os byddwch yn eu cyflwyno ar ôl dyddiad cyflwyno’r cais cyntaf, yna bydd rhaid i chi dalu £183 arall. Am y rheswm hwn, argymhellwn eich bod yn dechrau eich ceisiadau yn gynnar a bod gennych bopeth rydych ei angen wrth law.',
-  line13:
-    'Mae’n rhaid ichi fewngofnodi gan ddefnyddio’r un cyfeiriad e-bost a chyfrinair a ddefnyddiwyd ar gyfer eich cais cyntaf.',
-  startnow: 'Dechrau nawr',
+  continue: 'Parhau',
 };
 
 describe('eligibility > start > content', () => {
   const commonContent = generatePageContent({
     language: 'en',
     userCase: {},
-    fee: {
-      FeeCode: 'MOCK_CODE',
-      FeeDescription: 'MOCK_DESCRIPTION',
-      FeeVersion: 'MOCK_VERSION',
-      FeeAmount: 'MOCK_AMOUNT',
-    },
   }) as CommonContent;
 
   test('should return correct english content', () => {

src/main/steps/eligibility/start/content.ts

@@ -1,66 +1,45 @@
 import { TranslationFn } from '../../../app/controller/GetController';
 
-const en = content => ({
-  title: 'Apply to adopt a child placed in your care',
+const en = () => ({
+  title: 'Before you start',
   line1:
-    'You can apply to adopt a child who\'s in your care following a <a class="govuk-link" href="https://www.gov.uk/child-adoption/applying-for-an-adoption-court-order">court placement order.</a>',
+    'This online service can only be used to apply for post placement adoptions. This means adopting a child who has been placed in your care by a local authority. To adopt a step-child, a child from overseas or a baby that has been willingly given up by the birth parents, you must <a class="govuk-link" href="https://www.gov.uk/government/publications/form-a58-application-for-an-adoption-order-section-46-adoption-and-children-act-2002">apply for an adoption order.</a>',
   line2:
     'You can start your application at any time however, the child must have lived with you for at least 10 weeks before you can submit it.',
-  line3:
-    "You can save your progress in the application by selecting 'save as draft'. This saves your answers so you can continue working on the application at a later date. You can only submit once all sections are complete.",
-  heading1: 'Before you start',
   subheading1: 'Details about you',
-  line4: 'You need to provide details about yourself and any second applicant.',
-  line5:
+  line3: 'You need to provide details about yourself and any second applicant.',
+  line4:
     "Some of the information is needed for the Adoption Register and adoption certificate which will replace the child's birth certificate.",
-  line6:
+  line5:
     "You will be asked for information that is on the child's placement order. This includes the name of the local authority who placed the child in your care and the court which made the order. Your social worker or adoption agency will have this information.",
-  line7: 'You will be asked for some personal information. This does not affect your application to adopt.',
-  line8: 'The information you provide is only seen by the court and relevant adoption agencies or authorities.',
+  line6: 'You will be asked for some personal information. This does not affect your application to adopt.',
   subheading2: 'What to expect',
-  line9: `The court processing fee for an application is £${content.fee?.FeeAmount}. Payment is due once the application is complete and ready to submit to the court.`,
-  line10:
+  line7:
     "We will notify your local authority of your application. They will provide details to the court about the child you wish to adopt. This includes information about their birth parents and any siblings. If you don't receive an email confirming this has been done within 10 working days, contact your social worker.",
-  line11:
+  line8:
     "Once your application and the information from your local authority is submitted, it can take up to 6 weeks before the court contacts you about a first hearing date. You do not have to attend any of the hearing dates. Some of the child's birth relatives can also be present at court hearings. Your social worker can discuss these hearings with you.",
-  subheading3: 'Applying for more than one child',
-  line12:
-    "If you're applying for more than one child, you must submit a new application for each child. You will not be charged if you submit these before midnight on the day of your first application. If you submit after the day of the first application, you will be charged another £183. For this reason we recommend you begin the applications early and have everything you need.",
-  line13: 'You must sign in using the same email address and password used in your first application.',
-  startnow: 'Start now',
+  continue: 'Continue',
 });
 
 const cy: typeof en = () => ({
-  title: 'Gwneud cais i fabwysiadu plentyn a osodwyd yn eich gofal',
+  title: 'Cyn ichi ddechrau',
   line1:
-    'Gallwch wneud cais i fabwysiadu plentyn sydd yn eich gofal yn dilyn <a class="govuk-link" href="https://www.gov.uk/child-adoption/applying-for-an-adoption-court-order">gorchymyn lleoli gan y llys.</a>',
+    'Gellir defnyddio’r gwasanaeth ar-lein hwn i wneud ceisiadau mabwysiadu ar ôl lleoliad yn unig. Mae hyn yn golygu mabwysiadu plentyn sydd wedi cael ei roi dan eich gofal gan awdurdod lleol. <a class="govuk-link" href="https://www.gov.uk/government/publications/form-a58-application-for-an-adoption-order-section-46-adoption-and-children-act-2002">Rhaid i chi wneud cais am orchymyn mabwysiadu</a> i fabwysiadu llysblentyn, plentyn o dramor neu faban y mae ei rieni wedi cytuno i’w roi i ffwrdd.',
   line2:
     "Gallwch ddechrau eich cais ar unrhyw adeg fodd bynnag, mae'n rhaid i'r plentyn fod wedi byw gyda chi am o leiaf 10 wythnos cyn y gallwch gyflwyno’r cais.",
-  line3:
-    "Gallwch gadw eich cais drwy ddewis 'save as draft'. Bydd hyn yn cadw eich atebion fel y gallwch barhau i weithio ar y cais yn hwyrach ymlaen. Dim ond unwaith y bydd pob adran wedi'i chwblhau y gallwch ei gyflwyno.",
-  heading1: 'Cyn i chi ddechrau ',
   subheading1: 'Manylion amdanoch chi',
-  line4: 'Mae angen i chi ddarparu manylion amdanoch chi eich hun ac unrhyw ail geisydd. ',
-  line5:
+  line3: 'Mae angen i chi ddarparu manylion amdanoch chi eich hun ac unrhyw ail geisydd. ',
+  line4:
     "Mae angen rhywfaint o'r wybodaeth ar gyfer y Gofrestr Mabwysiadu a'r dystysgrif fabwysiadu a fydd yn disodli tystysgrif geni’r plentyn.",
-  line6:
+  line5:
     "Gofynnir i chi am wybodaeth sydd ar orchymyn lleoli’r plentyn. Mae hyn yn cynnwys enw'r awdurdod lleol a osododd y plentyn yn eich gofal a'r llys a wnaeth y gorchymyn. Bydd gan eich gweithiwr cymdeithasol neu'ch asiantaeth fabwysiadu'r wybodaeth hon.",
-  line7: 'Fe ofynnir am rywfaint o wybodaeth bersonol gennych. Nid yw hyn yn effeithio ar eich cais i fabwysiadu.',
-  line8:
-    'Dim ond y llys ac asiantaethau neu awdurdodau mabwysiadu perthnasol fydd yn gweld yr wybodaeth y byddwch yn ei darparu.',
+  line6: 'Fe ofynnir am rywfaint o wybodaeth bersonol gennych. Nid yw hyn yn effeithio ar eich cais i fabwysiadu.',
   subheading2: "Beth i'w ddisgwyl",
-  line9:
-    'Ffi prosesu’r llys ar gyfer gwneud cais yw £183. Mae’r taliad yn ddyledus unwaith y bydd y cais wedi’i gwblhau ac yn barod i’w gyflwyno i’r llys.',
-  line10:
+  line7:
     'Byddwn yn hysbysu eich awdurdod lleol am eich cais. Byddant yn rhoi manylion i’r llys am y plentyn rydych yn dymuno ei fabwysiadu. Mae hyn yn cynnwys gwybodaeth am eu rhieni biolegol ac unrhyw frodyr/chwiorydd. Os na chewch neges e-bost yn cadarnhau bod hyn wedi’i wneud o fewn 10 diwrnod gwaith, cysylltwch â’ch gweithiwr cymdeithasol.',
-  line11:
+  line8:
     'Unwaith y bydd eich cais a’r wybodaeth gan eich awdurdod lleol wedi’u cyflwyno, gall gymryd hyd at 6 wythnos cyn i’r llys gysylltu â chi gyda manylion dyddiad y gwrandawiad cyntaf. Nid oes rhaid i chi fynychu unrhyw un o’r gwrandawiadau llys. Gall rhai o berthnasau biolegol y plentyn hefyd fod yn bresennol yn y gwrandawiadau llys. Gall eich gweithiwr cymdeithasol drafod y gwrandawiadau hyn gyda chi.',
-  subheading3: 'Gwneud cais i fabwysiadu mwy nag un plentyn',
-  line12:
-    'Os ydych chi’n gwneud cais i fabwysiadu mwy nag un plentyn, mae’n rhaid i chi gyflwyno cais newydd ar gyfer pob plentyn. Ni chodir ffi arall arnoch os byddwch yn cyflwyno’r ceisiadau hyn cyn hanner nos ar ddyddiad cyflwyno’ch cais cyntaf. Os byddwch yn eu cyflwyno ar ôl dyddiad cyflwyno’r cais cyntaf, yna bydd rhaid i chi dalu £183 arall. Am y rheswm hwn, argymhellwn eich bod yn dechrau eich ceisiadau yn gynnar a bod gennych bopeth rydych ei angen wrth law.',
-  line13:
-    'Mae’n rhaid ichi fewngofnodi gan ddefnyddio’r un cyfeiriad e-bost a chyfrinair a ddefnyddiwyd ar gyfer eich cais cyntaf.',
-  startnow: 'Dechrau nawr',
+  continue: 'Parhau',
 });
 
 const languages = {
@@ -69,5 +48,5 @@ const languages = {
 };
 
 export const generateContent: TranslationFn = content => {
-  return languages[content.language](content);
+  return languages[content.language]();
 };

src/main/steps/eligibility/start/template.njk

@@ -10,42 +10,22 @@
 
         <p class="govuk-body">{{ line1 | safe }}</p>
         <p class="govuk-body">{{ line2 }}</p>
-        <p class="govuk-body">{{ line3 }}</p>
-
-        <h2 class="govuk-heading-m">{{heading1}}</h2>
-        <ol class="govuk-list">
-          <li>
-            <h3 class="govuk-heading-s">1. {{subheading1}}</h3>
-
-            <p class="govuk-body">{{line4}}</p>
-            <p class="govuk-body">{{line5}}</p>
-            <p class="govuk-body">{{line6}}</p>
-            <p class="govuk-body">{{line7}}</p>
-            <p class="govuk-body">{{line8}}</p>
-          </li>
-          <li>
-            <h3 class="govuk-heading-s">2. {{subheading2}}</h3>
-
-            <p class="govuk-body">{{line9}}</p>
-            <p class="govuk-body">{{line10}}</p>
-            <p class="govuk-body">{{line11}}</p>
-          </li>
-          <li>
-            <h3 class="govuk-heading-s">3. {{subheading3}}</h3>
-
-            <p class="govuk-body">{{line12}}</p>
-            <p class="govuk-body">{{line13}}</p>
-            </li>
-        </ol>
+
+        <h2 class="govuk-heading-m">{{subheading1}}</h2>
+        <p class="govuk-body">{{line3}}</p>
+        <p class="govuk-body">{{line4}}</p>
+        <p class="govuk-body">{{line5}}</p>
+        <p class="govuk-body">{{line6}}</p>
+
+        <h2 class="govuk-heading-m">{{subheading2}}</h2>
+        <p class="govuk-body">{{line7}}</p>
+        <p class="govuk-body">{{line8}}</p>
         <a href="/eligibility/multiple-children" role="button" draggable="false" class="govuk-button govuk-!-margin-top-2 govuk-!-margin-bottom-8 govuk-button--start" data-module="govuk-button">
-          {{startnow}}
-          <svg class="govuk-button__start-icon" xmlns="http://www.w3.org/2000/svg" width="17.5" height="19" viewBox="0 0 33 40" aria-hidden="true" focusable="false">
-            <path fill="currentColor" d="M0 0h13l20 20-20 20H0l20-20z"/>
-          </svg>
+          {{continue}}
         </a>
+      </div>
     </div>
-  </div>
 
-</div>
+  </div>
 
 {% endblock %}

src/test/e2e/pages/login.page.js

@@ -30,7 +30,7 @@ module.exports = {
   async signInFromEligibility() {
     await I.retry(3).goToPage(config.baseUrl + 'eligibility/start');
     await I.wait(4);
-    await I.retry(3).click('Start now');
+    await I.retry(3).click('Continue');
     await I.wait(4);
     await I.retry(3).see('Are you applying to adopt more than one child?');
     await I.retry(3).click('Continue');