From 86b93f8469d512d32d140acdd2ef9c075ae13d48 Mon Sep 17 00:00:00 2001
From: Jack Spagnoli <jack.spagnoli1@nhs.net>
Date: Mon, 30 Sep 2024 08:34:07 +0000
Subject: [PATCH] updates snapshots

---
 .../__snapshots__/dispenseForm.spec.tsx.snap  | 36 ++++++-------
 ...scriptionSummaryViewEditable.spec.tsx.snap |  6 +--
 .../__snapshots__/releaseForm.spec.tsx.snap   | 54 +++++++++----------
 .../__snapshots__/dispensePage.spec.tsx.snap  |  8 +--
 .../__snapshots__/releasePage.spec.tsx.snap   | 12 ++---
 .../__snapshots__/returnPage.spec.tsx.snap    | 22 ++++----
 .../__snapshots__/signPage.spec.tsx.snap      |  6 +--
 .../__snapshots__/withdrawPage.spec.tsx.snap  | 18 +++----
 8 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/packages/tool/site/client/tests/components/dispense/__snapshots__/dispenseForm.spec.tsx.snap b/packages/tool/site/client/tests/components/dispense/__snapshots__/dispenseForm.spec.tsx.snap
index a5606bb8e1..89559c322b 100644
--- a/packages/tool/site/client/tests/components/dispense/__snapshots__/dispenseForm.spec.tsx.snap
+++ b/packages/tool/site/client/tests/components/dispense/__snapshots__/dispenseForm.spec.tsx.snap
@@ -6,8 +6,8 @@ exports[`Dispense Different Medication checkbox is present for paracetamol 500 (
     <fieldset class="nhsuk-fieldset">
       <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="dispenseType--label" for="dispenseType">Choose how you want to dispense this prescription</label>
         <div class="nhsuk-radios" id="dispenseType" value="form" aria-label="Choose how you want to dispense this prescription">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-1" name="dispenseType" aria-labelledby="dispenseType-1--label" type="radio" value="form" checked=""><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-1--label" for="dispenseType-1">Use the dispense prescription form</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-2" name="dispenseType" aria-labelledby="dispenseType-2--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-2--label" for="dispenseType-2">With a FHIR dispense message</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-1" name="dispenseType" type="radio" value="form" checked=""><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-1--label" for="dispenseType-1">Use the dispense prescription form</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-2" name="dispenseType" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-2--label" for="dispenseType-2">With a FHIR dispense message</label></div>
         </div>
       </div>
       <div class="nhsuk-form-group">
@@ -114,8 +114,8 @@ exports[`Fields default to current values 1`] = `
     <fieldset class="nhsuk-fieldset">
       <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="dispenseType--label" for="dispenseType">Choose how you want to dispense this prescription</label>
         <div class="nhsuk-radios" id="dispenseType" value="form" aria-label="Choose how you want to dispense this prescription">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-1" name="dispenseType" aria-labelledby="dispenseType-1--label" type="radio" value="form" checked=""><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-1--label" for="dispenseType-1">Use the dispense prescription form</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-2" name="dispenseType" aria-labelledby="dispenseType-2--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-2--label" for="dispenseType-2">With a FHIR dispense message</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-1" name="dispenseType" type="radio" value="form" checked=""><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-1--label" for="dispenseType-1">Use the dispense prescription form</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-2" name="dispenseType" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-2--label" for="dispenseType-2">With a FHIR dispense message</label></div>
         </div>
       </div>
       <div class="nhsuk-form-group">
@@ -222,8 +222,8 @@ exports[`Prescription status is not updated automatically if field has been touc
     <fieldset class="nhsuk-fieldset">
       <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="dispenseType--label" for="dispenseType">Choose how you want to dispense this prescription</label>
         <div class="nhsuk-radios" id="dispenseType" value="form" aria-label="Choose how you want to dispense this prescription">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-1" name="dispenseType" aria-labelledby="dispenseType-1--label" type="radio" value="form" checked=""><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-1--label" for="dispenseType-1">Use the dispense prescription form</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-2" name="dispenseType" aria-labelledby="dispenseType-2--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-2--label" for="dispenseType-2">With a FHIR dispense message</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-1" name="dispenseType" type="radio" value="form" checked=""><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-1--label" for="dispenseType-1">Use the dispense prescription form</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-2" name="dispenseType" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-2--label" for="dispenseType-2">With a FHIR dispense message</label></div>
         </div>
       </div>
       <div class="nhsuk-form-group">
@@ -319,8 +319,8 @@ exports[`Prescription status updates to suggested value when line item status is
     <fieldset class="nhsuk-fieldset">
       <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="dispenseType--label" for="dispenseType">Choose how you want to dispense this prescription</label>
         <div class="nhsuk-radios" id="dispenseType" value="form" aria-label="Choose how you want to dispense this prescription">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-1" name="dispenseType" aria-labelledby="dispenseType-1--label" type="radio" value="form" checked=""><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-1--label" for="dispenseType-1">Use the dispense prescription form</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-2" name="dispenseType" aria-labelledby="dispenseType-2--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-2--label" for="dispenseType-2">With a FHIR dispense message</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-1" name="dispenseType" type="radio" value="form" checked=""><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-1--label" for="dispenseType-1">Use the dispense prescription form</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-2" name="dispenseType" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-2--label" for="dispenseType-2">With a FHIR dispense message</label></div>
         </div>
       </div>
       <div class="nhsuk-form-group">
@@ -416,8 +416,8 @@ exports[`Quantity field is hidden when status is not set to partial dispensed 1`
     <fieldset class="nhsuk-fieldset">
       <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="dispenseType--label" for="dispenseType">Choose how you want to dispense this prescription</label>
         <div class="nhsuk-radios" id="dispenseType" value="form" aria-label="Choose how you want to dispense this prescription">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-1" name="dispenseType" aria-labelledby="dispenseType-1--label" type="radio" value="form" checked=""><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-1--label" for="dispenseType-1">Use the dispense prescription form</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-2" name="dispenseType" aria-labelledby="dispenseType-2--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-2--label" for="dispenseType-2">With a FHIR dispense message</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-1" name="dispenseType" type="radio" value="form" checked=""><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-1--label" for="dispenseType-1">Use the dispense prescription form</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-2" name="dispenseType" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-2--label" for="dispenseType-2">With a FHIR dispense message</label></div>
         </div>
       </div>
       <div class="nhsuk-form-group">
@@ -524,8 +524,8 @@ exports[`Quantity field is shown when status is set to partial dispensed 1`] = `
     <fieldset class="nhsuk-fieldset">
       <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="dispenseType--label" for="dispenseType">Choose how you want to dispense this prescription</label>
         <div class="nhsuk-radios" id="dispenseType" value="form" aria-label="Choose how you want to dispense this prescription">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-1" name="dispenseType" aria-labelledby="dispenseType-1--label" type="radio" value="form" checked=""><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-1--label" for="dispenseType-1">Use the dispense prescription form</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-2" name="dispenseType" aria-labelledby="dispenseType-2--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-2--label" for="dispenseType-2">With a FHIR dispense message</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-1" name="dispenseType" type="radio" value="form" checked=""><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-1--label" for="dispenseType-1">Use the dispense prescription form</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-2" name="dispenseType" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-2--label" for="dispenseType-2">With a FHIR dispense message</label></div>
         </div>
       </div>
       <div class="nhsuk-form-group">
@@ -633,8 +633,8 @@ exports[`Reason field is hidden when status is not set to not dispensed 1`] = `
     <fieldset class="nhsuk-fieldset">
       <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="dispenseType--label" for="dispenseType">Choose how you want to dispense this prescription</label>
         <div class="nhsuk-radios" id="dispenseType" value="form" aria-label="Choose how you want to dispense this prescription">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-1" name="dispenseType" aria-labelledby="dispenseType-1--label" type="radio" value="form" checked=""><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-1--label" for="dispenseType-1">Use the dispense prescription form</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-2" name="dispenseType" aria-labelledby="dispenseType-2--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-2--label" for="dispenseType-2">With a FHIR dispense message</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-1" name="dispenseType" type="radio" value="form" checked=""><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-1--label" for="dispenseType-1">Use the dispense prescription form</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-2" name="dispenseType" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-2--label" for="dispenseType-2">With a FHIR dispense message</label></div>
         </div>
       </div>
       <div class="nhsuk-form-group">
@@ -728,8 +728,8 @@ exports[`Reason field is shown when status is set to not dispensed 1`] = `
     <fieldset class="nhsuk-fieldset">
       <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="dispenseType--label" for="dispenseType">Choose how you want to dispense this prescription</label>
         <div class="nhsuk-radios" id="dispenseType" value="form" aria-label="Choose how you want to dispense this prescription">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-1" name="dispenseType" aria-labelledby="dispenseType-1--label" type="radio" value="form" checked=""><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-1--label" for="dispenseType-1">Use the dispense prescription form</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-2" name="dispenseType" aria-labelledby="dispenseType-2--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-2--label" for="dispenseType-2">With a FHIR dispense message</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-1" name="dispenseType" type="radio" value="form" checked=""><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-1--label" for="dispenseType-1">Use the dispense prescription form</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-2" name="dispenseType" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-2--label" for="dispenseType-2">With a FHIR dispense message</label></div>
         </div>
       </div>
       <div class="nhsuk-form-group">
@@ -849,8 +849,8 @@ exports[`Reason field value is reset when hidden 1`] = `
     <fieldset class="nhsuk-fieldset">
       <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="dispenseType--label" for="dispenseType">Choose how you want to dispense this prescription</label>
         <div class="nhsuk-radios" id="dispenseType" value="form" aria-label="Choose how you want to dispense this prescription">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-1" name="dispenseType" aria-labelledby="dispenseType-1--label" type="radio" value="form" checked=""><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-1--label" for="dispenseType-1">Use the dispense prescription form</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-2" name="dispenseType" aria-labelledby="dispenseType-2--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-2--label" for="dispenseType-2">With a FHIR dispense message</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-1" name="dispenseType" type="radio" value="form" checked=""><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-1--label" for="dispenseType-1">Use the dispense prescription form</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-2" name="dispenseType" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-2--label" for="dispenseType-2">With a FHIR dispense message</label></div>
         </div>
       </div>
       <div class="nhsuk-form-group">
diff --git a/packages/tool/site/client/tests/components/prescription-summary/__snapshots__/prescriptionSummaryViewEditable.spec.tsx.snap b/packages/tool/site/client/tests/components/prescription-summary/__snapshots__/prescriptionSummaryViewEditable.spec.tsx.snap
index 504c92635c..635e007de3 100644
--- a/packages/tool/site/client/tests/components/prescription-summary/__snapshots__/prescriptionSummaryViewEditable.spec.tsx.snap
+++ b/packages/tool/site/client/tests/components/prescription-summary/__snapshots__/prescriptionSummaryViewEditable.spec.tsx.snap
@@ -130,9 +130,9 @@ exports[`Renders correctly 1`] = `
   </dl>
   <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="signingOptions--label" for="signingOptions">Choose a sign in option</label>
     <div class="nhsuk-radios" id="signingOptions" aria-label="Choose a sign in option">
-      <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="signingOptions-1" name="signingOptions" aria-labelledby="signingOptions-1--label" type="radio" value="N3_SMARTCARD" checked=""><label class="nhsuk-label nhsuk-radios__label" id="signingOptions-1--label" for="signingOptions-1">N3 Smartcard</label></div>
-      <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="signingOptions-2" name="signingOptions" aria-labelledby="signingOptions-2--label" type="radio" value="IOS"><label class="nhsuk-label nhsuk-radios__label" id="signingOptions-2--label" for="signingOptions-2">IOS</label></div>
-      <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="signingOptions-3" name="signingOptions" aria-labelledby="signingOptions-3--label" type="radio" value="FIDO2"><label class="nhsuk-label nhsuk-radios__label" id="signingOptions-3--label" for="signingOptions-3">FIDO2</label></div>
+      <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="signingOptions-1" name="signingOptions" type="radio" value="N3_SMARTCARD" checked=""><label class="nhsuk-label nhsuk-radios__label" id="signingOptions-1--label" for="signingOptions-1">N3 Smartcard</label></div>
+      <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="signingOptions-2" name="signingOptions" type="radio" value="IOS"><label class="nhsuk-label nhsuk-radios__label" id="signingOptions-2--label" for="signingOptions-2">IOS</label></div>
+      <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="signingOptions-3" name="signingOptions" type="radio" value="FIDO2"><label class="nhsuk-label nhsuk-radios__label" id="signingOptions-3--label" for="signingOptions-3">FIDO2</label></div>
     </div>
   </div>
 </form>"
diff --git a/packages/tool/site/client/tests/components/release/__snapshots__/releaseForm.spec.tsx.snap b/packages/tool/site/client/tests/components/release/__snapshots__/releaseForm.spec.tsx.snap
index 4192204bfd..c452e53329 100644
--- a/packages/tool/site/client/tests/components/release/__snapshots__/releaseForm.spec.tsx.snap
+++ b/packages/tool/site/client/tests/components/release/__snapshots__/releaseForm.spec.tsx.snap
@@ -6,9 +6,9 @@ exports[`Fhir Field is required when releasing a custom fhir release message 1`]
     <fieldset class="nhsuk-fieldset">
       <div class="nhsuk-form-group nhsuk-form-group--error"><label class="nhsuk-label nhsuk-label--s" id="releaseType--label" for="releaseType">Choose how you want to release prescription(s)</label><span class="nhsuk-error-message" id="releaseType--error-message"><span class="nhsuk-u-visually-hidden">Error: </span>You must enter a FHIR release message when selecting 'With a FHIR release message'</span>
         <div class="nhsuk-radios" id="releaseType" value="custom" aria-label="Choose how you want to release prescription(s)" aria-describedby="releaseType--error-message">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-1" name="releaseType" aria-labelledby="releaseType-1--label" type="radio" value="all" checked=""><label class="nhsuk-label nhsuk-radios__label" id="releaseType-1--label" for="releaseType-1">All nominated prescriptions for the below pharmacy</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-2" name="releaseType" aria-labelledby="releaseType-2--label" type="radio" value="prescriptionId"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-2--label" for="releaseType-2">A single prescription by ID</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-3" name="releaseType" aria-labelledby="releaseType-3--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-3--label" for="releaseType-3">With a FHIR release message</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-1" name="releaseType" type="radio" value="all" checked=""><label class="nhsuk-label nhsuk-radios__label" id="releaseType-1--label" for="releaseType-1">All nominated prescriptions for the below pharmacy</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-2" name="releaseType" type="radio" value="prescriptionId"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-2--label" for="releaseType-2">A single prescription by ID</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-3" name="releaseType" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-3--label" for="releaseType-3">With a FHIR release message</label></div>
         </div>
       </div>
       <div class="nhsuk-form-group"><label class="nhsuk-label" id="customReleaseFhir--label" for="customReleaseFhir">Paste a FHIR release message</label><textarea class="nhsuk-textarea" name="customReleaseFhir" id="customReleaseFhir" rows="20"></textarea></div>
@@ -24,16 +24,16 @@ exports[`Fields default to current values for nominated release 1`] = `
     <fieldset class="nhsuk-fieldset">
       <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="releaseType--label" for="releaseType">Choose how you want to release prescription(s)</label>
         <div class="nhsuk-radios" id="releaseType" value="all" aria-label="Choose how you want to release prescription(s)">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-1" name="releaseType" aria-labelledby="releaseType-1--label" type="radio" value="all" checked=""><label class="nhsuk-label nhsuk-radios__label" id="releaseType-1--label" for="releaseType-1">All nominated prescriptions for the below pharmacy</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-2" name="releaseType" aria-labelledby="releaseType-2--label" type="radio" value="prescriptionId"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-2--label" for="releaseType-2">A single prescription by ID</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-3" name="releaseType" aria-labelledby="releaseType-3--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-3--label" for="releaseType-3">With a FHIR release message</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-1" name="releaseType" type="radio" value="all" checked=""><label class="nhsuk-label nhsuk-radios__label" id="releaseType-1--label" for="releaseType-1">All nominated prescriptions for the below pharmacy</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-2" name="releaseType" type="radio" value="prescriptionId"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-2--label" for="releaseType-2">A single prescription by ID</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-3" name="releaseType" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-3--label" for="releaseType-3">With a FHIR release message</label></div>
         </div>
       </div>
       <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="pharmacy--label" for="pharmacy">Pharmacy to release prescriptions to</label>
         <div class="nhsuk-radios" id="pharmacy" value="" aria-label="Pharmacy to release prescriptions to">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-1" name="pharmacy" aria-labelledby="pharmacy-1--label" type="radio" value="VNFKT"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-1--label" for="pharmacy-1">VNFKT - FIVE STAR HOMECARE LEEDS LTD</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-2" name="pharmacy" aria-labelledby="pharmacy-2--label" type="radio" value="YGM1E"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-2--label" for="pharmacy-2">YGM1E - MBBM HEALTHCARE TECHNOLOGIES LTD</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-3" name="pharmacy" aria-labelledby="pharmacy-3--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-3--label" for="pharmacy-3">Other</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-1" name="pharmacy" type="radio" value="VNFKT"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-1--label" for="pharmacy-1">VNFKT - FIVE STAR HOMECARE LEEDS LTD</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-2" name="pharmacy" type="radio" value="YGM1E"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-2--label" for="pharmacy-2">YGM1E - MBBM HEALTHCARE TECHNOLOGIES LTD</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-3" name="pharmacy" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-3--label" for="pharmacy-3">Other</label></div>
         </div>
       </div>
     </fieldset>
@@ -48,17 +48,17 @@ exports[`Fields default to current values for patient release 1`] = `
     <fieldset class="nhsuk-fieldset">
       <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="releaseType--label" for="releaseType">Choose how you want to release prescription(s)</label>
         <div class="nhsuk-radios" id="releaseType" value="prescriptionId" aria-label="Choose how you want to release prescription(s)">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-1" name="releaseType" aria-labelledby="releaseType-1--label" type="radio" value="all"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-1--label" for="releaseType-1">All nominated prescriptions for the below pharmacy</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-2" name="releaseType" aria-labelledby="releaseType-2--label" type="radio" value="prescriptionId" checked=""><label class="nhsuk-label nhsuk-radios__label" id="releaseType-2--label" for="releaseType-2">A single prescription by ID</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-3" name="releaseType" aria-labelledby="releaseType-3--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-3--label" for="releaseType-3">With a FHIR release message</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-1" name="releaseType" type="radio" value="all"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-1--label" for="releaseType-1">All nominated prescriptions for the below pharmacy</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-2" name="releaseType" type="radio" value="prescriptionId" checked=""><label class="nhsuk-label nhsuk-radios__label" id="releaseType-2--label" for="releaseType-2">A single prescription by ID</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-3" name="releaseType" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-3--label" for="releaseType-3">With a FHIR release message</label></div>
         </div>
       </div>
       <div class="nhsuk-form-group"><label class="nhsuk-label" id="prescriptionId--label" for="prescriptionId">Prescription ID</label><input class="nhsuk-input nhsuk-input--width-30" type="text" name="prescriptionId" id="prescriptionId" value="7A9089-A83008-56A03J"></div>
       <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="pharmacy--label" for="pharmacy">Pharmacy to release prescriptions to</label>
         <div class="nhsuk-radios" id="pharmacy" value="" aria-label="Pharmacy to release prescriptions to">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-1" name="pharmacy" aria-labelledby="pharmacy-1--label" type="radio" value="VNFKT"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-1--label" for="pharmacy-1">VNFKT - FIVE STAR HOMECARE LEEDS LTD</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-2" name="pharmacy" aria-labelledby="pharmacy-2--label" type="radio" value="YGM1E"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-2--label" for="pharmacy-2">YGM1E - MBBM HEALTHCARE TECHNOLOGIES LTD</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-3" name="pharmacy" aria-labelledby="pharmacy-3--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-3--label" for="pharmacy-3">Other</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-1" name="pharmacy" type="radio" value="VNFKT"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-1--label" for="pharmacy-1">VNFKT - FIVE STAR HOMECARE LEEDS LTD</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-2" name="pharmacy" type="radio" value="YGM1E"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-2--label" for="pharmacy-2">YGM1E - MBBM HEALTHCARE TECHNOLOGIES LTD</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-3" name="pharmacy" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-3--label" for="pharmacy-3">Other</label></div>
         </div>
       </div>
     </fieldset>
@@ -73,16 +73,16 @@ exports[`Pharmacy to release to is always required 1`] = `
     <fieldset class="nhsuk-fieldset">
       <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="releaseType--label" for="releaseType">Choose how you want to release prescription(s)</label>
         <div class="nhsuk-radios" id="releaseType" value="all" aria-label="Choose how you want to release prescription(s)">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-1" name="releaseType" aria-labelledby="releaseType-1--label" type="radio" value="all" checked=""><label class="nhsuk-label nhsuk-radios__label" id="releaseType-1--label" for="releaseType-1">All nominated prescriptions for the below pharmacy</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-2" name="releaseType" aria-labelledby="releaseType-2--label" type="radio" value="prescriptionId"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-2--label" for="releaseType-2">A single prescription by ID</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-3" name="releaseType" aria-labelledby="releaseType-3--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-3--label" for="releaseType-3">With a FHIR release message</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-1" name="releaseType" type="radio" value="all" checked=""><label class="nhsuk-label nhsuk-radios__label" id="releaseType-1--label" for="releaseType-1">All nominated prescriptions for the below pharmacy</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-2" name="releaseType" type="radio" value="prescriptionId"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-2--label" for="releaseType-2">A single prescription by ID</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-3" name="releaseType" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-3--label" for="releaseType-3">With a FHIR release message</label></div>
         </div>
       </div>
       <div class="nhsuk-form-group nhsuk-form-group--error"><label class="nhsuk-label nhsuk-label--s" id="pharmacy--label" for="pharmacy">Pharmacy to release prescriptions to</label><span class="nhsuk-error-message" id="pharmacy--error-message"><span class="nhsuk-u-visually-hidden">Error: </span>You must select a pharmacy to release to</span>
         <div class="nhsuk-radios" id="pharmacy" value="" aria-label="Pharmacy to release prescriptions to" aria-describedby="pharmacy--error-message">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-1" name="pharmacy" aria-labelledby="pharmacy-1--label" type="radio" value="VNFKT"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-1--label" for="pharmacy-1">VNFKT - FIVE STAR HOMECARE LEEDS LTD</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-2" name="pharmacy" aria-labelledby="pharmacy-2--label" type="radio" value="YGM1E"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-2--label" for="pharmacy-2">YGM1E - MBBM HEALTHCARE TECHNOLOGIES LTD</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-3" name="pharmacy" aria-labelledby="pharmacy-3--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-3--label" for="pharmacy-3">Other</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-1" name="pharmacy" type="radio" value="VNFKT"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-1--label" for="pharmacy-1">VNFKT - FIVE STAR HOMECARE LEEDS LTD</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-2" name="pharmacy" type="radio" value="YGM1E"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-2--label" for="pharmacy-2">YGM1E - MBBM HEALTHCARE TECHNOLOGIES LTD</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-3" name="pharmacy" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-3--label" for="pharmacy-3">Other</label></div>
         </div>
       </div>
     </fieldset>
@@ -97,17 +97,17 @@ exports[`Prescription Id Field is required when releasing by prescription Id 1`]
     <fieldset class="nhsuk-fieldset">
       <div class="nhsuk-form-group nhsuk-form-group--error"><label class="nhsuk-label nhsuk-label--s" id="releaseType--label" for="releaseType">Choose how you want to release prescription(s)</label><span class="nhsuk-error-message" id="releaseType--error-message"><span class="nhsuk-u-visually-hidden">Error: </span>You must enter a 'Prescription ID' to release to when releasing a single prescription</span>
         <div class="nhsuk-radios" id="releaseType" value="prescriptionId" aria-label="Choose how you want to release prescription(s)" aria-describedby="releaseType--error-message">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-1" name="releaseType" aria-labelledby="releaseType-1--label" type="radio" value="all" checked=""><label class="nhsuk-label nhsuk-radios__label" id="releaseType-1--label" for="releaseType-1">All nominated prescriptions for the below pharmacy</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-2" name="releaseType" aria-labelledby="releaseType-2--label" type="radio" value="prescriptionId"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-2--label" for="releaseType-2">A single prescription by ID</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-3" name="releaseType" aria-labelledby="releaseType-3--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-3--label" for="releaseType-3">With a FHIR release message</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-1" name="releaseType" type="radio" value="all" checked=""><label class="nhsuk-label nhsuk-radios__label" id="releaseType-1--label" for="releaseType-1">All nominated prescriptions for the below pharmacy</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-2" name="releaseType" type="radio" value="prescriptionId"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-2--label" for="releaseType-2">A single prescription by ID</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-3" name="releaseType" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-3--label" for="releaseType-3">With a FHIR release message</label></div>
         </div>
       </div>
       <div class="nhsuk-form-group"><label class="nhsuk-label" id="prescriptionId--label" for="prescriptionId">Prescription ID</label><input class="nhsuk-input nhsuk-input--width-30" type="text" name="prescriptionId" id="prescriptionId" value=""></div>
       <div class="nhsuk-form-group nhsuk-form-group--error"><label class="nhsuk-label nhsuk-label--s" id="pharmacy--label" for="pharmacy">Pharmacy to release prescriptions to</label><span class="nhsuk-error-message" id="pharmacy--error-message"><span class="nhsuk-u-visually-hidden">Error: </span>You must select a pharmacy to release to</span>
         <div class="nhsuk-radios" id="pharmacy" value="" aria-label="Pharmacy to release prescriptions to" aria-describedby="pharmacy--error-message">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-1" name="pharmacy" aria-labelledby="pharmacy-1--label" type="radio" value="VNFKT"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-1--label" for="pharmacy-1">VNFKT - FIVE STAR HOMECARE LEEDS LTD</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-2" name="pharmacy" aria-labelledby="pharmacy-2--label" type="radio" value="YGM1E"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-2--label" for="pharmacy-2">YGM1E - MBBM HEALTHCARE TECHNOLOGIES LTD</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-3" name="pharmacy" aria-labelledby="pharmacy-3--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-3--label" for="pharmacy-3">Other</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-1" name="pharmacy" type="radio" value="VNFKT"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-1--label" for="pharmacy-1">VNFKT - FIVE STAR HOMECARE LEEDS LTD</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-2" name="pharmacy" type="radio" value="YGM1E"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-2--label" for="pharmacy-2">YGM1E - MBBM HEALTHCARE TECHNOLOGIES LTD</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-3" name="pharmacy" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-3--label" for="pharmacy-3">Other</label></div>
         </div>
       </div>
     </fieldset>
diff --git a/packages/tool/site/client/tests/pages/__snapshots__/dispensePage.spec.tsx.snap b/packages/tool/site/client/tests/pages/__snapshots__/dispensePage.spec.tsx.snap
index 701ded768c..e71f58cc5a 100644
--- a/packages/tool/site/client/tests/pages/__snapshots__/dispensePage.spec.tsx.snap
+++ b/packages/tool/site/client/tests/pages/__snapshots__/dispensePage.spec.tsx.snap
@@ -103,8 +103,8 @@ exports[`Displays dispense form if prescription details are retrieved successful
     <fieldset class="nhsuk-fieldset">
       <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="dispenseType--label" for="dispenseType">Choose how you want to dispense this prescription</label>
         <div class="nhsuk-radios" id="dispenseType" value="form" aria-label="Choose how you want to dispense this prescription">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-1" name="dispenseType" aria-labelledby="dispenseType-1--label" type="radio" value="form" checked=""><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-1--label" for="dispenseType-1">Use the dispense prescription form</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-2" name="dispenseType" aria-labelledby="dispenseType-2--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-2--label" for="dispenseType-2">With a FHIR dispense message</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-1" name="dispenseType" type="radio" value="form" checked=""><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-1--label" for="dispenseType-1">Use the dispense prescription form</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-2" name="dispenseType" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-2--label" for="dispenseType-2">With a FHIR dispense message</label></div>
         </div>
       </div>
       <div class="nhsuk-form-group">
@@ -165,8 +165,8 @@ exports[`Displays dispense form if prescription details are retrieved successful
     <fieldset class="nhsuk-fieldset">
       <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="dispenseType--label" for="dispenseType">Choose how you want to dispense this prescription</label>
         <div class="nhsuk-radios" id="dispenseType" value="form" aria-label="Choose how you want to dispense this prescription">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-1" name="dispenseType" aria-labelledby="dispenseType-1--label" type="radio" value="form" checked=""><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-1--label" for="dispenseType-1">Use the dispense prescription form</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-2" name="dispenseType" aria-labelledby="dispenseType-2--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-2--label" for="dispenseType-2">With a FHIR dispense message</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-1" name="dispenseType" type="radio" value="form" checked=""><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-1--label" for="dispenseType-1">Use the dispense prescription form</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="dispenseType-2" name="dispenseType" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="dispenseType-2--label" for="dispenseType-2">With a FHIR dispense message</label></div>
         </div>
       </div>
       <div class="nhsuk-form-group">
diff --git a/packages/tool/site/client/tests/pages/__snapshots__/releasePage.spec.tsx.snap b/packages/tool/site/client/tests/pages/__snapshots__/releasePage.spec.tsx.snap
index a815b70902..310b80c081 100644
--- a/packages/tool/site/client/tests/pages/__snapshots__/releasePage.spec.tsx.snap
+++ b/packages/tool/site/client/tests/pages/__snapshots__/releasePage.spec.tsx.snap
@@ -51,17 +51,17 @@ exports[`Displays release form 1`] = `
     <fieldset class="nhsuk-fieldset">
       <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="releaseType--label" for="releaseType">Choose how you want to release prescription(s)</label>
         <div class="nhsuk-radios" id="releaseType" value="prescriptionId" aria-label="Choose how you want to release prescription(s)">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-1" name="releaseType" aria-labelledby="releaseType-1--label" type="radio" value="all"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-1--label" for="releaseType-1">All nominated prescriptions for the below pharmacy</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-2" name="releaseType" aria-labelledby="releaseType-2--label" type="radio" value="prescriptionId" checked=""><label class="nhsuk-label nhsuk-radios__label" id="releaseType-2--label" for="releaseType-2">A single prescription by ID</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-3" name="releaseType" aria-labelledby="releaseType-3--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-3--label" for="releaseType-3">With a FHIR release message</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-1" name="releaseType" type="radio" value="all"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-1--label" for="releaseType-1">All nominated prescriptions for the below pharmacy</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-2" name="releaseType" type="radio" value="prescriptionId" checked=""><label class="nhsuk-label nhsuk-radios__label" id="releaseType-2--label" for="releaseType-2">A single prescription by ID</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="releaseType-3" name="releaseType" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="releaseType-3--label" for="releaseType-3">With a FHIR release message</label></div>
         </div>
       </div>
       <div class="nhsuk-form-group"><label class="nhsuk-label" id="prescriptionId--label" for="prescriptionId">Prescription ID</label><input class="nhsuk-input nhsuk-input--width-30" type="text" name="prescriptionId" id="prescriptionId" value="7A9089-A83008-56A03J"></div>
       <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="pharmacy--label" for="pharmacy">Pharmacy to release prescriptions to</label>
         <div class="nhsuk-radios" id="pharmacy" value="" aria-label="Pharmacy to release prescriptions to">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-1" name="pharmacy" aria-labelledby="pharmacy-1--label" type="radio" value="VNFKT"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-1--label" for="pharmacy-1">VNFKT - FIVE STAR HOMECARE LEEDS LTD</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-2" name="pharmacy" aria-labelledby="pharmacy-2--label" type="radio" value="YGM1E"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-2--label" for="pharmacy-2">YGM1E - MBBM HEALTHCARE TECHNOLOGIES LTD</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-3" name="pharmacy" aria-labelledby="pharmacy-3--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-3--label" for="pharmacy-3">Other</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-1" name="pharmacy" type="radio" value="VNFKT"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-1--label" for="pharmacy-1">VNFKT - FIVE STAR HOMECARE LEEDS LTD</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-2" name="pharmacy" type="radio" value="YGM1E"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-2--label" for="pharmacy-2">YGM1E - MBBM HEALTHCARE TECHNOLOGIES LTD</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-3" name="pharmacy" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-3--label" for="pharmacy-3">Other</label></div>
         </div>
       </div>
     </fieldset>
diff --git a/packages/tool/site/client/tests/pages/__snapshots__/returnPage.spec.tsx.snap b/packages/tool/site/client/tests/pages/__snapshots__/returnPage.spec.tsx.snap
index 7deac01a0c..3221e0c6d2 100644
--- a/packages/tool/site/client/tests/pages/__snapshots__/returnPage.spec.tsx.snap
+++ b/packages/tool/site/client/tests/pages/__snapshots__/returnPage.spec.tsx.snap
@@ -13,21 +13,21 @@ exports[`Displays return form 1`] = `
     <fieldset class="nhsuk-fieldset">
       <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="pharmacy--label" for="pharmacy">Pharmacy returning prescription</label>
         <div class="nhsuk-radios" id="pharmacy" value="VNFKT" aria-label="Pharmacy returning prescription">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-1" name="pharmacy" aria-labelledby="pharmacy-1--label" type="radio" value="VNFKT" checked=""><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-1--label" for="pharmacy-1">VNFKT - FIVE STAR HOMECARE LEEDS LTD</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-2" name="pharmacy" aria-labelledby="pharmacy-2--label" type="radio" value="YGM1E"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-2--label" for="pharmacy-2">YGM1E - MBBM HEALTHCARE TECHNOLOGIES LTD</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-3" name="pharmacy" aria-labelledby="pharmacy-3--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-3--label" for="pharmacy-3">Other</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-1" name="pharmacy" type="radio" value="VNFKT" checked=""><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-1--label" for="pharmacy-1">VNFKT - FIVE STAR HOMECARE LEEDS LTD</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-2" name="pharmacy" type="radio" value="YGM1E"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-2--label" for="pharmacy-2">YGM1E - MBBM HEALTHCARE TECHNOLOGIES LTD</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-3" name="pharmacy" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-3--label" for="pharmacy-3">Other</label></div>
         </div>
       </div>
       <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="reason--label" for="reason">Choose a reason for returning</label>
         <div class="nhsuk-radios" id="reason" value="0002" aria-label="Choose a reason for returning">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-1" name="reason" aria-labelledby="reason-1--label" type="radio" value="0001"><label class="nhsuk-label nhsuk-radios__label" id="reason-1--label" for="reason-1">Patient non-attendance</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-2" name="reason" aria-labelledby="reason-2--label" type="radio" value="0002" checked=""><label class="nhsuk-label nhsuk-radios__label" id="reason-2--label" for="reason-2">Unable to dispense medication on prescriptions</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-3" name="reason" aria-labelledby="reason-3--label" type="radio" value="0003"><label class="nhsuk-label nhsuk-radios__label" id="reason-3--label" for="reason-3">Patient requested release</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-4" name="reason" aria-labelledby="reason-4--label" type="radio" value="0004"><label class="nhsuk-label nhsuk-radios__label" id="reason-4--label" for="reason-4">Another dispenser requested release on behalf of the patient</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-5" name="reason" aria-labelledby="reason-5--label" type="radio" value="0005"><label class="nhsuk-label nhsuk-radios__label" id="reason-5--label" for="reason-5">Invalid digital signature</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-6" name="reason" aria-labelledby="reason-6--label" type="radio" value="0006"><label class="nhsuk-label nhsuk-radios__label" id="reason-6--label" for="reason-6">Rejected due to version problem</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-7" name="reason" aria-labelledby="reason-7--label" type="radio" value="0007"><label class="nhsuk-label nhsuk-radios__label" id="reason-7--label" for="reason-7">Prescription otherwise invalid or unreadable</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-8" name="reason" aria-labelledby="reason-8--label" type="radio" value="0008"><label class="nhsuk-label nhsuk-radios__label" id="reason-8--label" for="reason-8">Prescription expired</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-1" name="reason" type="radio" value="0001"><label class="nhsuk-label nhsuk-radios__label" id="reason-1--label" for="reason-1">Patient non-attendance</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-2" name="reason" type="radio" value="0002" checked=""><label class="nhsuk-label nhsuk-radios__label" id="reason-2--label" for="reason-2">Unable to dispense medication on prescriptions</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-3" name="reason" type="radio" value="0003"><label class="nhsuk-label nhsuk-radios__label" id="reason-3--label" for="reason-3">Patient requested release</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-4" name="reason" type="radio" value="0004"><label class="nhsuk-label nhsuk-radios__label" id="reason-4--label" for="reason-4">Another dispenser requested release on behalf of the patient</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-5" name="reason" type="radio" value="0005"><label class="nhsuk-label nhsuk-radios__label" id="reason-5--label" for="reason-5">Invalid digital signature</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-6" name="reason" type="radio" value="0006"><label class="nhsuk-label nhsuk-radios__label" id="reason-6--label" for="reason-6">Rejected due to version problem</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-7" name="reason" type="radio" value="0007"><label class="nhsuk-label nhsuk-radios__label" id="reason-7--label" for="reason-7">Prescription otherwise invalid or unreadable</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-8" name="reason" type="radio" value="0008"><label class="nhsuk-label nhsuk-radios__label" id="reason-8--label" for="reason-8">Prescription expired</label></div>
         </div>
       </div>
     </fieldset>
diff --git a/packages/tool/site/client/tests/pages/__snapshots__/signPage.spec.tsx.snap b/packages/tool/site/client/tests/pages/__snapshots__/signPage.spec.tsx.snap
index 8e8bb19a1b..1d6ce93850 100644
--- a/packages/tool/site/client/tests/pages/__snapshots__/signPage.spec.tsx.snap
+++ b/packages/tool/site/client/tests/pages/__snapshots__/signPage.spec.tsx.snap
@@ -261,9 +261,9 @@ exports[`Displays prescription summary if prescription details are retrieved suc
   </dl>
   <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="signingOptions--label" for="signingOptions">Choose a sign in option</label>
     <div class="nhsuk-radios" id="signingOptions" value="N3_SMARTCARD" aria-label="Choose a sign in option">
-      <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="signingOptions-1" name="signingOptions" aria-labelledby="signingOptions-1--label" type="radio" value="N3_SMARTCARD" checked=""><label class="nhsuk-label nhsuk-radios__label" id="signingOptions-1--label" for="signingOptions-1">N3 Smartcard</label></div>
-      <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="signingOptions-2" name="signingOptions" aria-labelledby="signingOptions-2--label" type="radio" value="IOS"><label class="nhsuk-label nhsuk-radios__label" id="signingOptions-2--label" for="signingOptions-2">IOS</label></div>
-      <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="signingOptions-3" name="signingOptions" aria-labelledby="signingOptions-3--label" type="radio" value="FIDO2"><label class="nhsuk-label nhsuk-radios__label" id="signingOptions-3--label" for="signingOptions-3">FIDO2</label></div>
+      <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="signingOptions-1" name="signingOptions" type="radio" value="N3_SMARTCARD" checked=""><label class="nhsuk-label nhsuk-radios__label" id="signingOptions-1--label" for="signingOptions-1">N3 Smartcard</label></div>
+      <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="signingOptions-2" name="signingOptions" type="radio" value="IOS"><label class="nhsuk-label nhsuk-radios__label" id="signingOptions-2--label" for="signingOptions-2">IOS</label></div>
+      <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="signingOptions-3" name="signingOptions" type="radio" value="FIDO2"><label class="nhsuk-label nhsuk-radios__label" id="signingOptions-3--label" for="signingOptions-3">FIDO2</label></div>
     </div>
   </div>
   <div class="sc-egkSDF hcqWyj"><button class="nhsuk-button" aria-disabled="false" type="submit">Sign &amp; Send</button><button class="nhsuk-button nhsuk-button--secondary" aria-disabled="false" type="button">Back</button></div>
diff --git a/packages/tool/site/client/tests/pages/__snapshots__/withdrawPage.spec.tsx.snap b/packages/tool/site/client/tests/pages/__snapshots__/withdrawPage.spec.tsx.snap
index 129e9020ec..77d7484abc 100644
--- a/packages/tool/site/client/tests/pages/__snapshots__/withdrawPage.spec.tsx.snap
+++ b/packages/tool/site/client/tests/pages/__snapshots__/withdrawPage.spec.tsx.snap
@@ -238,19 +238,19 @@ exports[`Withdraw Page When there are two dispense notifications should match th
     <fieldset class="nhsuk-fieldset">
       <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="pharmacy--label" for="pharmacy">Pharmacy withdrawing prescription</label>
         <div class="nhsuk-radios" id="pharmacy" value="VNFKT" aria-label="Pharmacy withdrawing prescription">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-1" name="pharmacy" aria-labelledby="pharmacy-1--label" type="radio" value="VNFKT" checked=""><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-1--label" for="pharmacy-1">VNFKT - FIVE STAR HOMECARE LEEDS LTD</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-2" name="pharmacy" aria-labelledby="pharmacy-2--label" type="radio" value="YGM1E"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-2--label" for="pharmacy-2">YGM1E - MBBM HEALTHCARE TECHNOLOGIES LTD</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-3" name="pharmacy" aria-labelledby="pharmacy-3--label" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-3--label" for="pharmacy-3">Other</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-1" name="pharmacy" type="radio" value="VNFKT" checked=""><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-1--label" for="pharmacy-1">VNFKT - FIVE STAR HOMECARE LEEDS LTD</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-2" name="pharmacy" type="radio" value="YGM1E"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-2--label" for="pharmacy-2">YGM1E - MBBM HEALTHCARE TECHNOLOGIES LTD</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="pharmacy-3" name="pharmacy" type="radio" value="custom"><label class="nhsuk-label nhsuk-radios__label" id="pharmacy-3--label" for="pharmacy-3">Other</label></div>
         </div>
       </div>
       <div class="nhsuk-form-group"><label class="nhsuk-label nhsuk-label--s" id="reason--label" for="reason">Choose a reason for withdrawing</label>
         <div class="nhsuk-radios" id="reason" value="0002" aria-label="Choose a reason for withdrawing">
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-1" name="reason" aria-labelledby="reason-1--label" type="radio" value="QU"><label class="nhsuk-label nhsuk-radios__label" id="reason-1--label" for="reason-1">Quantity Update</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-2" name="reason" aria-labelledby="reason-2--label" type="radio" value="MU"><label class="nhsuk-label nhsuk-radios__label" id="reason-2--label" for="reason-2">Medication Update</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-3" name="reason" aria-labelledby="reason-3--label" type="radio" value="DA"><label class="nhsuk-label nhsuk-radios__label" id="reason-3--label" for="reason-3">Dosage Amendments</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-4" name="reason" aria-labelledby="reason-4--label" type="radio" value="PA"><label class="nhsuk-label nhsuk-radios__label" id="reason-4--label" for="reason-4">Patient Details Amendments</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-5" name="reason" aria-labelledby="reason-5--label" type="radio" value="OC"><label class="nhsuk-label nhsuk-radios__label" id="reason-5--label" for="reason-5">Other Clinical</label></div>
-          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-6" name="reason" aria-labelledby="reason-6--label" type="radio" value="ONC"><label class="nhsuk-label nhsuk-radios__label" id="reason-6--label" for="reason-6">Other Non-Clinical</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-1" name="reason" type="radio" value="QU"><label class="nhsuk-label nhsuk-radios__label" id="reason-1--label" for="reason-1">Quantity Update</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-2" name="reason" type="radio" value="MU"><label class="nhsuk-label nhsuk-radios__label" id="reason-2--label" for="reason-2">Medication Update</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-3" name="reason" type="radio" value="DA"><label class="nhsuk-label nhsuk-radios__label" id="reason-3--label" for="reason-3">Dosage Amendments</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-4" name="reason" type="radio" value="PA"><label class="nhsuk-label nhsuk-radios__label" id="reason-4--label" for="reason-4">Patient Details Amendments</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-5" name="reason" type="radio" value="OC"><label class="nhsuk-label nhsuk-radios__label" id="reason-5--label" for="reason-5">Other Clinical</label></div>
+          <div class="nhsuk-radios__item"><input class="nhsuk-radios__input" id="reason-6" name="reason" type="radio" value="ONC"><label class="nhsuk-label nhsuk-radios__label" id="reason-6--label" for="reason-6">Other Non-Clinical</label></div>
         </div>
       </div>
     </fieldset>