From c97f66c02dde3faec61336fc8b362deb1b816511 Mon Sep 17 00:00:00 2001
From: adamwhitingnhs <adam.whiting3@nhs.net>
Date: Mon, 9 Feb 2026 16:59:34 +0000
Subject: [PATCH] [PRMP-1244] Changes to document view page buttons

---
 .../ReviewDetailsAssessmentStage.test.tsx     |   2 +-
 .../ReviewDetailsAssessmentStage.tsx          |   2 +-
 .../ReviewDetailsDocumentRemoveAllStage.tsx   |   2 +-
 ...ewDetailsDocumentSelectOrderStage.test.tsx |   2 +-
 .../ReviewDetailsDocumentSelectOrderStage.tsx |   2 +-
 .../ReviewDetailsDocumentSelectStage.tsx      |   2 +-
 ...viewDetailsDocumentUploadingStage.test.tsx |   2 +-
 .../ReviewDetailsDocumentUploadingStage.tsx   |   2 +-
 .../ReviewDetailsPatientSearchStage.test.tsx  |   2 +-
 .../ReviewDetailsPatientSearchStage.tsx       |   2 +-
 .../ReviewsDetailsStage.tsx                   |   2 +-
 .../DocumentSelectFileErrorsPage.test.tsx     |   0
 .../DocumentSelectFileErrorsPage.tsx          |   1 -
 .../DocumentSelectOrderStage.test.tsx         |   0
 .../DocumentSelectOrderStage.tsx              |   7 +-
 .../DocumentSelectPagesStage.test.tsx         |  10 ++
 .../DocumentSelectPagesStage.tsx              |   9 ++
 .../DocumentSelectStage.scss                  |   0
 .../DocumentSelectStage.test.tsx              |   2 +-
 .../DocumentSelectStage.tsx                   |  19 ++-
 .../DocumentUploadCompleteStage.scss          |   0
 .../DocumentUploadCompleteStage.test.tsx      |   0
 .../DocumentUploadCompleteStage.tsx           |   0
 .../DocumentUploadConfirmStage.test.tsx       |   0
 .../DocumentUploadConfirmStage.tsx            |   0
 .../components/DocumentList.test.tsx          |   0
 .../components/DocumentList.tsx               |   0
 .../DocumentUploadIndex.test.tsx              |   0
 .../DocumentUploadIndex.tsx                   |   0
 .../DocumentUploadInfectedStage.test.tsx      |   0
 .../DocumentUploadInfectedStage.tsx           |   0
 .../DocumentUploadLloydGeorgePreview.test.tsx |   0
 .../DocumentUploadLloydGeorgePreview.tsx      |   0
 .../DocumentUploadRemoveFilesStage.test.tsx   |   0
 .../DocumentUploadRemoveFilesStage.tsx        |   0
 .../DocumentUploadingStage.test.tsx           |   0
 .../DocumentUploadingStage.tsx                |   0
 .../documentView/DocumentView.scss            |  24 ++++
 .../documentView/DocumentView.test.tsx        |  73 ++++++++--
 .../documentView/DocumentView.tsx             | 134 ++++++++++++------
 .../generic/recordCard/RecordCard.tsx         |  16 ++-
 .../recordMenuCard/RecordMenuCard.test.tsx    |  49 +------
 ...ectronicHealthRecordAttachmentsConfig.json |   6 +-
 .../config/electronicHealthRecordConfig.json  |   6 +-
 app/src/config/lettersAndDocumentsConfig.json |   6 +-
 app/src/config/lloydGeorgeConfig.json         |   6 +-
 app/src/helpers/utils/documentType.ts         |  24 ++--
 .../DocumentCorrectPage.test.tsx              |  39 +++++
 .../DocumentCorrectPage.tsx                   |  21 +++
 .../DocumentSearchResultsPage.tsx             |   7 +-
 .../documentUploadPage/DocumentUploadPage.tsx |  24 ++--
 app/src/router/AppRouter.tsx                  |  15 ++
 app/src/styles/App.scss                       |   9 +-
 .../types/blocks/lloydGeorgeActions.test.ts   |  19 ++-
 app/src/types/blocks/lloydGeorgeActions.ts    |  23 ++-
 app/src/types/generic/featureFlags.ts         |   2 +
 app/src/types/generic/location.ts             |   7 +
 app/src/types/generic/routes.ts               |   4 +
 .../types/pages/UploadDocumentsPage/types.ts  |   9 +-
 app/src/types/pages/documentCorrect/types.ts  |   5 +
 60 files changed, 416 insertions(+), 182 deletions(-)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentSelectFileErrorsPage/DocumentSelectFileErrorsPage.test.tsx (100%)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentSelectFileErrorsPage/DocumentSelectFileErrorsPage.tsx (99%)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentSelectOrderStage/DocumentSelectOrderStage.test.tsx (100%)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentSelectOrderStage/DocumentSelectOrderStage.tsx (98%)
 create mode 100644 app/src/components/blocks/_documentManagement/documentSelectPagesStage/DocumentSelectPagesStage.test.tsx
 create mode 100644 app/src/components/blocks/_documentManagement/documentSelectPagesStage/DocumentSelectPagesStage.tsx
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentSelectStage/DocumentSelectStage.scss (100%)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentSelectStage/DocumentSelectStage.test.tsx (99%)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentSelectStage/DocumentSelectStage.tsx (98%)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentUploadCompleteStage/DocumentUploadCompleteStage.scss (100%)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentUploadCompleteStage/DocumentUploadCompleteStage.test.tsx (100%)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentUploadCompleteStage/DocumentUploadCompleteStage.tsx (100%)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentUploadConfirmStage/DocumentUploadConfirmStage.test.tsx (100%)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentUploadConfirmStage/DocumentUploadConfirmStage.tsx (100%)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentUploadConfirmStage/components/DocumentList.test.tsx (100%)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentUploadConfirmStage/components/DocumentList.tsx (100%)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentUploadIndex/DocumentUploadIndex.test.tsx (100%)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentUploadIndex/DocumentUploadIndex.tsx (100%)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentUploadInfectedStage/DocumentUploadInfectedStage.test.tsx (100%)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentUploadInfectedStage/DocumentUploadInfectedStage.tsx (100%)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentUploadLloydGeorgePreview/DocumentUploadLloydGeorgePreview.test.tsx (100%)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentUploadLloydGeorgePreview/DocumentUploadLloydGeorgePreview.tsx (100%)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentUploadRemoveFilesStage/DocumentUploadRemoveFilesStage.test.tsx (100%)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentUploadRemoveFilesStage/DocumentUploadRemoveFilesStage.tsx (100%)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentUploadingStage/DocumentUploadingStage.test.tsx (100%)
 rename app/src/components/blocks/{_documentUpload => _documentManagement}/documentUploadingStage/DocumentUploadingStage.tsx (100%)
 create mode 100644 app/src/components/blocks/_patientDocuments/documentView/DocumentView.scss
 create mode 100644 app/src/pages/documentCorrectPage/DocumentCorrectPage.test.tsx
 create mode 100644 app/src/pages/documentCorrectPage/DocumentCorrectPage.tsx
 create mode 100644 app/src/types/generic/location.ts
 create mode 100644 app/src/types/pages/documentCorrect/types.ts

