From 0b7d8a3e4765617de442a6313d3fd7557e415282 Mon Sep 17 00:00:00 2001
From: Sam Whyte <sam.whyte@answerdigital.com>
Date: Mon, 9 Feb 2026 14:43:04 +0000
Subject: [PATCH 1/3] [PRMP-1208] content change error message

---
 .../ReviewDetailsPatientSearchStage.tsx                  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/components/blocks/_admin/reviewDetailsPatientSearchStage/ReviewDetailsPatientSearchStage.tsx b/app/src/components/blocks/_admin/reviewDetailsPatientSearchStage/ReviewDetailsPatientSearchStage.tsx
index ecd22965a..112343e15 100644
--- a/app/src/components/blocks/_admin/reviewDetailsPatientSearchStage/ReviewDetailsPatientSearchStage.tsx
+++ b/app/src/components/blocks/_admin/reviewDetailsPatientSearchStage/ReviewDetailsPatientSearchStage.tsx
@@ -32,7 +32,8 @@ import { DOWNLOAD_STAGE } from '../../../../types/generic/downloadStage';
 import { getFormattedDateFromString } from '../../../../helpers/utils/formatDate';
 import { ReviewUploadDocument } from '../../../../types/pages/UploadDocumentsPage/types';
 
-export const incorrectFormatMessage = "Enter patient's 10 digit NHS number";
+export const incorrectFormatMessage =
+    "Enter a valid patient NHS number. If you keep getting this message, select 'I don't know the NHS number'.";
 
 interface ReviewDetailsPatientSearchPageProps {
     reviewData: ReviewDetails | null;
@@ -159,6 +160,8 @@ const ReviewDetailsPatientSearchStage = ({
         <>
             <BackButton backLinkText="Go back" dataTestid="back-button" />
 
+            <h1>Search for the correct patient</h1>
+
             {(submissionState === PATIENT_SEARCH_STATES.FAILED ||
                 inputError === incorrectFormatMessage) && (
                 <>
@@ -175,8 +178,6 @@ const ReviewDetailsPatientSearchStage = ({
                 </>
             )}
 
-            <h1>Search for the correct patient</h1>
-
             <p>Enter the NHS number to find the correct patient demographics for this document.</p>
 
             <form onSubmit={handleSubmit(handleValidSubmit, handleFormError)}>
@@ -189,7 +190,7 @@ const ReviewDetailsPatientSearchStage = ({
                     {...searchProps}
                     error={
                         submissionState !== PATIENT_SEARCH_STATES.SEARCHING && inputError
-                            ? inputError
+                            ? true
                             : false
                     }
                     name="nhsNumber"

From 87a643e22dab2a8235514357e513123b8e744921 Mon Sep 17 00:00:00 2001
From: Sam Whyte <sam.whyte@answerdigital.com>
Date: Mon, 9 Feb 2026 15:09:22 +0000
Subject: [PATCH 2/3] [PRMP-1208]reverting removing second error message

---
 .../ReviewDetailsPatientSearchStage.tsx                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/components/blocks/_admin/reviewDetailsPatientSearchStage/ReviewDetailsPatientSearchStage.tsx b/app/src/components/blocks/_admin/reviewDetailsPatientSearchStage/ReviewDetailsPatientSearchStage.tsx
index 112343e15..65c347742 100644
--- a/app/src/components/blocks/_admin/reviewDetailsPatientSearchStage/ReviewDetailsPatientSearchStage.tsx
+++ b/app/src/components/blocks/_admin/reviewDetailsPatientSearchStage/ReviewDetailsPatientSearchStage.tsx
@@ -190,7 +190,7 @@ const ReviewDetailsPatientSearchStage = ({
                     {...searchProps}
                     error={
                         submissionState !== PATIENT_SEARCH_STATES.SEARCHING && inputError
-                            ? true
+                            ? inputError
                             : false
                     }
                     name="nhsNumber"

From 4b2c87a7185ae09ca9c511eac58cf6176af4aa45 Mon Sep 17 00:00:00 2001
From: Sam Whyte <sam.whyte@answerdigital.com>
Date: Thu, 12 Feb 2026 15:40:36 +0000
Subject: [PATCH 3/3] [PRMP-1208] tests

---
 .../ReviewDetailsPatientSearchStage.test.tsx  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/app/src/components/blocks/_admin/reviewDetailsPatientSearchStage/ReviewDetailsPatientSearchStage.test.tsx b/app/src/components/blocks/_admin/reviewDetailsPatientSearchStage/ReviewDetailsPatientSearchStage.test.tsx
index 9f305978c..0f4fd75c2 100644
--- a/app/src/components/blocks/_admin/reviewDetailsPatientSearchStage/ReviewDetailsPatientSearchStage.test.tsx
+++ b/app/src/components/blocks/_admin/reviewDetailsPatientSearchStage/ReviewDetailsPatientSearchStage.test.tsx
@@ -236,6 +236,29 @@ describe('ReviewDetailsPatientSearchPage', () => {
             });
         });
 
+        it('displays incorrectFormatMessage in both ErrorBox and TextInput on validation failure', async () => {
+            render(
+                <ReviewDetailsPatientSearchStage
+                    uploadDocuments={[]}
+                    reviewData={mockReviewData}
+                    setNewPatientDetails={(): void => {}}
+                />,
+            );
+
+            const input = screen.getByTestId('nhs-number-input');
+            const continueButton = screen.getByTestId('continue-button');
+
+            // Submit with invalid NHS number
+            await userEvent.type(input, '12345');
+            await userEvent.click(continueButton);
+
+            await waitFor(() => {
+                // Check that incorrectFormatMessage appears twice (ErrorBox + TextInput)
+                const errorMessages = screen.getAllByText(incorrectFormatMessage);
+                expect(errorMessages).toHaveLength(2);
+            });
+        });
+
         it('shows error for invalid NHS number format', async () => {
             render(
                 <ReviewDetailsPatientSearchStage