Feature/register other org sprint 31.6 - EXUI_MO_3.0.64 (#1191)

* EUI-8797 Register other org - CYA display amendments * EUI-8797 Register other org - CYA display amendments * EUI-8797 Register other org - CYA display amendments * EUI-8797 Register other org - CYA display amendments * EUI-8797 Register other org - CYA display amendments * EUI-8797 Register other org - CYA display amendments * EUI-8797 Register other org - CYA display amendments * EUI-8797 Register other org - CYA display amendments * register other org workflow pages a11y tests added (#1103) * register other org workflow pages a11y tests added * a11y test name update * Add test fixes * Temporary fix for back link * postcode validator * EUI-8821 Register Other Org - Service not listed * Update organisation types value * fix typos * EUI-8821 Register Other Org - Service not listed * Update document-exchange-reference.component.ts * Update yarn-audit-known-issues * Update yarn-audit-known-issues * Merge from base branch * EUI-8821 Register Other Org - Service not listed * EUI-8797 Register other org - CYA display amendments * EUI-8838 Register Other Other - Back link not working * Create renovate.json * Create renovate.json * Create renovate.json * EUI-8838 Register Other Other - Back link not working * Update organisation-services-access.component.spec.ts * EUI-8838 Register Other Other - Back link not working * EUI-8838 Register Other Other - Back link not working * Update organisation-services-access.component.ts * EUI-8838 Register Other Other - Back link not working * fix the 7 digit PBA * Call Lov API for org type * initialise PBA * pba fix * EUI-8838 Register Other Other - Back link not working * Update organisation-services-access.component.ts * Update regulator-details.component.spec.ts * Update organisation-services-access.component.spec.ts * pba * Add value to preview yaml * register org automation test page object steps updates * EUI-8838 Register Other Other - Back link not working * Fix the unit tests * EUI-8838 Register Other Other - Back link not working * Feature/e UI 8771 postcode lookup validation (#1112) * Commit address component changes before merge * Finalise changes * Change version * Make changes to ensure back to address works correctly * e2e test for register other create scenario * ROO basic flow fixes * Post Registration Data (#1122) * Post Registration Data * Add Validation for checkbox * Adding error handling * lint fix * Update company-house-details.component.spec.ts * code review comments * refactoring * fix ordering * Clear session * fix Organisation Type * yarn audit * add cancel Link --------- Co-authored-by: John Benjamin <john.benjamin@hmcts.net> Co-authored-by: connorpgpmcelroy <74015088+connorpgpmcelroy@users.noreply.github.com> * EUI-8841 Register Other Org Accessibility issues * EUI-8841 Register Other Org Accessibility issues * EUI-8835 Register Other Org - Organisation page changes (#1124) * EUI-8835 Register Other Org - Organisation page changes * EUI-8835 Register Other Org - Organisation page changes * EUI-8835 Register Other Org - Organisation page changes * EUI-8835 Register Other Org - Organisation page changes * EUI-8835 Register Other Org - Organisation page changes * EUI-8835 Register Other Org - Organisation page changes * Update yarn-audit-known-issues * e2e test for register other create scenario (#1128) * e2e test for register other create scenario * ROO basic flow fixes * Add required changes and test changes (#1131) * Add required changes and test changes * Add the previousUrl existence check * Make previousUrl change * system user auth for prd api * ROO e2e test fix for current change impact on test * new register org BDD scenarios * emabled playwring as codecept driver * CVE suppress * hooks fix * more ROO tests * ROO test updates * yarn audit changes * playwright chromium install * functional test screenshot fix, invite user fix * test fixes * Feature/e UI 8869 (#1135) * Integrate Create Organisation * Organisation Type * remove dead code * Feature toggle Organisation Details * excluded in-dev and failing tests * Update app.routes.ts (#1136) * Update app.routes.ts Blocks and redirects either of two routes to the other * Update app.routes.ts * Change common-lib for tag * Change tag * test fix * test inclusion exclsuion in AAT preview for feature toggles features * EUI-8841 Register Other Org - Accessibility issues * fix Address optional fields (#1142) * EUI-8841 Register Other Org - Accessibility issues * EUI-8841 Register Other Org - Accessibility issues * pa11y test updates for ROO * EUI-8841 Register Other Org - Accessibility issues * EUI-8841 Register Other Org - Accessibility issues * Update yarn-audit-known-issues * ROO functional tests (#1139) * emabled playwring as codecept driver * CVE suppress * hooks fix * more ROO tests * ROO test updates * yarn audit changes * playwright chromium install * functional test screenshot fix, invite user fix * test fixes * excluded in-dev and failing tests * test fix * test inclusion exclsuion in AAT preview for feature toggles features * Unassigned cases functional tests added * smoke test fix * smoke test command fix * yarn functional test command fix * CVE updates * functional test comand update * assigned cases tests added --------- Co-authored-by: Uday Denduluri <uday.denduluri1@hmcts.net> * test update * EUI-8921 Register Other Org - Back link issue * EUI-8921 Register Other Org - Back link issue * Update yarn-audit-known-issues * EUI-8929 ROO Individual regulator corrections * EUI-8929 ROO Individual regulator corrections * Update regulator-details.component.ts * Update yarn-audit-known-issues * a11y test fix * CVE to known issues * EUI-8928 ROO CYA page corrections * EUI-8928 ROO CYA page corrections * Update check-your-answers.component.ts * Fix issue * fix test * EUI-8927 ROO Pba details page fixes * Merge branch 'feature/Register-Other-Org-Sprint-31.5' into bug/EUI-8929-ROO-Individual-regulator-corrections * Update yarn-audit-known-issues * Move logic to app-utils * EUI-8927 ROO Pba details page fixes * Feature/e UI 8831 review roo (#1149) * Commit all design changes - Form group changes - Tobedefined changes - Error message changes -Fieldset changes * Update index.ts --------- Co-authored-by: David Rajkumar Jayakumar <107850923+DavidJayakumar@users.noreply.github.com> * EUI-8939 ROO PBA changes on CYA page * EUI-8939 ROO PBA changes on CYA page * Update yarn-audit-known-issues * EUI-8939 ROO PBA changes on CYA page * EUI-8927 ROO Pba details page fixes * EUI-8926 ROO Organisation regulators fixes * Update yarn-audit-known-issues * EUI-8927 ROO Pba details page fixes * EUI-8926 ROO Organisation regulators fixes * EUI-8926 ROO Organisation regulators fixes * Fix test failure * Make error message changes (#1161) * fix issue in CYA * EUI-8927 ROO Pba details page fixes * Update yarn-audit-known-issues * invite ueer validation test added * Make address postcode fix (#1167) * Make address postcode fix * Update registered-address.component.ts * Make changes to error message display on 400 (#1163) * Make changes to error message display on 400 * Make PR comment changes * Add inline error removal and scrolling to error * Update .nvmrc * node version rollback * ROO test updates to use user targetting (#1178) * e2e creayte org usertargetting chnages * node version update * EUI-8961 ROO Companies house page corrections * EUI-8961 ROO Companies house page corrections * EUI-8961 ROO Companies house page corrections * EUI-8970 ROO Organisation services page changes * Update yarn-audit-known-issues * EUI-8961 ROO Companies house page corrections * Update yarn-audit-known-issues * Make changes to post services correctly (#1158) * Make changes to post services correctly * Make changes to fix issue * Add failsafes for old service lists * Add common-lib tag (#1169) * Add common-lib tag * e2e tests update for ROO and old create org using LD user targetting * fix step definition * Make changes to buttons and to tag --------- Co-authored-by: sreekanthpuligadda <sreekanth.puligadda@hmcts.net> Co-authored-by: udaydenduluri33 <50869558+udaydenduluri33@users.noreply.github.com> * EUI-8974 ROO Regulator page corrections * EUI-8969: MyHMCTS Terms and Conditions changes (#1183) * EUI-8969: MyHMCTS Terms and Conditions changes Update with latest MyHMCTS Terms and Conditions wording; minor change to agreement checkbox wording on Check Your Answers page. * Temporarily ignore CVE vulnerabilities * EUI-8969: MyHMCTS Terms and Conditions changes Add direct link to section on web scraping. * Use error message, not description (#1174) * Update company-house-details.component.html (#1177) * Update register-org.component.ts (#1180) * Get tag (#1179) * EUI-8925 ROO Minor corrections on several pages * Update yarn-audit-known-issues * EUI-8925 ROO Minor corrections on several pages * EUI-8925 ROO Minor corrections on several pages * EUI-8925 ROO Minor corrections on several pages * EUI-8971/EUI-8972: Regulator Details amendments (#1186) * EUI-8971/EUI-8972: Regulator Details amendments EUI-8971: Change "registration number" to "registration reference"; EUI-8972: Add additional clarification on adding organisation regulator or professional body registrations. * EUI-8971/EUI-8972: Regulator Details amendments EUI-8971: Change "registration number" to "registration reference"; EUI-8972: Add additional clarification on adding organisation regulator or professional body registrations. * Temporarily ignore CVE vulnerabilities --------- Co-authored-by: udaydenduluri33 <50869558+udaydenduluri33@users.noreply.github.com> * fix test * Feature/EUI 8952 (#1190) * Move username and password to config * Bumping chart version/ fixing aliases * fix security issue * Add configs to jenkin * Test * revert changes * update mock * use AAT LD Key * Fix for the LD Key --------- Co-authored-by: hmcts-jenkins-j-to-z <61242337+hmcts-jenkins-j-to-z[bot]@users.noreply.github.com> Co-authored-by: udaydenduluri33 <Uday.Denduluri1@HMCTS.NET> * Update commonlib version * Update values.yaml (#1195) * Update values.yaml * Bumping chart version/ fixing aliases * Update yarn-audit-known-issues --------- Co-authored-by: hmcts-jenkins-j-to-z <61242337+hmcts-jenkins-j-to-z[bot]@users.noreply.github.com> Co-authored-by: udaydenduluri33 <50869558+udaydenduluri33@users.noreply.github.com> * enabled ROO e2e tests * ROO page validation error message updated * EUI-8989: Minor amendments to display text (#1198) * EUI-8989: Minor amendments to display text Remove unnecessary paragraph indentation and add missing full stops. * Temporarily ignore CVE vulnerabilities * disabled ROO e2e tests, to be enabled post release AAT validation --------- Co-authored-by: David Rajkumar Jayakumar <107850923+DavidJayakumar@users.noreply.github.com> Co-authored-by: John Benjamin <john.benjamin@hmcts.net> Co-authored-by: sreekanthpuligadda <52752138+sreekanthpuligadda@users.noreply.github.com> Co-authored-by: connorpgpmcelroy <connor.mcelroy@hmcts.net> Co-authored-by: connorpgpmcelroy <74015088+connorpgpmcelroy@users.noreply.github.com> Co-authored-by: DavidJayakumar <David.Jayakumar@hmcts.net> Co-authored-by: John Benjamin <90200268+johnbenjamin-hmcts@users.noreply.github.com> Co-authored-by: sreekanthpuligadda <sreekanth.puligadda@hmcts.net> Co-authored-by: Daniel Lam <Daniel-Lam@users.noreply.github.com> Co-authored-by: hmcts-jenkins-j-to-z <61242337+hmcts-jenkins-j-to-z[bot]@users.noreply.github.com>
hmcts · Nov 21, 2023 · 3ebfc80 · 3ebfc80
1 parent d9cce50
commit 3ebfc80
Show file tree

Hide file tree

Showing 40 changed files with 193 additions and 163 deletions.
diff --git a/Jenkinsfile_parameterized b/Jenkinsfile_parameterized
@@ -27,7 +27,9 @@ List<LinkedHashMap<String, Object>> secrets = [
   secret('xui-oauth2-token',              'IDAM_SECRET'),
   secret('appinsights-instrumentationkey-mo', 'APPINSIGHTS_INSTRUMENTATIONKEY'),
   secret('google-analytics-key', 'GOOGLE_ANALYTICS_KEY'),
-  secret('launch-darkly-client-id', 'LAUNCH_DARKLY_CLIENT_ID')
+  secret('launch-darkly-client-id', 'LAUNCH_DARKLY_CLIENT_ID'),
+  secret('system-user-name', 'SYSTEM_USER_NAME'),
+  secret('system-user-password', 'SYSTEM_USER_PASSWORD')
 ]
 
 static LinkedHashMap<String, Object> secret(String secretName, String envVar) {

diff --git a/api/auth/index.ts b/api/auth/index.ts
@@ -21,7 +21,9 @@ import {
   SERVICES_IDAM_ISS_URL,
   SERVICES_IDAM_WEB, SERVICES_RD_PROFESSIONAL_API_PATH,
   SERVICE_S2S_PATH,
-  SESSION_SECRET
+  SESSION_SECRET,
+  SYSTEM_USER_NAME,
+  SYSTEM_USER_PASSWORD
 } from '../configuration/references';
 import { http } from '../lib/http';
 import * as log4jui from '../lib/log4jui';
@@ -86,8 +88,8 @@ export const getXuiNodeMiddleware = () => {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const ccdUrl = getConfigValue(SERVICES_CCD_COMPONENT_API_PATH);
   const tokenUrl = `${getConfigValue(SERVICES_IDAM_API_PATH)}/oauth2/token`;
-  const userName = 'xui_mo_system_user@mailinator.com';
-  const password = 'Welcome01';
+  const userName = getConfigValue(SYSTEM_USER_NAME);
+  const password = getConfigValue(SYSTEM_USER_PASSWORD);
 
   const routeCredential = {
     password,

diff --git a/api/configuration/references.ts b/api/configuration/references.ts
@@ -87,3 +87,7 @@ export const PACT_BROKER_PASSWORD = 'pact.brokerPassword';
 
 // LD PREVIEW KEY
 export const PREVIEW_LD_KEY = 'previewLDKey';
+
+// System user
+export const SYSTEM_USER_NAME = 'secrets.rpx.system-user-name';
+export const SYSTEM_USER_PASSWORD = 'secrets.rpx.system-user-password';
diff --git a/api/configurationUI/index.ts b/api/configurationUI/index.ts
@@ -25,7 +25,7 @@ router.get('/', configurationUIRoute);
  */
 export async function configurationUIRoute(req, res): Promise<void> {
   const environment = process && process.env && process.env.PUI_ENV;
-  const launchDarklyClientId = environment !== 'preview' ? getConfigValue(LAUNCH_DARKLY_CLIENT_ID) : getConfigValue(PREVIEW_LD_KEY);
+  const launchDarklyClientId = getConfigValue(LAUNCH_DARKLY_CLIENT_ID);
   res.status(200).send({
     feeAndPayApiPath: getConfigValue(SERVICES_FEE_AND_PAY_API_PATH),
     googleAnalyticsKey: getConfigValue(GOOGLE_ANALYTICS_KEY),

diff --git a/api/models/registrationData.ts b/api/models/registrationData.ts
@@ -23,7 +23,7 @@ export type RegistrationData = {
     hasDxReference: boolean;
     dxNumber?: string;
     dxExchange?: string;
-    services: string[];
+    services: {key: string, value: string}[];
     otherServices?: string;
     hasPBA: boolean;
     contactDetails: ContactDetails;
@@ -72,10 +72,5 @@ export type RegistrationRequest = {
       }
     ],
     orgType: string,
-    orgAttributes?: [
-      {
-        key: string,
-        value: string
-      }
-    ]
+    orgAttributes?: {key: string, value: string}[]
 }
diff --git a/api/registerOrganisation/index.ts b/api/registerOrganisation/index.ts
@@ -1,9 +1,9 @@
 import { NextFunction, Request, Response, Router } from 'express';
-import { RegistrationData, RegistrationRequest } from '../models/registrationData';
-import { generateS2sToken } from '../lib/s2sTokenGeneration';
 import { getConfigValue } from '../configuration';
 import { SERVICES_RD_PROFESSIONAL_API_PATH, SERVICE_S2S_PATH } from '../configuration/references';
 import { http } from '../lib/http';
+import { generateS2sToken } from '../lib/s2sTokenGeneration';
+import { RegistrationData, RegistrationRequest } from '../models/registrationData';
 
 export function mapRequestObject(requestBody: RegistrationData): RegistrationRequest {
   const request: RegistrationRequest = {
@@ -27,8 +27,17 @@ export function mapRequestObject(requestBody: RegistrationData): RegistrationReq
         dxAddress: getDx(requestBody)
       }
     ],
-    orgType: requestBody.organisationType.key
+    orgType: requestBody.organisationType.key,
+    orgAttributes: [
+      ...requestBody.services.filter((service) => service.key !== undefined)
+    ]
   };
+  if (requestBody.otherServices && requestBody.otherServices !== '') {
+    request.orgAttributes.push({
+      key: 'otherServices',
+      value: requestBody.otherServices
+    });
+  }
   return request;
 }
 

diff --git a/charts/xui-mo-webapp/Chart.yaml b/charts/xui-mo-webapp/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: xui-mo-webapp
 home: https://github.com/hmcts/rpx-xui-manage-organisations
-version: 1.1.14
+version: 1.1.15
 description: Expert UI
 maintainers:
   - name: HMCTS RPX XUI

diff --git a/charts/xui-mo-webapp/values.preview.template.yaml b/charts/xui-mo-webapp/values.preview.template.yaml
@@ -36,6 +36,8 @@ nodejs:
         - appinsights-instrumentationkey-mo
         - google-analytics-key
         - launch-darkly-client-id
+        - system-user-name
+        - system-user-password
   autoscaling:
     enabled: false
 redis:

diff --git a/charts/xui-mo-webapp/values.yaml b/charts/xui-mo-webapp/values.yaml
@@ -59,7 +59,7 @@ nodejs:
     # IDAM_URL: https://idam-api.{{ .Values.global.environment }}.platform.hmcts.net
     # S2S_URL: http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal
 
-    SERVICES_CCD_COMPONENT_API: https://idam-api.{{ .Values.global.environment }}.platform.hmcts.net
+    SERVICES_CCD_COMPONENT_API: https://ccd-api-gateway-web-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal
     IDAM_API_SERVICE: https://idam-api.{{ .Values.global.environment }}.platform.hmcts.net
     IDAM_WEB_SERVICE: https://idam-web-public.{{ .Values.global.environment }}.platform.hmcts.net
     RD_PROFESSIONAL_API_SERVICE: http://rd-professional-api-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal
@@ -84,6 +84,8 @@ nodejs:
         - name: mo-webapp-redis6-connection-string
           alias: mo-webapp-redis-connection-string
         - launch-darkly-client-id
+        - system-user-name
+        - system-user-password
   # Don't modify below here
   image: ${IMAGE_NAME}
   ingressHost: ${SERVICE_FQDN}

diff --git a/config/custom-environment-variables.json b/config/custom-environment-variables.json
@@ -57,7 +57,9 @@
         "xui-oauth2-token": "IDAM_SECRET",
         "mo-webapp-redis-connection-string": "REDISCLOUD_URL",
         "google-analytics-key": "GOOGLE_ANALYTICS_KEY",
-        "launch-darkly-client-id": "LAUNCH_DARKLY_CLIENT_ID"
+        "launch-darkly-client-id": "LAUNCH_DARKLY_CLIENT_ID",
+        "system-user-name": "SYSTEM_USER_NAME",
+        "system-user-password": "SYSTEM_USER_PASSWORD"
       }
     },
     "feature": {

diff --git a/package.json b/package.json
@@ -76,7 +76,7 @@
     "@hmcts/frontend": "0.0.50-alpha",
     "@hmcts/nodejs-healthcheck": "1.7.0",
     "@hmcts/properties-volume": "0.0.13",
-    "@hmcts/rpx-xui-common-lib": "1.9.0-error-message-change",
+    "@hmcts/rpx-xui-common-lib": "1.9.0-register-org-address-styling-fixes-v2",
     "@hmcts/rpx-xui-node-lib": "2.27.1",
     "@ng-idle/core": "^10.0.0",
     "@ng-idle/keepalive": "^10.0.0",

diff --git a/...-and-conditions-register-other-org/terms-and-conditions-register-other-org.component.html b/...-and-conditions-register-other-org/terms-and-conditions-register-other-org.component.html
@@ -17,8 +17,10 @@ <h3 class="govuk-heading-m">What's in these terms and conditions?</h3>
         <ul class="govuk-list govuk-list--bullet">
           <li><a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#how-to-contact-us">Who we
               are and how to contact us.</a></li>
-          <li><a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#accept-these-terms">By using
-              our site you accept these terms.</a></li>
+          <li><a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#accept-these-terms">You
+              accept these terms and conditions by using our site.</a></li>
+          <li><a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#controllers-of-personal-data">
+              We are independent controllers of the personal data shared.</a></li>
           <li><a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#other-terms">There are other
               terms that may apply to you.</a></li>
           <li><a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#change-to-these-terms">We
@@ -35,6 +37,8 @@ <h3 class="govuk-heading-m">What's in these terms and conditions?</h3>
               must keep your account details safe.</a></li>
           <li><a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#materials-on-our-site">How
               you may use material on our site.</a></li>
+          <li><a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#web-scraping">No text or
+              data mining, or web scraping.</a></li>
           <li><a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#information-on-this-site">Do
               not rely on information on our site.</a></li>
           <li><a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#websites-we-link-to">We are
@@ -66,7 +70,7 @@ <h3 class="govuk-heading-m" id="how-to-contact-us">Who we are and how to contact
         <a class="govuk-link" target="_blank"
           href="https://hmcts-access.service.gov.uk/login?client_id=xuiwebapp&redirect_uri=https://manage-case.platform.hmcts.net/oauth2/callback&state=0MCD1z9Wt38-SpaXfhA2QJGPjdPaamCM-Fn8MpGqolI&nonce=0_ZPmm6a9E89V174hyfYbnKbHb7jBL-bTQqOwSyEGH4&response_type=code&scope=profile openid roles manage-user create-user search-user&prompt=">
           <i>MyHMCTS</i>
-        </a> is a site operated by His Majesty’s Courts and Tribunals Service ("We", "Our" or "Us").
+        </a> is a site operated by His Majesty's Courts and Tribunals Service ("We", "Our" or "Us").
       </p>
       <p class="govuk-body">Please <a class="govuk-link" href="mailto:MyHMCTSsupport@justice.gov.uk">contact us</a> if
         you require further information.</p>
@@ -77,25 +81,26 @@ <h3 class="govuk-heading-m" id="accept-these-terms">You accept these terms and c
       <p>If you do not agree to these terms, you must not use our site.</p>
       <p>You are also responsible for ensuring that all persons who access our site through your account, and any
         individual user accounts created by you, have read, understood and will abide by these terms and conditions and
-        other applicable terms and conditions such as our 
-        <a class="govuk-link" target="_blank" href="https://hmcts-access.service.gov.uk/cookies">Cookie Policy
-        </a> and 
-        <a class="govuk-link" target="_blank" href="https://hmcts-access.service.gov.uk/privacy-policy">Privacy Policy
-        </a>.
+        other applicable terms and conditions such as our
+        <a class="govuk-link" target="_blank" href="https://hmcts-access.service.gov.uk/cookies">Cookie Policy</a> and
+        <a class="govuk-link" target="_blank" href="https://hmcts-access.service.gov.uk/privacy-policy">Privacy Policy</a>.
+      </p>
+      <h3 class="govuk-heading-m" id="controllers-of-personal-data">We are independent controllers of the personal data shared
+      </h3>
+      <p class="govuk-body">You acknowledge that you are the controller of any shared personal data when it is in your
+        possession and that HMCTS is the controller of any shared personal data when it is in our possession.
       </p>
       <h3 class="govuk-heading-m" id="other-terms">There are other terms that may apply to you</h3>
       <div class="govuk-body">
         These terms of use refer to the following additional terms, which also apply to your use of our site:
         <ul class="govuk-list govuk-list--bullet">
           <li>
             <a class="govuk-link" href="https://hmcts-access.service.gov.uk/privacy-policy" target="_blank">
-              Our Privacy Policy
-            </a>, which sets out how we may use your personal information.
+              Our Privacy Policy</a>, which sets out how we may use your personal information.
           </li>
           <li>
             <a class="govuk-link" href="https://hmcts-access.service.gov.uk/cookies" target="_blank">
-              Our Cookie Policy
-            </a>, which sets out information about the cookies on our site.
+              Our Cookie Policy</a>, which sets out information about the cookies on our site.
           </li>
         </ul>
       </div>
@@ -250,10 +255,9 @@ <h3 class="govuk-heading-m" id="uploading-content-to-our-site">Uploading content
       <p class="govuk-body">Any content you upload to our site will be considered non-confidential and non-proprietary.
         You retain all ownership rights in your content, but you grant us and other users of our site a limited licence
         to use, store and copy that content and to distribute and make it available to third parties. The rights you
-        license to us are described in 
-        <a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#materials-on-our-site">
-          Rights you are giving us to use
-          material you upload</a>.</p>
+        license to us are described in
+        <a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#materials-on-our-site">Rights you
+          are giving us to use material you upload</a>.</p>
       <p class="govuk-body">We also have the right to disclose your identity to any third party who is claiming that any
         content posted or uploaded by you to our site constitutes a violation of their intellectual property rights
         or of their right to privacy.</p>
@@ -291,14 +295,13 @@ <h3 class="govuk-heading-m" id="linking-to-our-site">Rules about linking to our
       <p class="govuk-body">Your right to link to our home page will cease immediately on the expiration or termination,
         for any reason, of these terms and conditions.</p>
       <p class="govuk-body">The website in which you are linking must comply in all respects with the content standards
-        <a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#uploading-content-to-our-site">
-          set out here
-        </a>.</p>
+        <a class="govuk-link" href="{{TERMS_AND_CONDITIONS_REGISTER_OTHER_ORG_ROUTE}}#uploading-content-to-our-site">set
+          out here</a>.</p>
       <p class="govuk-body">If you wish to link to or make any use of content on our site other than that set out above,
         please <a class="govuk-link" href="mailto:MyHMCTSsupport@justice.gov.uk">contact us</a>.</p>
       <h3 class="govuk-heading-m" id="dispute-laws">Which country's laws apply to any disputes?</h3>
       <p class="govuk-body">Please note that these terms of use, their subject matter and their formation, are governed
         by English law. You and we both agree that the courts of England and Wales will have exclusive jurisdiction.</p>
     </div>
   </div>
-</main>
+</main>
diff --git a/src/register-org/components/before-you-start/before-you-start.component.html b/src/register-org/components/before-you-start/before-you-start.component.html
@@ -7,11 +7,11 @@ <h1 class="govuk-heading-xl">
       </h1>
       <hr>
       <br>
-      <p class="govuk-body">
-        MyHMCTS is a service for submitting and managing applications. It can be used by organisations and legal professionals.
+      <p class="govuk-body">MyHMCTS is a service for submitting and managing applications.
+        It can be used by organisations and legal professionals.
       </p>
-      <p class="govuk-body">
-        If you are not sure if your organisation will be able to use this service, see the <a class="govuk-link" href="https://www.gov.uk/guidance/register-for-myhmcts-online-case-management-for-legal-professionals" target="_blank">MyHMCTS guidance on GOV.UK</a>.
+      <p class="govuk-body">If you are not sure if your organisation will be able to use this service, see the
+        <a class="govuk-link" href="https://www.gov.uk/guidance/register-for-myhmcts-online-case-management-for-legal-professionals" target="_blank">MyHMCTS guidance on GOV.UK</a>.
       </p>
       <div class="govuk-body">
         <p>By registering, you will:</p>
@@ -21,17 +21,16 @@ <h1 class="govuk-heading-xl">
         </ul>
       </div>
       <h3 class="govuk-heading-m">Before you start</h3>
-      <p class="govuk-body">
-        MyHMCTS is a service for organisations and legal professionals. Do not use this service if you are a member of the public making an application on your own behalf.
+      <p class="govuk-body">MyHMCTS is a service for organisations and legal professionals.
+        Do not use this service if you are a member of the public making an application on your own behalf.
       </p>
-      <p class="govuk-body">
-        Make sure the information you give us is complete and accurate. If there are any errors in the application, HMCTS will reject it and you will need to start again.
+      <p class="govuk-body">Make sure the information you give us is complete and accurate.
+        If there are any errors in the application, HMCTS will reject it and you will need to start again.
       </p>
-      <p class="govuk-body">
-        Check if your organisation already has an account. If so, ask your organisation's MyHMCTS administrator to give you access.
+      <p class="govuk-body">Check if your organisation already has an account.
+        If so, ask your organisation's MyHMCTS administrator to give you access.
       </p>
-      <p class="govuk-body">
-        Do not create an additional account for your organisation unless you need to keep parts of your business separate.
+      <p class="govuk-body">Do not create an additional account for your organisation unless you need to keep parts of your business separate.
       </p>
       <div class="govuk-body">
         <p>You will not be able to:</p>

diff --git a/src/register-org/components/check-your-answers/check-your-answers.component.html b/src/register-org/components/check-your-answers/check-your-answers.component.html
@@ -3,7 +3,7 @@
     <div class="govuk-grid-column-two-thirds">
       <a class="govuk-back-link" href="javascript:void(0)" (click)="onBack()">Back</a>
       <xuilib-hmcts-error-summary [errorMessages]="validationErrors" [header]="'There is a problem'"></xuilib-hmcts-error-summary>
-      <h1 class="govuk-heading-l">Check your answers before you register</h1>
+      <h1 class="govuk-heading-xl">Check your answers before you register</h1>
       <h2 class="govuk-heading-m govuk-!-margin-top-8">Organisation details</h2>
 
       <div *ngIf="registrationData.otherOrganisationType">
@@ -246,7 +246,7 @@ <h2 class="govuk-heading-m govuk-!-margin-top-8">Confirm your registration detai
               <input class="govuk-checkboxes__input" type="checkbox" id="confirm-terms-and-conditions"
               name="confirmTermsAndConditions" formControlName="confirmTermsAndConditions">
               <label class="govuk-label govuk-checkboxes__label" for="confirm-terms-and-conditions">
-                You have read and understood the
+                You have read, understood and will abide by the
                 <a href="javascript:void(0)" target="_blank"
                   routerLink="/terms-and-conditions">terms and conditions</a>
                 and are eligible for an account to manage your organisation and cases

diff --git a/src/register-org/components/check-your-answers/check-your-answers.component.spec.ts b/src/register-org/components/check-your-answers/check-your-answers.component.spec.ts
@@ -25,8 +25,8 @@ describe('CheckYourAnswersComponent', () => {
       'PBA1234568'
     ],
     services: [
-      'AAA7',
-      'ABA3'
+      { key: 'AAA7', value: 'Damages' },
+      { key: 'ABA3', value: 'Divorce' }
     ],
     otherServices: 'test service',
     contactDetails: {

diff --git a/src/register-org/components/check-your-answers/check-your-answers.component.ts b/src/register-org/components/check-your-answers/check-your-answers.component.ts
@@ -34,9 +34,8 @@ export class CheckYourAnswersComponent extends RegisterComponent implements OnIn
     this.cyaFormGroup = new FormGroup({
       confirmTermsAndConditions: new FormControl(null, [Validators.required, this.getCustomValidationForTermsAndConditions()])
     });
-
-    this.registrationData.services?.forEach((serviceKey) => {
-      const service = ORGANISATION_SERVICES.find((service) => service.key === serviceKey).value;
+    this.registrationData.services?.forEach((thisService) => {
+      const service = ORGANISATION_SERVICES.find((service) => service.key === thisService.key).value;
       this.services.push(service);
     });
     if (this.registrationData.otherServices) {