diff --git a/app/src/components/blocks/_admin/reviewDetailsAssessmentStage/ReviewDetailsAssessmentStage.test.tsx b/app/src/components/blocks/_admin/reviewDetailsAssessmentStage/ReviewDetailsAssessmentStage.test.tsx
index af9ed6b839..0c269d70ed 100644
--- a/app/src/components/blocks/_admin/reviewDetailsAssessmentStage/ReviewDetailsAssessmentStage.test.tsx
+++ b/app/src/components/blocks/_admin/reviewDetailsAssessmentStage/ReviewDetailsAssessmentStage.test.tsx
@@ -71,7 +71,7 @@ vi.mock('./ExistingRecordTable', () => ({
 }));
 
 vi.mock(
-    '../../_documentUpload/documentUploadLloydGeorgePreview/DocumentUploadLloydGeorgePreview',
+    '../../_documentManagement/documentUploadLloydGeorgePreview/DocumentUploadLloydGeorgePreview',
     () => ({
         default: ({
             documents,
diff --git a/app/src/components/blocks/_admin/reviewDetailsAssessmentStage/ReviewDetailsAssessmentStage.tsx b/app/src/components/blocks/_admin/reviewDetailsAssessmentStage/ReviewDetailsAssessmentStage.tsx
index 340e70abbb..8f06f06759 100644
--- a/app/src/components/blocks/_admin/reviewDetailsAssessmentStage/ReviewDetailsAssessmentStage.tsx
+++ b/app/src/components/blocks/_admin/reviewDetailsAssessmentStage/ReviewDetailsAssessmentStage.tsx
@@ -24,7 +24,7 @@ import {
     ReviewUploadDocument,
     UploadDocumentType,
 } from '../../../../types/pages/UploadDocumentsPage/types';
-import DocumentUploadLloydGeorgePreview from '../../_documentUpload/documentUploadLloydGeorgePreview/DocumentUploadLloydGeorgePreview';
+import DocumentUploadLloydGeorgePreview from '../../_documentManagement/documentUploadLloydGeorgePreview/DocumentUploadLloydGeorgePreview';
 import { AxiosError } from 'axios';
 import { errorToParams } from '../../../../helpers/utils/errorToParams';
 import PatientSummary, { PatientInfo } from '../../../generic/patientSummary/PatientSummary';
diff --git a/app/src/components/blocks/_admin/reviewDetailsDocumentRemoveAllStage/ReviewDetailsDocumentRemoveAllStage.tsx b/app/src/components/blocks/_admin/reviewDetailsDocumentRemoveAllStage/ReviewDetailsDocumentRemoveAllStage.tsx
index 2da1b7888b..3b9a91d648 100644
--- a/app/src/components/blocks/_admin/reviewDetailsDocumentRemoveAllStage/ReviewDetailsDocumentRemoveAllStage.tsx
+++ b/app/src/components/blocks/_admin/reviewDetailsDocumentRemoveAllStage/ReviewDetailsDocumentRemoveAllStage.tsx
@@ -7,7 +7,7 @@ import {
     UploadDocumentType,
 } from '../../../../types/pages/UploadDocumentsPage/types';
 import Spinner from '../../../generic/spinner/Spinner';
-import DocumentUploadRemoveFilesStage from '../../_documentUpload/documentUploadRemoveFilesStage/DocumentUploadRemoveFilesStage';
+import DocumentUploadRemoveFilesStage from '../../_documentManagement/documentUploadRemoveFilesStage/DocumentUploadRemoveFilesStage';
 import BackButton from '../../../generic/backButton/BackButton';
 
 type ReviewDetailsDocumentRemoveAllStageProps = {
diff --git a/app/src/components/blocks/_admin/reviewDetailsDocumentSelectOrderStage/ReviewDetailsDocumentSelectOrderStage.test.tsx b/app/src/components/blocks/_admin/reviewDetailsDocumentSelectOrderStage/ReviewDetailsDocumentSelectOrderStage.test.tsx
index b3cdd7f462..b931ac7112 100644
--- a/app/src/components/blocks/_admin/reviewDetailsDocumentSelectOrderStage/ReviewDetailsDocumentSelectOrderStage.test.tsx
+++ b/app/src/components/blocks/_admin/reviewDetailsDocumentSelectOrderStage/ReviewDetailsDocumentSelectOrderStage.test.tsx
@@ -7,7 +7,7 @@ import { ReviewDetails } from '../../../../types/generic/reviews';
 import { UploadDocument } from '../../../../types/pages/UploadDocumentsPage/types';
 import userEvent from '@testing-library/user-event';
 
-vi.mock('../../_documentUpload/documentSelectOrderStage/DocumentSelectOrderStage', () => ({
+vi.mock('../../_documentManagement/documentSelectOrderStage/DocumentSelectOrderStage', () => ({
     default: vi.fn(
         ({ documents, setDocuments, setMergedPdfBlob, existingDocuments, onSuccess }) => (
             <div data-testid="mock-document-select-order-stage">
diff --git a/app/src/components/blocks/_admin/reviewDetailsDocumentSelectOrderStage/ReviewDetailsDocumentSelectOrderStage.tsx b/app/src/components/blocks/_admin/reviewDetailsDocumentSelectOrderStage/ReviewDetailsDocumentSelectOrderStage.tsx
index 2ca7a98cad..2352ca3028 100644
--- a/app/src/components/blocks/_admin/reviewDetailsDocumentSelectOrderStage/ReviewDetailsDocumentSelectOrderStage.tsx
+++ b/app/src/components/blocks/_admin/reviewDetailsDocumentSelectOrderStage/ReviewDetailsDocumentSelectOrderStage.tsx
@@ -7,7 +7,7 @@ import {
     UploadDocument,
 } from '../../../../types/pages/UploadDocumentsPage/types';
 import Spinner from '../../../generic/spinner/Spinner';
-import DocumentSelectOrderStage from '../../_documentUpload/documentSelectOrderStage/DocumentSelectOrderStage';
+import DocumentSelectOrderStage from '../../_documentManagement/documentSelectOrderStage/DocumentSelectOrderStage';
 import { getConfigForDocType } from '../../../../helpers/utils/documentType';
 
 type Props = {
diff --git a/app/src/components/blocks/_admin/reviewDetailsDocumentSelectStage/ReviewDetailsDocumentSelectStage.tsx b/app/src/components/blocks/_admin/reviewDetailsDocumentSelectStage/ReviewDetailsDocumentSelectStage.tsx
index 045a38e4b9..3057a30426 100644
--- a/app/src/components/blocks/_admin/reviewDetailsDocumentSelectStage/ReviewDetailsDocumentSelectStage.tsx
+++ b/app/src/components/blocks/_admin/reviewDetailsDocumentSelectStage/ReviewDetailsDocumentSelectStage.tsx
@@ -1,5 +1,5 @@
 import { JSX, useEffect, useRef, useState } from 'react';
-import DocumentSelectStage from '../../_documentUpload/documentSelectStage/DocumentSelectStage';
+import DocumentSelectStage from '../../_documentManagement/documentSelectStage/DocumentSelectStage';
 import { getConfigForDocType } from '../../../../helpers/utils/documentType';
 import { useNavigate } from 'react-router-dom';
 import { ReviewDetails } from '../../../../types/generic/reviews';
diff --git a/app/src/components/blocks/_admin/reviewDetailsDocumentUploadingStage/ReviewDetailsDocumentUploadingStage.test.tsx b/app/src/components/blocks/_admin/reviewDetailsDocumentUploadingStage/ReviewDetailsDocumentUploadingStage.test.tsx
index 65719e502b..cab54026a9 100644
--- a/app/src/components/blocks/_admin/reviewDetailsDocumentUploadingStage/ReviewDetailsDocumentUploadingStage.test.tsx
+++ b/app/src/components/blocks/_admin/reviewDetailsDocumentUploadingStage/ReviewDetailsDocumentUploadingStage.test.tsx
@@ -50,7 +50,7 @@ vi.mock('../../../../helpers/utils/urlManipulations', () => ({
     },
 }));
 
-vi.mock('../../_documentUpload/documentUploadingStage/DocumentUploadingStage', () => ({
+vi.mock('../../_documentManagement/documentUploadingStage/DocumentUploadingStage', () => ({
     default: ({ documents, startUpload }: any): JSX.Element => (
         <div data-testid="mock-document-uploading-stage">
             <button data-testid="start-upload-button" onClick={startUpload}>
diff --git a/app/src/components/blocks/_admin/reviewDetailsDocumentUploadingStage/ReviewDetailsDocumentUploadingStage.tsx b/app/src/components/blocks/_admin/reviewDetailsDocumentUploadingStage/ReviewDetailsDocumentUploadingStage.tsx
index 60bbbb8416..ed83cf024f 100644
--- a/app/src/components/blocks/_admin/reviewDetailsDocumentUploadingStage/ReviewDetailsDocumentUploadingStage.tsx
+++ b/app/src/components/blocks/_admin/reviewDetailsDocumentUploadingStage/ReviewDetailsDocumentUploadingStage.tsx
@@ -33,7 +33,7 @@ import {
     UploadDocumentType,
 } from '../../../../types/pages/UploadDocumentsPage/types';
 import Spinner from '../../../generic/spinner/Spinner';
-import DocumentUploadingStage from '../../_documentUpload/documentUploadingStage/DocumentUploadingStage';
+import DocumentUploadingStage from '../../_documentManagement/documentUploadingStage/DocumentUploadingStage';
 
 type Props = {
     reviewData: ReviewDetails | null;
diff --git a/app/src/components/blocks/_admin/reviewDetailsPatientSearchStage/ReviewDetailsPatientSearchStage.test.tsx b/app/src/components/blocks/_admin/reviewDetailsPatientSearchStage/ReviewDetailsPatientSearchStage.test.tsx
index 9f305978c9..1055aa9bb2 100644
--- a/app/src/components/blocks/_admin/reviewDetailsPatientSearchStage/ReviewDetailsPatientSearchStage.test.tsx
+++ b/app/src/components/blocks/_admin/reviewDetailsPatientSearchStage/ReviewDetailsPatientSearchStage.test.tsx
@@ -54,7 +54,7 @@ vi.mock('../../../../providers/sessionProvider/SessionProvider', () => ({
 }));
 
 vi.mock(
-    '../../_documentUpload/documentUploadLloydGeorgePreview/DocumentUploadLloydGeorgePreview',
+    '../../_documentManagement/documentUploadLloydGeorgePreview/DocumentUploadLloydGeorgePreview',
     () => ({
         default: (): React.JSX.Element => <div data-testid="lloyd-george-preview">Preview</div>,
     }),
diff --git a/app/src/components/blocks/_admin/reviewDetailsPatientSearchStage/ReviewDetailsPatientSearchStage.tsx b/app/src/components/blocks/_admin/reviewDetailsPatientSearchStage/ReviewDetailsPatientSearchStage.tsx
index ecd22965ab..7d1ead5b5f 100644
--- a/app/src/components/blocks/_admin/reviewDetailsPatientSearchStage/ReviewDetailsPatientSearchStage.tsx
+++ b/app/src/components/blocks/_admin/reviewDetailsPatientSearchStage/ReviewDetailsPatientSearchStage.tsx
@@ -24,7 +24,7 @@ import BackButton from '../../../generic/backButton/BackButton';
 import SpinnerButton from '../../../generic/spinnerButton/SpinnerButton';
 import ErrorBox from '../../../layout/errorBox/ErrorBox';
 import ServiceError from '../../../layout/serviceErrorBox/ServiceErrorBox';
-import DocumentUploadLloydGeorgePreview from '../../_documentUpload/documentUploadLloydGeorgePreview/DocumentUploadLloydGeorgePreview';
+import DocumentUploadLloydGeorgePreview from '../../_documentManagement/documentUploadLloydGeorgePreview/DocumentUploadLloydGeorgePreview';
 import { RecordLayout } from '../../../generic/recordCard/RecordCard';
 import { RecordLoader, RecordLoaderProps } from '../../../generic/recordLoader/RecordLoader';
 import { getConfigForDocType } from '../../../../helpers/utils/documentType';
diff --git a/app/src/components/blocks/_admin/reviewsDetailsStage/ReviewsDetailsStage.tsx b/app/src/components/blocks/_admin/reviewsDetailsStage/ReviewsDetailsStage.tsx
index 6dbd256d43..e3da2abede 100644
--- a/app/src/components/blocks/_admin/reviewsDetailsStage/ReviewsDetailsStage.tsx
+++ b/app/src/components/blocks/_admin/reviewsDetailsStage/ReviewsDetailsStage.tsx
@@ -33,8 +33,8 @@ import { useForm } from 'react-hook-form';
 import { AxiosError } from 'axios';
 import { errorToParams } from '../../../../helpers/utils/errorToParams';
 import waitForSeconds from '../../../../helpers/utils/waitForSeconds';
-import DocumentUploadLloydGeorgePreview from '../../_documentUpload/documentUploadLloydGeorgePreview/DocumentUploadLloydGeorgePreview';
 import { NHS_NUMBER_UNKNOWN } from '../../../../helpers/constants/numbers';
+import DocumentUploadLloydGeorgePreview from '../../_documentManagement/documentUploadLloydGeorgePreview/DocumentUploadLloydGeorgePreview';
 
 export type ReviewsDetailsStageProps = {
     reviewData: ReviewDetails;
diff --git a/app/src/components/blocks/_documentUpload/documentSelectFileErrorsPage/DocumentSelectFileErrorsPage.test.tsx b/app/src/components/blocks/_documentManagement/documentSelectFileErrorsPage/DocumentSelectFileErrorsPage.test.tsx
similarity index 100%
rename from app/src/components/blocks/_documentUpload/documentSelectFileErrorsPage/DocumentSelectFileErrorsPage.test.tsx
rename to app/src/components/blocks/_documentManagement/documentSelectFileErrorsPage/DocumentSelectFileErrorsPage.test.tsx
diff --git a/app/src/components/blocks/_documentUpload/documentSelectFileErrorsPage/DocumentSelectFileErrorsPage.tsx b/app/src/components/blocks/_documentManagement/documentSelectFileErrorsPage/DocumentSelectFileErrorsPage.tsx
similarity index 99%
rename from app/src/components/blocks/_documentUpload/documentSelectFileErrorsPage/DocumentSelectFileErrorsPage.tsx
rename to app/src/components/blocks/_documentManagement/documentSelectFileErrorsPage/DocumentSelectFileErrorsPage.tsx
index 805de37a29..601c17beeb 100644
--- a/app/src/components/blocks/_documentUpload/documentSelectFileErrorsPage/DocumentSelectFileErrorsPage.tsx
+++ b/app/src/components/blocks/_documentManagement/documentSelectFileErrorsPage/DocumentSelectFileErrorsPage.tsx
@@ -19,7 +19,6 @@ const DocumentSelectFileErrorsPage = ({ documents }: Props): JSX.Element => {
     useEffect(() => {
         if (documents.length === 0) {
             navigate(routes.HOME);
-            return;
         }
     }, []);
 
diff --git a/app/src/components/blocks/_documentUpload/documentSelectOrderStage/DocumentSelectOrderStage.test.tsx b/app/src/components/blocks/_documentManagement/documentSelectOrderStage/DocumentSelectOrderStage.test.tsx
similarity index 100%
rename from app/src/components/blocks/_documentUpload/documentSelectOrderStage/DocumentSelectOrderStage.test.tsx
rename to app/src/components/blocks/_documentManagement/documentSelectOrderStage/DocumentSelectOrderStage.test.tsx
diff --git a/app/src/components/blocks/_documentUpload/documentSelectOrderStage/DocumentSelectOrderStage.tsx b/app/src/components/blocks/_documentManagement/documentSelectOrderStage/DocumentSelectOrderStage.tsx
similarity index 98%
rename from app/src/components/blocks/_documentUpload/documentSelectOrderStage/DocumentSelectOrderStage.tsx
rename to app/src/components/blocks/_documentManagement/documentSelectOrderStage/DocumentSelectOrderStage.tsx
index e209f9be97..65c7748ffc 100644
--- a/app/src/components/blocks/_documentUpload/documentSelectOrderStage/DocumentSelectOrderStage.tsx
+++ b/app/src/components/blocks/_documentManagement/documentSelectOrderStage/DocumentSelectOrderStage.tsx
@@ -89,10 +89,7 @@ const DocumentSelectOrderStage = ({
         });
     }, [documents.length, existingDocuments]);
 
-    const DocumentPositionDropdown = (
-        documentId: string,
-        currentPosition: number | undefined,
-    ): React.JSX.Element => {
+    const getDocumentPositionDropdown = (documentId: string): React.JSX.Element => {
         const key = documentPositionKey(documentId);
 
         const positionOffset = existingDocuments && existingDocuments.length > 0 ? 1 : 0;
@@ -263,7 +260,7 @@ const DocumentSelectOrderStage = ({
                     {id === 'existing-documents' ? <b>{filename}</b> : filename}
                 </Table.Cell>
                 <Table.Cell className="position-cell">
-                    {ableToReposition && DocumentPositionDropdown(id, position)}
+                    {ableToReposition && getDocumentPositionDropdown(id)}
                     {!ableToReposition && position}
                 </Table.Cell>
                 <Table.Cell className="view-cell">
diff --git a/app/src/components/blocks/_documentManagement/documentSelectPagesStage/DocumentSelectPagesStage.test.tsx b/app/src/components/blocks/_documentManagement/documentSelectPagesStage/DocumentSelectPagesStage.test.tsx
new file mode 100644
index 0000000000..88542ba4d1
--- /dev/null
+++ b/app/src/components/blocks/_documentManagement/documentSelectPagesStage/DocumentSelectPagesStage.test.tsx
@@ -0,0 +1,10 @@
+import { render, screen } from '@testing-library/react';
+import DocumentSelectPagesStage from './DocumentSelectPagesStage';
+
+describe('DocumentSelectPagesStage', () => {
+    it('renders', () => {
+        render(<DocumentSelectPagesStage />);
+
+        expect(screen.getByText('Document select page')).toBeInTheDocument();
+    });
+});
diff --git a/app/src/components/blocks/_documentManagement/documentSelectPagesStage/DocumentSelectPagesStage.tsx b/app/src/components/blocks/_documentManagement/documentSelectPagesStage/DocumentSelectPagesStage.tsx
new file mode 100644
index 0000000000..cda60e48a3
--- /dev/null
+++ b/app/src/components/blocks/_documentManagement/documentSelectPagesStage/DocumentSelectPagesStage.tsx
@@ -0,0 +1,9 @@
+const DocumentSelectPagesStage = (): React.JSX.Element => {
+    return (
+        <>
+            <p>Document select page</p>
+        </>
+    );
+};
+
+export default DocumentSelectPagesStage;
diff --git a/app/src/components/blocks/_documentUpload/documentSelectStage/DocumentSelectStage.scss b/app/src/components/blocks/_documentManagement/documentSelectStage/DocumentSelectStage.scss
similarity index 100%
rename from app/src/components/blocks/_documentUpload/documentSelectStage/DocumentSelectStage.scss
rename to app/src/components/blocks/_documentManagement/documentSelectStage/DocumentSelectStage.scss
diff --git a/app/src/components/blocks/_documentUpload/documentSelectStage/DocumentSelectStage.test.tsx b/app/src/components/blocks/_documentManagement/documentSelectStage/DocumentSelectStage.test.tsx
similarity index 99%
rename from app/src/components/blocks/_documentUpload/documentSelectStage/DocumentSelectStage.test.tsx
rename to app/src/components/blocks/_documentManagement/documentSelectStage/DocumentSelectStage.test.tsx
index 5b76b16f8d..ea647d5d57 100644
--- a/app/src/components/blocks/_documentUpload/documentSelectStage/DocumentSelectStage.test.tsx
+++ b/app/src/components/blocks/_documentManagement/documentSelectStage/DocumentSelectStage.test.tsx
@@ -97,7 +97,7 @@ describe('DocumentSelectStage', () => {
             expect(
                 screen.getByText('Drag and drop a file or multiple files here'),
             ).toBeInTheDocument();
-            expect(dropzone);
+            expect(dropzone).toBeInTheDocument();
 
             fireEvent.drop(dropzone, { dataTransfer: { files: [lgDocumentOne] } });
 
diff --git a/app/src/components/blocks/_documentUpload/documentSelectStage/DocumentSelectStage.tsx b/app/src/components/blocks/_documentManagement/documentSelectStage/DocumentSelectStage.tsx
similarity index 98%
rename from app/src/components/blocks/_documentUpload/documentSelectStage/DocumentSelectStage.tsx
rename to app/src/components/blocks/_documentManagement/documentSelectStage/DocumentSelectStage.tsx
index b79df0c569..cb58a9bba7 100644
--- a/app/src/components/blocks/_documentUpload/documentSelectStage/DocumentSelectStage.tsx
+++ b/app/src/components/blocks/_documentManagement/documentSelectStage/DocumentSelectStage.tsx
@@ -93,7 +93,6 @@ const DocumentSelectStage = ({
     useEffect(() => {
         if (filesErrorRef.current) {
             navigate(routes.HOME);
-            return;
         }
     }, []);
 
@@ -216,16 +215,16 @@ const DocumentSelectStage = ({
     };
 
     const updateDocuments = (docs: UploadDocument[]): void => {
-        const sortedDocs = docs
-            .sort((a, b) => a.file.lastModified - b.file.lastModified)
-            .map((doc, index) => ({
-                ...doc,
-                position: index + 1,
-            }));
+        const sortedDocs = docs.toSorted((a, b) => a.file.lastModified - b.file.lastModified);
+
+        const docsWithPositions = sortedDocs.map((doc, index) => ({
+            ...doc,
+            position: index + 1,
+        }));
 
         setDocuments((previousState) => {
             const docs = previousState.filter((doc) => doc.docType !== documentType);
-            return [...docs, ...sortedDocs];
+            return [...docs, ...docsWithPositions];
         });
     };
 
@@ -299,7 +298,7 @@ const DocumentSelectStage = ({
         resetErrors();
     };
 
-    const DocumentRow = (
+    const getDocumentRow = (
         document: UploadDocument | ReviewUploadDocument,
         index: number,
     ): JSX.Element => {
@@ -570,7 +569,7 @@ const DocumentSelectStage = ({
                         </Table.Head>
 
                         <Table.Body>
-                            {documents.map((document, index) => DocumentRow(document, index))}
+                            {documents.map((document, index) => getDocumentRow(document, index))}
                         </Table.Body>
                     </Table>
                     {multifile && (
diff --git a/app/src/components/blocks/_documentUpload/documentUploadCompleteStage/DocumentUploadCompleteStage.scss b/app/src/components/blocks/_documentManagement/documentUploadCompleteStage/DocumentUploadCompleteStage.scss
similarity index 100%
rename from app/src/components/blocks/_documentUpload/documentUploadCompleteStage/DocumentUploadCompleteStage.scss
rename to app/src/components/blocks/_documentManagement/documentUploadCompleteStage/DocumentUploadCompleteStage.scss
diff --git a/app/src/components/blocks/_documentUpload/documentUploadCompleteStage/DocumentUploadCompleteStage.test.tsx b/app/src/components/blocks/_documentManagement/documentUploadCompleteStage/DocumentUploadCompleteStage.test.tsx
similarity index 100%
rename from app/src/components/blocks/_documentUpload/documentUploadCompleteStage/DocumentUploadCompleteStage.test.tsx
rename to app/src/components/blocks/_documentManagement/documentUploadCompleteStage/DocumentUploadCompleteStage.test.tsx
diff --git a/app/src/components/blocks/_documentUpload/documentUploadCompleteStage/DocumentUploadCompleteStage.tsx b/app/src/components/blocks/_documentManagement/documentUploadCompleteStage/DocumentUploadCompleteStage.tsx
similarity index 100%
rename from app/src/components/blocks/_documentUpload/documentUploadCompleteStage/DocumentUploadCompleteStage.tsx
rename to app/src/components/blocks/_documentManagement/documentUploadCompleteStage/DocumentUploadCompleteStage.tsx
diff --git a/app/src/components/blocks/_documentUpload/documentUploadConfirmStage/DocumentUploadConfirmStage.test.tsx b/app/src/components/blocks/_documentManagement/documentUploadConfirmStage/DocumentUploadConfirmStage.test.tsx
similarity index 100%
rename from app/src/components/blocks/_documentUpload/documentUploadConfirmStage/DocumentUploadConfirmStage.test.tsx
rename to app/src/components/blocks/_documentManagement/documentUploadConfirmStage/DocumentUploadConfirmStage.test.tsx
diff --git a/app/src/components/blocks/_documentUpload/documentUploadConfirmStage/DocumentUploadConfirmStage.tsx b/app/src/components/blocks/_documentManagement/documentUploadConfirmStage/DocumentUploadConfirmStage.tsx
similarity index 100%
rename from app/src/components/blocks/_documentUpload/documentUploadConfirmStage/DocumentUploadConfirmStage.tsx
rename to app/src/components/blocks/_documentManagement/documentUploadConfirmStage/DocumentUploadConfirmStage.tsx
diff --git a/app/src/components/blocks/_documentUpload/documentUploadConfirmStage/components/DocumentList.test.tsx b/app/src/components/blocks/_documentManagement/documentUploadConfirmStage/components/DocumentList.test.tsx
similarity index 100%
rename from app/src/components/blocks/_documentUpload/documentUploadConfirmStage/components/DocumentList.test.tsx
rename to app/src/components/blocks/_documentManagement/documentUploadConfirmStage/components/DocumentList.test.tsx
diff --git a/app/src/components/blocks/_documentUpload/documentUploadConfirmStage/components/DocumentList.tsx b/app/src/components/blocks/_documentManagement/documentUploadConfirmStage/components/DocumentList.tsx
similarity index 100%
rename from app/src/components/blocks/_documentUpload/documentUploadConfirmStage/components/DocumentList.tsx
rename to app/src/components/blocks/_documentManagement/documentUploadConfirmStage/components/DocumentList.tsx
diff --git a/app/src/components/blocks/_documentUpload/documentUploadIndex/DocumentUploadIndex.test.tsx b/app/src/components/blocks/_documentManagement/documentUploadIndex/DocumentUploadIndex.test.tsx
similarity index 100%
rename from app/src/components/blocks/_documentUpload/documentUploadIndex/DocumentUploadIndex.test.tsx
rename to app/src/components/blocks/_documentManagement/documentUploadIndex/DocumentUploadIndex.test.tsx
diff --git a/app/src/components/blocks/_documentUpload/documentUploadIndex/DocumentUploadIndex.tsx b/app/src/components/blocks/_documentManagement/documentUploadIndex/DocumentUploadIndex.tsx
similarity index 100%
rename from app/src/components/blocks/_documentUpload/documentUploadIndex/DocumentUploadIndex.tsx
rename to app/src/components/blocks/_documentManagement/documentUploadIndex/DocumentUploadIndex.tsx
diff --git a/app/src/components/blocks/_documentUpload/documentUploadInfectedStage/DocumentUploadInfectedStage.test.tsx b/app/src/components/blocks/_documentManagement/documentUploadInfectedStage/DocumentUploadInfectedStage.test.tsx
similarity index 100%
rename from app/src/components/blocks/_documentUpload/documentUploadInfectedStage/DocumentUploadInfectedStage.test.tsx
rename to app/src/components/blocks/_documentManagement/documentUploadInfectedStage/DocumentUploadInfectedStage.test.tsx
diff --git a/app/src/components/blocks/_documentUpload/documentUploadInfectedStage/DocumentUploadInfectedStage.tsx b/app/src/components/blocks/_documentManagement/documentUploadInfectedStage/DocumentUploadInfectedStage.tsx
similarity index 100%
rename from app/src/components/blocks/_documentUpload/documentUploadInfectedStage/DocumentUploadInfectedStage.tsx
rename to app/src/components/blocks/_documentManagement/documentUploadInfectedStage/DocumentUploadInfectedStage.tsx
diff --git a/app/src/components/blocks/_documentUpload/documentUploadLloydGeorgePreview/DocumentUploadLloydGeorgePreview.test.tsx b/app/src/components/blocks/_documentManagement/documentUploadLloydGeorgePreview/DocumentUploadLloydGeorgePreview.test.tsx
similarity index 100%
rename from app/src/components/blocks/_documentUpload/documentUploadLloydGeorgePreview/DocumentUploadLloydGeorgePreview.test.tsx
rename to app/src/components/blocks/_documentManagement/documentUploadLloydGeorgePreview/DocumentUploadLloydGeorgePreview.test.tsx
diff --git a/app/src/components/blocks/_documentUpload/documentUploadLloydGeorgePreview/DocumentUploadLloydGeorgePreview.tsx b/app/src/components/blocks/_documentManagement/documentUploadLloydGeorgePreview/DocumentUploadLloydGeorgePreview.tsx
similarity index 100%
rename from app/src/components/blocks/_documentUpload/documentUploadLloydGeorgePreview/DocumentUploadLloydGeorgePreview.tsx
rename to app/src/components/blocks/_documentManagement/documentUploadLloydGeorgePreview/DocumentUploadLloydGeorgePreview.tsx
diff --git a/app/src/components/blocks/_documentUpload/documentUploadRemoveFilesStage/DocumentUploadRemoveFilesStage.test.tsx b/app/src/components/blocks/_documentManagement/documentUploadRemoveFilesStage/DocumentUploadRemoveFilesStage.test.tsx
similarity index 100%
rename from app/src/components/blocks/_documentUpload/documentUploadRemoveFilesStage/DocumentUploadRemoveFilesStage.test.tsx
rename to app/src/components/blocks/_documentManagement/documentUploadRemoveFilesStage/DocumentUploadRemoveFilesStage.test.tsx
diff --git a/app/src/components/blocks/_documentUpload/documentUploadRemoveFilesStage/DocumentUploadRemoveFilesStage.tsx b/app/src/components/blocks/_documentManagement/documentUploadRemoveFilesStage/DocumentUploadRemoveFilesStage.tsx
similarity index 100%
rename from app/src/components/blocks/_documentUpload/documentUploadRemoveFilesStage/DocumentUploadRemoveFilesStage.tsx
rename to app/src/components/blocks/_documentManagement/documentUploadRemoveFilesStage/DocumentUploadRemoveFilesStage.tsx
diff --git a/app/src/components/blocks/_documentUpload/documentUploadingStage/DocumentUploadingStage.test.tsx b/app/src/components/blocks/_documentManagement/documentUploadingStage/DocumentUploadingStage.test.tsx
similarity index 100%
rename from app/src/components/blocks/_documentUpload/documentUploadingStage/DocumentUploadingStage.test.tsx
rename to app/src/components/blocks/_documentManagement/documentUploadingStage/DocumentUploadingStage.test.tsx
diff --git a/app/src/components/blocks/_documentUpload/documentUploadingStage/DocumentUploadingStage.tsx b/app/src/components/blocks/_documentManagement/documentUploadingStage/DocumentUploadingStage.tsx
similarity index 100%
rename from app/src/components/blocks/_documentUpload/documentUploadingStage/DocumentUploadingStage.tsx
rename to app/src/components/blocks/_documentManagement/documentUploadingStage/DocumentUploadingStage.tsx
diff --git a/app/src/components/blocks/_patientDocuments/documentView/DocumentView.scss b/app/src/components/blocks/_patientDocuments/documentView/DocumentView.scss
new file mode 100644
index 0000000000..2f5bd105b3
--- /dev/null
+++ b/app/src/components/blocks/_patientDocuments/documentView/DocumentView.scss
@@ -0,0 +1,24 @@
+.document_record-stage {
+    .card-links {
+        .nhsuk-card__content {
+            padding: 15px 25px 20px 25px;
+            min-height: 105px;
+
+            .nhsuk-card__heading {
+                margin: 0;
+            }
+
+            .nhsuk-card__description {
+                margin: 0;
+            }
+
+            .nhsuk-card__link {
+                font-size: 19px;
+            }
+        }
+    }
+
+    #pdf-viewer {
+        height: 90vh;
+    }
+}
\ No newline at end of file
diff --git a/app/src/components/blocks/_patientDocuments/documentView/DocumentView.test.tsx b/app/src/components/blocks/_patientDocuments/documentView/DocumentView.test.tsx
index 4ab60d1b95..a47f977e7b 100644
--- a/app/src/components/blocks/_patientDocuments/documentView/DocumentView.test.tsx
+++ b/app/src/components/blocks/_patientDocuments/documentView/DocumentView.test.tsx
@@ -9,15 +9,17 @@ import { routeChildren, routes } from '../../../../types/generic/routes';
 import { buildDocumentConfig, buildPatientDetails } from '../../../../helpers/test/testBuilders';
 import userEvent from '@testing-library/user-event';
 import { getFormattedDate } from '../../../../helpers/utils/formatDate';
-import { lloydGeorgeRecordLinks } from '../../../../types/blocks/lloydGeorgeActions';
+import { ACTION_LINK_KEY } from '../../../../types/blocks/lloydGeorgeActions';
 import SessionProvider from '../../../../providers/sessionProvider/SessionProvider';
 import { createMemoryHistory } from 'history';
 import * as ReactRouter from 'react-router-dom';
 import { REPOSITORY_ROLE } from '../../../../types/generic/authRole';
 import useRole from '../../../../helpers/hooks/useRole';
+import useConfig from '../../../../helpers/hooks/useConfig';
 
 // Mock dependencies
 vi.mock('../../../../helpers/hooks/usePatient');
+vi.mock('../../../../helpers/hooks/useConfig');
 vi.mock('../../../../helpers/hooks/useTitle');
 vi.mock('../../../../helpers/hooks/useRole');
 vi.mock('../../../../helpers/utils/documentType', async () => {
@@ -40,6 +42,7 @@ vi.mock('react-router-dom', async () => {
 });
 
 const mockUsePatient = usePatient as Mock;
+const mockUseConfig = useConfig as Mock;
 const mockUseTitle = useTitle as Mock;
 const mockUseRole = useRole as Mock;
 const mockUseNavigate = vi.fn();
@@ -108,6 +111,11 @@ describe('DocumentView', () => {
     beforeEach(() => {
         import.meta.env.VITE_ENVIRONMENT = 'vitest';
         mockUsePatient.mockReturnValue(mockPatientDetails);
+        mockUseConfig.mockReturnValue({
+            featureFlags: {
+                documentCorrectEnabled: false,
+            },
+        });
         mockUseRole.mockReturnValue(REPOSITORY_ROLE.GP_ADMIN);
         vi.mocked(getConfigForDocType).mockReturnValue(buildDocumentConfig());
 
@@ -238,7 +246,7 @@ describe('DocumentView', () => {
         it('navigates to upload page when add files is clicked', async () => {
             renderComponent();
 
-            const addFilesButton = screen.getByTestId('add-files-btn');
+            const addFilesButton = screen.getByTestId(ACTION_LINK_KEY.ADD);
             fireEvent.click(addFilesButton);
 
             await waitFor(() => {
@@ -265,7 +273,7 @@ describe('DocumentView', () => {
 
             renderComponent();
 
-            const addFilesButton = screen.getByTestId('add-files-btn');
+            const addFilesButton = screen.getByTestId(ACTION_LINK_KEY.ADD);
             fireEvent.click(addFilesButton);
 
             await waitFor(() => {
@@ -337,7 +345,7 @@ describe('DocumentView', () => {
                 }
 
                 await waitFor(() => {
-                    expect(screen.queryAllByTestId('add-files-btn')).toHaveLength(
+                    expect(screen.queryAllByTestId(ACTION_LINK_KEY.ADD)).toHaveLength(
                         addBtnVisible ? 1 : 0,
                     );
                 });
@@ -349,8 +357,7 @@ describe('DocumentView', () => {
         it('calls removeDocument when remove action is triggered', () => {
             renderComponent();
 
-            // assume first link is remove
-            const removeRecordLink = screen.getByTestId(lloydGeorgeRecordLinks[0].key);
+            const removeRecordLink = screen.getByTestId(ACTION_LINK_KEY.DELETE);
             fireEvent.click(removeRecordLink);
             expect(mockRemoveDocument).toHaveBeenCalled();
         });
@@ -359,14 +366,64 @@ describe('DocumentView', () => {
             vi.useFakeTimers();
             renderComponent();
 
-            // assume second link is download
-            const downloadRecordLink = screen.getByTestId(lloydGeorgeRecordLinks[1].key);
+            const downloadRecordLink = screen.getByTestId(ACTION_LINK_KEY.DOWNLOAD);
             fireEvent.click(downloadRecordLink);
 
             vi.advanceTimersByTime(5000000);
             expect(mockUseNavigate).toHaveBeenCalledWith(routes.DOWNLOAD_COMPLETE);
             vi.useRealTimers();
         });
+
+        it('does not show reassign button when document type does not support it', () => {
+            vi.mocked(getConfigForDocType).mockReturnValue(
+                buildDocumentConfig({ canBeUpdated: false }),
+            );
+
+            renderComponent();
+
+            const reassignRecordLink = screen.queryByTestId(ACTION_LINK_KEY.REASSIGN);
+            expect(reassignRecordLink).not.toBeInTheDocument();
+        });
+
+        it('does not show reassign button when feature flag is disabled', () => {
+            renderComponent();
+
+            const reassignRecordLink = screen.queryByTestId(ACTION_LINK_KEY.REASSIGN);
+            expect(reassignRecordLink).not.toBeInTheDocument();
+        });
+
+        it('does not show reassign button when patient is deceased', () => {
+            mockUsePatient.mockReturnValue(buildPatientDetails({ deceased: true }));
+
+            renderComponent();
+
+            const reassignRecordLink = screen.queryByTestId(ACTION_LINK_KEY.REASSIGN);
+            expect(reassignRecordLink).not.toBeInTheDocument();
+        });
+
+        it('navigates to document reassign page when reassign action is triggered', async () => {
+            mockUseConfig.mockReturnValue({
+                featureFlags: {
+                    documentCorrectEnabled: true,
+                },
+            });
+
+            renderComponent();
+
+            const reassignRecordLink = screen.getByTestId(ACTION_LINK_KEY.REASSIGN);
+            await userEvent.click(reassignRecordLink);
+
+            expect(mockUseNavigate).toHaveBeenCalledWith(
+                expect.objectContaining({
+                    pathname: routeChildren.DOCUMENT_REASSIGN_SELECT_PAGES,
+                }),
+                expect.objectContaining({
+                    state: expect.objectContaining({
+                        documentReference: mockDocumentReference,
+                    }),
+                }),
+            );
+        });
     });
 
     describe('Role-based rendering', () => {
diff --git a/app/src/components/blocks/_patientDocuments/documentView/DocumentView.tsx b/app/src/components/blocks/_patientDocuments/documentView/DocumentView.tsx
index edac3e6364..b8d88c02b1 100644
--- a/app/src/components/blocks/_patientDocuments/documentView/DocumentView.tsx
+++ b/app/src/components/blocks/_patientDocuments/documentView/DocumentView.tsx
@@ -5,6 +5,7 @@ import { DOCUMENT_TYPE, getConfigForDocType } from '../../../../helpers/utils/do
 import { getFormattedDate } from '../../../../helpers/utils/formatDate';
 import { DocumentReference } from '../../../../types/pages/documentSearchResultsPage/types';
 import {
+    ACTION_LINK_KEY,
     getRecordActionLinksAllowedForRole,
     LGRecordActionLink,
     lloydGeorgeRecordLinks,
@@ -14,13 +15,14 @@ import { createSearchParams, NavigateOptions, To, useNavigate } from 'react-rout
 import { REPOSITORY_ROLE } from '../../../../types/generic/authRole';
 import RecordCard from '../../../generic/recordCard/RecordCard';
 import PatientSummary, { PatientInfo } from '../../../generic/patientSummary/PatientSummary';
-import RecordMenuCard from '../../../generic/recordMenuCard/RecordMenuCard';
-import { Button, ChevronLeftIcon } from 'nhsuk-react-components';
+import { Button, Card, ChevronLeftIcon } from 'nhsuk-react-components';
 import BackButton from '../../../generic/backButton/BackButton';
 import usePatient from '../../../../helpers/hooks/usePatient';
 import { useEffect } from 'react';
 import useRole from '../../../../helpers/hooks/useRole';
 import LinkButton from '../../../generic/linkButton/LinkButton';
+import useConfig from '../../../../helpers/hooks/useConfig';
+import Spinner from '../../../generic/spinner/Spinner';
 
 type Props = {
     documentReference: DocumentReference | null;
@@ -36,6 +38,7 @@ const DocumentView = ({
     const navigate = useNavigate();
     const showMenu = role === REPOSITORY_ROLE.GP_ADMIN && !session.isFullscreen;
     const patientDetails = usePatient();
+    const config = useConfig();
     const documentConfig = getConfigForDocType(
         documentReference?.documentSnomedCodeType ?? DOCUMENT_TYPE.LLOYD_GEORGE,
     );
@@ -106,25 +109,56 @@ const DocumentView = ({
         removeDocument();
     };
 
-    const getCardLinks = (): Array<LGRecordActionLink> => {
+    const getLinks = (): Array<LGRecordActionLink> => {
         if (session.isFullscreen) {
             return [];
         }
 
-        const links = getRecordActionLinksAllowedForRole({
-            role,
-            hasRecordInStorage: true,
-            inputLinks: lloydGeorgeRecordLinks,
-        });
+        const canAddFiles =
+            documentConfig.canBeUpdated &&
+            documentReference.url &&
+            !patientDetails?.deceased &&
+            (role === REPOSITORY_ROLE.GP_ADMIN || role === REPOSITORY_ROLE.GP_CLINICAL);
 
-        return links.map((link) => {
+        const inputLinks = lloydGeorgeRecordLinks.map((link) => {
             return {
                 ...link,
-                href:
-                    link.type === RECORD_ACTION.DELETE ? routeChildren.DOCUMENT_DELETE : undefined,
+                href: undefined,
                 onClick: link.type === RECORD_ACTION.DOWNLOAD ? downloadClicked : removeClicked,
-            };
+            } as LGRecordActionLink;
         });
+
+        if (canAddFiles) {
+            inputLinks.push({
+                index: 2,
+                label: documentConfig.content.addFilesLinkLabel as string,
+                key: ACTION_LINK_KEY.ADD,
+                type: RECORD_ACTION.UPDATE,
+                unauthorised: [],
+                onClick: handleAddFilesClick,
+                showIfRecordInStorage: true,
+            });
+
+            if (config.featureFlags.documentCorrectEnabled) {
+                inputLinks.push({
+                    index: 3,
+                    label: documentConfig.content.reassignPagesLinkLabel as string,
+                    key: ACTION_LINK_KEY.REASSIGN,
+                    type: RECORD_ACTION.UPDATE,
+                    unauthorised: [],
+                    onClick: handleReassignPagesClick,
+                    showIfRecordInStorage: true,
+                });
+            }
+        }
+
+        const links = getRecordActionLinksAllowedForRole({
+            role,
+            hasRecordInStorage: true,
+            inputLinks,
+        });
+
+        return links.sort((a, b) => a.index - b.index);
     };
 
     const getPdfObjectUrl = (): string => {
@@ -173,6 +207,21 @@ const DocumentView = ({
         navigate(to, options);
     };
 
+    const handleReassignPagesClick = (): void => {
+        const to: To = {
+            pathname: routeChildren.DOCUMENT_REASSIGN_SELECT_PAGES,
+        };
+        const options: NavigateOptions = {
+            state: {
+                documentReference,
+            },
+        };
+        // Defer navigation to next tick to ensure React state is settled
+        setTimeout(() => {
+            navigate(to, options);
+        }, 0);
+    };
+
     const getRecordCard = (): React.JSX.Element => {
         const card = (
             <RecordCard
@@ -180,7 +229,7 @@ const DocumentView = ({
                 fullScreenHandler={enableFullscreen}
                 detailsElement={details()}
                 isFullScreen={session.isFullscreen!}
-                recordLinks={getCardLinks()}
+                linksElement={recordCardLinks()}
                 pdfObjectUrl={getPdfObjectUrl()}
                 showMenu={showMenu}
             />
@@ -200,11 +249,33 @@ const DocumentView = ({
         );
     };
 
-    const canAddFiles =
-        documentConfig.canBeUpdated &&
-        documentReference.url &&
-        !patientDetails?.deceased &&
-        (role === REPOSITORY_ROLE.GP_ADMIN || role === REPOSITORY_ROLE.GP_CLINICAL);
+    const recordCardLinks = (): React.JSX.Element => {
+        return (
+            <Card.Group className="card-links" data-testid="record-menu-card">
+                {getLinks().map((link) => (
+                    <Card.GroupItem key={link.key} width="one-half">
+                        <Card clickable cardType="primary">
+                            <Card.Content>
+                                <Card.Heading className="nhsuk-heading-m">
+                                    <Card.Link
+                                        data-testid={link.key}
+                                        href="#"
+                                        onClick={link.onClick}
+                                    >
+                                        {link.label}
+                                    </Card.Link>
+                                </Card.Heading>
+
+                                {link.description && (
+                                    <Card.Description>{link.description}</Card.Description>
+                                )}
+                            </Card.Content>
+                        </Card>
+                    </Card.GroupItem>
+                ))}
+            </Card.Group>
+        );
+    };
 
     return (
         <div className="document_record-stage">
@@ -255,33 +326,10 @@ const DocumentView = ({
                         <PatientSummary.Child item={PatientInfo.BIRTH_DATE} />
                     </PatientSummary>
 
-                    {session.isFullscreen && (
-                        <RecordMenuCard
-                            recordLinks={getCardLinks()}
-                            setStage={(): void => {}}
-                            showMenu={showMenu}
-                        />
-                    )}
-
-                    {!session.isFullscreen && canAddFiles && (
-                        <>
-                            <h2 className="title">Add Files</h2>
-                            <p>You can add more files to this patient's record.</p>
-                            <Button onClick={handleAddFilesClick} data-testid="add-files-btn">
-                                Add Files
-                            </Button>
-                        </>
-                    )}
+                    {session.isFullscreen && showMenu && recordCardLinks()}
                 </div>
 
-                {documentReference.url ? (
-                    getRecordCard()
-                ) : (
-                    <p>
-                        This document is currently being uploaded, please try again in a few
-                        minutes.
-                    </p>
-                )}
+                {documentReference.url ? getRecordCard() : <Spinner status="Loading document" />}
             </div>
         </div>
     );
diff --git a/app/src/components/generic/recordCard/RecordCard.tsx b/app/src/components/generic/recordCard/RecordCard.tsx
index ec8ea9b271..eecc309787 100644
--- a/app/src/components/generic/recordCard/RecordCard.tsx
+++ b/app/src/components/generic/recordCard/RecordCard.tsx
@@ -16,6 +16,7 @@ export type RecordLayoutProps = {
     detailsElement: ReactNode;
     isFullScreen: boolean;
     recordLinks?: Array<LGRecordActionLink>;
+    linksElement?: ReactNode;
     setStage?: Dispatch<SetStateAction<LG_RECORD_STAGE>>;
     showMenu?: boolean;
     children?: ReactNode;
@@ -27,6 +28,7 @@ export const RecordLayout = ({
     heading,
     fullScreenHandler,
     recordLinks = [],
+    linksElement,
     setStage = (): void => {},
     showMenu = false,
     children,
@@ -64,11 +66,13 @@ export const RecordLayout = ({
 
                     {detailsElement}
 
-                    <RecordMenuCard
-                        recordLinks={recordLinks}
-                        setStage={setStage}
-                        showMenu={showMenu}
-                    />
+                    {linksElement || (
+                        <RecordMenuCard
+                            recordLinks={recordLinks}
+                            setStage={setStage}
+                            showMenu={showMenu}
+                        />
+                    )}
                 </Card.Content>
                 <div>{children}</div>
             </Card>
@@ -83,6 +87,7 @@ const RecordCard = ({
     isFullScreen,
     pdfObjectUrl,
     recordLinks = [],
+    linksElement,
     setStage = (): void => {},
     showMenu = false,
 }: RecordCardProps): React.JSX.Element => {
@@ -108,6 +113,7 @@ const RecordCard = ({
             heading={heading}
             fullScreenHandler={fullScreenHandler}
             recordLinks={recordLinks}
+            linksElement={linksElement}
             setStage={setStage}
             showMenu={showMenu}
         >
diff --git a/app/src/components/generic/recordMenuCard/RecordMenuCard.test.tsx b/app/src/components/generic/recordMenuCard/RecordMenuCard.test.tsx
index e09725e6fc..ffbfce6c63 100644
--- a/app/src/components/generic/recordMenuCard/RecordMenuCard.test.tsx
+++ b/app/src/components/generic/recordMenuCard/RecordMenuCard.test.tsx
@@ -5,7 +5,6 @@ import { LGRecordActionLink, RECORD_ACTION } from '../../../types/blocks/lloydGe
 import { REPOSITORY_ROLE } from '../../../types/generic/authRole';
 import { LinkProps } from 'react-router-dom';
 import { LG_RECORD_STAGE } from '../../../types/blocks/lloydGeorgeStages';
-import { routes } from '../../../types/generic/routes';
 import userEvent from '@testing-library/user-event';
 import { afterEach, beforeEach, describe, expect, it, vi, Mock } from 'vitest';
 
@@ -13,18 +12,10 @@ vi.mock('../../../helpers/hooks/useRole');
 const mockSetStage = vi.fn();
 const mockedUseNavigate = vi.fn();
 const mockedUseRole = useRole as Mock;
-const mockShowDownloadAndRemoveConfirmation = vi.fn();
 
 const mockLinks: Array<LGRecordActionLink> = [
     {
-        label: 'Upload files',
-        key: 'upload-files-link',
-        type: RECORD_ACTION.UPDATE,
-        href: routes.HOME,
-        unauthorised: [REPOSITORY_ROLE.GP_CLINICAL],
-        showIfRecordInStorage: false,
-    },
-    {
+        index: 1,
         label: 'Remove files',
         key: 'delete-all-files-link',
         type: RECORD_ACTION.UPDATE,
@@ -33,20 +24,13 @@ const mockLinks: Array<LGRecordActionLink> = [
         showIfRecordInStorage: true,
     },
     {
+        index: 0,
         label: 'Download files',
         key: 'download-all-files-link',
         type: RECORD_ACTION.DOWNLOAD,
         stage: LG_RECORD_STAGE.DOWNLOAD_ALL,
-        unauthorised: [REPOSITORY_ROLE.GP_CLINICAL],
-        showIfRecordInStorage: true,
-    },
-    {
-        label: 'Download and remove files',
-        key: 'download-and-remove-all-files-link',
-        type: RECORD_ACTION.DOWNLOAD,
-        unauthorised: [REPOSITORY_ROLE.GP_CLINICAL],
+        unauthorised: [],
         showIfRecordInStorage: true,
-        onClick: mockShowDownloadAndRemoveConfirmation,
     },
 ];
 
@@ -71,7 +55,6 @@ describe('RecordMenuCard', () => {
                 <RecordMenuCard setStage={mockSetStage} recordLinks={mockLinks} showMenu={true} />,
             );
             expect(screen.getByRole('link', { name: 'Remove files' })).toBeInTheDocument();
-            expect(screen.getByRole('link', { name: 'Upload files' })).toBeInTheDocument();
             expect(screen.getByRole('link', { name: 'Download files' })).toBeInTheDocument();
         });
 
@@ -87,7 +70,6 @@ describe('RecordMenuCard', () => {
                     showMenu={true}
                 />,
             );
-            expect(screen.getByRole('link', { name: 'Upload files' })).toBeInTheDocument();
             expect(screen.getByRole('link', { name: 'Remove files' })).toBeInTheDocument();
             expect(screen.queryByRole('link', { name: 'Download files' })).not.toBeInTheDocument();
 
@@ -103,7 +85,6 @@ describe('RecordMenuCard', () => {
             );
             expect(screen.getByRole('link', { name: 'Download files' })).toBeInTheDocument();
 
-            expect(screen.queryByRole('link', { name: 'Upload files' })).not.toBeInTheDocument();
             expect(screen.queryByRole('link', { name: 'Remove files' })).not.toBeInTheDocument();
         });
 
@@ -114,21 +95,6 @@ describe('RecordMenuCard', () => {
             expect(container).toBeEmptyDOMElement();
         });
 
-        it('render menu item as a <button> if link item does not have stage or href', async () => {
-            render(
-                <RecordMenuCard setStage={mockSetStage} recordLinks={mockLinks} showMenu={true} />,
-            );
-            expect(
-                screen.getByRole('button', { name: 'Download and remove files' }),
-            ).toBeInTheDocument();
-
-            await userEvent.click(
-                screen.getByRole('button', { name: 'Download and remove files' }),
-            );
-
-            expect(mockShowDownloadAndRemoveConfirmation).toBeCalledTimes(1);
-        });
-
         it('Does not render the MenuCard if showMenu is false', () => {
             const { container } = render(
                 <RecordMenuCard setStage={mockSetStage} recordLinks={mockLinks} showMenu={false} />,
@@ -138,15 +104,6 @@ describe('RecordMenuCard', () => {
     });
 
     describe('Navigation', () => {
-        it('navigates to href when clicked', async () => {
-            render(
-                <RecordMenuCard setStage={mockSetStage} recordLinks={mockLinks} showMenu={true} />,
-            );
-            expect(screen.getByRole('link', { name: 'Upload files' })).toBeInTheDocument();
-            await userEvent.click(screen.getByRole('link', { name: 'Upload files' }));
-            expect(mockedUseNavigate).toHaveBeenCalledWith(routes.HOME);
-        });
-
         it('change stage when clicked', async () => {
             render(
                 <RecordMenuCard setStage={mockSetStage} recordLinks={mockLinks} showMenu={true} />,
diff --git a/app/src/config/electronicHealthRecordAttachmentsConfig.json b/app/src/config/electronicHealthRecordAttachmentsConfig.json
index 6f6529f12c..9d3e1d9ce3 100644
--- a/app/src/config/electronicHealthRecordAttachmentsConfig.json
+++ b/app/src/config/electronicHealthRecordAttachmentsConfig.json
@@ -33,6 +33,10 @@
         "previewUploadTitle": "Preview electronic health record attachment",
         "uploadFilesExtraParagraph": "",
         "reviewDocumentTitle": "EHR Attachments",
-        "skipDocumentLinkText": "Continue without uploading any EHR attachments"
+        "skipDocumentLinkText": "Continue without uploading any EHR attachments",
+        "choosePagesToRemoveTitle": "",
+        "choosePagesToRemoveWarning": "",
+        "addFilesLinkLabel": "",
+        "reassignPagesLinkLabel": ""
     }
 }
\ No newline at end of file
diff --git a/app/src/config/electronicHealthRecordConfig.json b/app/src/config/electronicHealthRecordConfig.json
index a251d0ffde..9f9fb2bbed 100644
--- a/app/src/config/electronicHealthRecordConfig.json
+++ b/app/src/config/electronicHealthRecordConfig.json
@@ -37,6 +37,10 @@
         "previewUploadTitle": "Preview this electronic health record",
         "uploadFilesExtraParagraph": "",
         "reviewDocumentTitle": "Electronic health record",
-        "skipDocumentLinkText": "Continue without uploading EHR notes"
+        "skipDocumentLinkText": "Continue without uploading EHR notes",
+        "choosePagesToRemoveTitle": "",
+        "choosePagesToRemoveWarning": "",
+        "addFilesLinkLabel": "",
+        "reassignPagesLinkLabel": ""
     }
 }
\ No newline at end of file
diff --git a/app/src/config/lettersAndDocumentsConfig.json b/app/src/config/lettersAndDocumentsConfig.json
index 0f00538476..0eac177546 100644
--- a/app/src/config/lettersAndDocumentsConfig.json
+++ b/app/src/config/lettersAndDocumentsConfig.json
@@ -31,6 +31,10 @@
         "beforeYouUploadTitle": "Before you upload",
         "previewUploadTitle": "Preview your PDF files",
         "uploadFilesExtraParagraph": "",
-        "reviewDocumentTitle": "Letters and documents"
+        "reviewDocumentTitle": "Letters and documents",
+        "choosePagesToRemoveTitle": "",
+        "choosePagesToRemoveWarning": "",
+        "addFilesLinkLabel": "",
+        "reassignPagesLinkLabel": ""
     }
 }
\ No newline at end of file
diff --git a/app/src/config/lloydGeorgeConfig.json b/app/src/config/lloydGeorgeConfig.json
index a35946e31b..5db32efa93 100644
--- a/app/src/config/lloydGeorgeConfig.json
+++ b/app/src/config/lloydGeorgeConfig.json
@@ -33,6 +33,10 @@
         "beforeYouUploadTitle": "Before you upload",
         "previewUploadTitle": "Preview these scanned paper notes",
         "uploadFilesExtraParagraph": "You can add a note to the patient's electronic health record to say their Lloyd George record is stored in this service. Use SNOMED code 16521000000101.",
-        "reviewDocumentTitle": "Scanned paper notes"
+        "reviewDocumentTitle": "Scanned paper notes",
+        "choosePagesToRemoveTitle": "Choose the pages you want to remove from these scanned paper notes",
+        "choosePagesToRemoveWarning": "These notes may contain pages for more than one other patient that you want to remove. Only remove pages for one patient at a time.",
+        "addFilesLinkLabel": "Add files to this patient's notes",
+        "reassignPagesLinkLabel": "Reassign pages in these notes to another patient"
     }
 }
\ No newline at end of file
diff --git a/app/src/helpers/utils/documentType.ts b/app/src/helpers/utils/documentType.ts
index d1e60497c0..8f0a40ee22 100644
--- a/app/src/helpers/utils/documentType.ts
+++ b/app/src/helpers/utils/documentType.ts
@@ -26,26 +26,30 @@ export type ContentKey =
     | 'uploadFilesBulletPoints'
     | 'skipDocumentLinkText'
     | 'confirmFilesTableTitle'
-    | 'confirmFilesTableParagraph';
+    | 'confirmFilesTableParagraph'
+    | 'choosePagesToRemoveTitle'
+    | 'choosePagesToRemoveWarning'
+    | 'addFilesLinkLabel'
+    | 'reassignPagesLinkLabel';
 export interface IndividualDocumentTypeContent extends Record<ContentKey, string | string[]> {}
 
 // The individual config for each document type
 export type DOCUMENT_TYPE_CONFIG = {
-    snomedCode: DOCUMENT_TYPE;
+    acceptedFileTypes: string[];
+    associatedSnomed?: DOCUMENT_TYPE;
+    canBeDiscarded: boolean;
+    canBeUpdated: boolean;
+    content: IndividualDocumentTypeContent;
     displayName: string;
     filenameOverride?: string;
-    canBeUpdated: boolean;
-    associatedSnomed?: DOCUMENT_TYPE;
+    multifileReview: boolean;
     multifileUpload: boolean;
     multifileZipped: boolean;
-    zippedFilename?: string;
-    multifileReview: boolean;
-    canBeDiscarded: boolean;
-    stitched: boolean;
     singleDocumentOnly: boolean;
+    snomedCode: DOCUMENT_TYPE;
+    stitched: boolean;
     stitchedFilenamePrefix?: string;
-    acceptedFileTypes: string[];
-    content: IndividualDocumentTypeContent;
+    zippedFilename?: string;
 };
 
 export type DocumentTypeContentKey = 'uploadTitle' | 'uploadDescription';
diff --git a/app/src/pages/documentCorrectPage/DocumentCorrectPage.test.tsx b/app/src/pages/documentCorrectPage/DocumentCorrectPage.test.tsx
new file mode 100644
index 0000000000..dc31ee799d
--- /dev/null
+++ b/app/src/pages/documentCorrectPage/DocumentCorrectPage.test.tsx
@@ -0,0 +1,39 @@
+import { render, RenderResult, screen } from '@testing-library/react';
+import DocumentCorrectPage from './DocumentCorrectPage';
+import { Mock } from 'vitest';
+import { createMemoryHistory } from 'history';
+import * as ReactRouter from 'react-router-dom';
+
+vi.mock('react-router-dom', async () => {
+    const actual = await vi.importActual('react-router-dom');
+    return {
+        ...actual,
+        useNavigate: (): Mock => vi.fn(),
+    };
+});
+
+describe('DocumentCorrectPage', () => {
+    it('renders', () => {
+        renderPage();
+
+        expect(screen.getByText('Document select page')).toBeInTheDocument();
+    });
+});
+
+const renderPage = async (): Promise<RenderResult> => {
+    const history = createMemoryHistory({
+        initialEntries: ['/patient/document-reassign/select-pages'],
+        initialIndex: 0,
+    });
+
+    return render(
+        <ReactRouter.Router location={history.location} navigator={history}>
+            <ReactRouter.Routes>
+                <ReactRouter.Route
+                    path="/patient/document-reassign/*"
+                    element={<DocumentCorrectPage />}
+                />
+            </ReactRouter.Routes>
+        </ReactRouter.Router>,
+    );
+};
diff --git a/app/src/pages/documentCorrectPage/DocumentCorrectPage.tsx b/app/src/pages/documentCorrectPage/DocumentCorrectPage.tsx
new file mode 100644
index 0000000000..4c0023bb7d
--- /dev/null
+++ b/app/src/pages/documentCorrectPage/DocumentCorrectPage.tsx
@@ -0,0 +1,21 @@
+import { Outlet, Route, Routes } from 'react-router-dom';
+import DocumentSelectPagesStage from '../../components/blocks/_documentManagement/documentSelectPagesStage/DocumentSelectPagesStage';
+import { routeChildren } from '../../types/generic/routes';
+import { getLastURLPath } from '../../helpers/utils/urlManipulations';
+
+const DocumentCorrectPage = (): React.JSX.Element => {
+    return (
+        <>
+            <Routes>
+                <Route
+                    path={getLastURLPath(routeChildren.DOCUMENT_REASSIGN_SELECT_PAGES) + '/*'}
+                    element={<DocumentSelectPagesStage />}
+                />
+            </Routes>
+
+            <Outlet />
+        </>
+    );
+};
+
+export default DocumentCorrectPage;
diff --git a/app/src/pages/documentSearchResultsPage/DocumentSearchResultsPage.tsx b/app/src/pages/documentSearchResultsPage/DocumentSearchResultsPage.tsx
index 147d3d76be..118aa964cc 100644
--- a/app/src/pages/documentSearchResultsPage/DocumentSearchResultsPage.tsx
+++ b/app/src/pages/documentSearchResultsPage/DocumentSearchResultsPage.tsx
@@ -142,12 +142,7 @@ const DocumentSearchResultsPage = (): React.JSX.Element => {
             await handleViewDocSuccess(documentResponse);
         } catch (e) {
             const error = e as AxiosError;
-            if (isMock(error)) {
-                await handleViewDocSuccess({
-                    url: '/dev/testFile.pdf',
-                    contentType: activeSearchResult.current?.contentType || 'application/pdf',
-                });
-            } else if (error.response?.status === 403) {
+            if (error.response?.status === 403) {
                 navigate(routes.SESSION_EXPIRED);
             } else if (error.response?.status === 404) {
                 await handleViewDocSuccess({
diff --git a/app/src/pages/documentUploadPage/DocumentUploadPage.tsx b/app/src/pages/documentUploadPage/DocumentUploadPage.tsx
index 6bee84c0c1..b92f027891 100644
--- a/app/src/pages/documentUploadPage/DocumentUploadPage.tsx
+++ b/app/src/pages/documentUploadPage/DocumentUploadPage.tsx
@@ -1,14 +1,14 @@
 import { AxiosError } from 'axios';
 import { useEffect, useRef, useState } from 'react';
 import { Outlet, Route, Routes, useLocation } from 'react-router-dom';
-import DocumentSelectFileErrorsPage from '../../components/blocks/_documentUpload/documentSelectFileErrorsPage/DocumentSelectFileErrorsPage';
-import DocumentSelectOrderStage from '../../components/blocks/_documentUpload/documentSelectOrderStage/DocumentSelectOrderStage';
-import DocumentSelectStage from '../../components/blocks/_documentUpload/documentSelectStage/DocumentSelectStage';
-import DocumentUploadCompleteStage from '../../components/blocks/_documentUpload/documentUploadCompleteStage/DocumentUploadCompleteStage';
-import DocumentUploadConfirmStage from '../../components/blocks/_documentUpload/documentUploadConfirmStage/DocumentUploadConfirmStage';
-import DocumentUploadInfectedStage from '../../components/blocks/_documentUpload/documentUploadInfectedStage/DocumentUploadInfectedStage';
-import DocumentUploadingStage from '../../components/blocks/_documentUpload/documentUploadingStage/DocumentUploadingStage';
-import DocumentUploadRemoveFilesStage from '../../components/blocks/_documentUpload/documentUploadRemoveFilesStage/DocumentUploadRemoveFilesStage';
+import DocumentSelectFileErrorsPage from '../../components/blocks/_documentManagement/documentSelectFileErrorsPage/DocumentSelectFileErrorsPage';
+import DocumentSelectOrderStage from '../../components/blocks/_documentManagement/documentSelectOrderStage/DocumentSelectOrderStage';
+import DocumentSelectStage from '../../components/blocks/_documentManagement/documentSelectStage/DocumentSelectStage';
+import DocumentUploadCompleteStage from '../../components/blocks/_documentManagement/documentUploadCompleteStage/DocumentUploadCompleteStage';
+import DocumentUploadConfirmStage from '../../components/blocks/_documentManagement/documentUploadConfirmStage/DocumentUploadConfirmStage';
+import DocumentUploadInfectedStage from '../../components/blocks/_documentManagement/documentUploadInfectedStage/DocumentUploadInfectedStage';
+import DocumentUploadingStage from '../../components/blocks/_documentManagement/documentUploadingStage/DocumentUploadingStage';
+import DocumentUploadRemoveFilesStage from '../../components/blocks/_documentManagement/documentUploadRemoveFilesStage/DocumentUploadRemoveFilesStage';
 import useBaseAPIHeaders from '../../helpers/hooks/useBaseAPIHeaders';
 import useBaseAPIUrl from '../../helpers/hooks/useBaseAPIUrl';
 import useConfig from '../../helpers/hooks/useConfig';
@@ -31,8 +31,7 @@ import { UploadSession } from '../../types/generic/uploadResult';
 import {
     DOCUMENT_UPLOAD_STATE,
     ExistingDocument,
-    LocationParams,
-    LocationState,
+    DocumentUploadLocationState,
     UploadDocument,
 } from '../../types/pages/UploadDocumentsPage/types';
 import {
@@ -47,13 +46,14 @@ import {
     reduceDocumentsForUpload,
     startIntervalTimer,
 } from '../../helpers/utils/documentUpload';
-import DocumentUploadIndex from '../../components/blocks/_documentUpload/documentUploadIndex/DocumentUploadIndex';
+import DocumentUploadIndex from '../../components/blocks/_documentManagement/documentUploadIndex/DocumentUploadIndex';
+import { LocationParams } from '../../types/generic/location';
 
 const DocumentUploadPage = (): React.JSX.Element => {
     const patientDetails = usePatient();
     const nhsNumber: string = patientDetails?.nhsNumber ?? '';
     const baseUrl = useBaseAPIUrl();
-    const location: LocationParams<LocationState> = useLocation();
+    const location: LocationParams<DocumentUploadLocationState> = useLocation();
     const baseHeaders = useBaseAPIHeaders();
     const [documents, setDocuments] = useState<Array<UploadDocument>>([]);
     const [existingDocuments, setExistingDocuments] = useState<Array<UploadDocument>>([]);
diff --git a/app/src/router/AppRouter.tsx b/app/src/router/AppRouter.tsx
index 5ea538f734..fea7c10a6b 100644
--- a/app/src/router/AppRouter.tsx
+++ b/app/src/router/AppRouter.tsx
@@ -30,6 +30,7 @@ import DocumentUploadPage from '../pages/documentUploadPage/DocumentUploadPage';
 import AdminRoutesPage from '../pages/adminRoutesPage/AdminRoutesPage';
 import DownloadCompletePage from '../pages/downloadCompletePage/DownloadCompletePage';
 import CookiePolicyPage from '../pages/cookiePolicyPage/CookiePolicyPage';
+import DocumentCorrectPage from '../pages/documentCorrectPage/DocumentCorrectPage';
 
 const {
     START,
@@ -63,6 +64,8 @@ const {
     DOWNLOAD_COMPLETE,
     COOKIES_POLICY,
     COOKIES_POLICY_WILDCARD,
+    DOCUMENT_REASSIGN_PAGES,
+    DOCUMENT_REASSIGN_PAGES_WILDCARD,
 } = routes;
 
 type Routes = {
@@ -166,6 +169,10 @@ export const childRoutes = [
         route: routeChildren.COOKIES_POLICY_UPDATED,
         parent: COOKIES_POLICY,
     },
+    {
+        route: routeChildren.DOCUMENT_REASSIGN_SELECT_PAGES,
+        parent: DOCUMENT_REASSIGN_PAGES,
+    },
 ];
 
 export const routeMap: Routes = {
@@ -307,6 +314,14 @@ export const routeMap: Routes = {
         page: <CookiePolicyPage />,
         type: ROUTE_TYPE.PUBLIC,
     },
+    [DOCUMENT_REASSIGN_PAGES]: {
+        page: <DocumentCorrectPage />,
+        type: ROUTE_TYPE.PATIENT,
+    },
+    [DOCUMENT_REASSIGN_PAGES_WILDCARD]: {
+        page: <DocumentCorrectPage />,
+        type: ROUTE_TYPE.PATIENT,
+    },
 };
 
 const createRoutesFromType = (routeType: ROUTE_TYPE): Array<React.JSX.Element> =>
diff --git a/app/src/styles/App.scss b/app/src/styles/App.scss
index 51cdf9cb34..df80d5fe50 100644
--- a/app/src/styles/App.scss
+++ b/app/src/styles/App.scss
@@ -1304,11 +1304,16 @@ progress:not(.continuous-progress-bar) {
     max-width: 960px !important;
 }
 
+.placeholder-text {
+    color: #757575;
+}
+
 @import '../components/blocks/_patientDocuments/documentSearchResults/DocumentSearchResults.scss';
-@import '../components/blocks/_documentUpload/documentUploadCompleteStage/DocumentUploadCompleteStage.scss';
+@import '../components/blocks/_documentManagement/documentUploadCompleteStage/DocumentUploadCompleteStage.scss';
 @import '../components/blocks/_admin/reviewsPage/ReviewsPage.scss';
 @import '../components/generic/paginationV2/Pagination.scss';
 @import '../components/generic/spinnerV2/SpinnerV2.scss';
 @import '../components/blocks/_admin/reviewDetailsNoFilesChoiceStage/ReviewDetailsNoFilesChoiceStage.scss';
 @import '../components/blocks/_admin/reviewDetailsDownloadChoiceStage/ReviewDetailsDownloadChoiceStage.scss';
-@import '../components/blocks/_documentUpload/documentSelectStage/DocumentSelectStage.scss';
+@import '../components/blocks/_documentManagement/documentSelectStage/DocumentSelectStage.scss';
+@import '../components/blocks/_patientDocuments/documentView/DocumentView.scss';
\ No newline at end of file
diff --git a/app/src/types/blocks/lloydGeorgeActions.test.ts b/app/src/types/blocks/lloydGeorgeActions.test.ts
index 29c070d5b3..8406237332 100644
--- a/app/src/types/blocks/lloydGeorgeActions.test.ts
+++ b/app/src/types/blocks/lloydGeorgeActions.test.ts
@@ -9,12 +9,12 @@ describe('getUserRecordActionLinks', () => {
             const hasRecordInRepo = true;
             const expectedOutput = expect.arrayContaining([
                 expect.objectContaining({
-                    label: 'Remove record',
+                    label: 'Remove this document',
                     key: 'delete-files-link',
                     type: RECORD_ACTION.UPDATE,
                 }),
                 expect.objectContaining({
-                    label: 'Download record',
+                    label: 'Download this document',
                     key: 'download-files-link',
                     type: RECORD_ACTION.DOWNLOAD,
                 }),
@@ -41,11 +41,20 @@ describe('getUserRecordActionLinks', () => {
     });
 
     describe('When role = GP_CLINICAL', () => {
-        it('returns an empty array in any case', () => {
+        it('returns no remove record button', () => {
             const role = REPOSITORY_ROLE.GP_CLINICAL;
 
-            expect(getUserRecordActionLinks({ role, hasRecordInStorage: true })).toEqual([]);
-            expect(getUserRecordActionLinks({ role, hasRecordInStorage: false })).toEqual([]);
+            const expected = expect.arrayContaining([
+                expect.objectContaining({
+                    label: 'Download this document',
+                    key: 'download-files-link',
+                    type: RECORD_ACTION.DOWNLOAD,
+                }),
+            ]);
+
+            const actual = getUserRecordActionLinks({ role, hasRecordInStorage: true });
+
+            expect(actual).toEqual(expected);
         });
     });
 });
diff --git a/app/src/types/blocks/lloydGeorgeActions.ts b/app/src/types/blocks/lloydGeorgeActions.ts
index 94780e7730..696e69bc94 100644
--- a/app/src/types/blocks/lloydGeorgeActions.ts
+++ b/app/src/types/blocks/lloydGeorgeActions.ts
@@ -11,6 +11,7 @@ export enum RECORD_ACTION {
 type ActionRoute = routeChildren | routes;
 
 export type LGRecordActionLink = {
+    index: number;
     label: string;
     key: string;
     stage?: LG_RECORD_STAGE;
@@ -19,22 +20,34 @@ export type LGRecordActionLink = {
     type: RECORD_ACTION;
     unauthorised?: Array<REPOSITORY_ROLE>;
     showIfRecordInStorage: boolean;
+    description?: string;
 };
 
+export enum ACTION_LINK_KEY {
+    DOWNLOAD = 'download-files-link',
+    DELETE = 'delete-files-link',
+    REASSIGN = 'reassign-pages-link',
+    ADD = 'add-files-link',
+}
+
 export const lloydGeorgeRecordLinks: Array<LGRecordActionLink> = [
     {
-        label: 'Remove record',
-        key: 'delete-files-link',
+        index: 1,
+        label: 'Remove this document',
+        key: ACTION_LINK_KEY.DELETE,
         type: RECORD_ACTION.UPDATE,
         unauthorised: [REPOSITORY_ROLE.GP_CLINICAL],
         href: routeChildren.LLOYD_GEORGE_DELETE,
         showIfRecordInStorage: true,
+        description:
+            'This action will remove all pages of this document from storage in this service.',
     },
     {
-        label: 'Download record',
-        key: 'download-files-link',
+        index: 0,
+        label: 'Download this document',
+        key: ACTION_LINK_KEY.DOWNLOAD,
         type: RECORD_ACTION.DOWNLOAD,
-        unauthorised: [REPOSITORY_ROLE.GP_CLINICAL],
+        unauthorised: [],
         href: routeChildren.LLOYD_GEORGE_DOWNLOAD,
         showIfRecordInStorage: true,
     },
diff --git a/app/src/types/generic/featureFlags.ts b/app/src/types/generic/featureFlags.ts
index 6b6f372051..387f13d680 100644
--- a/app/src/types/generic/featureFlags.ts
+++ b/app/src/types/generic/featureFlags.ts
@@ -4,6 +4,7 @@ export type FeatureFlags = {
     uploadArfWorkflowEnabled: boolean;
     uploadDocumentIteration2Enabled?: boolean;
     uploadDocumentIteration3Enabled?: boolean;
+    documentCorrectEnabled?: boolean;
 };
 
 export const defaultFeatureFlags: FeatureFlags = {
@@ -12,4 +13,5 @@ export const defaultFeatureFlags: FeatureFlags = {
     uploadArfWorkflowEnabled: false,
     uploadDocumentIteration2Enabled: false,
     uploadDocumentIteration3Enabled: false,
+    documentCorrectEnabled: false,
 };
diff --git a/app/src/types/generic/location.ts b/app/src/types/generic/location.ts
new file mode 100644
index 0000000000..e307f7c661
--- /dev/null
+++ b/app/src/types/generic/location.ts
@@ -0,0 +1,7 @@
+export type LocationParams<T> = {
+    pathname: string;
+    state: T | undefined;
+    search: string;
+    hash: string;
+    key: string;
+};
diff --git a/app/src/types/generic/routes.ts b/app/src/types/generic/routes.ts
index aed587d44b..a5b75d5cda 100644
--- a/app/src/types/generic/routes.ts
+++ b/app/src/types/generic/routes.ts
@@ -27,6 +27,8 @@ export enum routes {
     PATIENT_ACCESS_AUDIT_WILDCARD = '/patient/access-audit/*',
     DOCUMENT_UPLOAD = '/patient/document-upload',
     DOCUMENT_UPLOAD_WILDCARD = '/patient/document-upload/*',
+    DOCUMENT_REASSIGN_PAGES = '/patient/document-reassign-pages',
+    DOCUMENT_REASSIGN_PAGES_WILDCARD = '/patient/document-reassign-pages/*',
 
     MOCK_LOGIN = 'Auth/MockLogin',
 
@@ -59,6 +61,8 @@ export enum routeChildren {
     DOCUMENT_UPLOAD_INFECTED = '/patient/document-upload/infected',
     DOCUMENT_UPLOAD_FILE_ERRORS = '/patient/document-upload/file-errors',
 
+    DOCUMENT_REASSIGN_SELECT_PAGES = '/patient/document-reassign-pages/select-pages',
+
     DOCUMENT_VIEW = '/patient/documents/view',
     DOCUMENT_DELETE = '/patient/documents/delete',
     DOCUMENT_DELETE_CONFIRMATION = '/patient/documents/delete/confirmation',
diff --git a/app/src/types/pages/UploadDocumentsPage/types.ts b/app/src/types/pages/UploadDocumentsPage/types.ts
index 121c6a8b00..707963a205 100644
--- a/app/src/types/pages/UploadDocumentsPage/types.ts
+++ b/app/src/types/pages/UploadDocumentsPage/types.ts
@@ -68,14 +68,7 @@ export type ExistingDocument = {
     documentId?: string | null;
     versionId: string;
 };
-export type LocationState = {
+export type DocumentUploadLocationState = {
     journey?: JourneyType;
     existingDocuments?: ExistingDocument[];
 };
-export type LocationParams<T> = {
-    pathname: string;
-    state: T | undefined;
-    search: string;
-    hash: string;
-    key: string;
-};
diff --git a/app/src/types/pages/documentCorrect/types.ts b/app/src/types/pages/documentCorrect/types.ts
new file mode 100644
index 0000000000..7e9246296c
--- /dev/null
+++ b/app/src/types/pages/documentCorrect/types.ts
@@ -0,0 +1,5 @@
+import { DocumentReference } from '../documentSearchResultsPage/types';
+
+export type DocumentCorrectLocationState = {
+    documentReference?: DocumentReference;
+};