Fix/rebase vtmdev1 (#1563)

* feat(cb2-10973): feature flags changed to show IVA flow in all envs (#1464) Co-authored-by: Tom Evans <[email protected]> * feat(cb2-11930): ensure certificate number is sent to backend if it exists on MVSA IVA tests (#1481) * feat(cb2-11930): ensure certificate number is sent to backend if its exists on MVSA IVA tests * feat(cb2-11930): fix linting issue * feat(cb2-12056): test codes moved (#1486) Co-authored-by: Tom Evans <[email protected]> * feat(RELEASE-123): merge holding branch back into develop (#1490) * feat(cb2-10241): update adr notes to use custom component (#1446) * feat/CB2-11250 - Edit button on additional examiner notes takes you to blank page (#1447) * feat(cb2-10241): update adr notes to use custom component * feat(cb2-11250): format table * feat(cb2-11250): set up router link * feat(cb2-11250): blank page link working * feat(cb2-11250): revert unnecessary changes * feat(cb2-11250): amend routing function * feat(cb2-11250): fix linting and add unit test * feat(cb2-11250): fix linting and add unit test * feat(cb2-11250): update link design * feat(cb2-11250): fix button link styling --------- Co-authored-by: Brandon Thomas-Davies <[email protected]> * feat(CB2-9916): Add warning to cherished transfer (#1451) * feat(cb2-9916): added cherised transfer warning message for psv and hgv * feat(cb2-9916): fix linting * feat(cb2-10032): add pagination to adr examiner notes (#1450) * feat(cb2-10032): add pagination to adr examiner notes * feat(cb2-10032): add pagination to notes amend view * feat(cb2-11103): createdAtDate for adr examiner notes now save as full iso date string (#1452) * feat(cb2-11103): ability to submit and show date and time for adr notes creation * feat(cb2-11103): fix unit test * feat(cb2-11103): fix other unit test * feat/CB2-10033 - Additional Examiner Note (#1448) * feat(cb2-10241): update adr notes to use custom component * feat(cb2-11250): format table * feat(cb2-11250): set up router link * feat(cb2-11250): blank page link working * feat(cb2-11250): revert unnecessary changes * feat(cb2-11250): amend routing function * feat(cb2-11250): fix linting and add unit test * feat(cb2-11250): fix linting and add unit test * feat(cb2-11250): update link design * feat(cb2-11250): fix button link styling * feat(cb2-10033): basic setup and grabbed selected note from record * feat(cb2-10033): stash for mobbing * feat(cb2-10033): hook form up to display note which is to be edited * feat(cb2-10033): set up model binding to component * feat(cb2-10033): use correct directive and basic form validation * feat(cb2-10033): amend routing title for notifiable alteration * feat(cb2-10033): remove validation as requirements confirmed not needed * feat(cb2-10033): implement state management solution * feat(cb2-10033): fix display for summary screen * feat(cb2-10033): refactor state and data handling approach * feat(cb2-10033): reducer tests * feat(cb2-10033): basic unit testing draft * feat(cb2-10033): unit testing * feat(cb2-10033): linting fix * feat(cb2-10033): fix review screen * feat(cb2-10033): git stash for mobbing * feat(cb2-10033): add logic to hide collapse function and fix missing acs * feat(cb2-10033): move title from component to templates * feat(cb2-10033): acordion issues solved --------- Co-authored-by: Brandon Thomas-Davies <[email protected]> Co-authored-by: Tom Evans <[email protected]> Co-authored-by: Thomas Evans <[email protected]> * feat(cb2-10033): upped char count to 151 (#1453) Co-authored-by: Tom Evans <[email protected]> * feat(cb2-10033): upped char count to 150 * feat(cb2-10033): upped char count to 150 * feat(cb2-10033): upped char count to 15 again * feat(cb2-10033): css removed * fix(cb2-11103): re-add missing timestamp from adr notes view (#1460) * feat(cb2-10286): add hint text to 3 month extension (#1462) * feat(cb2-10973): feature flags changed to show IVA flow in all envs (#1465) Co-authored-by: Tom Evans <[email protected]> * feat(cb2-10125): make adr guidance notes a checkbox group (#1466) * feat(cb2-11546): make 'make' required for HGVs and TRLs which carry dangerous goods (#1461) * fix(cb2-11546): make vehicle make required when carrying dangerous goods * feat(cb2-11546): only make applicable for HGVs and LGVs * feat(cb2-10286): add new certificate required field (#1463) * feat(cb2-10286): add new certificate required field * feat(cb2-9747): default checkbox to false so it will correctly display no text in read mode * feat/CB2-10740 - Mark if a vehicle is used for international journeys on VTM (#1467) * feat(cb2-10740): hook up template and values correctly to type definition * feat(cb2-10740): lint fix --------- Co-authored-by: pbardy2000 <[email protected]> * fix(cb2-9747): fix failing unit test (#1468) * fix(cb2-9747): create mocked date to fix failing unit test (#1469) * feat(cb2-11185): ensure correct text-wrapping. (#1473) * fix(cb2-11185): break text to avoid long strings causing the page to overflow horizontally * fix(cb2-11185): break long strings to overflow, but not mid-word unless necessary * fix(cb2-11185): fix linting * fix(cb2-10419): change casing in select defect (#1474) * fix(cb2-11302): correct spelling of accessor to assessor (#1475) * fix(cb2-10562): prevent submitting a psv with one axle (#1480) * fix(cb2-11069): reset error message when new data is provided (#1479) * fix(cb2-11068): allow unset as form node width so it never hides option text (#1478) * fix(CB2-11243): prevent SR field in tyres component being cut-off on large screens (#1477) * fix(cb2-11068): allow unset as form node width so it never hides option text * fix(cb2-11243): set width to unset to select autoscales to text * fix(CB2-11453): prevent download .zip file in seperate window (as this may be blocked) (#1476) * fix(cb2-11453): do not download link via external tab * fix(cb2-11453): fix unit test * feat(cb2-11930): ensure certificate number is sent to backend if it exists on MVSA IVA tests (#1482) * feat(cb2-11930): ensure certificate number is sent to backend if its exists on MVSA IVA tests * feat(cb2-11930): fix linting issue * fix(cb2-11908): remove duplicate label from additional examiner notes history (#1483) * feat(cb2-12056): test codes moved (#1487) Co-authored-by: Tom Evans <[email protected]> --------- Co-authored-by: Thomas Crawley <[email protected]> Co-authored-by: Tom Evans <[email protected]> Co-authored-by: Thomas Evans <[email protected]> Co-authored-by: pbardy2000 <[email protected]> * fix(cb2-11908): Change labels of examiner notes (#1491) * feat(cb2-10241): update adr notes to use custom component (#1446) * feat/CB2-11250 - Edit button on additional examiner notes takes you to blank page (#1447) * feat(cb2-10241): update adr notes to use custom component * feat(cb2-11250): format table * feat(cb2-11250): set up router link * feat(cb2-11250): blank page link working * feat(cb2-11250): revert unnecessary changes * feat(cb2-11250): amend routing function * feat(cb2-11250): fix linting and add unit test * feat(cb2-11250): fix linting and add unit test * feat(cb2-11250): update link design * feat(cb2-11250): fix button link styling --------- Co-authored-by: Brandon Thomas-Davies <[email protected]> * feat(CB2-9916): Add warning to cherished transfer (#1451) * feat(cb2-9916): added cherised transfer warning message for psv and hgv * feat(cb2-9916): fix linting * feat(cb2-10032): add pagination to adr examiner notes (#1450) * feat(cb2-10032): add pagination to adr examiner notes * feat(cb2-10032): add pagination to notes amend view * feat(cb2-11103): createdAtDate for adr examiner notes now save as full iso date string (#1452) * feat(cb2-11103): ability to submit and show date and time for adr notes creation * feat(cb2-11103): fix unit test * feat(cb2-11103): fix other unit test * feat/CB2-10033 - Additional Examiner Note (#1448) * feat(cb2-10241): update adr notes to use custom component * feat(cb2-11250): format table * feat(cb2-11250): set up router link * feat(cb2-11250): blank page link working * feat(cb2-11250): revert unnecessary changes * feat(cb2-11250): amend routing function * feat(cb2-11250): fix linting and add unit test * feat(cb2-11250): fix linting and add unit test * feat(cb2-11250): update link design * feat(cb2-11250): fix button link styling * feat(cb2-10033): basic setup and grabbed selected note from record * feat(cb2-10033): stash for mobbing * feat(cb2-10033): hook form up to display note which is to be edited * feat(cb2-10033): set up model binding to component * feat(cb2-10033): use correct directive and basic form validation * feat(cb2-10033): amend routing title for notifiable alteration * feat(cb2-10033): remove validation as requirements confirmed not needed * feat(cb2-10033): implement state management solution * feat(cb2-10033): fix display for summary screen * feat(cb2-10033): refactor state and data handling approach * feat(cb2-10033): reducer tests * feat(cb2-10033): basic unit testing draft * feat(cb2-10033): unit testing * feat(cb2-10033): linting fix * feat(cb2-10033): fix review screen * feat(cb2-10033): git stash for mobbing * feat(cb2-10033): add logic to hide collapse function and fix missing acs * feat(cb2-10033): move title from component to templates * feat(cb2-10033): acordion issues solved --------- Co-authored-by: Brandon Thomas-Davies <[email protected]> Co-authored-by: Tom Evans <[email protected]> Co-authored-by: Thomas Evans <[email protected]> * feat(cb2-10033): upped char count to 151 (#1453) Co-authored-by: Tom Evans <[email protected]> * feat(cb2-10033): upped char count to 150 * feat(cb2-10033): upped char count to 150 * feat(cb2-10033): upped char count to 15 again * feat(cb2-10033): css removed * fix(cb2-11103): re-add missing timestamp from adr notes view (#1460) * feat(cb2-10286): add hint text to 3 month extension (#1462) * feat(cb2-10973): feature flags changed to show IVA flow in all envs (#1465) Co-authored-by: Tom Evans <[email protected]> * feat(cb2-10125): make adr guidance notes a checkbox group (#1466) * feat(cb2-11546): make 'make' required for HGVs and TRLs which carry dangerous goods (#1461) * fix(cb2-11546): make vehicle make required when carrying dangerous goods * feat(cb2-11546): only make applicable for HGVs and LGVs * feat(cb2-10286): add new certificate required field (#1463) * feat(cb2-10286): add new certificate required field * feat(cb2-9747): default checkbox to false so it will correctly display no text in read mode * feat/CB2-10740 - Mark if a vehicle is used for international journeys on VTM (#1467) * feat(cb2-10740): hook up template and values correctly to type definition * feat(cb2-10740): lint fix --------- Co-authored-by: pbardy2000 <[email protected]> * fix(cb2-9747): fix failing unit test (#1468) * fix(cb2-9747): create mocked date to fix failing unit test (#1469) * feat(cb2-11185): ensure correct text-wrapping. (#1473) * fix(cb2-11185): break text to avoid long strings causing the page to overflow horizontally * fix(cb2-11185): break long strings to overflow, but not mid-word unless necessary * fix(cb2-11185): fix linting * fix(cb2-10419): change casing in select defect (#1474) * fix(cb2-11302): correct spelling of accessor to assessor (#1475) * fix(cb2-10562): prevent submitting a psv with one axle (#1480) * fix(cb2-11069): reset error message when new data is provided (#1479) * fix(cb2-11068): allow unset as form node width so it never hides option text (#1478) * fix(CB2-11243): prevent SR field in tyres component being cut-off on large screens (#1477) * fix(cb2-11068): allow unset as form node width so it never hides option text * fix(cb2-11243): set width to unset to select autoscales to text * fix(CB2-11453): prevent download .zip file in seperate window (as this may be blocked) (#1476) * fix(cb2-11453): do not download link via external tab * fix(cb2-11453): fix unit test * fix(cb2-11908): remove duplicate label from additional examiner notes history * fix(cb2-11908): Change labels of examiner notes * fix(cb2-11908): fix unit tests --------- Co-authored-by: Brandon Thomas-Davies <[email protected]> Co-authored-by: Thomas Crawley <[email protected]> Co-authored-by: Tom Evans <[email protected]> Co-authored-by: Thomas Evans <[email protected]> * fix(cb2-12009): default psv body model to null if its an empty string (#1493) * fix(cb2-12009): default psv body model to null if its an empty string * fix(cb2-12009): add snyk ignore * fix(cb2-12009): correct snyk ignore indentation * fix(cb2-12009): add package number to snyk ignore * feat(cb2-12304): add id (#1494) * fix(cb2-12599): ensure additional examiner notes appear in the correc… (#1497) * fix(cb2-12599): ensure additional examiner notes appear in the correct order * feat(cb2-12599) adding temp fixup for the gha action * Update pr-checks.yml * fix(cb2-12599): updated references in pr checks gha job * fix(cb2-12599) removed node16 version from scanner --------- Co-authored-by: Josh Carter <[email protected]> * feat/cb2 12722-2 - Use new google tag manager npm plugin (#1502) * feat(dev-no-analytics): remove analytics implementation * feat(cb2-12722): add gtm plugin * feat(cb2-12722): add new gtm plugin and fix tests * feat(cb2-12600): add form control to specialist contingency test (#1500) * feat(cb2-12600): add form control to specialist contingency test group 1 and 5 * feat(cb2-12600): add hint text * feat(cb2-12600): adjust error messages so they match ACs * feat(cb2-12600): fix linting * feat(cb2-12600): enable viewing reapplication date on view history and amend * feat(cb2-12600): fix linting * Feat/cb2 12600 (#1503) * feat(cb2-12600): add form control to specialist contingency test group 1 and 5 * feat(cb2-12600): add hint text * feat(cb2-12600): adjust error messages so they match ACs * feat(cb2-12600): fix linting * feat(cb2-12600): enable viewing reapplication date on view history and amend * feat(cb2-12600): fix linting * feat(cb2-12600): remove reapplication date from group 5 templates * feat(cb2-12600): remove reapplication date from group 5 * feat(cb2-12600): fix the linting * Feat/cb2 12600 (#1504) * feat(cb2-12600): add form control to specialist contingency test group 1 and 5 * feat(cb2-12600): add hint text * feat(cb2-12600): adjust error messages so they match ACs * feat(cb2-12600): fix linting * feat(cb2-12600): enable viewing reapplication date on view history and amend * feat(cb2-12600): fix linting * feat(cb2-12600): remove reapplication date from group 5 templates * feat(cb2-12600): remove reapplication date from group 5 * feat(cb2-12600): fix the linting * feat(cb2-12600): hide reapplication date when amending passed specialist test * feat(cb2-12600): fix linting * chore(dependency-1): remove cypress config and dependencies (#1507) * chore(husky-1): update command to remove deprecation warning (#1509) * fix(cb2-12972): allow users to submit cancelled iva tests (#1517) * fix(cb2-12006): prevent error message duplication (#1492) * fix(cb2-12006): prevent error message duplication * fix(cb2-12006): fix unit test * chore(storybook-1): removal of storybook dependencies and commands (#1511) * chore(cypress-1): further removal of cypress and any config related (#1510) * Update deploy-prod.yml (#1520) * feat(cb2-13176): VTM - Add guidance for handling documents issued centrally (#1519) * feat(cb2-13164): add issue documents centrally * feat(cb2-13164): issue documents centrally for all relevant templates * feat(cb2-13164): fix linting * feat(cb2-13164): change name from issueDocumentsCentrally to issueRequired to match BE * feat(cb2-13164): fix linting again * feat(cb2-13164): hide for group 1 * feat(cb2-13164): fix linting again again * feat(cb2-13164): set issueRequired to false for fail/abandon * feat(cb2-13176): conditionally show hint text on ADR tests only * feat(cb2-13176): fix linting * feat(cb2-13176): remove issue docs centrally from groups 2 3 4 and add to 15 and 16 * feat(cb2-13176): remove issue required from group 3 * feat(cb2-13176): remove validation for certificate number on groups 3 and 4 * feat(cb2-13176): fix linting * feat(cb2-13176): use nested shape * feat(cb2-13176): fix linting * feat(cb2-13176): ensure reasons for issue is always an array of strings * feat(cb2-13299): VTM - Pass and issue Documents Centrally for a Notifiable Alteration test (#1521) * feat(cb2-13164): add issue documents centrally * feat(cb2-13164): issue documents centrally for all relevant templates * feat(cb2-13164): fix linting * feat(cb2-13164): change name from issueDocumentsCentrally to issueRequired to match BE * feat(cb2-13164): fix linting again * feat(cb2-13164): hide for group 1 * feat(cb2-13164): fix linting again again * feat(cb2-13164): set issueRequired to false for fail/abandon * feat(cb2-13176): conditionally show hint text on ADR tests only * feat(cb2-13176): fix linting * feat(cb2-13176): remove issue docs centrally from groups 2 3 4 and add to 15 and 16 * feat(cb2-13176): remove issue required from group 3 * feat(cb2-13176): remove validation for certificate number on groups 3 and 4 * feat(cb2-13176): fix linting * feat(cb2-13176): use nested shape * feat(cb2-13176): fix linting * feat(cb2-13176): ensure reasons for issue is always an array of strings * feat(cb2-13299): enable issue documents centrally for free or paid notifiable alteration test types --------- Co-authored-by: Thomas Evans <[email protected]> * Revert "feat(cb2-13299): VTM - Pass and issue Documents Centrally for a Notif…" (#1523) This reverts commit aafbbb2. * Revert "feat(cb2-13176): VTM - Add guidance for handling documents issued cen…" (#1524) This reverts commit e5d5615. * chore(version-bump): bump version (#1526) * chore(version-bump): bump package lock (#1527) * chore(version-bump): bump version * chore(version-bump): bump version * Revert "Revert "feat(cb2-13176): VTM - Add guidance for handling documents is…" (#1525) This reverts commit 6bfbc2d. Co-authored-by: Thomas Evans <[email protected]> * Revert "Revert "feat(cb2-13299): VTM - Pass and issue Documents Centrally for…" (#1528) This reverts commit 70c3984. * feat(13396):lec removed (#1529) Co-authored-by: Tom Evans <[email protected]> * feat(cb2-13176): only show hint text for pass/prs results (#1531) * fix(cb2-13506): use correct notes section on amending ADR tests (#1533) * fix(cb2-13506): use correct notes section on amending ADR tests * fix(cb2-13506): fix linting * feat(cb2-13455): VTM - Pass and issue Documents Centrally (additional test type ids) (#1530) * feat(cb2-13455): add issue docs centrally for first test and first test prohibition clearance * feat(cb2-13455): linting * feat(cb2-13455): fix linting * feat(cb2-13455): fix template * feat(cb2-13455): show issue docs for prs --------- Co-authored-by: Brandon Thomas-Davies <[email protected]> * fix: upgrade @sentry/angular-ivy from 7.103.0 to 7.118.0 (#1512) Snyk has created this PR to upgrade @sentry/angular-ivy from 7.103.0 to 7.118.0. See this package in npm: @sentry/angular-ivy See this project in Snyk: https://app.snyk.io/org/vtm/project/d3e66907-3971-40a3-b0d4-07150d232ac4?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot <[email protected]> Co-authored-by: pbardy2000 <[email protected]> * fix: upgrade @sentry/types from 7.103.0 to 7.118.0 (#1532) Snyk has created this PR to upgrade @sentry/types from 7.103.0 to 7.118.0. See this package in npm: @sentry/types See this project in Snyk: https://app.snyk.io/org/vtm/project/d3e66907-3971-40a3-b0d4-07150d232ac4?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot <[email protected]> Co-authored-by: pbardy2000 <[email protected]> Co-authored-by: Thomas Crawley <[email protected]> * fix: upgrade @sentry/cli from 2.28.6 to 2.32.1 (#1515) Snyk has created this PR to upgrade @sentry/cli from 2.28.6 to 2.32.1. See this package in npm: @sentry/cli See this project in Snyk: https://app.snyk.io/org/vtm/project/d3e66907-3971-40a3-b0d4-07150d232ac4?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot <[email protected]> Co-authored-by: pbardy2000 <[email protected]> Co-authored-by: Thomas Crawley <[email protected]> * fix: upgrade @azure/msal-angular from 3.0.13 to 3.0.20 (#1516) Snyk has created this PR to upgrade @azure/msal-angular from 3.0.13 to 3.0.20. See this package in npm: @azure/msal-angular See this project in Snyk: https://app.snyk.io/org/vtm/project/d3e66907-3971-40a3-b0d4-07150d232ac4?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot <[email protected]> Co-authored-by: pbardy2000 <[email protected]> Co-authored-by: Thomas Crawley <[email protected]> * fix(cb2-13164): add issue docs centrally to TIR test types (#1543) * fix(cb2-13164): add issue docs centrally to TIR test types * fix(cb2-13164): fix linting * refactor(gha-1): decouple sonar from pr checks (#1547) * refactor(gha-1): decouple sonar from pr checks * fix(gha-1): conflict * fix(gha-1): remove sonar from pr check * feat(linting): biome intro (#1544) * feat(linting-1): biome intro * fix(linting-1): disable rules * chore(linting-1): enable useTemplate * fix(linting-1): ignore api files * chore(testing-1): exclude non functional files from jest path/coverage (#1546) * chore(testing-1): remove files from test and coverage paths that hold no functionality * chore(linting-1): point test step to arm runner * chore(nodeupgrade-1): node upgrade (#1536) * chore(nodeupgrade-1): node upgrade * chore(nodeupgrade-1): node downgrade * chore(nodeupgrade-1): nvmrc bump * chore(nodeupgrade-1): attempt 3 * Delete cypress.env.json * [Snyk] Upgrade @sentry/cli from 2.28.6 to 2.32.2 (#1541) * fix: upgrade @sentry/cli from 2.28.6 to 2.32.2 Snyk has created this PR to upgrade @sentry/cli from 2.28.6 to 2.32.2. See this package in npm: @sentry/cli See this project in Snyk: https://app.snyk.io/org/vtm/project/d3e66907-3971-40a3-b0d4-07150d232ac4?utm_source=github&utm_medium=referral&page=upgrade-pr * feat(snykupgrade-2): move to dev dependencies --------- Co-authored-by: snyk-bot <[email protected]> Co-authored-by: Thomas Crawley <[email protected]> Co-authored-by: pbardy2000 <[email protected]> * chore(dep-1): angular 18 upgrade (#1553) * chore(dep-1): bump jest preset angular * chore(dep-1): update angular core and cli * fix(build-1): provider hoisting * chore(dep-1): update ngrx packages * chore(dep-1): migrate to sentry angular package * refactor(gha-1): remove matrix and reference nvmrc * chore(dep-1): fix linting and update build command * chore(dep-1): update lib to 2023 option * fix(linting-1): revert api folder changes * fix(tidyup-1): remove commented out opts * chore(linting-1): fix lint * fix(cb2-13684): prevent lost of tech record status when filtering test types (#1557) * fix(cb2-13684): prevent lost of tech record status when filtering test types * fix(cb2-13684): use statusCode form tech record instead of off test result * fix(cb2-13684): fix unit tests * fix(cb2-13615): ensure we're not showing child if parent is also hidden (#1554) * fix(cb2-13615): ensure we're not showing child if parent is also hidden * fix(cb2-13615): fix unit tests --------- Co-authored-by: Thomas Evans <[email protected]> * fix(cb2-13455): ensure certificate number is present (#1559) * fix(cb2-0000): fix linting --------- Co-authored-by: Thomas Evans <[email protected]> Co-authored-by: Tom Evans <[email protected]> Co-authored-by: Brandon Thomas-Davies <[email protected]> Co-authored-by: Thomas Crawley <[email protected]> Co-authored-by: Josh Carter <[email protected]> Co-authored-by: Matthew Bell <[email protected]> Co-authored-by: cvs-ops <[email protected]> Co-authored-by: snyk-bot <[email protected]>
dvsa · Aug 27, 2024 · b717ddd · b717ddd
1 parent ab070d6
commit b717ddd
Show file tree

Hide file tree

Showing 765 changed files with 75,580 additions and 81,967 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -18,13 +18,11 @@ jest.config.js
 protractor.conf.js
 /src/app/api/*
 /mock-api
-/cypress
 /.vscode
 /.storybook
 /.husky
 /.github
 setenv.ts
 setup-jest.ts
-cypress.config.ts
 jest-global-mocks.ts
 environment.deploy.ts
diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
@@ -8,7 +8,7 @@ jobs:
   vtm-app:
     uses: ./.github/workflows/deploy.yml
     with:
-      branch: 'master'
+      branch: ${{ github.ref_name }}
       environment: 'prod'
       bucket: '.prod'
     secrets:

diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
@@ -12,38 +12,27 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [18.18.0]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-
     steps:
-      - uses: actions/checkout@v3
-      - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version-file: '.nvmrc'
           cache: 'npm'
       - name: Install dependencies
         run: npm ci --include=optional
       - name: Build
         run: npm run build --ignore-scripts -- --configuration production
 
   test:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [18.18.0]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-
+    runs-on:
+      - ARM64
     steps:
-      - uses: actions/checkout@v3
-      - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version-file: '.nvmrc'
           cache: 'npm'
       - name: Install dependencies
         run: npm ci --include=optional
@@ -52,18 +41,12 @@ jobs:
 
   lint:
     runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [18.18.0]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-
     steps:
-      - uses: actions/checkout@v3
-      - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version-file: '.nvmrc'
           cache: 'npm'
       - name: Install dependencies
         run: npm ci --include=optional
@@ -72,45 +55,12 @@ jobs:
 
   audit:
     runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [18.18.0]
     steps:
-      - uses: actions/checkout@v3
-      - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version-file: '.nvmrc'
           cache: 'npm'
       - name: Run audit
         run: npm audit --audit-level=critical
-
-  scanner:
-    permissions:
-      id-token: write
-    runs-on: X64
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-      - uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: ${{ secrets.AWS_MGMT_ROLE }}
-          aws-region: ${{ secrets.DVSA_AWS_REGION }}
-          role-session-name: 'cvs-app-vtm'
-      - uses: aws-actions/aws-secretsmanager-get-secrets@v1
-        with: 
-          secret-ids: sonarqube-gha
-          parse-json-secrets: true
-      - name: Install dependencies
-        run: npm ci --include=optional
-      - name: Run SonarQube scanner
-        run: |
-          npm run sonar-scanner -- \
-          -Dsonar.host.url=${{ env.SONARQUBE_GHA_URL }} \
-          -Dsonar.token=${{ env.SONARQUBE_GHA_TOKEN }} \
-          -Dsonar.login=${{ env.SONARQUBE_GHA_TOKEN }} \
-          -Dsonar.projectName=${{ github.repository }} \
-          -Dsonar.projectVersion=1.0.${{ github.run_id }}
diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml
@@ -0,0 +1,40 @@
+name: Sonar scan
+
+on:
+  push:
+    branches: [ 'develop' ]
+
+jobs:
+  scanner:
+    permissions:
+      id-token: write
+    runs-on: X64
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.AWS_MGMT_ROLE }}
+          aws-region: ${{ secrets.DVSA_AWS_REGION }}
+          role-session-name: 'cvs-app-vtm'
+
+      - uses: aws-actions/aws-secretsmanager-get-secrets@v2
+        with:
+          secret-ids: sonarqube-gha
+          parse-json-secrets: true
+
+      - name: Install dependencies
+        run: npm ci --include=optional
+
+      - name: Run SonarQube scanner
+        run: |
+          npm run sonar-scanner -- \
+          -Dsonar.host.url=${{ env.SONARQUBE_GHA_URL }} \
+          -Dsonar.token=${{ env.SONARQUBE_GHA_TOKEN }} \
+          -Dsonar.login=${{ env.SONARQUBE_GHA_TOKEN }} \
+          -Dsonar.projectName=${{ github.repository }} \
+          -Dsonar.projectVersion=1.0.${{ github.run_id }}
diff --git a/.gitignore b/.gitignore
@@ -45,21 +45,12 @@ yarn-error.log
 testem.log
 /typings
 .reports/
-{}
 .scannerwork
 
 # System files
 .DS_Store
 Thumbs.db
 
-# Cypress
-cypress.env.json
-cypress/videos
-cypress/screenshots
-runner-results
-multi-reporter-config.json
-cypress/parallel-weights.json
-
 report.json
 # Sentry Config File
 .sentryclirc
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-18.18.0
+20.16.0
diff --git a/.snyk b/.snyk
@@ -0,0 +1,23 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.25.0
+
+# TEMPLATE that can be used inside the `ignore section`
+#  SNYK-LANG-PKG-NUM:
+#    - '*':
+#        reason: Remediation not yet available
+#        expires: 2023-08-27T09:01:15.119Z
+#        created: 2022-08-08T09:01:15.122Z
+
+# ignores vulnerabilities until expiry date; change duration by modifying expiry date
+ignore:
+  SNYK-JS-BRACES-6838727:
+    - '*':
+      reason: Remediation not yet available
+      expires: 2024-11-24T09:01:15.119Z
+      created: 2024-05-24T09:01:15.122Z
+  SNYK-JS-MICROMATCH-6838728:
+    - '*':
+      reason: Remediation not yet available
+      expires: 2024-11-24T09:01:15.119Z
+      created: 2024-05-24T09:01:15.122Z
+patch: {}
diff --git a/angular.json b/angular.json
@@ -24,12 +24,15 @@
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular/build:application",
           "options": {
-            "outputPath": "dist/cvs-app-vtm",
+            "outputPath": {
+              "base": "dist/cvs-app-vtm"
+            },
             "index": "src/index.html",
-            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": [
+              "src/polyfills.ts"
+            ],
             "tsConfig": "tsconfig.app.json",
             "inlineStyleLanguage": "scss",
             "sourceMap": true,
@@ -46,7 +49,15 @@
               "src/global-styles.scss"
             ],
             "scripts": [],
-            "allowedCommonJsDependencies": ["validate-govuk-date"]
+            "allowedCommonJsDependencies": [
+              "validate-govuk-date"
+            ],
+            "browser": "src/main.ts",
+            "stylePreprocessorOptions": {
+              "includePaths": [
+                "."
+              ]
+            }
           },
           "configurations": {
             "production": {
@@ -60,10 +71,7 @@
               "outputHashing": "all",
               "sourceMap": false,
               "namedChunks": false,
-              "aot": true,
-              "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true
+              "extractLicenses": true
             },
             "deploy": {
               "fileReplacements": [
@@ -76,30 +84,27 @@
               "outputHashing": "all",
               "sourceMap": true,
               "namedChunks": false,
-              "aot": true,
-              "extractLicenses": true,
-              "vendorChunk": true,
-              "buildOptimizer": true
+              "extractLicenses": true
             }
           },
           "defaultConfiguration": "deploy"
         },
         "serve": {
-          "builder": "@angular-devkit/build-angular:dev-server",
+          "builder": "@angular/build:dev-server",
           "configurations": {
             "production": {
-              "browserTarget": "cvs-app-vtm:build:production"
+              "buildTarget": "cvs-app-vtm:build:production"
             },
             "deploy": {
-              "browserTarget": "cvs-app-vtm:build:deploy"
+              "buildTarget": "cvs-app-vtm:build:deploy"
             }
           },
           "defaultConfiguration": "deploy"
         },
         "extract-i18n": {
-          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "builder": "@angular/build:extract-i18n",
           "options": {
-            "browserTarget": "cvs-app-vtm:build"
+            "buildTarget": "cvs-app-vtm:build"
           }
         },
         "lint": {
@@ -114,9 +119,7 @@
       }
     }
   },
-  "defaultProject": "cvs-app-vtm",
   "cli": {
-    "analytics": false,
-    "defaultCollection": "@angular-eslint/schematics"
+    "analytics": false
   }
 }
diff --git a/biome.json b/biome.json
@@ -0,0 +1,47 @@
+{
+  "extends": ["@dvsa/biome-config/biome"],
+  "files": {
+    "ignore": ["src/app/api/**"]
+  },
+  "overrides": [
+    {
+      "include": ["**/*.mock.ts", "**/*.spec.ts", "**/*.ts"],
+      "linter": {
+        "rules": {
+          "complexity": {
+            "noBannedTypes": "off",
+            "noForEach": "off",
+            "noThisInStatic": "off",
+            "noUselessConstructor": "off",
+            "useLiteralKeys": "off",
+            "useOptionalChain": "off",
+            "useRegexLiterals": "off"
+          },
+          "correctness": {
+            "noInvalidUseBeforeDeclaration": "off",
+            "noVoidTypeReturn": "off",
+            "noSwitchDeclarations": "off"
+          },
+          "performance": {
+            "noAccumulatingSpread": "off",
+            "noDelete": "off"
+          },
+          "suspicious": {
+            "noAssignInExpressions": "off",
+            "noDoubleEquals": "off",
+            "noDuplicateTestHooks": "off",
+            "noExplicitAny": "off",
+            "noImplicitAnyLet": "off",
+            "noPrototypeBuiltins": "off",
+            "noShadowRestrictedNames": "off",
+            "useValidTypeof": "off"
+          },
+          "style": {
+            "noNonNullAssertion": "off",
+            "noParameterAssign": "off"
+          }
+        }
+      }
+    }
+  ]
+}
diff --git a/cypress.config.ts b/cypress.config.ts