From 177486cfe8905347933799146bfda9ee5bf97551 Mon Sep 17 00:00:00 2001
From: Chris Elliott <chris.elliott17@nhs.net>
Date: Thu, 19 Mar 2026 15:00:09 +0000
Subject: [PATCH 01/57] CCM-14758: Preview approved letter template

---
 frontend/jest.config.ts                       |   2 +
 frontend/package.json                         |   4 +-
 .../[templateId]/page.test.tsx                |  65 ++--
 .../[templateId]/page.test.tsx                |  69 ++--
 .../__snapshots__/page.test.tsx.snap          | 356 ++++++++++++++++++
 .../page.test.tsx                             | 200 ++++++++++
 .../page.test.tsx                             |  33 +-
 .../LetterRender/LetterRenderDetails.test.tsx | 148 ++++++++
 .../LetterRenderDetails.test.tsx.snap         |  38 ++
 .../molecules/MessageTemplates.test.tsx       |  25 ++
 .../MessageTemplates.test.tsx.snap            | 100 +++++
 .../[templateId]/page.tsx                     |  28 +-
 .../edit-template-name/[templateId]/page.tsx  |  28 +-
 .../[templateId]/page.tsx                     |  69 ++++
 .../[templateId]/page.tsx                     |  18 +-
 .../molecules/LetterRender/LetterRender.tsx   |  14 +-
 .../LetterRender/LetterRenderDetails.tsx      |  60 +++
 .../LetterRender/LetterRenderForm.tsx         |   1 +
 .../LetterRender/LetterRenderTab.tsx          |  41 +-
 .../MessageTemplates/MessageTemplates.tsx     |   9 +
 .../PreviewPdfLetterTemplate.tsx              |   4 +-
 frontend/src/content/content.ts               |   1 +
 frontend/src/middleware.ts                    |   1 +
 package-lock.json                             |  48 +--
 tests/test-team/pages/letter/index.ts         |   1 +
 ...plate-mgmt-preview-approved-letter-page.ts |   6 +
 .../letter-templates.accessibility.spec.ts    |  10 +
 .../route-coverage.accessibility.spec.ts      |   2 +
 ...t-edit-template-campaign.component.spec.ts |   2 +-
 ...-mgmt-edit-template-name.component.spec.ts |   2 +-
 ...iew-approved-letter-page.component.spec.ts | 139 +++++++
 ...ew-submitted-letter-page.component.spec.ts |  91 ++---
 ...emplate-protected-routes.component.spec.ts |   2 +
 .../routing.e2e.spec.ts                       |   6 +-
 .../__tests__/__snapshots__/enum.test.ts.snap |   4 +-
 utils/utils/src/__tests__/enum.test.ts        |   9 +
 utils/utils/src/enum.ts                       |   5 +-
 37 files changed, 1433 insertions(+), 208 deletions(-)
 create mode 100644 frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap
 create mode 100644 frontend/src/__tests__/app/preview-approved-letter-template/page.test.tsx
 create mode 100644 frontend/src/__tests__/components/molecules/LetterRender/LetterRenderDetails.test.tsx
 create mode 100644 frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderDetails.test.tsx.snap
 create mode 100644 frontend/src/app/preview-approved-letter-template/[templateId]/page.tsx
 create mode 100644 frontend/src/components/molecules/LetterRender/LetterRenderDetails.tsx
 create mode 100644 tests/test-team/pages/letter/template-mgmt-preview-approved-letter-page.ts
 create mode 100644 tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts

diff --git a/frontend/jest.config.ts b/frontend/jest.config.ts
index 1f5be258f..98a996722 100644
--- a/frontend/jest.config.ts
+++ b/frontend/jest.config.ts
@@ -38,6 +38,8 @@ const config: Config = {
   },
 
   setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
+
+  maxWorkers: 3,
 };
 
 // createJestConfig is exported this way to ensure that next/jest can load the Next.js config which is async
diff --git a/frontend/package.json b/frontend/package.json
index 5e73026cd..758321776 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "@aws-amplify/adapter-nextjs": "^1.7.1",
-    "@aws-amplify/ui-react": "^6.9.4",
-    "aws-amplify": "^6.13.6",
+    "@aws-amplify/ui-react": "^6.15.2",
+    "aws-amplify": "^6.16.3",
     "classnames": "^2.5.1",
     "clsx": "^2.1.1",
     "date-fns": "^4.1.0",
diff --git a/frontend/src/__tests__/app/edit-template-campaign/[templateId]/page.test.tsx b/frontend/src/__tests__/app/edit-template-campaign/[templateId]/page.test.tsx
index 534a74f98..627b0ed03 100644
--- a/frontend/src/__tests__/app/edit-template-campaign/[templateId]/page.test.tsx
+++ b/frontend/src/__tests__/app/edit-template-campaign/[templateId]/page.test.tsx
@@ -7,6 +7,7 @@ import { getTemplate } from '@utils/form-actions';
 import { verifyFormCsrfToken } from '@utils/csrf-utils';
 import { editTemplateCampaign } from '@app/edit-template-campaign/[templateId]/server-action';
 import Page, { metadata } from '@app/edit-template-campaign/[templateId]/page';
+import { PdfLetterTemplate } from 'nhs-notify-web-template-management-utils';
 
 jest.mock('next/navigation');
 jest.mock('@utils/server-features');
@@ -42,6 +43,27 @@ const mockTemplate: TemplateDto = {
   },
 };
 
+const mockPdfTemplate: PdfLetterTemplate = {
+  id: 'template-123',
+  name: 'PDF Letter Template',
+  templateType: 'LETTER',
+  templateStatus: 'NOT_YET_SUBMITTED',
+  lockNumber: 5,
+  language: 'en',
+  letterType: 'x0',
+  letterVersion: 'PDF',
+  files: {
+    pdfTemplate: {
+      fileName: 'test.pdf',
+      currentVersion: 'v1',
+      virusScanStatus: 'PASSED',
+    },
+  },
+  createdAt: '2026-01-01T00:00:00.000Z',
+  updatedAt: '2026-01-01T00:00:00.000Z',
+  clientId: 'client-123',
+};
+
 beforeEach(() => {
   jest.resetAllMocks();
   jest.mocked(editTemplateCampaign).mockResolvedValue({});
@@ -104,26 +126,7 @@ describe('template is not a letter', () => {
 
 describe('letter version is not AUTHORING', () => {
   beforeEach(() => {
-    jest.mocked(getTemplate).mockResolvedValue({
-      id: 'template-123',
-      name: 'PDF Letter Template',
-      templateType: 'LETTER',
-      templateStatus: 'NOT_YET_SUBMITTED',
-      lockNumber: 5,
-      language: 'en',
-      letterType: 'x0',
-      letterVersion: 'PDF',
-      files: {
-        pdfTemplate: {
-          fileName: 'test.pdf',
-          currentVersion: 'v1',
-          virusScanStatus: 'PASSED',
-        },
-      },
-      createdAt: '2026-01-01T00:00:00.000Z',
-      updatedAt: '2026-01-01T00:00:00.000Z',
-      clientId: 'client-123',
-    });
+    jest.mocked(getTemplate).mockResolvedValue(mockPdfTemplate);
   });
 
   it('redirects to preview letter template page', async () => {
@@ -156,10 +159,10 @@ describe('client has letter authoring feature flag disabled', () => {
   });
 });
 
-describe('template has been submitted', () => {
+describe('template has been submitted - PDF', () => {
   beforeEach(() => {
     jest.mocked(getTemplate).mockResolvedValue({
-      ...mockTemplate,
+      ...mockPdfTemplate,
       templateStatus: 'SUBMITTED',
     });
   });
@@ -174,6 +177,24 @@ describe('template has been submitted', () => {
   });
 });
 
+describe('template has been submitted - authoring', () => {
+  beforeEach(() => {
+    jest.mocked(getTemplate).mockResolvedValue({
+      ...mockTemplate,
+      templateStatus: 'SUBMITTED',
+    });
+  });
+
+  it('redirects to preview submitted letter template page', async () => {
+    await Page({ params: Promise.resolve({ templateId: 'template-123' }) });
+
+    expect(redirect).toHaveBeenCalledWith(
+      '/preview-approved-letter-template/template-123',
+      RedirectType.replace
+    );
+  });
+});
+
 describe('client only has one campaign', () => {
   beforeEach(() => {
     jest.mocked(fetchClient).mockResolvedValue({
diff --git a/frontend/src/__tests__/app/edit-template-name/[templateId]/page.test.tsx b/frontend/src/__tests__/app/edit-template-name/[templateId]/page.test.tsx
index d9bfedba1..eb278ac66 100644
--- a/frontend/src/__tests__/app/edit-template-name/[templateId]/page.test.tsx
+++ b/frontend/src/__tests__/app/edit-template-name/[templateId]/page.test.tsx
@@ -1,7 +1,10 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { redirect, RedirectType } from 'next/navigation';
-import type { AuthoringLetterTemplate } from 'nhs-notify-web-template-management-utils';
+import type {
+  AuthoringLetterTemplate,
+  PdfLetterTemplate,
+} from 'nhs-notify-web-template-management-utils';
 import { fetchClient } from '@utils/server-features';
 import { getTemplate } from '@utils/form-actions';
 import { verifyFormCsrfToken } from '@utils/csrf-utils';
@@ -42,6 +45,27 @@ const mockTemplate: AuthoringLetterTemplate = {
   systemPersonalisation: [],
 };
 
+const mockPdfTemplate: PdfLetterTemplate = {
+  id: 'template-123',
+  name: 'PDF Letter Template',
+  templateType: 'LETTER',
+  templateStatus: 'NOT_YET_SUBMITTED',
+  lockNumber: 5,
+  language: 'en',
+  letterType: 'x0',
+  letterVersion: 'PDF',
+  files: {
+    pdfTemplate: {
+      fileName: 'test.pdf',
+      currentVersion: 'v1',
+      virusScanStatus: 'PASSED',
+    },
+  },
+  createdAt: '2026-01-01T00:00:00.000Z',
+  updatedAt: '2026-01-01T00:00:00.000Z',
+  clientId: 'client-123',
+};
+
 beforeEach(() => {
   jest.resetAllMocks();
   jest.mocked(editTemplateName).mockResolvedValue({});
@@ -104,26 +128,7 @@ describe('template is not a letter', () => {
 
 describe('letter version is not AUTHORING', () => {
   beforeEach(() => {
-    jest.mocked(getTemplate).mockResolvedValue({
-      id: 'template-123',
-      name: 'PDF Letter Template',
-      templateType: 'LETTER',
-      templateStatus: 'NOT_YET_SUBMITTED',
-      lockNumber: 5,
-      language: 'en',
-      letterType: 'x0',
-      letterVersion: 'PDF',
-      files: {
-        pdfTemplate: {
-          fileName: 'test.pdf',
-          currentVersion: 'v1',
-          virusScanStatus: 'PASSED',
-        },
-      },
-      createdAt: '2026-01-01T00:00:00.000Z',
-      updatedAt: '2026-01-01T00:00:00.000Z',
-      clientId: 'client-123',
-    });
+    jest.mocked(getTemplate).mockResolvedValue(mockPdfTemplate);
   });
 
   it('redirects to preview letter template page', async () => {
@@ -156,10 +161,10 @@ describe('client has letter authoring feature flag disabled', () => {
   });
 });
 
-describe('template has been submitted', () => {
+describe('template has been submitted - PDF', () => {
   beforeEach(() => {
     jest.mocked(getTemplate).mockResolvedValue({
-      ...mockTemplate,
+      ...mockPdfTemplate,
       templateStatus: 'SUBMITTED',
     });
   });
@@ -174,6 +179,24 @@ describe('template has been submitted', () => {
   });
 });
 
+describe('template has been submitted - authoring', () => {
+  beforeEach(() => {
+    jest.mocked(getTemplate).mockResolvedValue({
+      ...mockTemplate,
+      templateStatus: 'SUBMITTED',
+    });
+  });
+
+  it('redirects to preview submitted letter template page', async () => {
+    await Page({ params: Promise.resolve({ templateId: 'template-123' }) });
+
+    expect(redirect).toHaveBeenCalledWith(
+      '/preview-approved-letter-template/template-123',
+      RedirectType.replace
+    );
+  });
+});
+
 describe('valid template', () => {
   it('matches snapshot on initial render', async () => {
     expect(
diff --git a/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap
new file mode 100644
index 000000000..3a2fc8e43
--- /dev/null
+++ b/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap
@@ -0,0 +1,356 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`valid authoring letter template matches snapshot 1`] = `
+<DocumentFragment>
+  <div
+    class="nhsuk-width-container-fluid"
+  >
+    <div
+      class="nhsuk-width-container"
+    >
+      <a
+        class="nhsuk-back-link"
+        data-testid="back-link-top"
+        href="/message-templates"
+      >
+        Back to all templates
+      </a>
+    </div>
+    <main
+      class="nhsuk-main-wrapper"
+      id="maincontent"
+      role="main"
+    >
+      <div
+        class="nhsuk-width-container"
+      >
+        <div
+          class="nhsuk-grid-row"
+        >
+          <div
+            class="nhsuk-grid-column-full"
+          >
+            <div
+              class="nhsuk-u-reading-width"
+            >
+              <span
+                class="nhsuk-caption-l"
+              >
+                Template
+              </span>
+              <h1
+                class="preview__heading"
+                data-testid="preview-message__heading"
+              >
+                authoring letter template name
+              </h1>
+            </div>
+            <div
+              class="nhsuk-width-container nhsuk-u-margin-bottom-6 nhsuk-body-m"
+            >
+              <dl
+                class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview authoringLetterDetails"
+              >
+                <div
+                  class="nhsuk-summary-list__row"
+                >
+                  <dt
+                    class="nhsuk-summary-list__key"
+                  >
+                    Template ID
+                  </dt>
+                  <dd
+                    class="nhsuk-summary-list__value monospace-font"
+                    data-testid="preview-template-id"
+                  >
+                    authoring-letter-template-id
+                  </dd>
+                  <dd
+                    class="nhsuk-summary-list__actions"
+                  />
+                </div>
+                <div
+                  class="nhsuk-summary-list__row"
+                >
+                  <dt
+                    class="nhsuk-summary-list__key"
+                  >
+                    Template type
+                  </dt>
+                  <dd
+                    class="nhsuk-summary-list__value"
+                  >
+                    Standard letter
+                  </dd>
+                  <dd
+                    class="nhsuk-summary-list__actions"
+                  />
+                </div>
+                <div
+                  class="nhsuk-summary-list__row missing-value"
+                  id="campaign-id"
+                >
+                  <dt
+                    class="nhsuk-summary-list__key"
+                  >
+                    Campaign
+                  </dt>
+                  <dd
+                    class="nhsuk-summary-list__value"
+                  />
+                  <dd
+                    aria-hidden="true"
+                    class="nhsuk-summary-list__actions"
+                  />
+                </div>
+                <div
+                  class="nhsuk-summary-list__row"
+                >
+                  <dt
+                    class="nhsuk-summary-list__key"
+                  >
+                    Total pages
+                  </dt>
+                  <dd
+                    class="nhsuk-summary-list__value"
+                  >
+                    2
+                  </dd>
+                  <dd
+                    class="nhsuk-summary-list__actions"
+                  />
+                </div>
+                <div
+                  class="nhsuk-summary-list__row"
+                >
+                  <dt
+                    class="nhsuk-summary-list__key"
+                  >
+                    Sheets
+                  </dt>
+                  <dd
+                    class="nhsuk-summary-list__value"
+                  >
+                    1
+                  </dd>
+                  <dd
+                    class="nhsuk-summary-list__actions nhsuk-u-padding-right-4"
+                  >
+                    <a
+                      data-testid="sheets-action"
+                      href="https://notify.nhs.uk/pricing-and-commercial/letters"
+                      rel="noopener noreferrer"
+                      target="_blank"
+                    >
+                      Learn more
+                      <span
+                        class="nhsuk-u-visually-hidden"
+                      >
+                         about sheets
+                      </span>
+                    </a>
+                  </dd>
+                </div>
+                <div
+                  class="nhsuk-summary-list__row"
+                >
+                  <dt
+                    class="nhsuk-summary-list__key"
+                  >
+                    Printing and postage
+                  </dt>
+                  <dd
+                    class="nhsuk-summary-list__value"
+                  >
+                    variant-123
+                  </dd>
+                  <dd
+                    aria-hidden="true"
+                    class="nhsuk-summary-list__actions"
+                  />
+                </div>
+                <div
+                  class="nhsuk-summary-list__row"
+                >
+                  <dt
+                    class="nhsuk-summary-list__key"
+                  >
+                    Status
+                  </dt>
+                  <dd
+                    class="nhsuk-summary-list__value"
+                  >
+                    <strong
+                      class="nhsuk-tag nhsuk-tag--green"
+                      data-status="proof-approved"
+                      data-testid="status-tag"
+                    >
+                      Approved
+                    </strong>
+                  </dd>
+                  <dd
+                    class="nhsuk-summary-list__actions nhsuk-u-padding-right-4"
+                  >
+                    <a
+                      data-testid="status-action"
+                      href="https://notify.nhs.uk/templates/what-template-statuses-mean"
+                      rel="noopener noreferrer"
+                      target="_blank"
+                    >
+                      Learn more
+                      <span
+                        class="nhsuk-u-visually-hidden"
+                      >
+                         about status
+                      </span>
+                    </a>
+                  </dd>
+                </div>
+              </dl>
+            </div>
+          </div>
+        </div>
+      </div>
+      <section
+        class="nhsuk-u-margin-top-6"
+      >
+        <h2
+          class="nhsuk-heading-m"
+        >
+          Letter preview
+        </h2>
+        <p>
+          Check how your personalisation fields will appear in your letter.
+        </p>
+        <a
+          class="nhsuk-body"
+          href="https://notify.nhs.uk/using-nhs-notify/personalisation"
+        >
+          Learn more about personalising your letters (opens in a new tab).
+        </a>
+        <div
+          class="nhsuk-tabs nhsuk-u-margin-top-6"
+          data-module="nhsuk-tabs"
+        >
+          <h2
+            class="nhsuk-tabs__title"
+          >
+            Example personalisation data
+          </h2>
+          <ul
+            class="nhsuk-tabs__list"
+            role="tablist"
+          >
+            <li
+              class="nhsuk-tabs__list-item nhsuk-tabs__list-item--selected"
+              role="presentation"
+            >
+              <a
+                aria-controls="tab-short"
+                aria-selected="true"
+                class="nhsuk-tabs__tab"
+                href="#tab-short"
+                id="tab_tab-short"
+                role="tab"
+                tabindex="0"
+              >
+                Short examples
+              </a>
+            </li>
+            <li
+              class="nhsuk-tabs__list-item"
+              role="presentation"
+            >
+              <a
+                aria-controls="tab-long"
+                aria-selected="false"
+                class="nhsuk-tabs__tab"
+                href="#tab-long"
+                id="tab_tab-long"
+                role="tab"
+                tabindex="-1"
+              >
+                Long examples
+              </a>
+            </li>
+          </ul>
+          <div
+            aria-labelledby="tab_tab-short"
+            class="nhsuk-tabs__panel"
+            id="tab-short"
+            role="tabpanel"
+          >
+            <div
+              class="nhsuk-grid-row tabRow"
+            >
+              <div
+                class="nhsuk-grid-column-one-third"
+              >
+                <h3
+                  class="nhsuk-heading-s"
+                >
+                  PDS personalisation fields
+                </h3>
+                <label
+                  class="nhsuk-label nhsuk-label--s"
+                >
+                  Example recipient
+                </label>
+                <div
+                  class="nhsuk-u-margin-bottom-4"
+                />
+              </div>
+              <div
+                class="nhsuk-grid-column-two-thirds iframeColumn"
+              >
+                <iframe
+                  aria-label="PDF preview of letter template with short example personalisation data"
+                  src="/templates/files/undefined/renders/authoring-letter-template-id/render.pdf"
+                  title="Letter preview - short examples"
+                />
+              </div>
+            </div>
+          </div>
+          <div
+            aria-labelledby="tab_tab-long"
+            class="nhsuk-tabs__panel nhsuk-tabs__panel--hidden"
+            id="tab-long"
+            role="tabpanel"
+          >
+            <div
+              class="nhsuk-grid-row tabRow"
+            >
+              <div
+                class="nhsuk-grid-column-one-third"
+              >
+                <h3
+                  class="nhsuk-heading-s"
+                >
+                  PDS personalisation fields
+                </h3>
+                <label
+                  class="nhsuk-label nhsuk-label--s"
+                >
+                  Example recipient
+                </label>
+                <div
+                  class="nhsuk-u-margin-bottom-4"
+                />
+              </div>
+              <div
+                class="nhsuk-grid-column-two-thirds iframeColumn"
+              >
+                <iframe
+                  aria-label="PDF preview of letter template with long example personalisation data"
+                  src="/templates/files/undefined/renders/authoring-letter-template-id/render.pdf"
+                  title="Letter preview - long examples"
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+      </section>
+    </main>
+  </div>
+</DocumentFragment>
+`;
diff --git a/frontend/src/__tests__/app/preview-approved-letter-template/page.test.tsx b/frontend/src/__tests__/app/preview-approved-letter-template/page.test.tsx
new file mode 100644
index 000000000..82cb1830c
--- /dev/null
+++ b/frontend/src/__tests__/app/preview-approved-letter-template/page.test.tsx
@@ -0,0 +1,200 @@
+import { render, screen } from '@testing-library/react';
+import { redirect, RedirectType } from 'next/navigation';
+import { getTemplate } from '@utils/form-actions';
+import { verifyFormCsrfToken } from '@utils/csrf-utils';
+import {
+  AUTHORING_LETTER_TEMPLATE,
+  EMAIL_TEMPLATE,
+  NHS_APP_TEMPLATE,
+  SMS_TEMPLATE,
+} from '@testhelpers/helpers';
+import Page, {
+  generateMetadata,
+} from '@app/preview-approved-letter-template/[templateId]/page';
+import content from '@content/content';
+import { AuthoringLetterTemplate } from 'nhs-notify-web-template-management-utils';
+
+const mockTemplate: AuthoringLetterTemplate = {
+  ...AUTHORING_LETTER_TEMPLATE,
+  templateStatus: 'PROOF_APPROVED',
+};
+
+jest.mock('@utils/form-actions');
+jest.mock('next/navigation');
+jest.mock('@utils/csrf-utils');
+
+const { approvedPageTitle } = content.pages.previewLetterTemplate;
+
+const NOW = new Date('2025-06-15T12:00:00.000Z');
+
+beforeEach(() => {
+  jest.resetAllMocks();
+  jest.useFakeTimers({ now: NOW });
+  jest.mocked(verifyFormCsrfToken).mockResolvedValue(true);
+});
+
+afterEach(() => {
+  jest.useRealTimers();
+});
+
+test('metadata', async () => {
+  expect(await generateMetadata()).toEqual({
+    title: approvedPageTitle,
+  });
+});
+
+describe('template does not exist', () => {
+  beforeEach(() => {
+    jest.mocked(getTemplate).mockResolvedValue(undefined);
+  });
+
+  it('redirects to invalid template page', async () => {
+    await Page({ params: Promise.resolve({ templateId: 'template-123' }) });
+
+    expect(redirect).toHaveBeenCalledWith(
+      '/invalid-template',
+      RedirectType.replace
+    );
+  });
+});
+
+describe('template is not a letter', () => {
+  it('redirects to invalid template page when template is an email', async () => {
+    jest.mocked(getTemplate).mockResolvedValue(EMAIL_TEMPLATE);
+
+    await Page({ params: Promise.resolve({ templateId: EMAIL_TEMPLATE.id }) });
+
+    expect(redirect).toHaveBeenCalledWith(
+      '/invalid-template',
+      RedirectType.replace
+    );
+  });
+
+  it('redirects to invalid template page when template is an SMS', async () => {
+    jest.mocked(getTemplate).mockResolvedValue(SMS_TEMPLATE);
+
+    await Page({ params: Promise.resolve({ templateId: SMS_TEMPLATE.id }) });
+
+    expect(redirect).toHaveBeenCalledWith(
+      '/invalid-template',
+      RedirectType.replace
+    );
+  });
+
+  it('redirects to invalid template page when template is an NHS App message', async () => {
+    jest.mocked(getTemplate).mockResolvedValue(NHS_APP_TEMPLATE);
+
+    await Page({
+      params: Promise.resolve({ templateId: NHS_APP_TEMPLATE.id }),
+    });
+
+    expect(redirect).toHaveBeenCalledWith(
+      '/invalid-template',
+      RedirectType.replace
+    );
+  });
+});
+
+describe('authoring letter template is invalid', () => {
+  it('redirects to invalid template page when name is missing', async () => {
+    jest.mocked(getTemplate).mockResolvedValue({
+      ...mockTemplate,
+      name: undefined as unknown as string,
+    });
+
+    await Page({
+      params: Promise.resolve({ templateId: mockTemplate.id }),
+    });
+
+    expect(redirect).toHaveBeenCalledWith(
+      '/invalid-template',
+      RedirectType.replace
+    );
+  });
+
+  it('redirects to invalid template page when language is missing', async () => {
+    jest.mocked(getTemplate).mockResolvedValue({
+      ...mockTemplate,
+      language: undefined as unknown as 'en',
+    });
+
+    await Page({
+      params: Promise.resolve({ templateId: mockTemplate.id }),
+    });
+
+    expect(redirect).toHaveBeenCalledWith(
+      '/invalid-template',
+      RedirectType.replace
+    );
+  });
+
+  it('redirects to invalid template page when letterType is missing', async () => {
+    jest.mocked(getTemplate).mockResolvedValue({
+      ...mockTemplate,
+      letterType: undefined as unknown as 'x0',
+    });
+
+    await Page({
+      params: Promise.resolve({ templateId: mockTemplate.id }),
+    });
+
+    expect(redirect).toHaveBeenCalledWith(
+      '/invalid-template',
+      RedirectType.replace
+    );
+  });
+});
+
+describe('valid authoring letter template', () => {
+  beforeEach(() => {
+    jest.mocked(getTemplate).mockResolvedValue(mockTemplate);
+  });
+
+  it('renders the page without redirecting', async () => {
+    const page = await Page({
+      params: Promise.resolve({ templateId: mockTemplate.id }),
+    });
+
+    expect(page).toBeTruthy();
+    expect(redirect).not.toHaveBeenCalled();
+  });
+
+  it('matches snapshot', async () => {
+    const { asFragment } = render(
+      await Page({
+        params: Promise.resolve({ templateId: mockTemplate.id }),
+      })
+    );
+
+    expect(asFragment()).toMatchSnapshot();
+  });
+
+  it('displays the back link with correct href', async () => {
+    render(
+      await Page({
+        params: Promise.resolve({ templateId: mockTemplate.id }),
+      })
+    );
+
+    const backLink = screen.getByTestId('back-link-top');
+    expect(backLink).toHaveAttribute('href', '/message-templates');
+  });
+
+  it('displays the letter renderer when initialRender file is RENDERED', async () => {
+    render(
+      await Page({
+        params: Promise.resolve({ templateId: mockTemplate.id }),
+      })
+    );
+
+    expect(
+      screen.getByRole('heading', { name: 'Letter preview' })
+    ).toBeInTheDocument();
+    expect(
+      screen.getByRole('tab', { name: 'Short examples' })
+    ).toBeInTheDocument();
+    expect(
+      screen.getByRole('tab', { name: 'Long examples' })
+    ).toBeInTheDocument();
+  });
+});
diff --git a/frontend/src/__tests__/app/preview-submitted-letter-template/page.test.tsx b/frontend/src/__tests__/app/preview-submitted-letter-template/page.test.tsx
index dc629c9ba..34fbba6df 100644
--- a/frontend/src/__tests__/app/preview-submitted-letter-template/page.test.tsx
+++ b/frontend/src/__tests__/app/preview-submitted-letter-template/page.test.tsx
@@ -9,14 +9,13 @@ import { getTemplate } from '@utils/form-actions';
 import { redirect } from 'next/navigation';
 import { TemplateDto } from 'nhs-notify-web-template-management-types';
 import {
-  AUTHORING_LETTER_TEMPLATE,
   EMAIL_TEMPLATE,
   NHS_APP_TEMPLATE,
   SMS_TEMPLATE,
   PDF_LETTER_TEMPLATE,
 } from '@testhelpers/helpers';
 import content from '@content/content';
-import PreviewTemplateDetailsLetter from '@molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter';
+import PreviewTemplateDetailsPdfLetter from '@molecules/PreviewTemplateDetails/PreviewTemplateDetailsPdfLetter';
 import { PreviewSubmittedTemplate } from '@molecules/PreviewSubmittedTemplate/PreviewSubmittedTemplate';
 import { NHSNotifyContainer } from '@layouts/container/container';
 
@@ -72,31 +71,7 @@ describe('PreviewSubmittedLetterTemplatePage', () => {
       <NHSNotifyContainer>
         <PreviewSubmittedTemplate
           initialState={submittedLetterTemplate}
-          previewComponent={PreviewTemplateDetailsLetter}
-        />
-      </NHSNotifyContainer>
-    );
-  });
-
-  it('should load page with authoring letter template', async () => {
-    const templateDTO = {
-      ...AUTHORING_LETTER_TEMPLATE,
-      templateStatus: 'SUBMITTED',
-    } satisfies TemplateDto;
-
-    getTemplateMock.mockResolvedValueOnce(templateDTO);
-
-    const page = await PreviewSubmittedLetterTemplatePage({
-      params: Promise.resolve({
-        templateId: AUTHORING_LETTER_TEMPLATE.id,
-      }),
-    });
-
-    expect(page).toEqual(
-      <NHSNotifyContainer>
-        <PreviewSubmittedTemplate
-          initialState={templateDTO}
-          previewComponent={PreviewTemplateDetailsLetter}
+          previewComponent={PreviewTemplateDetailsPdfLetter}
         />
       </NHSNotifyContainer>
     );
@@ -134,10 +109,6 @@ describe('PreviewSubmittedLetterTemplatePage', () => {
       ...PDF_LETTER_TEMPLATE,
       templateStatus: 'NOT_YET_SUBMITTED' as const,
     },
-    {
-      ...AUTHORING_LETTER_TEMPLATE,
-      templateStatus: 'NOT_YET_SUBMITTED' as const,
-    },
   ])(
     'should redirect to invalid-template when template is $templateType, name is $name, and status is $templateStatus',
     async (value) => {
diff --git a/frontend/src/__tests__/components/molecules/LetterRender/LetterRenderDetails.test.tsx b/frontend/src/__tests__/components/molecules/LetterRender/LetterRenderDetails.test.tsx
new file mode 100644
index 000000000..698540dc4
--- /dev/null
+++ b/frontend/src/__tests__/components/molecules/LetterRender/LetterRenderDetails.test.tsx
@@ -0,0 +1,148 @@
+import { render, screen } from '@testing-library/react';
+import { LetterRenderDetails } from '@molecules/LetterRender/LetterRenderDetails';
+import type { AuthoringLetterTemplate } from 'nhs-notify-web-template-management-utils';
+
+const baseTemplate: AuthoringLetterTemplate = {
+  id: 'template-123',
+  clientId: 'client-123',
+  name: 'Test Letter',
+  templateStatus: 'NOT_YET_SUBMITTED',
+  templateType: 'LETTER',
+  letterType: 'x0',
+  letterVersion: 'AUTHORING',
+  letterVariantId: 'variant-123',
+  language: 'en',
+  files: {
+    docxTemplate: {
+      currentVersion: 'version-id',
+      fileName: 'template.docx',
+      virusScanStatus: 'PASSED',
+    },
+    initialRender: {
+      status: 'RENDERED',
+      currentVersion: '1234',
+      fileName: '1234.pdf',
+      pageCount: 1,
+    },
+    shortFormRender: {
+      status: 'RENDERED',
+      currentVersion: 'short-version',
+      fileName: 'short.pdf',
+      pageCount: 1,
+      systemPersonalisationPackId: 'short-1',
+      personalisationParameters: {
+        appointmentDate: '2025-01-15',
+        clinicName: 'Riverside Clinic',
+      },
+    },
+    longFormRender: {
+      status: 'RENDERED',
+      currentVersion: 'long-version',
+      fileName: 'long.pdf',
+      pageCount: 2,
+      systemPersonalisationPackId: 'long-1',
+      personalisationParameters: {
+        appointmentDate: '2025-02-20',
+      },
+    },
+  },
+  systemPersonalisation: ['firstName', 'lastName'],
+  createdAt: '2025-01-13T10:19:25.579Z',
+  updatedAt: '2025-01-13T10:19:25.579Z',
+  lockNumber: 1,
+};
+
+describe('LetterRenderDetails', () => {
+  describe('PDS personalisation section', () => {
+    it('renders the selected short example recipient name', () => {
+      render(
+        <LetterRenderDetails template={baseTemplate} tab='shortFormRender' />
+      );
+
+      expect(
+        screen.getByRole('heading', { name: 'PDS personalisation fields' })
+      ).toBeInTheDocument();
+      expect(screen.getByText('Jo Bloggs')).toBeInTheDocument();
+    });
+
+    it('renders the selected long example recipient name', () => {
+      render(
+        <LetterRenderDetails template={baseTemplate} tab='longFormRender' />
+      );
+
+      expect(
+        screen.getByText('Mr Michael James Richardson-Clarke')
+      ).toBeInTheDocument();
+    });
+  });
+
+  describe('Custom personalisation section', () => {
+    it('renders custom field labels and values when present', () => {
+      const templateWithCustom: AuthoringLetterTemplate = {
+        ...baseTemplate,
+        customPersonalisation: ['appointmentDate', 'clinicName'],
+      };
+
+      render(
+        <LetterRenderDetails
+          template={templateWithCustom}
+          tab='shortFormRender'
+        />
+      );
+
+      expect(
+        screen.getByRole('heading', { name: 'Custom personalisation fields' })
+      ).toBeInTheDocument();
+      expect(screen.getByText('appointmentDate')).toBeInTheDocument();
+      expect(screen.getByText('2025-01-15')).toBeInTheDocument();
+      expect(screen.getByText('clinicName')).toBeInTheDocument();
+      expect(screen.getByText('Riverside Clinic')).toBeInTheDocument();
+    });
+
+    it('does not render the custom section when customPersonalisation is missing', () => {
+      render(
+        <LetterRenderDetails template={baseTemplate} tab='shortFormRender' />
+      );
+
+      expect(
+        screen.queryByRole('heading', { name: 'Custom personalisation fields' })
+      ).not.toBeInTheDocument();
+    });
+
+    it('does not render the custom section when customPersonalisation is empty', () => {
+      const templateWithEmptyCustom: AuthoringLetterTemplate = {
+        ...baseTemplate,
+        customPersonalisation: [],
+      };
+
+      render(
+        <LetterRenderDetails
+          template={templateWithEmptyCustom}
+          tab='shortFormRender'
+        />
+      );
+
+      expect(
+        screen.queryByRole('heading', { name: 'Custom personalisation fields' })
+      ).not.toBeInTheDocument();
+    });
+  });
+
+  describe('snapshots', () => {
+    it('matches snapshot', () => {
+      const templateWithCustom: AuthoringLetterTemplate = {
+        ...baseTemplate,
+        customPersonalisation: ['appointmentDate'],
+      };
+
+      const container = render(
+        <LetterRenderDetails
+          template={templateWithCustom}
+          tab='shortFormRender'
+        />
+      );
+
+      expect(container.asFragment()).toMatchSnapshot();
+    });
+  });
+});
diff --git a/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderDetails.test.tsx.snap b/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderDetails.test.tsx.snap
new file mode 100644
index 000000000..b67cf6c19
--- /dev/null
+++ b/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderDetails.test.tsx.snap
@@ -0,0 +1,38 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`LetterRenderDetails snapshots matches snapshot 1`] = `
+<DocumentFragment>
+  <h3
+    class="nhsuk-heading-s"
+  >
+    PDS personalisation fields
+  </h3>
+  <label
+    class="nhsuk-label nhsuk-label--s"
+  >
+    Example recipient
+  </label>
+  <div
+    class="nhsuk-u-margin-bottom-4"
+  >
+    Jo Bloggs
+  </div>
+  <h3
+    class="nhsuk-heading-s nhsuk-u-padding-top-4"
+  >
+    Custom personalisation fields
+  </h3>
+  <div>
+    <label
+      class="nhsuk-label nhsuk-label--s"
+    >
+      appointmentDate
+    </label>
+    <div
+      class="nhsuk-u-margin-bottom-4"
+    >
+      2025-01-15
+    </div>
+  </div>
+</DocumentFragment>
+`;
diff --git a/frontend/src/__tests__/components/molecules/MessageTemplates.test.tsx b/frontend/src/__tests__/components/molecules/MessageTemplates.test.tsx
index ec18a37c4..529078d7d 100644
--- a/frontend/src/__tests__/components/molecules/MessageTemplates.test.tsx
+++ b/frontend/src/__tests__/components/molecules/MessageTemplates.test.tsx
@@ -139,6 +139,31 @@ describe('MessageTemplates component', () => {
                 },
               },
             },
+            {
+              id: '2',
+              templateType: 'LETTER',
+              templateStatus: 'PROOF_APPROVED',
+              name: 'Template 2',
+              createdAt: '2021-02-01T00:00:00.000Z',
+              letterType: 'x0',
+              letterVersion: 'AUTHORING',
+              language: 'en',
+              updatedAt: '2021-02-01T00:00:00.000Z',
+              lockNumber: 1,
+              files: {
+                docxTemplate: {
+                  currentVersion: 'version-id',
+                  fileName: 'template.docx',
+                  virusScanStatus: 'PASSED',
+                },
+                initialRender: {
+                  fileName: 'render.pdf',
+                  currentVersion: 'v1',
+                  status: 'RENDERED',
+                  pageCount: 2,
+                },
+              },
+            },
           ],
         }}
       />
diff --git a/frontend/src/__tests__/components/molecules/__snapshots__/MessageTemplates.test.tsx.snap b/frontend/src/__tests__/components/molecules/__snapshots__/MessageTemplates.test.tsx.snap
index d8db0de9b..125da52a8 100644
--- a/frontend/src/__tests__/components/molecules/__snapshots__/MessageTemplates.test.tsx.snap
+++ b/frontend/src/__tests__/components/molecules/__snapshots__/MessageTemplates.test.tsx.snap
@@ -1132,6 +1132,106 @@ exports[`MessageTemplates component matches snapshot with proof approved status
               </div>
             </td>
           </tr>
+          <tr
+            class="nhsuk-table__row"
+          >
+            <td
+              class="nhsuk-table__cell"
+              role="cell"
+            >
+              <span
+                aria-hidden="true"
+                class="nhsuk-table-responsive__heading"
+              >
+                Name 
+              </span>
+              <a
+                href="/preview-approved-letter-template/2"
+              >
+                Template 2
+              </a>
+            </td>
+            <td
+              class="nhsuk-table__cell"
+              role="cell"
+            >
+              <span
+                aria-hidden="true"
+                class="nhsuk-table-responsive__heading"
+              >
+                ID 
+              </span>
+              2
+            </td>
+            <td
+              class="nhsuk-table__cell"
+              role="cell"
+            >
+              <span
+                aria-hidden="true"
+                class="nhsuk-table-responsive__heading"
+              >
+                Type 
+              </span>
+              Standard letter
+            </td>
+            <td
+              class="nhsuk-table__cell"
+              role="cell"
+            >
+              <span
+                aria-hidden="true"
+                class="nhsuk-table-responsive__heading"
+              >
+                Status 
+              </span>
+              <strong
+                class="nhsuk-tag nhsuk-tag--green"
+              >
+                Approved
+              </strong>
+            </td>
+            <td
+              class="nhsuk-table__cell"
+              role="cell"
+            >
+              <span
+                aria-hidden="true"
+                class="nhsuk-table-responsive__heading"
+              >
+                Last edited 
+              </span>
+              1st Feb 2021
+              <br />
+              00:00
+            </td>
+            <td
+              class="nhsuk-table__cell"
+              role="cell"
+            >
+              <span
+                aria-hidden="true"
+                class="nhsuk-table-responsive__heading"
+              >
+                Action 
+              </span>
+              <div
+                class="actionLinksWrapper"
+              >
+                <p
+                  class="nhsuk-u-margin-bottom-2"
+                >
+                  <a
+                    aria-label="Delete Template 2"
+                    data-testid="delete-link"
+                    href="/delete-template/2"
+                  >
+                    Delete
+                  </a>
+                </p>
+              </div>
+            </td>
+          </tr>
         </tbody>
       </table>
     </div>
diff --git a/frontend/src/app/edit-template-campaign/[templateId]/page.tsx b/frontend/src/app/edit-template-campaign/[templateId]/page.tsx
index 9a0d94589..934584486 100644
--- a/frontend/src/app/edit-template-campaign/[templateId]/page.tsx
+++ b/frontend/src/app/edit-template-campaign/[templateId]/page.tsx
@@ -1,6 +1,7 @@
 import type { Metadata } from 'next';
 import Link from 'next/link';
 import { redirect, RedirectType } from 'next/navigation';
+import type { TemplateDto } from 'nhs-notify-web-template-management-types';
 import type { TemplatePageProps } from 'nhs-notify-web-template-management-utils';
 import { HintText, Label } from '@atoms/nhsuk-components';
 import * as NHSNotifyForm from '@atoms/NHSNotifyForm';
@@ -20,6 +21,26 @@ export const metadata: Metadata = {
   title: content.pageTitle,
 };
 
+const getPreviewURL = (template: TemplateDto) => {
+  if (
+    template.templateType === 'LETTER' &&
+    template.letterVersion === 'AUTHORING' &&
+    ['PROOF_APPROVED', 'SUBMITTED'].includes(template.templateStatus)
+  ) {
+    return `/preview-approved-letter-template/${template.id}`;
+  }
+
+  if (
+    template.templateType === 'LETTER' &&
+    template.letterVersion === 'PDF' &&
+    template.templateStatus === 'SUBMITTED'
+  ) {
+    return `/preview-submitted-letter-template/${template.id}`;
+  }
+
+  return `/preview-letter-template/${template.id}`;
+};
+
 export default async function EditTemplateCampaignPage({
   params,
 }: TemplatePageProps) {
@@ -39,17 +60,12 @@ export default async function EditTemplateCampaignPage({
     return redirect('/message-templates', RedirectType.replace);
   }
 
-  const previewUrl =
-    template.templateStatus === 'SUBMITTED'
-      ? `/preview-submitted-letter-template/${templateId}`
-      : `/preview-letter-template/${templateId}`;
-
   if (
     template.templateStatus === 'SUBMITTED' ||
     template.letterVersion !== 'AUTHORING' ||
     campaignIds.length < 2
   ) {
-    return redirect(previewUrl, RedirectType.replace);
+    return redirect(getPreviewURL(template), RedirectType.replace);
   }
 
   if (!client?.features.letterAuthoring) {
diff --git a/frontend/src/app/edit-template-name/[templateId]/page.tsx b/frontend/src/app/edit-template-name/[templateId]/page.tsx
index b0853fe86..43d97c825 100644
--- a/frontend/src/app/edit-template-name/[templateId]/page.tsx
+++ b/frontend/src/app/edit-template-name/[templateId]/page.tsx
@@ -1,6 +1,7 @@
 import type { Metadata } from 'next';
 import Link from 'next/link';
 import { redirect, RedirectType } from 'next/navigation';
+import type { TemplateDto } from 'nhs-notify-web-template-management-types';
 import type { TemplatePageProps } from 'nhs-notify-web-template-management-utils';
 import { NHSNotifyContainer } from '@layouts/container/container';
 import { HintText, Label } from '@atoms/nhsuk-components';
@@ -20,6 +21,26 @@ export const metadata: Metadata = {
   title: content.pageTitle,
 };
 
+const getPreviewURL = (template: TemplateDto) => {
+  if (
+    template.templateType === 'LETTER' &&
+    template.letterVersion === 'AUTHORING' &&
+    ['PROOF_APPROVED', 'SUBMITTED'].includes(template.templateStatus)
+  ) {
+    return `/preview-approved-letter-template/${template.id}`;
+  }
+
+  if (
+    template.templateType === 'LETTER' &&
+    template.letterVersion === 'PDF' &&
+    template.templateStatus === 'SUBMITTED'
+  ) {
+    return `/preview-submitted-letter-template/${template.id}`;
+  }
+
+  return `/preview-letter-template/${template.id}`;
+};
+
 export default async function EditTemplateNamePage({
   params,
 }: TemplatePageProps) {
@@ -37,16 +58,11 @@ export default async function EditTemplateNamePage({
     return redirect('/message-templates', RedirectType.replace);
   }
 
-  const previewUrl =
-    template.templateStatus === 'SUBMITTED'
-      ? `/preview-submitted-letter-template/${templateId}`
-      : `/preview-letter-template/${templateId}`;
-
   if (
     template.templateStatus === 'SUBMITTED' ||
     template.letterVersion !== 'AUTHORING'
   ) {
-    return redirect(previewUrl, RedirectType.replace);
+    return redirect(getPreviewURL(template), RedirectType.replace);
   }
 
   if (!client?.features.letterAuthoring) {
diff --git a/frontend/src/app/preview-approved-letter-template/[templateId]/page.tsx b/frontend/src/app/preview-approved-letter-template/[templateId]/page.tsx
new file mode 100644
index 000000000..6f677b077
--- /dev/null
+++ b/frontend/src/app/preview-approved-letter-template/[templateId]/page.tsx
@@ -0,0 +1,69 @@
+import { redirect, RedirectType } from 'next/navigation';
+import type { Metadata } from 'next';
+import type { TemplatePageProps } from 'nhs-notify-web-template-management-utils';
+import {
+  $AuthoringLetterTemplate,
+  zodValidate,
+} from 'nhs-notify-web-template-management-utils';
+import { z } from 'zod';
+import { NHSNotifyMain } from '@atoms/NHSNotifyMain/NHSNotifyMain';
+import { NHSNotifyBackLink } from '@atoms/NHSNotifyBackLink/NHSNotifyBackLink';
+import { LetterRender } from '@molecules/LetterRender';
+import PreviewTemplateDetailsAuthoringLetter from '@molecules/PreviewTemplateDetails/PreviewTemplateDetailsAuthoringLetter';
+import { getTemplate } from '@utils/form-actions';
+import content from '@content/content';
+import { NHSNotifyContainer } from '@layouts/container/container';
+
+const { approvedPageTitle, backLinkText, links } =
+  content.pages.previewLetterTemplate;
+
+export async function generateMetadata(): Promise<Metadata> {
+  return {
+    title: approvedPageTitle,
+  };
+}
+
+export default async function PreviewApprovedLetterTemplatePage({
+  params,
+}: TemplatePageProps) {
+  const { templateId } = await params;
+
+  const template = await getTemplate(templateId);
+
+  const validatedTemplate = zodValidate(
+    z.intersection(
+      $AuthoringLetterTemplate,
+      z.object({
+        templateStatus: z.enum(['PROOF_APPROVED', 'SUBMITTED']),
+      })
+    ),
+    template
+  );
+
+  if (!validatedTemplate) {
+    return redirect('/invalid-template', RedirectType.replace);
+  }
+
+  return (
+    <NHSNotifyContainer fullWidth>
+      <NHSNotifyContainer>
+        <NHSNotifyBackLink href={links.messageTemplates}>
+          {backLinkText}
+        </NHSNotifyBackLink>
+      </NHSNotifyContainer>
+      <NHSNotifyMain>
+        <NHSNotifyContainer>
+          <div className='nhsuk-grid-row'>
+            <div className='nhsuk-grid-column-full'>
+              <PreviewTemplateDetailsAuthoringLetter
+                template={validatedTemplate}
+                hideEditActions={true}
+              />
+            </div>
+          </div>
+        </NHSNotifyContainer>
+        <LetterRender template={validatedTemplate} hideEditActions={true} />
+      </NHSNotifyMain>
+    </NHSNotifyContainer>
+  );
+}
diff --git a/frontend/src/app/preview-submitted-letter-template/[templateId]/page.tsx b/frontend/src/app/preview-submitted-letter-template/[templateId]/page.tsx
index 1d86da630..be1026f29 100644
--- a/frontend/src/app/preview-submitted-letter-template/[templateId]/page.tsx
+++ b/frontend/src/app/preview-submitted-letter-template/[templateId]/page.tsx
@@ -1,16 +1,18 @@
 'use server';
 
 import {
+  $PdfLetterTemplate,
   TemplatePageProps,
-  validateSubmittedLetterTemplate,
+  zodValidate,
 } from 'nhs-notify-web-template-management-utils';
 import { getTemplate } from '@utils/form-actions';
 import { redirect, RedirectType } from 'next/navigation';
 import { Metadata } from 'next';
 import content from '@content/content';
 import { PreviewSubmittedTemplate } from '@molecules/PreviewSubmittedTemplate/PreviewSubmittedTemplate';
-import PreviewTemplateDetailsLetter from '@molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter';
+import PreviewTemplateDetailsPdfLetter from '@molecules/PreviewTemplateDetails/PreviewTemplateDetailsPdfLetter';
 import { NHSNotifyContainer } from '@layouts/container/container';
+import { z } from 'zod';
 
 const { pageTitle } = content.pages.previewSubmittedLetterTemplate;
 
@@ -25,7 +27,15 @@ const PreviewSubmittedLetterTemplatePage = async (props: TemplatePageProps) => {
 
   const template = await getTemplate(templateId);
 
-  const validatedTemplate = validateSubmittedLetterTemplate(template);
+  const validatedTemplate = zodValidate(
+    z.intersection(
+      $PdfLetterTemplate,
+      z.object({
+        templateStatus: z.literal('SUBMITTED'),
+      })
+    ),
+    template
+  );
 
   if (!validatedTemplate) {
     redirect('/invalid-template', RedirectType.replace);
@@ -35,7 +45,7 @@ const PreviewSubmittedLetterTemplatePage = async (props: TemplatePageProps) => {
     <NHSNotifyContainer>
       <PreviewSubmittedTemplate
         initialState={validatedTemplate}
-        previewComponent={PreviewTemplateDetailsLetter}
+        previewComponent={PreviewTemplateDetailsPdfLetter}
       />
     </NHSNotifyContainer>
   );
diff --git a/frontend/src/components/molecules/LetterRender/LetterRender.tsx b/frontend/src/components/molecules/LetterRender/LetterRender.tsx
index 8cc802466..fd350a19d 100644
--- a/frontend/src/components/molecules/LetterRender/LetterRender.tsx
+++ b/frontend/src/components/molecules/LetterRender/LetterRender.tsx
@@ -8,8 +8,10 @@ import Link from 'next/link';
 
 export function LetterRender({
   template,
+  hideEditActions,
 }: {
   template: AuthoringLetterTemplate;
+  hideEditActions?: boolean;
 }) {
   const { letterRender: copy } = content.components;
 
@@ -28,10 +30,18 @@ export function LetterRender({
           <Tabs.ListItem id='tab-long'>{copy.tabs.long}</Tabs.ListItem>
         </Tabs.List>
         <Tabs.Contents id='tab-short'>
-          <LetterRenderTab template={template} tab='shortFormRender' />
+          <LetterRenderTab
+            template={template}
+            tab='shortFormRender'
+            hideEditActions={hideEditActions}
+          />
         </Tabs.Contents>
         <Tabs.Contents id='tab-long'>
-          <LetterRenderTab template={template} tab='longFormRender' />
+          <LetterRenderTab
+            template={template}
+            tab='longFormRender'
+            hideEditActions={hideEditActions}
+          />
         </Tabs.Contents>
       </Tabs>
     </section>
diff --git a/frontend/src/components/molecules/LetterRender/LetterRenderDetails.tsx b/frontend/src/components/molecules/LetterRender/LetterRenderDetails.tsx
new file mode 100644
index 000000000..73e3d5cf8
--- /dev/null
+++ b/frontend/src/components/molecules/LetterRender/LetterRenderDetails.tsx
@@ -0,0 +1,60 @@
+'use client';
+
+import { Label } from 'nhsuk-react-components';
+import type { AuthoringLetterTemplate } from 'nhs-notify-web-template-management-utils';
+import content from '@content/content';
+import {
+  LONG_EXAMPLE_RECIPIENTS,
+  SHORT_EXAMPLE_RECIPIENTS,
+} from '@content/example-recipients';
+import type { PersonalisedRenderKey } from '@utils/types';
+
+type LetterRenderDetailsProps = {
+  template: AuthoringLetterTemplate;
+  tab: PersonalisedRenderKey;
+};
+
+export function LetterRenderDetails({
+  template,
+  tab,
+}: LetterRenderDetailsProps) {
+  const { letterRender: copy } = content.components;
+
+  const hasCustomFields =
+    template.customPersonalisation && template.customPersonalisation.length > 0;
+
+  const render = template.files[tab];
+
+  return (
+    <>
+      <h3 className='nhsuk-heading-s'>{copy.pdsSection.heading}</h3>
+
+      <Label size='s'>{copy.pdsSection.recipientLabel}</Label>
+      <div className='nhsuk-u-margin-bottom-4'>
+        {
+          [...SHORT_EXAMPLE_RECIPIENTS, ...LONG_EXAMPLE_RECIPIENTS].find(
+            ({ id }) => id === render?.systemPersonalisationPackId
+          )?.name
+        }
+      </div>
+
+      {hasCustomFields && (
+        <>
+          <h3 className='nhsuk-heading-s nhsuk-u-padding-top-4'>
+            {copy.customSection.heading}
+          </h3>
+          {template.customPersonalisation!.map((field) => {
+            return (
+              <div key={field}>
+                <Label size='s'>{field}</Label>
+                <div className='nhsuk-u-margin-bottom-4'>
+                  {render?.personalisationParameters?.[field]}
+                </div>
+              </div>
+            );
+          })}
+        </>
+      )}
+    </>
+  );
+}
diff --git a/frontend/src/components/molecules/LetterRender/LetterRenderForm.tsx b/frontend/src/components/molecules/LetterRender/LetterRenderForm.tsx
index 8bbca6e03..8a9794338 100644
--- a/frontend/src/components/molecules/LetterRender/LetterRenderForm.tsx
+++ b/frontend/src/components/molecules/LetterRender/LetterRenderForm.tsx
@@ -17,6 +17,7 @@ import { PERSONALISATION_FORMDATA_PREFIX } from '@utils/constants';
 type LetterRenderFormProps = {
   template: AuthoringLetterTemplate;
   tab: PersonalisedRenderKey;
+  hideEditActions?: boolean;
 };
 
 export function LetterRenderForm({ template, tab }: LetterRenderFormProps) {
diff --git a/frontend/src/components/molecules/LetterRender/LetterRenderTab.tsx b/frontend/src/components/molecules/LetterRender/LetterRenderTab.tsx
index d34ac8e4d..41c4f3fab 100644
--- a/frontend/src/components/molecules/LetterRender/LetterRenderTab.tsx
+++ b/frontend/src/components/molecules/LetterRender/LetterRenderTab.tsx
@@ -10,6 +10,7 @@ import {
   useNHSNotifyForm,
 } from '@providers/form-provider';
 import type { RenderDetails } from 'nhs-notify-web-template-management-types';
+import { LetterRenderDetails } from './LetterRenderDetails';
 import { LetterRenderForm } from './LetterRenderForm';
 import { LetterRenderIframe } from './LetterRenderIframe';
 import { updateLetterPreview } from './server-action';
@@ -24,6 +25,7 @@ const { loadingText } = content.components.letterRender;
 type LetterRenderTabProps = {
   template: AuthoringLetterTemplate;
   tab: PersonalisedRenderKey;
+  hideEditActions?: boolean;
 };
 
 function buildPdfUrl(template: AuthoringLetterTemplate, fileName: string) {
@@ -74,34 +76,48 @@ function LetterRenderTabContent({
   template,
   tab,
   pdfUrl,
+  hideEditActions,
 }: {
   template: AuthoringLetterTemplate;
   tab: PersonalisedRenderKey;
   pdfUrl: string | null;
+  hideEditActions?: boolean;
 }) {
   const [_state, _dispatch, isPending] = useNHSNotifyForm();
 
   return (
     <div className={`nhsuk-grid-row ${styles.tabRow}`}>
       <div className='nhsuk-grid-column-one-third'>
-        <LetterRenderForm template={template} tab={tab} />
+        {hideEditActions ? (
+          <LetterRenderDetails template={template} tab={tab} />
+        ) : (
+          <LetterRenderForm template={template} tab={tab} />
+        )}
       </div>
 
       <div className={`nhsuk-grid-column-two-thirds ${styles.iframeColumn}`}>
-        <PollLetterRender
-          template={template}
-          mode={tab}
-          loadingElement={<p>{loadingText}</p>}
-          forcePolling={isPending}
-        >
+        {hideEditActions ? (
           <LetterRenderIframe tab={tab} pdfUrl={pdfUrl} />
-        </PollLetterRender>
+        ) : (
+          <PollLetterRender
+            template={template}
+            mode={tab}
+            loadingElement={<p>{loadingText}</p>}
+            forcePolling={isPending}
+          >
+            <LetterRenderIframe tab={tab} pdfUrl={pdfUrl} />
+          </PollLetterRender>
+        )}
       </div>
     </div>
   );
 }
 
-export function LetterRenderTab({ template, tab }: LetterRenderTabProps) {
+export function LetterRenderTab({
+  template,
+  tab,
+  hideEditActions,
+}: LetterRenderTabProps) {
   const personalisedRender = template.files[tab];
 
   const formState = deriveFormState(template, personalisedRender);
@@ -112,7 +128,12 @@ export function LetterRenderTab({ template, tab }: LetterRenderTabProps) {
       initialState={formState}
       serverAction={updateLetterPreview}
     >
-      <LetterRenderTabContent template={template} tab={tab} pdfUrl={pdfUrl} />
+      <LetterRenderTabContent
+        template={template}
+        tab={tab}
+        pdfUrl={pdfUrl}
+        hideEditActions={hideEditActions}
+      />
     </NHSNotifyFormProvider>
   );
 }
diff --git a/frontend/src/components/molecules/MessageTemplates/MessageTemplates.tsx b/frontend/src/components/molecules/MessageTemplates/MessageTemplates.tsx
index 5246b778f..c420bdf9e 100644
--- a/frontend/src/components/molecules/MessageTemplates/MessageTemplates.tsx
+++ b/frontend/src/components/molecules/MessageTemplates/MessageTemplates.tsx
@@ -11,6 +11,7 @@ import {
   previewTemplatePages,
   templateTypeDisplayMappings,
   previewSubmittedTemplatePages,
+  previewApprovedTemplatePages,
   templateDisplayCopyAction,
   templateDisplayDeleteAction,
   statusToDisplayMapping,
@@ -23,6 +24,14 @@ import { useFeatureFlags } from '@providers/client-config-provider';
 const messageTemplatesContent = content.pages.messageTemplates;
 
 const generateViewTemplateLink = (template: TemplateDto): string => {
+  if (
+    template.templateStatus === 'PROOF_APPROVED' &&
+    template.templateType === 'LETTER' &&
+    template.letterVersion === 'AUTHORING'
+  ) {
+    return `/${previewApprovedTemplatePages(template.templateType)}/${template.id}`;
+  }
+
   if (template.templateStatus === 'SUBMITTED') {
     return `/${previewSubmittedTemplatePages(template.templateType)}/${template.id}`;
   }
diff --git a/frontend/src/components/organisms/PreviewPdfLetterTemplate/PreviewPdfLetterTemplate.tsx b/frontend/src/components/organisms/PreviewPdfLetterTemplate/PreviewPdfLetterTemplate.tsx
index fd7695557..d58a5f643 100644
--- a/frontend/src/components/organisms/PreviewPdfLetterTemplate/PreviewPdfLetterTemplate.tsx
+++ b/frontend/src/components/organisms/PreviewPdfLetterTemplate/PreviewPdfLetterTemplate.tsx
@@ -1,7 +1,7 @@
 'use client';
 
 import Link from 'next/link';
-import PreviewTemplateDetailsLetter from '@molecules/PreviewTemplateDetails/PreviewTemplateDetailsPdfLetter';
+import PreviewTemplateDetailsPdfLetter from '@molecules/PreviewTemplateDetails/PreviewTemplateDetailsPdfLetter';
 import content from '@content/content';
 import type { PdfLetterTemplate } from 'nhs-notify-web-template-management-utils';
 import { isRightToLeft } from 'nhs-notify-web-template-management-utils/enum';
@@ -94,7 +94,7 @@ export function PreviewPdfLetterTemplate({
                 }}
               />
             )}
-            <PreviewTemplateDetailsLetter template={template} />
+            <PreviewTemplateDetailsPdfLetter template={template} />
 
             {template.templateStatus === 'PROOF_AVAILABLE' ? (
               <section className='nhsuk-u-reading-width'>
diff --git a/frontend/src/content/content.ts b/frontend/src/content/content.ts
index ac44c3d15..8b73406d3 100644
--- a/frontend/src/content/content.ts
+++ b/frontend/src/content/content.ts
@@ -522,6 +522,7 @@ const previewLetterTitle = generatePageTitle('Preview letter template');
 
 const previewLetterTemplate = {
   pageTitle: previewLetterTitle,
+  approvedPageTitle: generatePageTitle('Preview approved letter template'),
   backLinkText: backToAllTemplates,
   approveButtonText: 'Approve template',
   submitText: 'Submit template',
diff --git a/frontend/src/middleware.ts b/frontend/src/middleware.ts
index 04154678c..8ce776077 100644
--- a/frontend/src/middleware.ts
+++ b/frontend/src/middleware.ts
@@ -45,6 +45,7 @@ const protectedPaths = [
   /^\/message-plans$/,
   /^\/message-templates$/,
   /^\/nhs-app-template-submitted\/[^/]+$/,
+  /^\/preview-approved-letter-template\/[^/]+$/,
   /^\/preview-email-template\/[^/]+$/,
   /^\/preview-letter-template\/[^/]+$/,
   /^\/preview-nhs-app-template\/[^/]+$/,
diff --git a/package-lock.json b/package-lock.json
index cf7391f0d..e27f825cb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -57,8 +57,8 @@
       "version": "0.1.0",
       "dependencies": {
         "@aws-amplify/adapter-nextjs": "^1.7.1",
-        "@aws-amplify/ui-react": "^6.9.4",
-        "aws-amplify": "^6.13.6",
+        "@aws-amplify/ui-react": "^6.15.2",
+        "aws-amplify": "^6.16.3",
         "classnames": "^2.5.1",
         "clsx": "^2.1.1",
         "date-fns": "^4.1.0",
@@ -7501,13 +7501,13 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login": {
-      "version": "3.972.23",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.23.tgz",
-      "integrity": "sha512-OmE/pSkbMM3dCj1HdOnZ5kXnKK+R/Yz+kbBugraBecp0pGAs21eEURfQRz+1N2gzIHLVyGIP1MEjk/uSrFsngg==",
+      "version": "3.972.24",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.24.tgz",
+      "integrity": "sha512-sIk8oa6AzDoUhxsR11svZESqvzGuXesw62Rl2oW6wguZx8i9cdGCvkFg+h5K7iucUZP8wyWibUbJMc+J66cu5g==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.23",
-        "@aws-sdk/nested-clients": "^3.996.13",
+        "@aws-sdk/core": "^3.973.24",
+        "@aws-sdk/nested-clients": "^3.996.14",
         "@aws-sdk/types": "^3.973.6",
         "@smithy/property-provider": "^4.2.12",
         "@smithy/protocol-http": "^5.3.12",
@@ -7520,9 +7520,9 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/core": {
-      "version": "3.973.23",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.973.23.tgz",
-      "integrity": "sha512-aoJncvD1XvloZ9JLnKqTRL9dBy+Szkryoag9VT+V1TqsuUgIxV9cnBVM/hrDi2vE8bDqLiDR8nirdRcCdtJu0w==",
+      "version": "3.973.24",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.973.24.tgz",
+      "integrity": "sha512-vvf82RYQu2GidWAuQq+uIzaPz9V0gSCXVqdVzRosgl5rXcspXOpSD3wFreGGW6AYymPr97Z69kjVnLePBxloDw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-sdk/types": "^3.973.6",
@@ -7589,12 +7589,12 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-user-agent": {
-      "version": "3.972.24",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.24.tgz",
-      "integrity": "sha512-dLTWy6IfAMhNiSEvMr07g/qZ54be6pLqlxVblbF6AzafmmGAzMMj8qMoY9B4+YgT+gY9IcuxZslNh03L6PyMCQ==",
+      "version": "3.972.25",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.25.tgz",
+      "integrity": "sha512-QxiMPofvOt8SwSynTOmuZfvvPM1S9QfkESBxB22NMHTRXCJhR5BygLl8IXfC4jELiisQgwsgUby21GtXfX3f/g==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.23",
+        "@aws-sdk/core": "^3.973.24",
         "@aws-sdk/types": "^3.973.6",
         "@aws-sdk/util-endpoints": "^3.996.5",
         "@smithy/core": "^3.23.12",
@@ -7608,23 +7608,23 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/nested-clients": {
-      "version": "3.996.13",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.996.13.tgz",
-      "integrity": "sha512-ptZ1HF4yYHNJX8cgFF+8NdYO69XJKZn7ft0/ynV3c0hCbN+89fAbrLS+fqniU2tW8o9Kfqhj8FUh+IPXb2Qsuw==",
+      "version": "3.996.14",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.996.14.tgz",
+      "integrity": "sha512-fSESKvh1VbfjtV3QMnRkCPZWkUbQof6T/DOpiLp33yP2wA+rbwwnZeG3XT3Ekljgw2I8X4XaQPnw+zSR8yxJ5Q==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "^3.973.23",
+        "@aws-sdk/core": "^3.973.24",
         "@aws-sdk/middleware-host-header": "^3.972.8",
         "@aws-sdk/middleware-logger": "^3.972.8",
         "@aws-sdk/middleware-recursion-detection": "^3.972.8",
-        "@aws-sdk/middleware-user-agent": "^3.972.24",
+        "@aws-sdk/middleware-user-agent": "^3.972.25",
         "@aws-sdk/region-config-resolver": "^3.972.9",
         "@aws-sdk/types": "^3.973.6",
         "@aws-sdk/util-endpoints": "^3.996.5",
         "@aws-sdk/util-user-agent-browser": "^3.972.8",
-        "@aws-sdk/util-user-agent-node": "^3.973.10",
+        "@aws-sdk/util-user-agent-node": "^3.973.11",
         "@smithy/config-resolver": "^4.4.13",
         "@smithy/core": "^3.23.12",
         "@smithy/fetch-http-handler": "^5.3.15",
@@ -7714,12 +7714,12 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/util-user-agent-node": {
-      "version": "3.973.10",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.973.10.tgz",
-      "integrity": "sha512-E99zeTscCc+pTMfsvnfi6foPpKmdD1cZfOC7/P8UUrjsoQdg9VEWPRD+xdFduKnfPXwcvby58AlO9jwwF6U96g==",
+      "version": "3.973.11",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.973.11.tgz",
+      "integrity": "sha512-1qdXbXo2s5MMLpUvw00284LsbhtlQ4ul7Zzdn5n+7p4WVgCMLqhxImpHIrjSoc72E/fyc4Wq8dLtUld2Gsh+lA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/middleware-user-agent": "^3.972.24",
+        "@aws-sdk/middleware-user-agent": "^3.972.25",
         "@aws-sdk/types": "^3.973.6",
         "@smithy/node-config-provider": "^4.3.12",
         "@smithy/types": "^4.13.1",
diff --git a/tests/test-team/pages/letter/index.ts b/tests/test-team/pages/letter/index.ts
index d724dee67..ca404514f 100644
--- a/tests/test-team/pages/letter/index.ts
+++ b/tests/test-team/pages/letter/index.ts
@@ -1,6 +1,7 @@
 export * from './template-mgmt-edit-template-campaign-page';
 export * from './template-mgmt-letter-template-approved-page';
 export * from './template-mgmt-edit-template-name-page';
+export * from './template-mgmt-preview-approved-letter-page';
 export * from './template-mgmt-preview-letter-page';
 export * from './template-mgmt-preview-submitted-letter-page';
 export * from './template-mgmt-submit-letter-page';
diff --git a/tests/test-team/pages/letter/template-mgmt-preview-approved-letter-page.ts b/tests/test-team/pages/letter/template-mgmt-preview-approved-letter-page.ts
new file mode 100644
index 000000000..2a2dd019c
--- /dev/null
+++ b/tests/test-team/pages/letter/template-mgmt-preview-approved-letter-page.ts
@@ -0,0 +1,6 @@
+import { TemplateMgmtPreviewSubmittedBasePage } from '../template-mgmt-preview-submitted-base-page';
+
+export class TemplateMgmtPreviewApprovedLetterPage extends TemplateMgmtPreviewSubmittedBasePage {
+  static readonly pathTemplate =
+    '/preview-approved-letter-template/:templateId';
+}
diff --git a/tests/test-team/template-mgmt-accessibility/letter-templates.accessibility.spec.ts b/tests/test-team/template-mgmt-accessibility/letter-templates.accessibility.spec.ts
index fd2d9c530..2eb67c035 100644
--- a/tests/test-team/template-mgmt-accessibility/letter-templates.accessibility.spec.ts
+++ b/tests/test-team/template-mgmt-accessibility/letter-templates.accessibility.spec.ts
@@ -10,6 +10,7 @@ import { TemplateFactory } from 'helpers/factories/template-factory';
 import {
   TemplateMgmtEditTemplateCampaignPage,
   TemplateMgmtEditTemplateNamePage,
+  TemplateMgmtPreviewApprovedLetterPage,
   TemplateMgmtPreviewLetterPage,
   TemplateMgmtPreviewSubmittedLetterPage,
   TemplateMgmtSubmitLetterPage,
@@ -122,6 +123,7 @@ test.beforeAll(async () => {
     letterProof,
     letterProofDisabled,
     letterApproved,
+    letterProofApproved,
   ]);
 });
 
@@ -170,6 +172,14 @@ test.describe('Letter templates', () => {
       )
     ));
 
+  test('Preview submitted letter template', async ({ page, analyze }) =>
+    analyze(
+      new TemplateMgmtPreviewApprovedLetterPage(page).setPathParam(
+        'templateId',
+        templateIds.LETTER_APPROVED
+      )
+    ));
+
   test('Preview submitted letter template', async ({ page, analyze }) =>
     analyze(
       new TemplateMgmtPreviewSubmittedLetterPage(page).setPathParam(
diff --git a/tests/test-team/template-mgmt-accessibility/route-coverage.accessibility.spec.ts b/tests/test-team/template-mgmt-accessibility/route-coverage.accessibility.spec.ts
index 1fcc3d483..49ab2cc73 100644
--- a/tests/test-team/template-mgmt-accessibility/route-coverage.accessibility.spec.ts
+++ b/tests/test-team/template-mgmt-accessibility/route-coverage.accessibility.spec.ts
@@ -47,6 +47,7 @@ import {
 import {
   TemplateMgmtEditTemplateCampaignPage,
   TemplateMgmtEditTemplateNamePage,
+  TemplateMgmtPreviewApprovedLetterPage,
   TemplateMgmtPreviewLetterPage,
   TemplateMgmtPreviewSubmittedLetterPage,
   TemplateMgmtSubmitLetterPage,
@@ -137,6 +138,7 @@ const allPages: (typeof TemplateMgmtBasePage)[] = [
   TemplateMgmtUploadLetterMissingCampaignClientIdPage,
   TemplateMgmtEditTemplateNamePage,
   TemplateMgmtEditTemplateCampaignPage,
+  TemplateMgmtPreviewApprovedLetterPage,
   TemplateMgmtPreviewLetterPage,
   TemplateMgmtPreviewSubmittedLetterPage,
   TemplateMgmtSubmitLetterPage,
diff --git a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-edit-template-campaign.component.spec.ts b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-edit-template-campaign.component.spec.ts
index ada5e23b9..3f36c88b3 100644
--- a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-edit-template-campaign.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-edit-template-campaign.component.spec.ts
@@ -270,7 +270,7 @@ test.describe('Edit Template Campaign page', () => {
       await editPage.loadPage();
 
       await expect(page).toHaveURL(
-        `/templates/preview-submitted-letter-template/${template.id}`
+        `/templates/preview-approved-letter-template/${template.id}`
       );
     });
   });
diff --git a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-edit-template-name.component.spec.ts b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-edit-template-name.component.spec.ts
index c047379fd..d75ef1abd 100644
--- a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-edit-template-name.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-edit-template-name.component.spec.ts
@@ -243,7 +243,7 @@ test.describe('Edit Template Name page', () => {
       await editPage.loadPage();
 
       await expect(page).toHaveURL(
-        `/templates/preview-submitted-letter-template/${template.id}`
+        `/templates/preview-approved-letter-template/${template.id}`
       );
     });
   });
diff --git a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts
new file mode 100644
index 000000000..d389bce41
--- /dev/null
+++ b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts
@@ -0,0 +1,139 @@
+import { test, expect } from '@playwright/test';
+import { TemplateStorageHelper } from '../../helpers/db/template-storage-helper';
+import { TemplateMgmtPreviewApprovedLetterPage } from '../../pages/letter/template-mgmt-preview-approved-letter-page';
+import { TemplateFactory } from '../../helpers/factories/template-factory';
+import {
+  assertFooterLinks,
+  assertSignOutLink,
+  assertHeaderLogoLink,
+  assertSkipToMainContent,
+  assertBackLinkBottom,
+  assertAndClickBackLinkTop,
+} from '../../helpers/template-mgmt-common.steps';
+import {
+  createAuthHelper,
+  TestUser,
+  testUsers,
+} from '../../helpers/auth/cognito-auth-helper';
+
+function createTemplates(user: TestUser) {
+  return {
+    valid: TemplateFactory.createAuthoringLetterTemplate(
+      'e8b5f3a1-2c4d-4e6f-8a9b-1c2d3e4f5a6b',
+      user,
+      'authoring-letter-template-preview-approved-valid',
+      'SUBMITTED'
+    ),
+    invalid: TemplateFactory.createAuthoringLetterTemplate(
+      'e2a5b238-ecbf-42c8-90f1-0cf544a9c0ae',
+      user,
+      'authoring-letter-template-preview-approved-invalid',
+      'NOT_A_STATUS'
+    ),
+  };
+}
+
+test.describe('Preview submitted Letter message template Page', () => {
+  let templates: ReturnType<typeof createTemplates>;
+  const templateStorageHelper = new TemplateStorageHelper();
+
+  test.beforeAll(async () => {
+    const user = await createAuthHelper().getTestUser(testUsers.User1.userId);
+    templates = createTemplates(user);
+    await templateStorageHelper.seedTemplateData(Object.values(templates));
+  });
+
+  test.afterAll(async () => {
+    await templateStorageHelper.deleteSeededTemplates();
+  });
+
+  test('when user visits page, then page is loaded with template details', async ({
+    page,
+    baseURL,
+  }) => {
+    const previewSubmittedLetterTemplatePage =
+      new TemplateMgmtPreviewApprovedLetterPage(page).setPathParam(
+        'templateId',
+        templates.valid.id
+      );
+
+    await previewSubmittedLetterTemplatePage.loadPage();
+
+    await expect(page).toHaveURL(
+      `${baseURL}/templates/preview-approved-letter-template/${templates.valid.id}`
+    );
+
+    await expect(previewSubmittedLetterTemplatePage.pageHeading).toContainText(
+      templates.valid.name
+    );
+
+    expect(templates.valid.campaignId).toBeTruthy();
+
+    await expect(previewSubmittedLetterTemplatePage.campaignId).toContainText(
+      templates.valid.campaignId!
+    );
+
+    await expect(previewSubmittedLetterTemplatePage.statusTag).toHaveText(
+      'Locked'
+    );
+
+    await expect(previewSubmittedLetterTemplatePage.copyLink).toHaveCount(0);
+  });
+
+  test.describe('Page functionality', () => {
+    test('common page tests', async ({ page, baseURL }) => {
+      const props = {
+        page: new TemplateMgmtPreviewApprovedLetterPage(page).setPathParam(
+          'templateId',
+          templates.valid.id
+        ),
+        baseURL,
+      };
+
+      await assertSkipToMainContent(props);
+      await assertHeaderLogoLink(props);
+      await assertSignOutLink(props);
+      await assertFooterLinks(props);
+      await assertBackLinkBottom({
+        ...props,
+        expectedUrl: `templates/message-templates`,
+      });
+      await assertAndClickBackLinkTop({
+        ...props,
+        expectedUrl: `templates/message-templates`,
+      });
+    });
+  });
+
+  test.describe('Error handling', () => {
+    test('when user visits page with an unsubmitted template, then an invalid template error is displayed', async ({
+      baseURL,
+      page,
+    }) => {
+      const previewSubmittedLetterTemplatePage =
+        new TemplateMgmtPreviewApprovedLetterPage(page).setPathParam(
+          'templateId',
+          templates.invalid.id
+        );
+
+      await previewSubmittedLetterTemplatePage.loadPage();
+
+      await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
+    });
+
+    test('when user visits page with a fake template, then an invalid template error is displayed', async ({
+      baseURL,
+      page,
+    }) => {
+      const previewSubmittedLetterTemplatePage =
+        new TemplateMgmtPreviewApprovedLetterPage(page).setPathParam(
+          'templateId',
+          'fake-template-id'
+        );
+
+      await previewSubmittedLetterTemplatePage.loadPage();
+
+      await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
+    });
+  });
+});
diff --git a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-submitted-letter-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-submitted-letter-page.component.spec.ts
index 42d29d411..667f26eeb 100644
--- a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-submitted-letter-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-submitted-letter-page.component.spec.ts
@@ -39,16 +39,8 @@ function createTemplates(user: TestUser) {
     },
   };
 
-  const authoringValid = TemplateFactory.createAuthoringLetterTemplate(
-    'e8b5f3a1-2c4d-4e6f-8a9b-1c2d3e4f5a6b',
-    user,
-    'authoring-letter-template-preview-submitted',
-    'SUBMITTED'
-  );
-
   return {
     valid,
-    authoringValid,
     invalid: {
       ...TemplateFactory.uploadLetterTemplate(
         '621456cf-ace3-49c3-941e-4df5eba11373',
@@ -74,74 +66,37 @@ test.describe('Preview submitted Letter message template Page', () => {
     await templateStorageHelper.deleteSeededTemplates();
   });
 
-  test.describe('PDF letter', () => {
-    test('when user visits page, then page is loaded', async ({
-      page,
-      baseURL,
-    }) => {
-      const previewSubmittedLetterTemplatePage =
-        new TemplateMgmtPreviewSubmittedLetterPage(page).setPathParam(
-          'templateId',
-          templates.valid.id
-        );
-
-      await previewSubmittedLetterTemplatePage.loadPage();
-
-      await expect(page).toHaveURL(
-        `${baseURL}/templates/preview-submitted-letter-template/${templates.valid.id}`
+  test('when user visits page, then page is loaded', async ({
+    page,
+    baseURL,
+  }) => {
+    const previewSubmittedLetterTemplatePage =
+      new TemplateMgmtPreviewSubmittedLetterPage(page).setPathParam(
+        'templateId',
+        templates.valid.id
       );
 
-      await expect(
-        previewSubmittedLetterTemplatePage.pageHeading
-      ).toContainText(templates.valid.name);
+    await previewSubmittedLetterTemplatePage.loadPage();
 
-      expect(templates.valid.campaignId).toBeTruthy();
+    await expect(page).toHaveURL(
+      `${baseURL}/templates/preview-submitted-letter-template/${templates.valid.id}`
+    );
 
-      await expect(previewSubmittedLetterTemplatePage.campaignId).toContainText(
-        templates.valid.campaignId!
-      );
+    await expect(previewSubmittedLetterTemplatePage.pageHeading).toContainText(
+      templates.valid.name
+    );
 
-      await expect(previewSubmittedLetterTemplatePage.statusTag).toHaveText(
-        'Submitted'
-      );
+    expect(templates.valid.campaignId).toBeTruthy();
 
-      await expect(previewSubmittedLetterTemplatePage.copyLink).toHaveCount(0);
-    });
-  });
+    await expect(previewSubmittedLetterTemplatePage.campaignId).toContainText(
+      templates.valid.campaignId!
+    );
 
-  test.describe('AUTHORING letter', () => {
-    test('when user visits page, then page is loaded with template details', async ({
-      page,
-      baseURL,
-    }) => {
-      const previewSubmittedLetterTemplatePage =
-        new TemplateMgmtPreviewSubmittedLetterPage(page).setPathParam(
-          'templateId',
-          templates.authoringValid.id
-        );
-
-      await previewSubmittedLetterTemplatePage.loadPage();
+    await expect(previewSubmittedLetterTemplatePage.statusTag).toHaveText(
+      'Submitted'
+    );
 
-      await expect(page).toHaveURL(
-        `${baseURL}/templates/preview-submitted-letter-template/${templates.authoringValid.id}`
-      );
-
-      await expect(
-        previewSubmittedLetterTemplatePage.pageHeading
-      ).toContainText(templates.authoringValid.name);
-
-      expect(templates.authoringValid.campaignId).toBeTruthy();
-
-      await expect(previewSubmittedLetterTemplatePage.campaignId).toContainText(
-        templates.authoringValid.campaignId!
-      );
-
-      await expect(previewSubmittedLetterTemplatePage.statusTag).toHaveText(
-        'Locked'
-      );
-
-      await expect(previewSubmittedLetterTemplatePage.copyLink).toHaveCount(0);
-    });
+    await expect(previewSubmittedLetterTemplatePage.copyLink).toHaveCount(0);
   });
 
   test.describe('Page functionality', () => {
diff --git a/tests/test-team/template-mgmt-component-tests/template-protected-routes.component.spec.ts b/tests/test-team/template-mgmt-component-tests/template-protected-routes.component.spec.ts
index a4d5ca604..7f071f428 100644
--- a/tests/test-team/template-mgmt-component-tests/template-protected-routes.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/template-protected-routes.component.spec.ts
@@ -61,6 +61,7 @@ import { RoutingPreviewMessagePlanPage } from 'pages/routing/preview-message-pla
 import { RoutingReviewAndMoveToProductionPage } from 'pages/routing';
 import { getAppRoutes } from 'helpers/get-app-routes';
 import { TemplateMgmtLetterTemplateApprovedPage } from 'pages/letter/template-mgmt-letter-template-approved-page';
+import { TemplateMgmtPreviewApprovedLetterPage } from 'pages/letter/template-mgmt-preview-approved-letter-page';
 
 // Reset storage state for this file to avoid being authenticated
 test.use({ storageState: { cookies: [], origins: [] } });
@@ -102,6 +103,7 @@ const protectedPages = [
   TemplateMgmtEditTemplateNamePage,
   TemplateMgmtInvalidTemplatePage,
   TemplateMgmtMessageTemplatesPage,
+  TemplateMgmtPreviewApprovedLetterPage,
   TemplateMgmtPreviewEmailPage,
   TemplateMgmtPreviewLetterPage,
   TemplateMgmtPreviewNhsAppPage,
diff --git a/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts b/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts
index 159faf373..27e0080f4 100644
--- a/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts
+++ b/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts
@@ -180,12 +180,12 @@ test.describe('Routing', () => {
         { template: templates.POLISH_LETTER, expectedStatus: 'Locked' },
         { template: templates.EMAIL, expectedStatus: 'Draft' },
         { template: templates.SMS, expectedStatus: 'Draft' },
-        { template: templates.LETTER, expectedStatus: 'Proof approved' },
+        { template: templates.LETTER, expectedStatus: 'Approved' },
         {
           template: templates.LARGE_PRINT_LETTER,
-          expectedStatus: 'Proof approved',
+          expectedStatus: 'Approved',
         },
-        { template: templates.ARABIC_LETTER, expectedStatus: 'Proof approved' },
+        { template: templates.ARABIC_LETTER, expectedStatus: 'Approved' },
       ]);
     });
 
diff --git a/utils/utils/src/__tests__/__snapshots__/enum.test.ts.snap b/utils/utils/src/__tests__/__snapshots__/enum.test.ts.snap
index cae975aac..a3bd95392 100644
--- a/utils/utils/src/__tests__/__snapshots__/enum.test.ts.snap
+++ b/utils/utils/src/__tests__/__snapshots__/enum.test.ts.snap
@@ -324,11 +324,11 @@ exports[`statusToDisplayMapping status=PROOF_APPROVED type=EMAIL routing=false l
 
 exports[`statusToDisplayMapping status=PROOF_APPROVED type=EMAIL routing=true letterVersion=undefined 1`] = `"Proof approved"`;
 
-exports[`statusToDisplayMapping status=PROOF_APPROVED type=LETTER routing=false letterVersion=AUTHORING 1`] = `"Proof approved"`;
+exports[`statusToDisplayMapping status=PROOF_APPROVED type=LETTER routing=false letterVersion=AUTHORING 1`] = `"Approved"`;
 
 exports[`statusToDisplayMapping status=PROOF_APPROVED type=LETTER routing=false letterVersion=PDF 1`] = `"Proof approved"`;
 
-exports[`statusToDisplayMapping status=PROOF_APPROVED type=LETTER routing=true letterVersion=AUTHORING 1`] = `"Proof approved"`;
+exports[`statusToDisplayMapping status=PROOF_APPROVED type=LETTER routing=true letterVersion=AUTHORING 1`] = `"Approved"`;
 
 exports[`statusToDisplayMapping status=PROOF_APPROVED type=LETTER routing=true letterVersion=PDF 1`] = `"Proof approved"`;
 
diff --git a/utils/utils/src/__tests__/enum.test.ts b/utils/utils/src/__tests__/enum.test.ts
index 7b733c01b..52606698d 100644
--- a/utils/utils/src/__tests__/enum.test.ts
+++ b/utils/utils/src/__tests__/enum.test.ts
@@ -42,6 +42,7 @@ import {
   isLanguage,
   getMessageOrderOptions,
   MESSAGE_ORDER_OPTIONS_LIST,
+  previewApprovedTemplatePages,
 } from '../enum';
 
 describe('templateTypeDisplayMappings', () => {
@@ -367,6 +368,14 @@ describe('previewSubmittedTemplatePages', () => {
   });
 });
 
+describe('previewApprovedTemplatePages', () => {
+  test('EMAIL', () => {
+    expect(previewApprovedTemplatePages('LETTER')).toEqual(
+      'preview-approved-letter-template'
+    );
+  });
+});
+
 describe('templateDisplayCopyAction', () => {
   test.each<[TemplateType, TemplateStatus, boolean]>([
     ['NHS_APP', 'SUBMITTED', true],
diff --git a/utils/utils/src/enum.ts b/utils/utils/src/enum.ts
index f5534cb2b..6c212efd2 100644
--- a/utils/utils/src/enum.ts
+++ b/utils/utils/src/enum.ts
@@ -167,7 +167,8 @@ export const statusToDisplayMapping = (
     VIRUS_SCAN_FAILED: 'Checks failed',
     WAITING_FOR_PROOF: 'Waiting for proof',
     PROOF_AVAILABLE: 'Proof available',
-    PROOF_APPROVED: 'Proof approved',
+    PROOF_APPROVED:
+      template.letterVersion === 'AUTHORING' ? 'Approved' : 'Proof approved',
   };
 
   return statusToDisplayMappings[template.templateStatus];
@@ -279,6 +280,8 @@ export const previewTemplatePages = (type: TemplateType) =>
   `preview-${legacyTemplateTypeToUrlTextMappings(type)}-template`;
 export const previewSubmittedTemplatePages = (type: TemplateType) =>
   `preview-submitted-${legacyTemplateTypeToUrlTextMappings(type)}-template`;
+export const previewApprovedTemplatePages = (type: TemplateType) =>
+  `preview-approved-${legacyTemplateTypeToUrlTextMappings(type)}-template`;
 
 export const messagePlanChooseTemplateUrl = (
   type: TemplateType,

From cfe54829451937b0453d5291f680ee4f374c2427 Mon Sep 17 00:00:00 2001
From: Chris Elliott <chris.elliott17@nhs.net>
Date: Thu, 19 Mar 2026 15:27:04 +0000
Subject: [PATCH 02/57] CCM-14758: Preview approved letter template

---
 .../letter-templates.accessibility.spec.ts                   | 2 +-
 ...plate-mgmt-preview-approved-letter-page.component.spec.ts | 5 -----
 tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts  | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/tests/test-team/template-mgmt-accessibility/letter-templates.accessibility.spec.ts b/tests/test-team/template-mgmt-accessibility/letter-templates.accessibility.spec.ts
index 2eb67c035..1b262e96b 100644
--- a/tests/test-team/template-mgmt-accessibility/letter-templates.accessibility.spec.ts
+++ b/tests/test-team/template-mgmt-accessibility/letter-templates.accessibility.spec.ts
@@ -172,7 +172,7 @@ test.describe('Letter templates', () => {
       )
     ));
 
-  test('Preview submitted letter template', async ({ page, analyze }) =>
+  test('Preview approved letter template', async ({ page, analyze }) =>
     analyze(
       new TemplateMgmtPreviewApprovedLetterPage(page).setPathParam(
         'templateId',
diff --git a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts
index d389bce41..17c2c992c 100644
--- a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts
@@ -7,7 +7,6 @@ import {
   assertSignOutLink,
   assertHeaderLogoLink,
   assertSkipToMainContent,
-  assertBackLinkBottom,
   assertAndClickBackLinkTop,
 } from '../../helpers/template-mgmt-common.steps';
 import {
@@ -94,10 +93,6 @@ test.describe('Preview submitted Letter message template Page', () => {
       await assertHeaderLogoLink(props);
       await assertSignOutLink(props);
       await assertFooterLinks(props);
-      await assertBackLinkBottom({
-        ...props,
-        expectedUrl: `templates/message-templates`,
-      });
       await assertAndClickBackLinkTop({
         ...props,
         expectedUrl: `templates/message-templates`,
diff --git a/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts b/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts
index 27e0080f4..34ecff5e5 100644
--- a/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts
+++ b/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts
@@ -432,7 +432,7 @@ test.describe('Routing', () => {
         {
           template: templates.LARGE_PRINT_LETTER,
           // this was removed before going to production
-          expectedStatus: 'Proof approved',
+          expectedStatus: 'Approved',
         },
       ]);
     });

From cc3f13830874f7ab53f8fa3813c62ef919cc9156 Mon Sep 17 00:00:00 2001
From: Chris Elliott <chris.elliott17@nhs.net>
Date: Thu, 19 Mar 2026 16:27:19 +0000
Subject: [PATCH 03/57] CCM-14758: Increase routing e2e test timeout

---
 frontend/jest.config.ts                                     | 2 --
 tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/jest.config.ts b/frontend/jest.config.ts
index 98a996722..1f5be258f 100644
--- a/frontend/jest.config.ts
+++ b/frontend/jest.config.ts
@@ -38,8 +38,6 @@ const config: Config = {
   },
 
   setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
-
-  maxWorkers: 3,
 };
 
 // createJestConfig is exported this way to ensure that next/jest can load the Next.js config which is async
diff --git a/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts b/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts
index 34ecff5e5..87e1f518e 100644
--- a/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts
+++ b/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts
@@ -164,6 +164,8 @@ test.describe('Routing', () => {
   test('templates are added to the routing config, and the routing config is completed', async ({
     page,
   }) => {
+    test.setTimeout(90_000);
+
     const rcName = 'E2E TEST RC';
 
     const messageTemplatesPage = new TemplateMgmtMessageTemplatesPage(page);

From f8ea07112e7d6848b6610686e8fde77fea098884 Mon Sep 17 00:00:00 2001
From: Chris Elliott <chris.elliott17@nhs.net>
Date: Mon, 23 Mar 2026 10:14:13 +0000
Subject: [PATCH 04/57] CCM-14758: Review comments

---
 frontend/jest.config.ts                       |  2 ++
 .../__snapshots__/page.test.tsx.snap          | 10 ++++---
 .../page.test.tsx                             | 16 ++++++++++++
 .../__snapshots__/page.test.tsx.snap          | 12 ++++-----
 .../app/preview-letter-template/page.test.tsx |  7 ++---
 .../molecules/MessageTemplates.test.tsx       | 14 ++++++++++
 frontend/src/__tests__/helpers/helpers.ts     |  1 +
 .../[templateId]/page.tsx                     | 26 +++----------------
 .../edit-template-name/[templateId]/page.tsx  | 26 +++----------------
 .../[templateId]/page.tsx                     | 11 +++++++-
 .../LetterRender/LetterRenderDetails.tsx      |  2 --
 .../MessageTemplates/MessageTemplates.tsx     | 24 ++---------------
 .../letter-templates.accessibility.spec.ts    |  1 -
 ...t-edit-template-campaign.component.spec.ts |  2 +-
 ...iew-approved-letter-page.component.spec.ts |  4 +--
 utils/utils/src/__tests__/enum.test.ts        |  2 +-
 utils/utils/src/enum.ts                       | 16 ++++++++++++
 17 files changed, 89 insertions(+), 87 deletions(-)

diff --git a/frontend/jest.config.ts b/frontend/jest.config.ts
index 1f5be258f..98a996722 100644
--- a/frontend/jest.config.ts
+++ b/frontend/jest.config.ts
@@ -38,6 +38,8 @@ const config: Config = {
   },
 
   setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
+
+  maxWorkers: 3,
 };
 
 // createJestConfig is exported this way to ensure that next/jest can load the Next.js config which is async
diff --git a/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap
index 3a2fc8e43..c081344e9 100644
--- a/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap
@@ -87,7 +87,7 @@ exports[`valid authoring letter template matches snapshot 1`] = `
                   />
                 </div>
                 <div
-                  class="nhsuk-summary-list__row missing-value"
+                  class="nhsuk-summary-list__row"
                   id="campaign-id"
                 >
                   <dt
@@ -97,7 +97,9 @@ exports[`valid authoring letter template matches snapshot 1`] = `
                   </dt>
                   <dd
                     class="nhsuk-summary-list__value"
-                  />
+                  >
+                    campaign-id
+                  </dd>
                   <dd
                     aria-hidden="true"
                     class="nhsuk-summary-list__actions"
@@ -305,7 +307,7 @@ exports[`valid authoring letter template matches snapshot 1`] = `
               >
                 <iframe
                   aria-label="PDF preview of letter template with short example personalisation data"
-                  src="/templates/files/undefined/renders/authoring-letter-template-id/render.pdf"
+                  src="/templates/files/client-id/renders/authoring-letter-template-id/short-render.pdf"
                   title="Letter preview - short examples"
                 />
               </div>
@@ -342,7 +344,7 @@ exports[`valid authoring letter template matches snapshot 1`] = `
               >
                 <iframe
                   aria-label="PDF preview of letter template with long example personalisation data"
-                  src="/templates/files/undefined/renders/authoring-letter-template-id/render.pdf"
+                  src="/templates/files/client-id/renders/authoring-letter-template-id/long-render.pdf"
                   title="Letter preview - long examples"
                 />
               </div>
diff --git a/frontend/src/__tests__/app/preview-approved-letter-template/page.test.tsx b/frontend/src/__tests__/app/preview-approved-letter-template/page.test.tsx
index 82cb1830c..afd45f8c6 100644
--- a/frontend/src/__tests__/app/preview-approved-letter-template/page.test.tsx
+++ b/frontend/src/__tests__/app/preview-approved-letter-template/page.test.tsx
@@ -17,6 +17,22 @@ import { AuthoringLetterTemplate } from 'nhs-notify-web-template-management-util
 const mockTemplate: AuthoringLetterTemplate = {
   ...AUTHORING_LETTER_TEMPLATE,
   templateStatus: 'PROOF_APPROVED',
+  files: {
+    ...AUTHORING_LETTER_TEMPLATE.files,
+    shortFormRender: {
+      currentVersion: 'version-id',
+      fileName: 'short-render.pdf',
+      status: 'RENDERED',
+      pageCount: 2,
+    },
+    longFormRender: {
+      currentVersion: 'version-id',
+      fileName: 'long-render.pdf',
+      status: 'RENDERED',
+      pageCount: 2,
+    },
+  },
+  campaignId: 'campaign-id',
 };
 
 jest.mock('@utils/form-actions');
diff --git a/frontend/src/__tests__/app/preview-letter-template/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/preview-letter-template/__snapshots__/page.test.tsx.snap
index 48f920466..ca7fffb14 100644
--- a/frontend/src/__tests__/app/preview-letter-template/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/preview-letter-template/__snapshots__/page.test.tsx.snap
@@ -414,7 +414,7 @@ exports[`authoring letter template with VALIDATION_FAILED status matches snapsho
               >
                 <iframe
                   aria-label="PDF preview of letter template with short example personalisation data"
-                  src="/templates/files/undefined/renders/authoring-letter-template-id/render.pdf"
+                  src="/templates/files/client-id/renders/authoring-letter-template-id/render.pdf"
                   title="Letter preview - short examples"
                 />
               </div>
@@ -563,7 +563,7 @@ exports[`authoring letter template with VALIDATION_FAILED status matches snapsho
               >
                 <iframe
                   aria-label="PDF preview of letter template with long example personalisation data"
-                  src="/templates/files/undefined/renders/authoring-letter-template-id/render.pdf"
+                  src="/templates/files/client-id/renders/authoring-letter-template-id/render.pdf"
                   title="Letter preview - long examples"
                 />
               </div>
@@ -970,7 +970,7 @@ exports[`authoring letter template with VALIDATION_FAILED status matches snapsho
               >
                 <iframe
                   aria-label="PDF preview of letter template with short example personalisation data"
-                  src="/templates/files/undefined/renders/authoring-letter-template-id/render.pdf"
+                  src="/templates/files/client-id/renders/authoring-letter-template-id/render.pdf"
                   title="Letter preview - short examples"
                 />
               </div>
@@ -1119,7 +1119,7 @@ exports[`authoring letter template with VALIDATION_FAILED status matches snapsho
               >
                 <iframe
                   aria-label="PDF preview of letter template with long example personalisation data"
-                  src="/templates/files/undefined/renders/authoring-letter-template-id/render.pdf"
+                  src="/templates/files/client-id/renders/authoring-letter-template-id/render.pdf"
                   title="Letter preview - long examples"
                 />
               </div>
@@ -1754,7 +1754,7 @@ exports[`valid authoring letter template matches snapshot 1`] = `
               >
                 <iframe
                   aria-label="PDF preview of letter template with short example personalisation data"
-                  src="/templates/files/undefined/renders/authoring-letter-template-id/render.pdf"
+                  src="/templates/files/client-id/renders/authoring-letter-template-id/render.pdf"
                   title="Letter preview - short examples"
                 />
               </div>
@@ -1903,7 +1903,7 @@ exports[`valid authoring letter template matches snapshot 1`] = `
               >
                 <iframe
                   aria-label="PDF preview of letter template with long example personalisation data"
-                  src="/templates/files/undefined/renders/authoring-letter-template-id/render.pdf"
+                  src="/templates/files/client-id/renders/authoring-letter-template-id/render.pdf"
                   title="Letter preview - long examples"
                 />
               </div>
diff --git a/frontend/src/__tests__/app/preview-letter-template/page.test.tsx b/frontend/src/__tests__/app/preview-letter-template/page.test.tsx
index 7d7dd9ec0..af48b4ecf 100644
--- a/frontend/src/__tests__/app/preview-letter-template/page.test.tsx
+++ b/frontend/src/__tests__/app/preview-letter-template/page.test.tsx
@@ -445,9 +445,10 @@ describe('authoring letter template does not show submit form when already submi
       })
     );
 
-    expect(
-      screen.queryByRole('button', { name: 'Approve template' })
-    ).not.toBeInTheDocument();
+    expect(redirect).toHaveBeenCalledWith(
+      `/preview-approved-letter-template/${AUTHORING_LETTER_TEMPLATE.id}`,
+      RedirectType.replace
+    );
   });
 });
 
diff --git a/frontend/src/__tests__/components/molecules/MessageTemplates.test.tsx b/frontend/src/__tests__/components/molecules/MessageTemplates.test.tsx
index 529078d7d..c32cf923a 100644
--- a/frontend/src/__tests__/components/molecules/MessageTemplates.test.tsx
+++ b/frontend/src/__tests__/components/molecules/MessageTemplates.test.tsx
@@ -162,7 +162,21 @@ describe('MessageTemplates component', () => {
                   status: 'RENDERED',
                   pageCount: 2,
                 },
+                shortFormRender: {
+                  fileName: 'short-render.pdf',
+                  currentVersion: 'v1',
+                  status: 'RENDERED',
+                  pageCount: 2,
+                },
+                longFormRender: {
+                  fileName: 'long-render.pdf',
+                  currentVersion: 'v1',
+                  status: 'RENDERED',
+                  pageCount: 2,
+                },
               },
+              letterVariantId: '2',
+              campaignId: 'campaign-id',
             },
           ],
         }}
diff --git a/frontend/src/__tests__/helpers/helpers.ts b/frontend/src/__tests__/helpers/helpers.ts
index c878bd8b7..6026e3219 100644
--- a/frontend/src/__tests__/helpers/helpers.ts
+++ b/frontend/src/__tests__/helpers/helpers.ts
@@ -100,6 +100,7 @@ export const LARGE_PRINT_LETTER_TEMPLATE: PdfLetterTemplate = {
 
 export const AUTHORING_LETTER_TEMPLATE: AuthoringLetterTemplate = {
   id: 'authoring-letter-template-id',
+  clientId: 'client-id',
   templateType: 'LETTER',
   templateStatus: 'NOT_YET_SUBMITTED',
   letterType: 'x0',
diff --git a/frontend/src/app/edit-template-campaign/[templateId]/page.tsx b/frontend/src/app/edit-template-campaign/[templateId]/page.tsx
index 934584486..bf74951b2 100644
--- a/frontend/src/app/edit-template-campaign/[templateId]/page.tsx
+++ b/frontend/src/app/edit-template-campaign/[templateId]/page.tsx
@@ -1,8 +1,10 @@
 import type { Metadata } from 'next';
 import Link from 'next/link';
 import { redirect, RedirectType } from 'next/navigation';
-import type { TemplateDto } from 'nhs-notify-web-template-management-types';
-import type { TemplatePageProps } from 'nhs-notify-web-template-management-utils';
+import {
+  type TemplatePageProps,
+  getPreviewURL,
+} from 'nhs-notify-web-template-management-utils';
 import { HintText, Label } from '@atoms/nhsuk-components';
 import * as NHSNotifyForm from '@atoms/NHSNotifyForm';
 import { NHSNotifyButton } from '@atoms/NHSNotifyButton/NHSNotifyButton';
@@ -21,26 +23,6 @@ export const metadata: Metadata = {
   title: content.pageTitle,
 };
 
-const getPreviewURL = (template: TemplateDto) => {
-  if (
-    template.templateType === 'LETTER' &&
-    template.letterVersion === 'AUTHORING' &&
-    ['PROOF_APPROVED', 'SUBMITTED'].includes(template.templateStatus)
-  ) {
-    return `/preview-approved-letter-template/${template.id}`;
-  }
-
-  if (
-    template.templateType === 'LETTER' &&
-    template.letterVersion === 'PDF' &&
-    template.templateStatus === 'SUBMITTED'
-  ) {
-    return `/preview-submitted-letter-template/${template.id}`;
-  }
-
-  return `/preview-letter-template/${template.id}`;
-};
-
 export default async function EditTemplateCampaignPage({
   params,
 }: TemplatePageProps) {
diff --git a/frontend/src/app/edit-template-name/[templateId]/page.tsx b/frontend/src/app/edit-template-name/[templateId]/page.tsx
index 43d97c825..29b29227b 100644
--- a/frontend/src/app/edit-template-name/[templateId]/page.tsx
+++ b/frontend/src/app/edit-template-name/[templateId]/page.tsx
@@ -1,8 +1,10 @@
 import type { Metadata } from 'next';
 import Link from 'next/link';
 import { redirect, RedirectType } from 'next/navigation';
-import type { TemplateDto } from 'nhs-notify-web-template-management-types';
-import type { TemplatePageProps } from 'nhs-notify-web-template-management-utils';
+import {
+  type TemplatePageProps,
+  getPreviewURL,
+} from 'nhs-notify-web-template-management-utils';
 import { NHSNotifyContainer } from '@layouts/container/container';
 import { HintText, Label } from '@atoms/nhsuk-components';
 import { NHSNotifyButton } from '@atoms/NHSNotifyButton/NHSNotifyButton';
@@ -21,26 +23,6 @@ export const metadata: Metadata = {
   title: content.pageTitle,
 };
 
-const getPreviewURL = (template: TemplateDto) => {
-  if (
-    template.templateType === 'LETTER' &&
-    template.letterVersion === 'AUTHORING' &&
-    ['PROOF_APPROVED', 'SUBMITTED'].includes(template.templateStatus)
-  ) {
-    return `/preview-approved-letter-template/${template.id}`;
-  }
-
-  if (
-    template.templateType === 'LETTER' &&
-    template.letterVersion === 'PDF' &&
-    template.templateStatus === 'SUBMITTED'
-  ) {
-    return `/preview-submitted-letter-template/${template.id}`;
-  }
-
-  return `/preview-letter-template/${template.id}`;
-};
-
 export default async function EditTemplateNamePage({
   params,
 }: TemplatePageProps) {
diff --git a/frontend/src/app/preview-letter-template/[templateId]/page.tsx b/frontend/src/app/preview-letter-template/[templateId]/page.tsx
index b373377fd..f7fb2a56a 100644
--- a/frontend/src/app/preview-letter-template/[templateId]/page.tsx
+++ b/frontend/src/app/preview-letter-template/[templateId]/page.tsx
@@ -5,7 +5,10 @@ import type {
   AuthoringLetterTemplate,
   TemplatePageProps,
 } from 'nhs-notify-web-template-management-utils';
-import { validateLetterTemplate } from 'nhs-notify-web-template-management-utils';
+import {
+  getPreviewURL,
+  validateLetterTemplate,
+} from 'nhs-notify-web-template-management-utils';
 import { NHSNotifyMain } from '@atoms/NHSNotifyMain/NHSNotifyMain';
 import { NHSNotifyBackLink } from '@atoms/NHSNotifyBackLink/NHSNotifyBackLink';
 import * as NHSNotifyForm from '@atoms/NHSNotifyForm';
@@ -68,6 +71,12 @@ export default async function PreviewLetterTemplatePage({
   }
 
   // AUTHORING letter
+  if (
+    ['SUBMITTED', 'PROOF_APPROVED'].includes(validatedTemplate.templateStatus)
+  ) {
+    return redirect(getPreviewURL(validatedTemplate), RedirectType.replace);
+  }
+
   const showRenderer =
     validatedTemplate.files.initialRender.status === 'RENDERED';
 
diff --git a/frontend/src/components/molecules/LetterRender/LetterRenderDetails.tsx b/frontend/src/components/molecules/LetterRender/LetterRenderDetails.tsx
index 73e3d5cf8..5e576135f 100644
--- a/frontend/src/components/molecules/LetterRender/LetterRenderDetails.tsx
+++ b/frontend/src/components/molecules/LetterRender/LetterRenderDetails.tsx
@@ -1,5 +1,3 @@
-'use client';
-
 import { Label } from 'nhsuk-react-components';
 import type { AuthoringLetterTemplate } from 'nhs-notify-web-template-management-utils';
 import content from '@content/content';
diff --git a/frontend/src/components/molecules/MessageTemplates/MessageTemplates.tsx b/frontend/src/components/molecules/MessageTemplates/MessageTemplates.tsx
index c420bdf9e..57e1f2044 100644
--- a/frontend/src/components/molecules/MessageTemplates/MessageTemplates.tsx
+++ b/frontend/src/components/molecules/MessageTemplates/MessageTemplates.tsx
@@ -8,14 +8,12 @@ import { format } from 'date-fns';
 import Link from 'next/link';
 import {
   letterTypeDisplayMappings,
-  previewTemplatePages,
   templateTypeDisplayMappings,
-  previewSubmittedTemplatePages,
-  previewApprovedTemplatePages,
   templateDisplayCopyAction,
   templateDisplayDeleteAction,
   statusToDisplayMapping,
   statusToColourMapping,
+  getPreviewURL,
 } from 'nhs-notify-web-template-management-utils';
 import type { TemplateDto } from 'nhs-notify-web-template-management-types';
 import style from './MessageTemplates.module.scss';
@@ -23,22 +21,6 @@ import { useFeatureFlags } from '@providers/client-config-provider';
 
 const messageTemplatesContent = content.pages.messageTemplates;
 
-const generateViewTemplateLink = (template: TemplateDto): string => {
-  if (
-    template.templateStatus === 'PROOF_APPROVED' &&
-    template.templateType === 'LETTER' &&
-    template.letterVersion === 'AUTHORING'
-  ) {
-    return `/${previewApprovedTemplatePages(template.templateType)}/${template.id}`;
-  }
-
-  if (template.templateStatus === 'SUBMITTED') {
-    return `/${previewSubmittedTemplatePages(template.templateType)}/${template.id}`;
-  }
-
-  return `/${previewTemplatePages(template.templateType)}/${template.id}`;
-};
-
 const typeDisplayMappings = (template: TemplateDto): string =>
   template.templateType === 'LETTER' &&
   'letterType' in template &&
@@ -89,9 +71,7 @@ export function MessageTemplates({
             {templateList.map((template, index) => (
               <Table.Row key={template.id}>
                 <Table.Cell>
-                  <Link href={generateViewTemplateLink(template)}>
-                    {template.name}
-                  </Link>
+                  <Link href={getPreviewURL(template)}>{template.name}</Link>
                 </Table.Cell>
                 <Table.Cell>{template.id}</Table.Cell>
                 <Table.Cell>{typeDisplayMappings(template)}</Table.Cell>
diff --git a/tests/test-team/template-mgmt-accessibility/letter-templates.accessibility.spec.ts b/tests/test-team/template-mgmt-accessibility/letter-templates.accessibility.spec.ts
index 1b262e96b..e1aeb65b1 100644
--- a/tests/test-team/template-mgmt-accessibility/letter-templates.accessibility.spec.ts
+++ b/tests/test-team/template-mgmt-accessibility/letter-templates.accessibility.spec.ts
@@ -123,7 +123,6 @@ test.beforeAll(async () => {
     letterProof,
     letterProofDisabled,
     letterApproved,
-    letterProofApproved,
   ]);
 });
 
diff --git a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-edit-template-campaign.component.spec.ts b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-edit-template-campaign.component.spec.ts
index 3f36c88b3..056edd4a1 100644
--- a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-edit-template-campaign.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-edit-template-campaign.component.spec.ts
@@ -251,7 +251,7 @@ test.describe('Edit Template Campaign page', () => {
       );
     });
 
-    test('redirects to preview submitted template page if template is submitted', async ({
+    test('redirects to preview approved template page if template is submitted', async ({
       page,
     }) => {
       const template = TemplateFactory.createAuthoringLetterTemplate(
diff --git a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts
index 17c2c992c..d1764ab21 100644
--- a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts
@@ -116,14 +116,14 @@ test.describe('Preview submitted Letter message template Page', () => {
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
 
-    test('when user visits page with a fake template, then an invalid template error is displayed', async ({
+    test('when user visits page with a nonexistent template ID, then an invalid template error is displayed', async ({
       baseURL,
       page,
     }) => {
       const previewSubmittedLetterTemplatePage =
         new TemplateMgmtPreviewApprovedLetterPage(page).setPathParam(
           'templateId',
-          'fake-template-id'
+          'nonexistent-template-id'
         );
 
       await previewSubmittedLetterTemplatePage.loadPage();
diff --git a/utils/utils/src/__tests__/enum.test.ts b/utils/utils/src/__tests__/enum.test.ts
index 52606698d..c8153e112 100644
--- a/utils/utils/src/__tests__/enum.test.ts
+++ b/utils/utils/src/__tests__/enum.test.ts
@@ -369,7 +369,7 @@ describe('previewSubmittedTemplatePages', () => {
 });
 
 describe('previewApprovedTemplatePages', () => {
-  test('EMAIL', () => {
+  test('LETTER', () => {
     expect(previewApprovedTemplatePages('LETTER')).toEqual(
       'preview-approved-letter-template'
     );
diff --git a/utils/utils/src/enum.ts b/utils/utils/src/enum.ts
index 6c212efd2..dac7aeb8d 100644
--- a/utils/utils/src/enum.ts
+++ b/utils/utils/src/enum.ts
@@ -283,6 +283,22 @@ export const previewSubmittedTemplatePages = (type: TemplateType) =>
 export const previewApprovedTemplatePages = (type: TemplateType) =>
   `preview-approved-${legacyTemplateTypeToUrlTextMappings(type)}-template`;
 
+export const getPreviewURL = (template: TemplateDto) => {
+  if (
+    template.templateType === 'LETTER' &&
+    template.letterVersion === 'AUTHORING' &&
+    ['PROOF_APPROVED', 'SUBMITTED'].includes(template.templateStatus)
+  ) {
+    return `/preview-approved-${legacyTemplateTypeToUrlTextMappings(template.templateType)}-template/${template.id}`;
+  }
+
+  if (template.templateStatus === 'SUBMITTED') {
+    return `/preview-submitted-${legacyTemplateTypeToUrlTextMappings(template.templateType)}-template/${template.id}`;
+  }
+
+  return `/preview-${legacyTemplateTypeToUrlTextMappings(template.templateType)}-template/${template.id}`;
+};
+
 export const messagePlanChooseTemplateUrl = (
   type: TemplateType,
   letterType?: RoutingSupportedLetterType

From 7acb7fe46c75bdac96343a76cfc241a039d60107 Mon Sep 17 00:00:00 2001
From: Chris Elliott <chris.elliott17@nhs.net>
Date: Mon, 23 Mar 2026 10:23:33 +0000
Subject: [PATCH 05/57] CCM-14758: Review comments

---
 ...-mgmt-edit-template-name.component.spec.ts |  2 +-
 utils/utils/src/__tests__/enum.test.ts        | 42 ++++++++++++++++---
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-edit-template-name.component.spec.ts b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-edit-template-name.component.spec.ts
index d75ef1abd..c689d20b6 100644
--- a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-edit-template-name.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-edit-template-name.component.spec.ts
@@ -223,7 +223,7 @@ test.describe('Edit Template Name page', () => {
       );
     });
 
-    test('redirects to preview submitted template page if template is submitted', async ({
+    test('redirects to preview approved template page if template is submitted', async ({
       page,
     }) => {
       const template = TemplateFactory.createAuthoringLetterTemplate(
diff --git a/utils/utils/src/__tests__/enum.test.ts b/utils/utils/src/__tests__/enum.test.ts
index c8153e112..65416c853 100644
--- a/utils/utils/src/__tests__/enum.test.ts
+++ b/utils/utils/src/__tests__/enum.test.ts
@@ -4,12 +4,13 @@ import {
   LANGUAGE_LIST,
   TEMPLATE_TYPE_LIST,
 } from 'nhs-notify-backend-client';
-import type {
-  Language,
-  LetterType,
-  TemplateStatus,
-  TemplateType,
-  LetterVersion,
+import {
+  type Language,
+  type LetterType,
+  type TemplateStatus,
+  type TemplateType,
+  type LetterVersion,
+  TemplateDto,
 } from 'nhs-notify-web-template-management-types';
 import {
   alphabeticalLanguageList,
@@ -43,7 +44,9 @@ import {
   getMessageOrderOptions,
   MESSAGE_ORDER_OPTIONS_LIST,
   previewApprovedTemplatePages,
+  getPreviewURL,
 } from '../enum';
+import { mockDeep } from 'jest-mock-extended';
 
 describe('templateTypeDisplayMappings', () => {
   test('NHS_APP', () => {
@@ -376,6 +379,33 @@ describe('previewApprovedTemplatePages', () => {
   });
 });
 
+describe('getPreviewUrl', () => {
+  test('for a draft template', () => {
+    expect(getPreviewURL(mockDeep<TemplateDto>({
+      templateType: 'EMAIL',
+      templateStatus: 'NOT_YET_SUBMITTED',
+      id: 'template-id',
+    }))).toEqual('/preview-email-template/template-id');
+  });
+
+  test('for an approved template', () => {
+    expect(getPreviewURL(mockDeep<TemplateDto>({
+      templateType: 'LETTER',
+      letterVersion: 'AUTHORING',
+      templateStatus: 'PROOF_APPROVED',
+      id: 'template-id',
+    }))).toEqual('/preview-approved-letter-template/template-id');
+  });
+
+  test('for a submitted template', () => {
+    expect(getPreviewURL(mockDeep<TemplateDto>({
+      templateType: 'NHS_APP',
+      templateStatus: 'SUBMITTED',
+      id: 'template-id',
+    }))).toEqual('/preview-submitted-nhs-app-template/template-id');
+  });
+});
+
 describe('templateDisplayCopyAction', () => {
   test.each<[TemplateType, TemplateStatus, boolean]>([
     ['NHS_APP', 'SUBMITTED', true],

From e577743d20249b3c2da559466b07a6f7f9664b5b Mon Sep 17 00:00:00 2001
From: Chris Elliott <chris.elliott17@nhs.net>
Date: Mon, 23 Mar 2026 10:28:55 +0000
Subject: [PATCH 06/57] CCM-14758: Fix CI

---
 utils/utils/src/__tests__/enum.test.ts | 44 ++++++++++++++++----------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/utils/utils/src/__tests__/enum.test.ts b/utils/utils/src/__tests__/enum.test.ts
index 65416c853..9eaab924d 100644
--- a/utils/utils/src/__tests__/enum.test.ts
+++ b/utils/utils/src/__tests__/enum.test.ts
@@ -381,28 +381,40 @@ describe('previewApprovedTemplatePages', () => {
 
 describe('getPreviewUrl', () => {
   test('for a draft template', () => {
-    expect(getPreviewURL(mockDeep<TemplateDto>({
-      templateType: 'EMAIL',
-      templateStatus: 'NOT_YET_SUBMITTED',
-      id: 'template-id',
-    }))).toEqual('/preview-email-template/template-id');
+    expect(
+      getPreviewURL(
+        mockDeep<TemplateDto>({
+          templateType: 'EMAIL',
+          templateStatus: 'NOT_YET_SUBMITTED',
+          id: 'template-id',
+        })
+      )
+    ).toEqual('/preview-email-template/template-id');
   });
 
   test('for an approved template', () => {
-    expect(getPreviewURL(mockDeep<TemplateDto>({
-      templateType: 'LETTER',
-      letterVersion: 'AUTHORING',
-      templateStatus: 'PROOF_APPROVED',
-      id: 'template-id',
-    }))).toEqual('/preview-approved-letter-template/template-id');
+    expect(
+      getPreviewURL(
+        mockDeep<TemplateDto>({
+          templateType: 'LETTER',
+          letterVersion: 'AUTHORING',
+          templateStatus: 'PROOF_APPROVED',
+          id: 'template-id',
+        })
+      )
+    ).toEqual('/preview-approved-letter-template/template-id');
   });
 
   test('for a submitted template', () => {
-    expect(getPreviewURL(mockDeep<TemplateDto>({
-      templateType: 'NHS_APP',
-      templateStatus: 'SUBMITTED',
-      id: 'template-id',
-    }))).toEqual('/preview-submitted-nhs-app-template/template-id');
+    expect(
+      getPreviewURL(
+        mockDeep<TemplateDto>({
+          templateType: 'NHS_APP',
+          templateStatus: 'SUBMITTED',
+          id: 'template-id',
+        })
+      )
+    ).toEqual('/preview-submitted-nhs-app-template/template-id');
   });
 });
 

From 474e2e12fc0b61ec309656104ed0e758056d1735 Mon Sep 17 00:00:00 2001
From: Chris Elliott <chris.elliott17@nhs.net>
Date: Tue, 24 Mar 2026 08:25:23 +0000
Subject: [PATCH 07/57] CCM-14758: Review comments

---
 .../PreviewSubmittedTemplate.test.tsx         |  55 ---
 .../PreviewSubmittedTemplate.test.tsx.snap    | 439 ------------------
 utils/utils/src/__tests__/enum.test.ts        | 136 ++++--
 utils/utils/src/enum.ts                       |   9 +-
 4 files changed, 91 insertions(+), 548 deletions(-)

diff --git a/frontend/src/__tests__/components/molecules/PreviewSubmittedTemplate.test.tsx b/frontend/src/__tests__/components/molecules/PreviewSubmittedTemplate.test.tsx
index b11cbe58e..2f9e9c29a 100644
--- a/frontend/src/__tests__/components/molecules/PreviewSubmittedTemplate.test.tsx
+++ b/frontend/src/__tests__/components/molecules/PreviewSubmittedTemplate.test.tsx
@@ -1,5 +1,4 @@
 import { PreviewSubmittedTemplate } from '@molecules/PreviewSubmittedTemplate/PreviewSubmittedTemplate';
-import PreviewTemplateDetailsAuthoringLetter from '@molecules/PreviewTemplateDetails/PreviewTemplateDetailsAuthoringLetter';
 import PreviewTemplateDetailsEmail from '@molecules/PreviewTemplateDetails/PreviewTemplateDetailsEmail';
 import PreviewTemplateDetailsPdfLetter from '@molecules/PreviewTemplateDetails/PreviewTemplateDetailsPdfLetter';
 import PreviewTemplateDetailsNhsApp from '@molecules/PreviewTemplateDetails/PreviewTemplateDetailsNhsApp';
@@ -132,59 +131,5 @@ describe('PreviewSubmittedTemplate component', () => {
 
       expect(container.asFragment()).toMatchSnapshot();
     });
-
-    it('should render authoring letter', () => {
-      const container = render(
-        <PreviewSubmittedTemplate
-          initialState={{
-            id: 'template-id',
-            clientId: 'client-id',
-            name: 'Example authoring letter',
-            templateStatus: 'SUBMITTED',
-            templateType: 'LETTER',
-            letterType: 'x0',
-            letterVersion: 'AUTHORING',
-            language: 'en',
-            letterVariantId: 'first-class',
-            files: {
-              docxTemplate: {
-                currentVersion: 'version-id',
-                fileName: 'template.docx',
-                virusScanStatus: 'PASSED',
-              },
-              initialRender: {
-                fileName: 'render.pdf',
-                currentVersion: 'v1',
-                status: 'RENDERED',
-                pageCount: 4,
-              },
-              shortFormRender: {
-                fileName: 'short-render.pdf',
-                currentVersion: 'v2',
-                status: 'RENDERED',
-                systemPersonalisationPackId: 'short-1',
-                personalisationParameters: {},
-                pageCount: 4,
-              },
-              longFormRender: {
-                fileName: 'long-render.pdf',
-                currentVersion: 'v3',
-                status: 'RENDERED',
-                systemPersonalisationPackId: 'long-1',
-                personalisationParameters: {},
-                pageCount: 4,
-              },
-            },
-            systemPersonalisation: [],
-            createdAt: '2025-01-13T10:19:25.579Z',
-            updatedAt: '2025-01-13T10:19:25.579Z',
-            lockNumber: 1,
-          }}
-          previewComponent={PreviewTemplateDetailsAuthoringLetter}
-        />
-      );
-
-      expect(container.asFragment()).toMatchSnapshot();
-    });
   });
 });
diff --git a/frontend/src/__tests__/components/molecules/__snapshots__/PreviewSubmittedTemplate.test.tsx.snap b/frontend/src/__tests__/components/molecules/__snapshots__/PreviewSubmittedTemplate.test.tsx.snap
index 93769d4c0..b3fb221d4 100644
--- a/frontend/src/__tests__/components/molecules/__snapshots__/PreviewSubmittedTemplate.test.tsx.snap
+++ b/frontend/src/__tests__/components/molecules/__snapshots__/PreviewSubmittedTemplate.test.tsx.snap
@@ -411,221 +411,6 @@ exports[`PreviewSubmittedTemplate component routing = false should render app me
 </DocumentFragment>
 `;
 
-exports[`PreviewSubmittedTemplate component routing = false should render authoring letter 1`] = `
-<DocumentFragment>
-  <a
-    class="nhsuk-back-link"
-    data-testid="back-link-top"
-    href="/message-templates"
-  >
-    Back to all templates
-  </a>
-  <main
-    class="nhsuk-main-wrapper"
-    id="maincontent"
-    role="main"
-  >
-    <div
-      class="nhsuk-grid-row"
-    >
-      <div
-        class="nhsuk-grid-column-full"
-      >
-        <div
-          class="nhsuk-u-reading-width"
-        >
-          <span
-            class="nhsuk-caption-l"
-          >
-            Template
-          </span>
-          <h1
-            class="preview__heading"
-            data-testid="preview-message__heading"
-          >
-            Example authoring letter
-          </h1>
-        </div>
-        <div
-          class="nhsuk-width-container nhsuk-u-margin-bottom-6 nhsuk-body-m"
-        >
-          <dl
-            class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview authoringLetterDetails"
-          >
-            <div
-              class="nhsuk-summary-list__row"
-            >
-              <dt
-                class="nhsuk-summary-list__key"
-              >
-                Template ID
-              </dt>
-              <dd
-                class="nhsuk-summary-list__value monospace-font"
-                data-testid="preview-template-id"
-              >
-                template-id
-              </dd>
-              <dd
-                class="nhsuk-summary-list__actions"
-              />
-            </div>
-            <div
-              class="nhsuk-summary-list__row"
-            >
-              <dt
-                class="nhsuk-summary-list__key"
-              >
-                Template type
-              </dt>
-              <dd
-                class="nhsuk-summary-list__value"
-              >
-                Standard letter
-              </dd>
-              <dd
-                class="nhsuk-summary-list__actions"
-              />
-            </div>
-            <div
-              class="nhsuk-summary-list__row missing-value"
-              id="campaign-id"
-            >
-              <dt
-                class="nhsuk-summary-list__key"
-              >
-                Campaign
-              </dt>
-              <dd
-                class="nhsuk-summary-list__value"
-              />
-              <dd
-                aria-hidden="true"
-                class="nhsuk-summary-list__actions"
-              />
-            </div>
-            <div
-              class="nhsuk-summary-list__row"
-            >
-              <dt
-                class="nhsuk-summary-list__key"
-              >
-                Total pages
-              </dt>
-              <dd
-                class="nhsuk-summary-list__value"
-              >
-                4
-              </dd>
-              <dd
-                class="nhsuk-summary-list__actions"
-              />
-            </div>
-            <div
-              class="nhsuk-summary-list__row"
-            >
-              <dt
-                class="nhsuk-summary-list__key"
-              >
-                Sheets
-              </dt>
-              <dd
-                class="nhsuk-summary-list__value"
-              >
-                2
-              </dd>
-              <dd
-                class="nhsuk-summary-list__actions nhsuk-u-padding-right-4"
-              >
-                <a
-                  data-testid="sheets-action"
-                  href="https://notify.nhs.uk/pricing-and-commercial/letters"
-                  rel="noopener noreferrer"
-                  target="_blank"
-                >
-                  Learn more
-                  <span
-                    class="nhsuk-u-visually-hidden"
-                  >
-                     about sheets
-                  </span>
-                </a>
-              </dd>
-            </div>
-            <div
-              class="nhsuk-summary-list__row"
-            >
-              <dt
-                class="nhsuk-summary-list__key"
-              >
-                Printing and postage
-              </dt>
-              <dd
-                class="nhsuk-summary-list__value"
-              >
-                first-class
-              </dd>
-              <dd
-                aria-hidden="true"
-                class="nhsuk-summary-list__actions"
-              />
-            </div>
-            <div
-              class="nhsuk-summary-list__row"
-            >
-              <dt
-                class="nhsuk-summary-list__key"
-              >
-                Status
-              </dt>
-              <dd
-                class="nhsuk-summary-list__value"
-              >
-                <strong
-                  class="nhsuk-tag nhsuk-tag--grey"
-                  data-status="submitted"
-                  data-testid="status-tag"
-                >
-                  Submitted
-                </strong>
-              </dd>
-              <dd
-                class="nhsuk-summary-list__actions nhsuk-u-padding-right-4"
-              >
-                <a
-                  data-testid="status-action"
-                  href="https://notify.nhs.uk/templates/what-template-statuses-mean"
-                  rel="noopener noreferrer"
-                  target="_blank"
-                >
-                  Learn more
-                  <span
-                    class="nhsuk-u-visually-hidden"
-                  >
-                     about status
-                  </span>
-                </a>
-              </dd>
-            </div>
-          </dl>
-        </div>
-        <p>
-          If you want to change a submitted or live template, you must create a new template to replace it.
-        </p>
-        <p>
-          <a
-            data-testid="back-link-bottom"
-            href="/message-templates"
-          >
-            Back to all templates
-          </a>
-        </p>
-      </div>
-    </div>
-  </main>
-</DocumentFragment>
-`;
-
 exports[`PreviewSubmittedTemplate component routing = false should render email 1`] = `
 <DocumentFragment>
   <a
@@ -1364,230 +1149,6 @@ exports[`PreviewSubmittedTemplate component routing = true should render app mes
 </DocumentFragment>
 `;
 
-exports[`PreviewSubmittedTemplate component routing = true should render authoring letter 1`] = `
-<DocumentFragment>
-  <a
-    class="nhsuk-back-link"
-    data-testid="back-link-top"
-    href="/message-templates"
-  >
-    Back to all templates
-  </a>
-  <main
-    class="nhsuk-main-wrapper"
-    id="maincontent"
-    role="main"
-  >
-    <div
-      class="nhsuk-grid-row"
-    >
-      <div
-        class="nhsuk-grid-column-full"
-      >
-        <div
-          class="nhsuk-u-reading-width"
-        >
-          <span
-            class="nhsuk-caption-l"
-          >
-            Template
-          </span>
-          <h1
-            class="preview__heading"
-            data-testid="preview-message__heading"
-          >
-            Example authoring letter
-          </h1>
-        </div>
-        <div
-          class="nhs_notify_warning_callout nhsuk-u-padding-4 nhsuk-u-margin-bottom-6 nhsuk-u-reading-width"
-        >
-          <strong
-            class="nhsuk-tag nhsuk-tag--pink nhsuk-u-margin-right-2 nhsuk-u-margin-bottom-3"
-          >
-            Locked
-          </strong>
-          <p>
-            You cannot delete this template because it's used in a message plan that's in production.
-          </p>
-        </div>
-        <div
-          class="nhsuk-width-container nhsuk-u-margin-bottom-6 nhsuk-body-m"
-        >
-          <dl
-            class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview authoringLetterDetails"
-          >
-            <div
-              class="nhsuk-summary-list__row"
-            >
-              <dt
-                class="nhsuk-summary-list__key"
-              >
-                Template ID
-              </dt>
-              <dd
-                class="nhsuk-summary-list__value monospace-font"
-                data-testid="preview-template-id"
-              >
-                template-id
-              </dd>
-              <dd
-                class="nhsuk-summary-list__actions"
-              />
-            </div>
-            <div
-              class="nhsuk-summary-list__row"
-            >
-              <dt
-                class="nhsuk-summary-list__key"
-              >
-                Template type
-              </dt>
-              <dd
-                class="nhsuk-summary-list__value"
-              >
-                Standard letter
-              </dd>
-              <dd
-                class="nhsuk-summary-list__actions"
-              />
-            </div>
-            <div
-              class="nhsuk-summary-list__row missing-value"
-              id="campaign-id"
-            >
-              <dt
-                class="nhsuk-summary-list__key"
-              >
-                Campaign
-              </dt>
-              <dd
-                class="nhsuk-summary-list__value"
-              />
-              <dd
-                aria-hidden="true"
-                class="nhsuk-summary-list__actions"
-              />
-            </div>
-            <div
-              class="nhsuk-summary-list__row"
-            >
-              <dt
-                class="nhsuk-summary-list__key"
-              >
-                Total pages
-              </dt>
-              <dd
-                class="nhsuk-summary-list__value"
-              >
-                4
-              </dd>
-              <dd
-                class="nhsuk-summary-list__actions"
-              />
-            </div>
-            <div
-              class="nhsuk-summary-list__row"
-            >
-              <dt
-                class="nhsuk-summary-list__key"
-              >
-                Sheets
-              </dt>
-              <dd
-                class="nhsuk-summary-list__value"
-              >
-                2
-              </dd>
-              <dd
-                class="nhsuk-summary-list__actions nhsuk-u-padding-right-4"
-              >
-                <a
-                  data-testid="sheets-action"
-                  href="https://notify.nhs.uk/pricing-and-commercial/letters"
-                  rel="noopener noreferrer"
-                  target="_blank"
-                >
-                  Learn more
-                  <span
-                    class="nhsuk-u-visually-hidden"
-                  >
-                     about sheets
-                  </span>
-                </a>
-              </dd>
-            </div>
-            <div
-              class="nhsuk-summary-list__row"
-            >
-              <dt
-                class="nhsuk-summary-list__key"
-              >
-                Printing and postage
-              </dt>
-              <dd
-                class="nhsuk-summary-list__value"
-              >
-                first-class
-              </dd>
-              <dd
-                aria-hidden="true"
-                class="nhsuk-summary-list__actions"
-              />
-            </div>
-            <div
-              class="nhsuk-summary-list__row"
-            >
-              <dt
-                class="nhsuk-summary-list__key"
-              >
-                Status
-              </dt>
-              <dd
-                class="nhsuk-summary-list__value"
-              >
-                <strong
-                  class="nhsuk-tag nhsuk-tag--pink"
-                  data-status="submitted"
-                  data-testid="status-tag"
-                >
-                  Locked
-                </strong>
-              </dd>
-              <dd
-                class="nhsuk-summary-list__actions nhsuk-u-padding-right-4"
-              >
-                <a
-                  data-testid="status-action"
-                  href="https://notify.nhs.uk/templates/what-template-statuses-mean"
-                  rel="noopener noreferrer"
-                  target="_blank"
-                >
-                  Learn more
-                  <span
-                    class="nhsuk-u-visually-hidden"
-                  >
-                     about status
-                  </span>
-                </a>
-              </dd>
-            </div>
-          </dl>
-        </div>
-        <p>
-          <a
-            data-testid="back-link-bottom"
-            href="/message-templates"
-          >
-            Back to all templates
-          </a>
-        </p>
-      </div>
-    </div>
-  </main>
-</DocumentFragment>
-`;
-
 exports[`PreviewSubmittedTemplate component routing = true should render email 1`] = `
 <DocumentFragment>
   <a
diff --git a/utils/utils/src/__tests__/enum.test.ts b/utils/utils/src/__tests__/enum.test.ts
index 9eaab924d..b100b0a68 100644
--- a/utils/utils/src/__tests__/enum.test.ts
+++ b/utils/utils/src/__tests__/enum.test.ts
@@ -18,8 +18,6 @@ import {
   isRightToLeft,
   languageMapping,
   letterTypeDisplayMappings,
-  previewSubmittedTemplatePages,
-  previewTemplatePages,
   statusToColourMapping,
   channelToTemplateType,
   templateTypeToChannel,
@@ -43,7 +41,6 @@ import {
   isLanguage,
   getMessageOrderOptions,
   MESSAGE_ORDER_OPTIONS_LIST,
-  previewApprovedTemplatePages,
   getPreviewURL,
 } from '../enum';
 import { mockDeep } from 'jest-mock-extended';
@@ -335,51 +332,98 @@ describe('messagePlanChooseTemplateUrl', () => {
   });
 });
 
-describe('previewTemplatePages', () => {
-  test('NHS_APP', () => {
-    expect(previewTemplatePages('NHS_APP')).toEqual('preview-nhs-app-template');
-  });
-
-  test('SMS', () => {
-    expect(previewTemplatePages('SMS')).toEqual(
-      'preview-text-message-template'
-    );
-  });
-
-  test('EMAIL', () => {
-    expect(previewTemplatePages('EMAIL')).toEqual('preview-email-template');
-  });
-});
-
-describe('previewSubmittedTemplatePages', () => {
-  test('NHS_APP', () => {
-    expect(previewSubmittedTemplatePages('NHS_APP')).toEqual(
-      'preview-submitted-nhs-app-template'
-    );
-  });
-
-  test('SMS', () => {
-    expect(previewSubmittedTemplatePages('SMS')).toEqual(
-      'preview-submitted-text-message-template'
-    );
-  });
-
-  test('EMAIL', () => {
-    expect(previewSubmittedTemplatePages('EMAIL')).toEqual(
-      'preview-submitted-email-template'
-    );
-  });
-});
-
-describe('previewApprovedTemplatePages', () => {
-  test('LETTER', () => {
-    expect(previewApprovedTemplatePages('LETTER')).toEqual(
-      'preview-approved-letter-template'
+describe('getPreviewUrl', () => {
+  test.each<{
+    mockTemplate: Partial<TemplateDto>;
+    expectedReturn: string;
+  }>([
+    {
+      mockTemplate: {
+        templateType: 'EMAIL',
+        templateStatus: 'NOT_YET_SUBMITTED',
+        id: 'template-id',
+      },
+      expectedReturn: '/preview-email-template/template-id',
+    },
+    {
+      mockTemplate: {
+        templateType: 'SMS',
+        templateStatus: 'NOT_YET_SUBMITTED',
+        id: 'template-id',
+      },
+      expectedReturn: '/preview-text-message-template/template-id',
+    },
+    {
+      mockTemplate: {
+        templateType: 'NHS_APP',
+        templateStatus: 'NOT_YET_SUBMITTED',
+        id: 'template-id',
+      },
+      expectedReturn: '/preview-nhs-app-template/template-id',
+    },
+    {
+      mockTemplate: {
+        templateType: 'LETTER',
+        templateStatus: 'NOT_YET_SUBMITTED',
+        id: 'template-id',
+      },
+      expectedReturn: '/preview-letter-template/template-id',
+    },
+    {
+      mockTemplate: {
+        templateType: 'EMAIL',
+        templateStatus: 'SUBMITTED',
+        id: 'template-id',
+      },
+      expectedReturn: '/preview-submitted-email-template/template-id',
+    },
+    {
+      mockTemplate: {
+        templateType: 'SMS',
+        templateStatus: 'SUBMITTED',
+        id: 'template-id',
+      },
+      expectedReturn: '/preview-submitted-text-message-template/template-id',
+    },
+    {
+      mockTemplate: {
+        templateType: 'NHS_APP',
+        templateStatus: 'SUBMITTED',
+        id: 'template-id',
+      },
+      expectedReturn: '/preview-submitted-nhs-app-template/template-id',
+    },
+    {
+      mockTemplate: {
+        templateType: 'LETTER',
+        templateStatus: 'SUBMITTED',
+        id: 'template-id',
+      },
+      expectedReturn: '/preview-submitted-letter-template/template-id',
+    },
+    {
+      mockTemplate: {
+        templateType: 'LETTER',
+        templateStatus: 'PROOF_APPROVED',
+        id: 'template-id',
+        letterVersion: 'AUTHORING',
+      },
+      expectedReturn: '/preview-approved-letter-template/template-id',
+    },
+    {
+      mockTemplate: {
+        templateType: 'LETTER',
+        templateStatus: 'SUBMITTED',
+        id: 'template-id',
+        letterVersion: 'AUTHORING',
+      },
+      expectedReturn: '/preview-approved-letter-template/template-id',
+    },
+  ])('returns $expectedReturn', ({ mockTemplate, expectedReturn }) => {
+    expect(getPreviewURL(mockDeep<TemplateDto>(mockTemplate))).toEqual(
+      expectedReturn
     );
   });
-});
-
-describe('getPreviewUrl', () => {
   test('for a draft template', () => {
     expect(
       getPreviewURL(
diff --git a/utils/utils/src/enum.ts b/utils/utils/src/enum.ts
index dac7aeb8d..af764a665 100644
--- a/utils/utils/src/enum.ts
+++ b/utils/utils/src/enum.ts
@@ -276,20 +276,13 @@ export const createTemplateUrl = (
 ) =>
   `/${creationAction(templateType)}-${templateTypeToUrlTextMappings(templateType, letterType)}-template`;
 
-export const previewTemplatePages = (type: TemplateType) =>
-  `preview-${legacyTemplateTypeToUrlTextMappings(type)}-template`;
-export const previewSubmittedTemplatePages = (type: TemplateType) =>
-  `preview-submitted-${legacyTemplateTypeToUrlTextMappings(type)}-template`;
-export const previewApprovedTemplatePages = (type: TemplateType) =>
-  `preview-approved-${legacyTemplateTypeToUrlTextMappings(type)}-template`;
-
 export const getPreviewURL = (template: TemplateDto) => {
   if (
     template.templateType === 'LETTER' &&
     template.letterVersion === 'AUTHORING' &&
     ['PROOF_APPROVED', 'SUBMITTED'].includes(template.templateStatus)
   ) {
-    return `/preview-approved-${legacyTemplateTypeToUrlTextMappings(template.templateType)}-template/${template.id}`;
+    return `/preview-approved-letter-template/${template.id}`;
   }
 
   if (template.templateStatus === 'SUBMITTED') {

From 7ec360a4aa29cbdb62290b667ebf11f47e1dc071 Mon Sep 17 00:00:00 2001
From: Chris Elliott <chris.elliott17@nhs.net>
Date: Tue, 24 Mar 2026 09:59:11 +0000
Subject: [PATCH 08/57] CCM-14758: Fix accessibility tests

---
 .../letter-templates.accessibility.spec.ts       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/test-team/template-mgmt-accessibility/letter-templates.accessibility.spec.ts b/tests/test-team/template-mgmt-accessibility/letter-templates.accessibility.spec.ts
index e1aeb65b1..85a2ce6e7 100644
--- a/tests/test-team/template-mgmt-accessibility/letter-templates.accessibility.spec.ts
+++ b/tests/test-team/template-mgmt-accessibility/letter-templates.accessibility.spec.ts
@@ -171,14 +171,6 @@ test.describe('Letter templates', () => {
       )
     ));
 
-  test('Preview approved letter template', async ({ page, analyze }) =>
-    analyze(
-      new TemplateMgmtPreviewApprovedLetterPage(page).setPathParam(
-        'templateId',
-        templateIds.LETTER_APPROVED
-      )
-    ));
-
   test('Preview submitted letter template', async ({ page, analyze }) =>
     analyze(
       new TemplateMgmtPreviewSubmittedLetterPage(page).setPathParam(
@@ -376,5 +368,13 @@ test.describe('Letter templates', () => {
           templateIds.LETTER_APPROVED
         )
       ));
+
+    test('Preview approved letter template', async ({ page, analyze }) =>
+      analyze(
+        new TemplateMgmtPreviewApprovedLetterPage(page).setPathParam(
+          'templateId',
+          templateIds.LETTER_APPROVED
+        )
+      ));
   });
 });

From 0c7e3bcf7477321497d8b70971bb162ff186bf3f Mon Sep 17 00:00:00 2001
From: Chris Elliott <chris.elliott17@nhs.net>
Date: Tue, 24 Mar 2026 13:41:16 +0000
Subject: [PATCH 09/57] CCM-14758: Review comments

---
 .../LetterRender/LetterRenderForm.tsx         |  1 -
 utils/utils/src/__tests__/enum.test.ts        | 36 -------------------
 2 files changed, 37 deletions(-)

diff --git a/frontend/src/components/molecules/LetterRender/LetterRenderForm.tsx b/frontend/src/components/molecules/LetterRender/LetterRenderForm.tsx
index 8a9794338..8bbca6e03 100644
--- a/frontend/src/components/molecules/LetterRender/LetterRenderForm.tsx
+++ b/frontend/src/components/molecules/LetterRender/LetterRenderForm.tsx
@@ -17,7 +17,6 @@ import { PERSONALISATION_FORMDATA_PREFIX } from '@utils/constants';
 type LetterRenderFormProps = {
   template: AuthoringLetterTemplate;
   tab: PersonalisedRenderKey;
-  hideEditActions?: boolean;
 };
 
 export function LetterRenderForm({ template, tab }: LetterRenderFormProps) {
diff --git a/utils/utils/src/__tests__/enum.test.ts b/utils/utils/src/__tests__/enum.test.ts
index b100b0a68..78363ee8a 100644
--- a/utils/utils/src/__tests__/enum.test.ts
+++ b/utils/utils/src/__tests__/enum.test.ts
@@ -424,42 +424,6 @@ describe('getPreviewUrl', () => {
       expectedReturn
     );
   });
-  test('for a draft template', () => {
-    expect(
-      getPreviewURL(
-        mockDeep<TemplateDto>({
-          templateType: 'EMAIL',
-          templateStatus: 'NOT_YET_SUBMITTED',
-          id: 'template-id',
-        })
-      )
-    ).toEqual('/preview-email-template/template-id');
-  });
-
-  test('for an approved template', () => {
-    expect(
-      getPreviewURL(
-        mockDeep<TemplateDto>({
-          templateType: 'LETTER',
-          letterVersion: 'AUTHORING',
-          templateStatus: 'PROOF_APPROVED',
-          id: 'template-id',
-        })
-      )
-    ).toEqual('/preview-approved-letter-template/template-id');
-  });
-
-  test('for a submitted template', () => {
-    expect(
-      getPreviewURL(
-        mockDeep<TemplateDto>({
-          templateType: 'NHS_APP',
-          templateStatus: 'SUBMITTED',
-          id: 'template-id',
-        })
-      )
-    ).toEqual('/preview-submitted-nhs-app-template/template-id');
-  });
 });
 
 describe('templateDisplayCopyAction', () => {

From edd4409c1b4876bd3f635824f0855c68127117d2 Mon Sep 17 00:00:00 2001
From: Chris Elliott <chris.elliott17@nhs.net>
Date: Tue, 24 Mar 2026 13:54:06 +0000
Subject: [PATCH 10/57] CCM-14758: empty commit


From 678f6a2bf78e29fca71821025bcd72ec8de37b3c Mon Sep 17 00:00:00 2001
From: Michael Harrison <michael.harrison31@nhs.net>
Date: Thu, 26 Mar 2026 16:25:13 +0000
Subject: [PATCH 11/57] CCM-14758: some feedback

---
 .../[templateId]/page.test.tsx                |   2 +-
 .../__snapshots__/page.test.tsx.snap          |  28 ++--
 .../page.test.tsx                             |  14 ++
 .../app/preview-letter-template/page.test.tsx |   4 +-
 .../page.test.tsx                             |   2 +
 .../LetterRenderDetails.test.tsx.snap         |  32 ++--
 .../[templateId]/page.tsx                     |  14 +-
 .../LetterRender/LetterRenderDetails.tsx      |  30 ++--
 ...iew-approved-letter-page.component.spec.ts | 154 +++++++++++-------
 ...ew-submitted-letter-page.component.spec.ts |  62 ++++---
 utils/utils/src/zod-validators.ts             |   8 +
 11 files changed, 201 insertions(+), 149 deletions(-)

diff --git a/frontend/src/__tests__/app/edit-template-campaign/[templateId]/page.test.tsx b/frontend/src/__tests__/app/edit-template-campaign/[templateId]/page.test.tsx
index 627b0ed03..e3837d495 100644
--- a/frontend/src/__tests__/app/edit-template-campaign/[templateId]/page.test.tsx
+++ b/frontend/src/__tests__/app/edit-template-campaign/[templateId]/page.test.tsx
@@ -185,7 +185,7 @@ describe('template has been submitted - authoring', () => {
     });
   });
 
-  it('redirects to preview submitted letter template page', async () => {
+  it('redirects to preview approved letter template page', async () => {
     await Page({ params: Promise.resolve({ templateId: 'template-123' }) });
 
     expect(redirect).toHaveBeenCalledWith(
diff --git a/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap
index c081344e9..7f8c1cd0e 100644
--- a/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap
@@ -293,14 +293,12 @@ exports[`valid authoring letter template matches snapshot 1`] = `
                 >
                   PDS personalisation fields
                 </h3>
-                <label
-                  class="nhsuk-label nhsuk-label--s"
-                >
-                  Example recipient
-                </label>
-                <div
-                  class="nhsuk-u-margin-bottom-4"
-                />
+                <p>
+                  <strong>
+                    Example recipient
+                  </strong>
+                  <br />
+                </p>
               </div>
               <div
                 class="nhsuk-grid-column-two-thirds iframeColumn"
@@ -330,14 +328,12 @@ exports[`valid authoring letter template matches snapshot 1`] = `
                 >
                   PDS personalisation fields
                 </h3>
-                <label
-                  class="nhsuk-label nhsuk-label--s"
-                >
-                  Example recipient
-                </label>
-                <div
-                  class="nhsuk-u-margin-bottom-4"
-                />
+                <p>
+                  <strong>
+                    Example recipient
+                  </strong>
+                  <br />
+                </p>
               </div>
               <div
                 class="nhsuk-grid-column-two-thirds iframeColumn"
diff --git a/frontend/src/__tests__/app/preview-approved-letter-template/page.test.tsx b/frontend/src/__tests__/app/preview-approved-letter-template/page.test.tsx
index afd45f8c6..bf6a8fe4c 100644
--- a/frontend/src/__tests__/app/preview-approved-letter-template/page.test.tsx
+++ b/frontend/src/__tests__/app/preview-approved-letter-template/page.test.tsx
@@ -6,6 +6,7 @@ import {
   AUTHORING_LETTER_TEMPLATE,
   EMAIL_TEMPLATE,
   NHS_APP_TEMPLATE,
+  PDF_LETTER_TEMPLATE,
   SMS_TEMPLATE,
 } from '@testhelpers/helpers';
 import Page, {
@@ -111,6 +112,19 @@ describe('template is not a letter', () => {
   });
 });
 
+it('redirects to invalid template page when template is PDF letter', async () => {
+  jest.mocked(getTemplate).mockResolvedValue(PDF_LETTER_TEMPLATE);
+
+  await Page({
+    params: Promise.resolve({ templateId: PDF_LETTER_TEMPLATE.id }),
+  });
+
+  expect(redirect).toHaveBeenCalledWith(
+    '/invalid-template',
+    RedirectType.replace
+  );
+});
+
 describe('authoring letter template is invalid', () => {
   it('redirects to invalid template page when name is missing', async () => {
     jest.mocked(getTemplate).mockResolvedValue({
diff --git a/frontend/src/__tests__/app/preview-letter-template/page.test.tsx b/frontend/src/__tests__/app/preview-letter-template/page.test.tsx
index af48b4ecf..9748215e8 100644
--- a/frontend/src/__tests__/app/preview-letter-template/page.test.tsx
+++ b/frontend/src/__tests__/app/preview-letter-template/page.test.tsx
@@ -432,8 +432,8 @@ describe('authoring letter initial render states', () => {
   });
 });
 
-describe('authoring letter template does not show submit form when already submitted', () => {
-  it('does not render the submit button when templateStatus is SUBMITTED', async () => {
+describe('when authoring letter template status is submitted', () => {
+  it('redirects to preview approved letter template page', async () => {
     jest.mocked(getTemplate).mockResolvedValue({
       ...AUTHORING_LETTER_TEMPLATE,
       templateStatus: 'SUBMITTED',
diff --git a/frontend/src/__tests__/app/preview-submitted-letter-template/page.test.tsx b/frontend/src/__tests__/app/preview-submitted-letter-template/page.test.tsx
index 34fbba6df..95eb7d322 100644
--- a/frontend/src/__tests__/app/preview-submitted-letter-template/page.test.tsx
+++ b/frontend/src/__tests__/app/preview-submitted-letter-template/page.test.tsx
@@ -13,6 +13,7 @@ import {
   NHS_APP_TEMPLATE,
   SMS_TEMPLATE,
   PDF_LETTER_TEMPLATE,
+  AUTHORING_LETTER_TEMPLATE,
 } from '@testhelpers/helpers';
 import content from '@content/content';
 import PreviewTemplateDetailsPdfLetter from '@molecules/PreviewTemplateDetails/PreviewTemplateDetailsPdfLetter';
@@ -109,6 +110,7 @@ describe('PreviewSubmittedLetterTemplatePage', () => {
       ...PDF_LETTER_TEMPLATE,
       templateStatus: 'NOT_YET_SUBMITTED' as const,
     },
+    AUTHORING_LETTER_TEMPLATE,
   ])(
     'should redirect to invalid-template when template is $templateType, name is $name, and status is $templateStatus',
     async (value) => {
diff --git a/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderDetails.test.tsx.snap b/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderDetails.test.tsx.snap
index b67cf6c19..ef3f32bc4 100644
--- a/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderDetails.test.tsx.snap
+++ b/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderDetails.test.tsx.snap
@@ -7,32 +7,24 @@ exports[`LetterRenderDetails snapshots matches snapshot 1`] = `
   >
     PDS personalisation fields
   </h3>
-  <label
-    class="nhsuk-label nhsuk-label--s"
-  >
-    Example recipient
-  </label>
-  <div
-    class="nhsuk-u-margin-bottom-4"
-  >
+  <p>
+    <strong>
+      Example recipient
+    </strong>
+    <br />
     Jo Bloggs
-  </div>
+  </p>
   <h3
     class="nhsuk-heading-s nhsuk-u-padding-top-4"
   >
     Custom personalisation fields
   </h3>
-  <div>
-    <label
-      class="nhsuk-label nhsuk-label--s"
-    >
+  <p>
+    <strong>
       appointmentDate
-    </label>
-    <div
-      class="nhsuk-u-margin-bottom-4"
-    >
-      2025-01-15
-    </div>
-  </div>
+    </strong>
+    <br />
+    2025-01-15
+  </p>
 </DocumentFragment>
 `;
diff --git a/frontend/src/app/preview-submitted-letter-template/[templateId]/page.tsx b/frontend/src/app/preview-submitted-letter-template/[templateId]/page.tsx
index be1026f29..1e452ebe0 100644
--- a/frontend/src/app/preview-submitted-letter-template/[templateId]/page.tsx
+++ b/frontend/src/app/preview-submitted-letter-template/[templateId]/page.tsx
@@ -1,9 +1,8 @@
 'use server';
 
 import {
-  $PdfLetterTemplate,
   TemplatePageProps,
-  zodValidate,
+  validateSubmittedPdfLetterTemplate,
 } from 'nhs-notify-web-template-management-utils';
 import { getTemplate } from '@utils/form-actions';
 import { redirect, RedirectType } from 'next/navigation';
@@ -12,7 +11,6 @@ import content from '@content/content';
 import { PreviewSubmittedTemplate } from '@molecules/PreviewSubmittedTemplate/PreviewSubmittedTemplate';
 import PreviewTemplateDetailsPdfLetter from '@molecules/PreviewTemplateDetails/PreviewTemplateDetailsPdfLetter';
 import { NHSNotifyContainer } from '@layouts/container/container';
-import { z } from 'zod';
 
 const { pageTitle } = content.pages.previewSubmittedLetterTemplate;
 
@@ -27,15 +25,7 @@ const PreviewSubmittedLetterTemplatePage = async (props: TemplatePageProps) => {
 
   const template = await getTemplate(templateId);
 
-  const validatedTemplate = zodValidate(
-    z.intersection(
-      $PdfLetterTemplate,
-      z.object({
-        templateStatus: z.literal('SUBMITTED'),
-      })
-    ),
-    template
-  );
+  const validatedTemplate = validateSubmittedPdfLetterTemplate(template);
 
   if (!validatedTemplate) {
     redirect('/invalid-template', RedirectType.replace);
diff --git a/frontend/src/components/molecules/LetterRender/LetterRenderDetails.tsx b/frontend/src/components/molecules/LetterRender/LetterRenderDetails.tsx
index 5e576135f..0d37f0cf3 100644
--- a/frontend/src/components/molecules/LetterRender/LetterRenderDetails.tsx
+++ b/frontend/src/components/molecules/LetterRender/LetterRenderDetails.tsx
@@ -1,4 +1,3 @@
-import { Label } from 'nhsuk-react-components';
 import type { AuthoringLetterTemplate } from 'nhs-notify-web-template-management-utils';
 import content from '@content/content';
 import {
@@ -12,6 +11,16 @@ type LetterRenderDetailsProps = {
   tab: PersonalisedRenderKey;
 };
 
+function Field({ label, value }: { label: string; value?: string }) {
+  return (
+    <p>
+      <strong>{label}</strong>
+      <br />
+      {value}
+    </p>
+  );
+}
+
 export function LetterRenderDetails({
   template,
   tab,
@@ -27,14 +36,14 @@ export function LetterRenderDetails({
     <>
       <h3 className='nhsuk-heading-s'>{copy.pdsSection.heading}</h3>
 
-      <Label size='s'>{copy.pdsSection.recipientLabel}</Label>
-      <div className='nhsuk-u-margin-bottom-4'>
-        {
+      <Field
+        label={copy.pdsSection.recipientLabel}
+        value={
           [...SHORT_EXAMPLE_RECIPIENTS, ...LONG_EXAMPLE_RECIPIENTS].find(
             ({ id }) => id === render?.systemPersonalisationPackId
           )?.name
         }
-      </div>
+      />
 
       {hasCustomFields && (
         <>
@@ -43,12 +52,11 @@ export function LetterRenderDetails({
           </h3>
           {template.customPersonalisation!.map((field) => {
             return (
-              <div key={field}>
-                <Label size='s'>{field}</Label>
-                <div className='nhsuk-u-margin-bottom-4'>
-                  {render?.personalisationParameters?.[field]}
-                </div>
-              </div>
+              <Field
+                key={field}
+                label={field}
+                value={render?.personalisationParameters?.[field]}
+              />
             );
           })}
         </>
diff --git a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts
index d1764ab21..1af8b6a89 100644
--- a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts
@@ -17,22 +17,40 @@ import {
 
 function createTemplates(user: TestUser) {
   return {
-    valid: TemplateFactory.createAuthoringLetterTemplate(
+    submitted: TemplateFactory.createAuthoringLetterTemplate(
       'e8b5f3a1-2c4d-4e6f-8a9b-1c2d3e4f5a6b',
       user,
-      'authoring-letter-template-preview-approved-valid',
+      'authoring-letter-template-preview-approved-submitted',
       'SUBMITTED'
     ),
+    proofApproved: TemplateFactory.createAuthoringLetterTemplate(
+      '375f5dc4-7c77-48f5-be47-d3df1f52bc0e',
+      user,
+      'authoring-letter-template-preview-approved-proof-approved',
+      'PROOF_APPROVED'
+    ),
     invalid: TemplateFactory.createAuthoringLetterTemplate(
       'e2a5b238-ecbf-42c8-90f1-0cf544a9c0ae',
       user,
       'authoring-letter-template-preview-approved-invalid',
       'NOT_A_STATUS'
     ),
+    pdf: TemplateFactory.uploadLetterTemplate(
+      'ec8d9f84-35ef-454b-b7c4-233e0af8f764',
+      user,
+      'pdf-letter-template-submitted',
+      'SUBMITTED'
+    ),
+    nhsapp: TemplateFactory.createNhsAppTemplate(
+      '367e3846-e4da-4817-ba5d-722ef0187e53',
+      user,
+      'nhsapp-template-submitted',
+      'SUBMITTED'
+    ),
   };
 }
 
-test.describe('Preview submitted Letter message template Page', () => {
+test.describe('Preview approved letter template page', () => {
   let templates: ReturnType<typeof createTemplates>;
   const templateStorageHelper = new TemplateStorageHelper();
 
@@ -46,45 +64,12 @@ test.describe('Preview submitted Letter message template Page', () => {
     await templateStorageHelper.deleteSeededTemplates();
   });
 
-  test('when user visits page, then page is loaded with template details', async ({
-    page,
-    baseURL,
-  }) => {
-    const previewSubmittedLetterTemplatePage =
-      new TemplateMgmtPreviewApprovedLetterPage(page).setPathParam(
-        'templateId',
-        templates.valid.id
-      );
-
-    await previewSubmittedLetterTemplatePage.loadPage();
-
-    await expect(page).toHaveURL(
-      `${baseURL}/templates/preview-approved-letter-template/${templates.valid.id}`
-    );
-
-    await expect(previewSubmittedLetterTemplatePage.pageHeading).toContainText(
-      templates.valid.name
-    );
-
-    expect(templates.valid.campaignId).toBeTruthy();
-
-    await expect(previewSubmittedLetterTemplatePage.campaignId).toContainText(
-      templates.valid.campaignId!
-    );
-
-    await expect(previewSubmittedLetterTemplatePage.statusTag).toHaveText(
-      'Locked'
-    );
-
-    await expect(previewSubmittedLetterTemplatePage.copyLink).toHaveCount(0);
-  });
-
   test.describe('Page functionality', () => {
     test('common page tests', async ({ page, baseURL }) => {
       const props = {
         page: new TemplateMgmtPreviewApprovedLetterPage(page).setPathParam(
           'templateId',
-          templates.valid.id
+          templates.submitted.id
         ),
         baseURL,
       };
@@ -98,37 +83,84 @@ test.describe('Preview submitted Letter message template Page', () => {
         expectedUrl: `templates/message-templates`,
       });
     });
-  });
 
-  test.describe('Error handling', () => {
-    test('when user visits page with an unsubmitted template, then an invalid template error is displayed', async ({
-      baseURL,
-      page,
-    }) => {
-      const previewSubmittedLetterTemplatePage =
-        new TemplateMgmtPreviewApprovedLetterPage(page).setPathParam(
-          'templateId',
-          templates.invalid.id
+    for (const { getTemplate, templateStatus, expectedTag } of [
+      {
+        getTemplate: () => templates.submitted,
+        templateStatus: 'SUBMITTED',
+        expectedTag: 'Locked',
+      },
+      {
+        getTemplate: () => templates.proofApproved,
+        templateStatus: 'PROOF_APPROVED',
+        expectedTag: 'Approved',
+      },
+    ]) {
+      test(`when user visits page for a template with status ${templateStatus}, then page is loaded with template details`, async ({
+        page,
+        baseURL,
+      }) => {
+        const template = getTemplate();
+
+        const previewSubmittedLetterTemplatePage =
+          new TemplateMgmtPreviewApprovedLetterPage(page).setPathParam(
+            'templateId',
+            template.id
+          );
+
+        await previewSubmittedLetterTemplatePage.loadPage();
+
+        await expect(page).toHaveURL(
+          `${baseURL}/templates/preview-approved-letter-template/${template.id}`
         );
 
-      await previewSubmittedLetterTemplatePage.loadPage();
+        await expect(
+          previewSubmittedLetterTemplatePage.pageHeading
+        ).toContainText(template.name);
 
-      await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
-    });
+        expect(template.campaignId).toBeTruthy();
 
-    test('when user visits page with a nonexistent template ID, then an invalid template error is displayed', async ({
-      baseURL,
-      page,
-    }) => {
-      const previewSubmittedLetterTemplatePage =
-        new TemplateMgmtPreviewApprovedLetterPage(page).setPathParam(
-          'templateId',
-          'nonexistent-template-id'
+        await expect(
+          previewSubmittedLetterTemplatePage.campaignId
+        ).toContainText(template.campaignId!);
+
+        await expect(previewSubmittedLetterTemplatePage.statusTag).toHaveText(
+          expectedTag
         );
 
-      await previewSubmittedLetterTemplatePage.loadPage();
+        await expect(previewSubmittedLetterTemplatePage.copyLink).toHaveCount(
+          0
+        );
+      });
+    }
+  });
 
-      await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
-    });
+  test.describe('Error handling', () => {
+    const cases = [
+      { title: 'an unsubmitted', getTemplateId: () => templates.invalid.id },
+      {
+        title: 'a nonexistent',
+        getTemplateId: () => 'nonexistent-template-id',
+      },
+      { title: 'a pdf letter', getTemplateId: () => templates.pdf.id },
+      { title: 'an nhsapp', getTemplateId: () => templates.nhsapp.id },
+    ];
+
+    for (const { title, getTemplateId } of cases) {
+      test(`when user visits page with the id for ${title} template, then an invalid template error is displayed`, async ({
+        baseURL,
+        page,
+      }) => {
+        const previewSubmittedLetterTemplatePage =
+          new TemplateMgmtPreviewApprovedLetterPage(page).setPathParam(
+            'templateId',
+            getTemplateId()
+          );
+
+        await previewSubmittedLetterTemplatePage.loadPage();
+
+        await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
+      });
+    }
   });
 });
diff --git a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-submitted-letter-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-submitted-letter-page.component.spec.ts
index 667f26eeb..140f43f99 100644
--- a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-submitted-letter-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-submitted-letter-page.component.spec.ts
@@ -39,8 +39,16 @@ function createTemplates(user: TestUser) {
     },
   };
 
+  const authoringValid = TemplateFactory.createAuthoringLetterTemplate(
+    'e8b5f3a1-2c4d-4e6f-8a9b-1c2d3e4f5a6b',
+    user,
+    'authoring-letter-template-preview-submitted',
+    'SUBMITTED'
+  );
+
   return {
     valid,
+    authoringValid,
     invalid: {
       ...TemplateFactory.uploadLetterTemplate(
         '621456cf-ace3-49c3-941e-4df5eba11373',
@@ -125,34 +133,36 @@ test.describe('Preview submitted Letter message template Page', () => {
   });
 
   test.describe('Error handling', () => {
-    test('when user visits page with an unsubmitted template, then an invalid template error is displayed', async ({
-      baseURL,
-      page,
-    }) => {
-      const previewSubmittedLetterTemplatePage =
-        new TemplateMgmtPreviewSubmittedLetterPage(page).setPathParam(
-          'templateId',
-          templates.invalid.id
-        );
-
-      await previewSubmittedLetterTemplatePage.loadPage();
-
-      await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
-    });
+    const cases = [
+      {
+        title: 'an invalid pdf template',
+        getTemplateId: () => templates.invalid.id,
+      },
+      {
+        title: 'a valid authoring template',
+        getTemplateId: () => templates.authoringValid.id,
+      },
+      {
+        title: 'a nonexistent template',
+        getTemplateId: () => 'nonexistent-template-id',
+      },
+    ];
 
-    test('when user visits page with a fake template, then an invalid template error is displayed', async ({
-      baseURL,
-      page,
-    }) => {
-      const previewSubmittedLetterTemplatePage =
-        new TemplateMgmtPreviewSubmittedLetterPage(page).setPathParam(
-          'templateId',
-          'fake-template-id'
-        );
+    for (const { getTemplateId, title } of cases) {
+      test(`when user visits page with id of ${title}, then it redirects to the invalid template page`, async ({
+        baseURL,
+        page,
+      }) => {
+        const previewSubmittedLetterTemplatePage =
+          new TemplateMgmtPreviewSubmittedLetterPage(page).setPathParam(
+            'templateId',
+            getTemplateId()
+          );
 
-      await previewSubmittedLetterTemplatePage.loadPage();
+        await previewSubmittedLetterTemplatePage.loadPage();
 
-      await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
-    });
+        await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
+      });
+    }
   });
 });
diff --git a/utils/utils/src/zod-validators.ts b/utils/utils/src/zod-validators.ts
index ccdc226fc..b11077e7a 100644
--- a/utils/utils/src/zod-validators.ts
+++ b/utils/utils/src/zod-validators.ts
@@ -112,6 +112,11 @@ export const $SubmittedLetterTemplate = z.intersection(
   $LetterTemplate
 );
 
+const $SubmittedPdfLetterTemplate = z.intersection(
+  $SubmittedTemplate,
+  $PdfLetterTemplate
+);
+
 export const $LargePrintLetterTemplate = z.intersection(
   $LetterTemplate,
   z.object({
@@ -162,6 +167,9 @@ export const validateSubmittedLetterTemplate = (template?: TemplateDto) =>
 export const validateNonSubmittedTemplate = (template?: TemplateDto) =>
   zodValidate($NonSubmittedTemplate, template);
 
+export const validateSubmittedPdfLetterTemplate = (template?: TemplateDto) =>
+  zodValidate($SubmittedPdfLetterTemplate, template);
+
 export const $GuardDutyMalwareScanStatus = z.enum([
   'NO_THREATS_FOUND',
   'THREATS_FOUND',

From ed634644bbad01dcfd261b06cc06eecac932d659 Mon Sep 17 00:00:00 2001
From: Michael Harrison <michael.harrison31@nhs.net>
Date: Thu, 26 Mar 2026 16:32:56 +0000
Subject: [PATCH 12/57] CCM-14758: rename test

---
 .../__tests__/app/edit-template-name/[templateId]/page.test.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/__tests__/app/edit-template-name/[templateId]/page.test.tsx b/frontend/src/__tests__/app/edit-template-name/[templateId]/page.test.tsx
index eb278ac66..17476a610 100644
--- a/frontend/src/__tests__/app/edit-template-name/[templateId]/page.test.tsx
+++ b/frontend/src/__tests__/app/edit-template-name/[templateId]/page.test.tsx
@@ -187,7 +187,7 @@ describe('template has been submitted - authoring', () => {
     });
   });
 
-  it('redirects to preview submitted letter template page', async () => {
+  it('redirects to preview approved letter template page', async () => {
     await Page({ params: Promise.resolve({ templateId: 'template-123' }) });
 
     expect(redirect).toHaveBeenCalledWith(

From 7bf5583d7d88fef30468b11eb51a957b3b101491 Mon Sep 17 00:00:00 2001
From: Michael Harrison <michael.harrison31@nhs.net>
Date: Fri, 27 Mar 2026 14:42:29 +0000
Subject: [PATCH 13/57] CCM-14758: add tabs test

---
 .../__snapshots__/page.test.tsx.snap          | 54 +++++++-----
 .../LetterRenderDetails.test.tsx.snap         | 60 +++++++++-----
 .../LetterRenderDetails.module.scss           | 12 +++
 .../LetterRender/LetterRenderDetails.tsx      | 62 +++++++-------
 ...plate-mgmt-preview-approved-letter-page.ts | 29 +++++++
 ...iew-approved-letter-page.component.spec.ts | 82 ++++++++++++++++++-
 6 files changed, 224 insertions(+), 75 deletions(-)
 create mode 100644 frontend/src/components/molecules/LetterRender/LetterRenderDetails.module.scss

diff --git a/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap
index 7f8c1cd0e..0faca5b63 100644
--- a/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap
@@ -288,17 +288,24 @@ exports[`valid authoring letter template matches snapshot 1`] = `
               <div
                 class="nhsuk-grid-column-one-third"
               >
-                <h3
-                  class="nhsuk-heading-s"
+                <section
+                  aria-labelledby="tab-shortFormRender-pds-heading"
                 >
-                  PDS personalisation fields
-                </h3>
-                <p>
-                  <strong>
-                    Example recipient
-                  </strong>
-                  <br />
-                </p>
+                  <h3
+                    class="nhsuk-heading-s"
+                    id="tab-shortFormRender-pds-heading"
+                  >
+                    PDS personalisation fields
+                  </h3>
+                  <dl
+                    class="dl"
+                  >
+                    <dt>
+                      Example recipient
+                    </dt>
+                    <dd />
+                  </dl>
+                </section>
               </div>
               <div
                 class="nhsuk-grid-column-two-thirds iframeColumn"
@@ -323,17 +330,24 @@ exports[`valid authoring letter template matches snapshot 1`] = `
               <div
                 class="nhsuk-grid-column-one-third"
               >
-                <h3
-                  class="nhsuk-heading-s"
+                <section
+                  aria-labelledby="tab-longFormRender-pds-heading"
                 >
-                  PDS personalisation fields
-                </h3>
-                <p>
-                  <strong>
-                    Example recipient
-                  </strong>
-                  <br />
-                </p>
+                  <h3
+                    class="nhsuk-heading-s"
+                    id="tab-longFormRender-pds-heading"
+                  >
+                    PDS personalisation fields
+                  </h3>
+                  <dl
+                    class="dl"
+                  >
+                    <dt>
+                      Example recipient
+                    </dt>
+                    <dd />
+                  </dl>
+                </section>
               </div>
               <div
                 class="nhsuk-grid-column-two-thirds iframeColumn"
diff --git a/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderDetails.test.tsx.snap b/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderDetails.test.tsx.snap
index ef3f32bc4..65b468baa 100644
--- a/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderDetails.test.tsx.snap
+++ b/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderDetails.test.tsx.snap
@@ -2,29 +2,45 @@
 
 exports[`LetterRenderDetails snapshots matches snapshot 1`] = `
 <DocumentFragment>
-  <h3
-    class="nhsuk-heading-s"
+  <section
+    aria-labelledby="tab-shortFormRender-pds-heading"
   >
-    PDS personalisation fields
-  </h3>
-  <p>
-    <strong>
-      Example recipient
-    </strong>
-    <br />
-    Jo Bloggs
-  </p>
-  <h3
-    class="nhsuk-heading-s nhsuk-u-padding-top-4"
+    <h3
+      class="nhsuk-heading-s"
+      id="tab-shortFormRender-pds-heading"
+    >
+      PDS personalisation fields
+    </h3>
+    <dl
+      class="dl"
+    >
+      <dt>
+        Example recipient
+      </dt>
+      <dd>
+        Jo Bloggs
+      </dd>
+    </dl>
+  </section>
+  <section
+    aria-labelledby="tab-shortFormRender-custom-personalisation"
   >
-    Custom personalisation fields
-  </h3>
-  <p>
-    <strong>
-      appointmentDate
-    </strong>
-    <br />
-    2025-01-15
-  </p>
+    <h3
+      class="nhsuk-heading-s nhsuk-u-padding-top-4"
+      id="tab-shortFormRender-custom-personalisation"
+    >
+      Custom personalisation fields
+    </h3>
+    <dl
+      class="dl"
+    >
+      <dt>
+        appointmentDate
+      </dt>
+      <dd>
+        2025-01-15
+      </dd>
+    </dl>
+  </section>
 </DocumentFragment>
 `;
diff --git a/frontend/src/components/molecules/LetterRender/LetterRenderDetails.module.scss b/frontend/src/components/molecules/LetterRender/LetterRenderDetails.module.scss
new file mode 100644
index 000000000..10f7a4174
--- /dev/null
+++ b/frontend/src/components/molecules/LetterRender/LetterRenderDetails.module.scss
@@ -0,0 +1,12 @@
+.dl {
+  margin: 0;
+
+  dt {
+    font-weight: 600;
+  }
+
+  dd {
+    margin-left: 0;
+    margin-bottom: 24px;
+  }
+}
diff --git a/frontend/src/components/molecules/LetterRender/LetterRenderDetails.tsx b/frontend/src/components/molecules/LetterRender/LetterRenderDetails.tsx
index 0d37f0cf3..80075755f 100644
--- a/frontend/src/components/molecules/LetterRender/LetterRenderDetails.tsx
+++ b/frontend/src/components/molecules/LetterRender/LetterRenderDetails.tsx
@@ -1,3 +1,4 @@
+import { Fragment } from 'react';
 import type { AuthoringLetterTemplate } from 'nhs-notify-web-template-management-utils';
 import content from '@content/content';
 import {
@@ -5,22 +6,13 @@ import {
   SHORT_EXAMPLE_RECIPIENTS,
 } from '@content/example-recipients';
 import type { PersonalisedRenderKey } from '@utils/types';
+import styles from './LetterRenderDetails.module.scss';
 
 type LetterRenderDetailsProps = {
   template: AuthoringLetterTemplate;
   tab: PersonalisedRenderKey;
 };
 
-function Field({ label, value }: { label: string; value?: string }) {
-  return (
-    <p>
-      <strong>{label}</strong>
-      <br />
-      {value}
-    </p>
-  );
-}
-
 export function LetterRenderDetails({
   template,
   tab,
@@ -34,32 +26,40 @@ export function LetterRenderDetails({
 
   return (
     <>
-      <h3 className='nhsuk-heading-s'>{copy.pdsSection.heading}</h3>
+      <section aria-labelledby={`tab-${tab}-pds-heading`}>
+        <h3 id={`tab-${tab}-pds-heading`} className='nhsuk-heading-s'>
+          {copy.pdsSection.heading}
+        </h3>
 
-      <Field
-        label={copy.pdsSection.recipientLabel}
-        value={
-          [...SHORT_EXAMPLE_RECIPIENTS, ...LONG_EXAMPLE_RECIPIENTS].find(
-            ({ id }) => id === render?.systemPersonalisationPackId
-          )?.name
-        }
-      />
+        <dl className={styles.dl}>
+          <dt>{copy.pdsSection.recipientLabel}</dt>
+          <dd>
+            {
+              [...SHORT_EXAMPLE_RECIPIENTS, ...LONG_EXAMPLE_RECIPIENTS].find(
+                ({ id }) => id === render?.systemPersonalisationPackId
+              )?.name
+            }
+          </dd>
+        </dl>
+      </section>
 
       {hasCustomFields && (
-        <>
-          <h3 className='nhsuk-heading-s nhsuk-u-padding-top-4'>
+        <section aria-labelledby={`tab-${tab}-custom-personalisation`}>
+          <h3
+            id={`tab-${tab}-custom-personalisation`}
+            className='nhsuk-heading-s nhsuk-u-padding-top-4'
+          >
             {copy.customSection.heading}
           </h3>
-          {template.customPersonalisation!.map((field) => {
-            return (
-              <Field
-                key={field}
-                label={field}
-                value={render?.personalisationParameters?.[field]}
-              />
-            );
-          })}
-        </>
+          <dl className={styles.dl}>
+            {template.customPersonalisation!.map((field) => (
+              <Fragment key={field}>
+                <dt>{field}</dt>
+                <dd>{render?.personalisationParameters?.[field]}</dd>
+              </Fragment>
+            ))}
+          </dl>
+        </section>
       )}
     </>
   );
diff --git a/tests/test-team/pages/letter/template-mgmt-preview-approved-letter-page.ts b/tests/test-team/pages/letter/template-mgmt-preview-approved-letter-page.ts
index 2a2dd019c..7bebe94ae 100644
--- a/tests/test-team/pages/letter/template-mgmt-preview-approved-letter-page.ts
+++ b/tests/test-team/pages/letter/template-mgmt-preview-approved-letter-page.ts
@@ -1,6 +1,35 @@
+import { Locator } from '@playwright/test';
 import { TemplateMgmtPreviewSubmittedBasePage } from '../template-mgmt-preview-submitted-base-page';
 
 export class TemplateMgmtPreviewApprovedLetterPage extends TemplateMgmtPreviewSubmittedBasePage {
   static readonly pathTemplate =
     '/preview-approved-letter-template/:templateId';
+
+  public getTab(name: string) {
+    const panel = this.page.getByRole('tabpanel', { name });
+    const tab = this.page.getByRole('tab', { name });
+
+    const pdsSection = panel.getByRole('region', {
+      name: 'PDS personalisation fields',
+    });
+
+    const customSection = panel.getByRole('region', {
+      name: 'Custom personalisation fields',
+    });
+
+    const recipientValue = this.getFieldValue(pdsSection, 'Example recipient');
+
+    return {
+      tab,
+      panel,
+      recipientValue,
+      getCustomFieldValue: (fieldName: string) => {
+        return this.getFieldValue(customSection, fieldName);
+      },
+    };
+  }
+
+  private getFieldValue(section: Locator, label: string) {
+    return section.getByRole('term').filter({ hasText: label }).locator('+ dd');
+  }
 }
diff --git a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts
index 1af8b6a89..94efba587 100644
--- a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts
@@ -21,13 +21,47 @@ function createTemplates(user: TestUser) {
       'e8b5f3a1-2c4d-4e6f-8a9b-1c2d3e4f5a6b',
       user,
       'authoring-letter-template-preview-approved-submitted',
-      'SUBMITTED'
+      'SUBMITTED',
+      {
+        customPersonalisation: ['gpSurgeryName', 'gpSurgeryAddress'],
+        longFormRender: {
+          personalisationParameters: {
+            gpSurgeryName: 'Falafel Medical Practice',
+            gpSurgeryAddress: 'Hummus Lane',
+          },
+          systemPersonalisationPackId: 'long-2', // Dr Elizabeth Anne Thompson
+        },
+        shortFormRender: {
+          personalisationParameters: {
+            gpSurgeryName: 'Moon Surgery',
+            gpSurgeryAddress: 'The Moon',
+          },
+          systemPersonalisationPackId: 'short-3', // Ms Sarah Jones
+        },
+      }
     ),
     proofApproved: TemplateFactory.createAuthoringLetterTemplate(
       '375f5dc4-7c77-48f5-be47-d3df1f52bc0e',
       user,
       'authoring-letter-template-preview-approved-proof-approved',
-      'PROOF_APPROVED'
+      'PROOF_APPROVED',
+      {
+        customPersonalisation: ['gpSurgeryName', 'gpSurgeryAddress'],
+        longFormRender: {
+          personalisationParameters: {
+            gpSurgeryName: 'Falafel Medical Practice',
+            gpSurgeryAddress: 'Hummus Lane',
+          },
+          systemPersonalisationPackId: 'long-2',
+        },
+        shortFormRender: {
+          personalisationParameters: {
+            gpSurgeryName: 'Moon Surgery',
+            gpSurgeryAddress: 'The Moon',
+          },
+          systemPersonalisationPackId: 'short-3',
+        },
+      }
     ),
     invalid: TemplateFactory.createAuthoringLetterTemplate(
       'e2a5b238-ecbf-42c8-90f1-0cf544a9c0ae',
@@ -131,6 +165,50 @@ test.describe('Preview approved letter template page', () => {
         await expect(previewSubmittedLetterTemplatePage.copyLink).toHaveCount(
           0
         );
+
+        const shortTab =
+          previewSubmittedLetterTemplatePage.getTab('Short examples');
+        const longTab =
+          previewSubmittedLetterTemplatePage.getTab('Long examples');
+
+        await expect(shortTab.tab).toHaveAttribute('aria-selected', 'true');
+        await expect(shortTab.panel).toBeVisible();
+        await expect(longTab.tab).toHaveAttribute('aria-selected', 'false');
+        await expect(longTab.panel).toBeHidden();
+
+        await longTab.tab.click();
+
+        await expect(longTab.tab).toHaveAttribute('aria-selected', 'true');
+        await expect(longTab.panel).toBeVisible();
+        await expect(shortTab.tab).toHaveAttribute('aria-selected', 'false');
+        await expect(shortTab.panel).toBeHidden();
+
+        await expect(longTab.recipientValue).toHaveText(
+          'Dr Elizabeth Anne Thompson'
+        );
+
+        await expect(longTab.getCustomFieldValue('gpSurgeryName')).toHaveText(
+          'Falafel Medical Practice'
+        );
+        await expect(
+          longTab.getCustomFieldValue('gpSurgeryAddress')
+        ).toHaveText('Hummus Lane');
+
+        await shortTab.tab.click();
+
+        await expect(shortTab.tab).toHaveAttribute('aria-selected', 'true');
+        await expect(shortTab.panel).toBeVisible();
+        await expect(longTab.tab).toHaveAttribute('aria-selected', 'false');
+        await expect(longTab.panel).toBeHidden();
+
+        await expect(shortTab.recipientValue).toHaveText('Ms Sarah Jones');
+
+        await expect(shortTab.getCustomFieldValue('gpSurgeryName')).toHaveText(
+          'Moon Surgery'
+        );
+        await expect(
+          shortTab.getCustomFieldValue('gpSurgeryAddress')
+        ).toHaveText('The Moon');
       });
     }
   });

From 7cd9d3df108e4bba3a4729606b6eede9a9663298 Mon Sep 17 00:00:00 2001
From: Michael Harrison <michael.harrison31@nhs.net>
Date: Fri, 27 Mar 2026 15:42:11 +0000
Subject: [PATCH 14/57] CCM-14758: lockfile

---
 package-lock.json | 307 +++++++++++++++++++++++++++++++---------------
 1 file changed, 207 insertions(+), 100 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 95ff11ea8..4ffce099b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -104,6 +104,179 @@
         "whatwg-fetch": "^3.6.20"
       }
     },
+    "frontend/node_modules/@aws-amplify/storage": {
+      "version": "6.13.2",
+      "resolved": "https://registry.npmjs.org/@aws-amplify/storage/-/storage-6.13.2.tgz",
+      "integrity": "sha512-XMhFXrEYD/x/cd5qvTnMa/xhbpJjZZyva2ea0wmLedLqY1glWyhKPmSi2PAfhhpkWcvA50XnQ/g9KaZsog5hww==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/types": "3.973.1",
+        "@smithy/md5-js": "2.0.7",
+        "buffer": "4.9.2",
+        "crc-32": "1.2.2",
+        "fast-xml-parser": "^5.3.6",
+        "tslib": "^2.5.0"
+      },
+      "peerDependencies": {
+        "@aws-amplify/core": "^6.1.0"
+      }
+    },
+    "frontend/node_modules/@aws-amplify/ui": {
+      "version": "6.15.2",
+      "resolved": "https://registry.npmjs.org/@aws-amplify/ui/-/ui-6.15.2.tgz",
+      "integrity": "sha512-w8ElY62cjBIKGOPEkEMXAtwrAoDYMLizfdIuR3KWDI8ta8Riv0l8nZt7N2EtraUnD7RxWUKgzR3kcBtFoPUbRA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "csstype": "^3.1.1",
+        "lodash": "4.17.23",
+        "tslib": "^2.5.2"
+      },
+      "peerDependencies": {
+        "@aws-amplify/core": "*",
+        "aws-amplify": "^6.14.3",
+        "xstate": "^4.33.6"
+      },
+      "peerDependenciesMeta": {
+        "xstate": {
+          "optional": true
+        }
+      }
+    },
+    "frontend/node_modules/@aws-amplify/ui-react": {
+      "version": "6.15.2",
+      "resolved": "https://registry.npmjs.org/@aws-amplify/ui-react/-/ui-react-6.15.2.tgz",
+      "integrity": "sha512-8eXVnyl8eLPKGXaJ3CEt1mNwWKJ98El5nVz9NnKzoW1/B5cPhc96yVzIzHmyAyMROLKArzWOC4unx/RLN1YDBA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-amplify/ui": "6.15.2",
+        "@aws-amplify/ui-react-core": "3.6.2",
+        "@radix-ui/react-direction": "^1.1.0",
+        "@radix-ui/react-dropdown-menu": "^2.1.10",
+        "@radix-ui/react-slider": "^1.3.2",
+        "@xstate/react": "^3.2.2",
+        "lodash": "4.17.23",
+        "qrcode": "1.5.0",
+        "tslib": "^2.5.2"
+      },
+      "peerDependencies": {
+        "@aws-amplify/core": "*",
+        "aws-amplify": "^6.14.3",
+        "react": "^16.14.0 || ^17.0 || ^18.0 || ^19",
+        "react-dom": "^16.14 || ^17 || ^18 || ^19"
+      },
+      "peerDependenciesMeta": {
+        "aws-amplify": {
+          "optional": true
+        }
+      }
+    },
+    "frontend/node_modules/@aws-amplify/ui-react-core": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/@aws-amplify/ui-react-core/-/ui-react-core-3.6.2.tgz",
+      "integrity": "sha512-wVyE9DFMJebGp1pLkcvohtGPFL6fpXH7lHiU/1fndPLUrUpHJFxslHAT3LGTwztThC27iM3hap+BcEewFiaqJA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-amplify/ui": "6.15.2",
+        "@xstate/react": "^3.2.2",
+        "lodash": "4.17.23",
+        "react-hook-form": "7.53.2",
+        "xstate": "^4.33.6"
+      },
+      "peerDependencies": {
+        "aws-amplify": "^6.14.3",
+        "react": "^16.14 || ^17 || ^18 || ^19"
+      }
+    },
+    "frontend/node_modules/@aws-sdk/types": {
+      "version": "3.973.1",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.1.tgz",
+      "integrity": "sha512-DwHBiMNOB468JiX6+i34c+THsKHErYUdNQ3HexeXZvVn4zouLjgaS4FejiGSi2HyBuzuyHg7SuOPmjSvoU9NRg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@smithy/types": "^4.12.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "frontend/node_modules/@smithy/is-array-buffer": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
+      "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "frontend/node_modules/@smithy/md5-js": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-2.0.7.tgz",
+      "integrity": "sha512-2i2BpXF9pI5D1xekqUsgQ/ohv5+H//G9FlawJrkOJskV18PgJ8LiNbLiskMeYt07yAsSTZR7qtlcAaa/GQLWww==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@smithy/types": "^2.3.1",
+        "@smithy/util-utf8": "^2.0.0",
+        "tslib": "^2.5.0"
+      }
+    },
+    "frontend/node_modules/@smithy/md5-js/node_modules/@smithy/types": {
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-2.12.0.tgz",
+      "integrity": "sha512-QwYgloJ0sVNBeBuBs65cIkTbfzV/Q6ZNPCJ99EICFEdJYG50nGIY/uYXp+TbsdJReIuPr0a0kXmCvren3MbRRw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "frontend/node_modules/@smithy/util-buffer-from": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
+      "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@smithy/is-array-buffer": "^2.2.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "frontend/node_modules/@smithy/util-utf8": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
+      "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@smithy/util-buffer-from": "^2.2.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "frontend/node_modules/aws-amplify": {
+      "version": "6.16.3",
+      "resolved": "https://registry.npmjs.org/aws-amplify/-/aws-amplify-6.16.3.tgz",
+      "integrity": "sha512-yWuvctncVzSI5K40k2LiZTTKu6p1O7YpbmFfbM9luAFssUj2P2DmgJgs2IQ0ArpJTi++QrAT5L4F60qxTpGTIA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-amplify/analytics": "7.0.93",
+        "@aws-amplify/api": "6.3.24",
+        "@aws-amplify/auth": "6.19.1",
+        "@aws-amplify/core": "6.16.1",
+        "@aws-amplify/datastore": "5.1.5",
+        "@aws-amplify/notifications": "2.0.93",
+        "@aws-amplify/storage": "6.13.2",
+        "tslib": "^2.5.0"
+      }
+    },
     "lambdas/authorizer": {
       "name": "nhs-notify-templates-api-authorizer",
       "version": "0.0.1",
@@ -5371,72 +5544,6 @@
         "node": ">=14.0.0"
       }
     },
-    "node_modules/@aws-amplify/ui": {
-      "version": "6.15.0",
-      "resolved": "https://registry.npmjs.org/@aws-amplify/ui/-/ui-6.15.0.tgz",
-      "integrity": "sha512-oHI0GrIiTKivqeBUZdcj/WbF+1iHa2U89Dk1wHWDgyNi9IX7LCADCvbL8EFZBC1/Z0GgzP9kS/nDG5AP9DOsLg==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "csstype": "^3.1.1",
-        "lodash": "4.17.23",
-        "tslib": "^2.5.2"
-      },
-      "peerDependencies": {
-        "@aws-amplify/core": "*",
-        "aws-amplify": "^6.14.3",
-        "xstate": "^4.33.6"
-      },
-      "peerDependenciesMeta": {
-        "xstate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@aws-amplify/ui-react": {
-      "version": "6.15.0",
-      "resolved": "https://registry.npmjs.org/@aws-amplify/ui-react/-/ui-react-6.15.0.tgz",
-      "integrity": "sha512-aH0H40TKl0KQ0pPCiopBS82Et5d8md1LlgiEBdQjbDK4ATMTa8qYGt1wAKgj8e74Q8S0PH+vxODJeTrbi/jdUw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-amplify/ui": "6.15.0",
-        "@aws-amplify/ui-react-core": "3.6.0",
-        "@radix-ui/react-direction": "^1.1.0",
-        "@radix-ui/react-dropdown-menu": "^2.1.10",
-        "@radix-ui/react-slider": "^1.3.2",
-        "@xstate/react": "^3.2.2",
-        "lodash": "4.17.23",
-        "qrcode": "1.5.0",
-        "tslib": "^2.5.2"
-      },
-      "peerDependencies": {
-        "@aws-amplify/core": "*",
-        "aws-amplify": "^6.14.3",
-        "react": "^16.14.0 || ^17.0 || ^18.0 || ^19",
-        "react-dom": "^16.14 || ^17 || ^18 || ^19"
-      },
-      "peerDependenciesMeta": {
-        "aws-amplify": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@aws-amplify/ui-react-core": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/@aws-amplify/ui-react-core/-/ui-react-core-3.6.0.tgz",
-      "integrity": "sha512-RkKuTQjBZH4q/XoVEAn8w/1B88WHRBw/+HFZt/u08tqRcxNU3fTMp5XcnVGWALCyD/ji5TkGdrmAG09qjKr7ow==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-amplify/ui": "6.15.0",
-        "@xstate/react": "^3.2.2",
-        "lodash": "4.17.23",
-        "react-hook-form": "7.53.2",
-        "xstate": "^4.33.6"
-      },
-      "peerDependencies": {
-        "aws-amplify": "^6.14.3",
-        "react": "^16.14 || ^17 || ^18 || ^19"
-      }
-    },
     "node_modules/@aws-crypto/crc32": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz",
@@ -7707,13 +7814,13 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login": {
-      "version": "3.972.24",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.24.tgz",
-      "integrity": "sha512-sIk8oa6AzDoUhxsR11svZESqvzGuXesw62Rl2oW6wguZx8i9cdGCvkFg+h5K7iucUZP8wyWibUbJMc+J66cu5g==",
+      "version": "3.972.25",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.25.tgz",
+      "integrity": "sha512-bUdmyJeVua7SmD+g2a65x2/0YqsGn4K2k4GawI43js0odaNaIzpIhLtHehUnPnfLuyhPWbJR1NyuIO4iMVfM0w==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.24",
-        "@aws-sdk/nested-clients": "^3.996.14",
+        "@aws-sdk/core": "^3.973.25",
+        "@aws-sdk/nested-clients": "^3.996.15",
         "@aws-sdk/types": "^3.973.6",
         "@smithy/property-provider": "^4.2.12",
         "@smithy/protocol-http": "^5.3.12",
@@ -7726,13 +7833,13 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/core": {
-      "version": "3.973.24",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.973.24.tgz",
-      "integrity": "sha512-vvf82RYQu2GidWAuQq+uIzaPz9V0gSCXVqdVzRosgl5rXcspXOpSD3wFreGGW6AYymPr97Z69kjVnLePBxloDw==",
+      "version": "3.973.25",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.973.25.tgz",
+      "integrity": "sha512-TNrx7eq6nKNOO62HWPqoBqPLXEkW6nLZQGwjL6lq1jZtigWYbK1NbCnT7mKDzbLMHZfuOECUt3n6CzxjUW9HWQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-sdk/types": "^3.973.6",
-        "@aws-sdk/xml-builder": "^3.972.15",
+        "@aws-sdk/xml-builder": "^3.972.16",
         "@smithy/core": "^3.23.12",
         "@smithy/node-config-provider": "^4.3.12",
         "@smithy/property-provider": "^4.2.12",
@@ -7779,9 +7886,9 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-recursion-detection": {
-      "version": "3.972.8",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.972.8.tgz",
-      "integrity": "sha512-BnnvYs2ZEpdlmZ2PNlV2ZyQ8j8AEkMTjN79y/YA475ER1ByFYrkVR85qmhni8oeTaJcDqbx364wDpitDAA/wCA==",
+      "version": "3.972.9",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.972.9.tgz",
+      "integrity": "sha512-/Wt5+CT8dpTFQxEJ9iGy/UGrXr7p2wlIOEHvIr/YcHYByzoLjrqkYqXdJjd9UIgWjv7eqV2HnFJen93UTuwfTQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-sdk/types": "^3.973.6",
@@ -7795,12 +7902,12 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-user-agent": {
-      "version": "3.972.25",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.25.tgz",
-      "integrity": "sha512-QxiMPofvOt8SwSynTOmuZfvvPM1S9QfkESBxB22NMHTRXCJhR5BygLl8IXfC4jELiisQgwsgUby21GtXfX3f/g==",
+      "version": "3.972.26",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.26.tgz",
+      "integrity": "sha512-AilFIh4rI/2hKyyGN6XrB0yN96W2o7e7wyrPWCM6QjZM1mcC/pVkW3IWWRvuBWMpVP8Fg+rMpbzeLQ6dTM4gig==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.24",
+        "@aws-sdk/core": "^3.973.25",
         "@aws-sdk/types": "^3.973.6",
         "@aws-sdk/util-endpoints": "^3.996.5",
         "@smithy/core": "^3.23.12",
@@ -7814,23 +7921,23 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/nested-clients": {
-      "version": "3.996.14",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.996.14.tgz",
-      "integrity": "sha512-fSESKvh1VbfjtV3QMnRkCPZWkUbQof6T/DOpiLp33yP2wA+rbwwnZeG3XT3Ekljgw2I8X4XaQPnw+zSR8yxJ5Q==",
+      "version": "3.996.15",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.996.15.tgz",
+      "integrity": "sha512-k6WAVNkub5DrU46iPQvH1m0xc1n+0dX79+i287tYJzf5g1yU2rX3uf4xNeL5JvK1NtYgfwMnsxHqhOXFBn367A==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "^3.973.24",
+        "@aws-sdk/core": "^3.973.25",
         "@aws-sdk/middleware-host-header": "^3.972.8",
         "@aws-sdk/middleware-logger": "^3.972.8",
-        "@aws-sdk/middleware-recursion-detection": "^3.972.8",
-        "@aws-sdk/middleware-user-agent": "^3.972.25",
-        "@aws-sdk/region-config-resolver": "^3.972.9",
+        "@aws-sdk/middleware-recursion-detection": "^3.972.9",
+        "@aws-sdk/middleware-user-agent": "^3.972.26",
+        "@aws-sdk/region-config-resolver": "^3.972.10",
         "@aws-sdk/types": "^3.973.6",
         "@aws-sdk/util-endpoints": "^3.996.5",
         "@aws-sdk/util-user-agent-browser": "^3.972.8",
-        "@aws-sdk/util-user-agent-node": "^3.973.11",
+        "@aws-sdk/util-user-agent-node": "^3.973.12",
         "@smithy/config-resolver": "^4.4.13",
         "@smithy/core": "^3.23.12",
         "@smithy/fetch-http-handler": "^5.3.15",
@@ -7863,9 +7970,9 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/region-config-resolver": {
-      "version": "3.972.9",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.972.9.tgz",
-      "integrity": "sha512-eQ+dFU05ZRC/lC2XpYlYSPlXtX3VT8sn5toxN2Fv7EXlMoA2p9V7vUBKqHunfD4TRLpxUq8Y8Ol/nCqiv327Ng==",
+      "version": "3.972.10",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.972.10.tgz",
+      "integrity": "sha512-1dq9ToC6e070QvnVhhbAs3bb5r6cQ10gTVc6cyRV5uvQe7P138TV2uG2i6+Yok4bAkVAcx5AqkTEBUvWEtBlsQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-sdk/types": "^3.973.6",
@@ -7920,12 +8027,12 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/util-user-agent-node": {
-      "version": "3.973.11",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.973.11.tgz",
-      "integrity": "sha512-1qdXbXo2s5MMLpUvw00284LsbhtlQ4ul7Zzdn5n+7p4WVgCMLqhxImpHIrjSoc72E/fyc4Wq8dLtUld2Gsh+lA==",
+      "version": "3.973.12",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.973.12.tgz",
+      "integrity": "sha512-8phW0TS8ntENJgDcFewYT/Q8dOmarpvSxEjATu2GUBAutiHr++oEGCiBUwxslCMNvwW2cAPZNT53S/ym8zm/gg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/middleware-user-agent": "^3.972.25",
+        "@aws-sdk/middleware-user-agent": "^3.972.26",
         "@aws-sdk/types": "^3.973.6",
         "@smithy/node-config-provider": "^4.3.12",
         "@smithy/types": "^4.13.1",
@@ -7945,9 +8052,9 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/xml-builder": {
-      "version": "3.972.15",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.15.tgz",
-      "integrity": "sha512-PxMRlCFNiQnke9YR29vjFQwz4jq+6Q04rOVFeTDR2K7Qpv9h9FOWOxG+zJjageimYbWqE3bTuLjmryWHAWbvaA==",
+      "version": "3.972.16",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.16.tgz",
+      "integrity": "sha512-iu2pyvaqmeatIJLURLqx9D+4jKAdTH20ntzB6BFwjyN7V960r4jK32mx0Zf7YbtOYAbmbtQfDNuL60ONinyw7A==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/types": "^4.13.1",

From b9a4c432ad3550330b91eff51327de240bbb0a13 Mon Sep 17 00:00:00 2001
From: Michael Harrison <michael.harrison31@nhs.net>
Date: Mon, 30 Mar 2026 10:03:07 +0100
Subject: [PATCH 15/57] CCM-14758: lockfile

---
 package-lock.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4ffce099b..b88d153c6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7814,13 +7814,13 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login": {
-      "version": "3.972.25",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.25.tgz",
-      "integrity": "sha512-bUdmyJeVua7SmD+g2a65x2/0YqsGn4K2k4GawI43js0odaNaIzpIhLtHehUnPnfLuyhPWbJR1NyuIO4iMVfM0w==",
+      "version": "3.972.26",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.26.tgz",
+      "integrity": "sha512-EFcM8RM3TUxnZOfMJo++3PnyxFu1fL/huzmn3Vh+8IWRgqZawUD3cRwwOr+/4bE9DpyHaLOWFAjY0lfK5X9ZkQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-sdk/core": "^3.973.25",
-        "@aws-sdk/nested-clients": "^3.996.15",
+        "@aws-sdk/nested-clients": "^3.996.16",
         "@aws-sdk/types": "^3.973.6",
         "@smithy/property-provider": "^4.2.12",
         "@smithy/protocol-http": "^5.3.12",
@@ -7921,9 +7921,9 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/nested-clients": {
-      "version": "3.996.15",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.996.15.tgz",
-      "integrity": "sha512-k6WAVNkub5DrU46iPQvH1m0xc1n+0dX79+i287tYJzf5g1yU2rX3uf4xNeL5JvK1NtYgfwMnsxHqhOXFBn367A==",
+      "version": "3.996.16",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.996.16.tgz",
+      "integrity": "sha512-L7Qzoj/qQU1cL5GnYLQP5LbI+wlLCLoINvcykR3htKcQ4tzrPf2DOs72x933BM7oArYj1SKrkb2lGlsJHIic3g==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",

From 40081f4cf35edc6dc1985100a05d4e1064dc43e0 Mon Sep 17 00:00:00 2001
From: Michael Harrison <michael.harrison31@nhs.net>
Date: Mon, 30 Mar 2026 15:26:31 +0100
Subject: [PATCH 16/57] CCM-14758: fix test

---
 .../choose-printing-and-postage/[templateId]/page.test.tsx    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/__tests__/app/choose-printing-and-postage/[templateId]/page.test.tsx b/frontend/src/__tests__/app/choose-printing-and-postage/[templateId]/page.test.tsx
index bbccf67f9..5ccdae778 100644
--- a/frontend/src/__tests__/app/choose-printing-and-postage/[templateId]/page.test.tsx
+++ b/frontend/src/__tests__/app/choose-printing-and-postage/[templateId]/page.test.tsx
@@ -215,14 +215,14 @@ describe('template has been submitted', () => {
     });
   });
 
-  it('redirects to preview submitted letter template page', async () => {
+  it('redirects to preview approved letter template page', async () => {
     await Page({
       params: Promise.resolve({ templateId: 'template-123' }),
       searchParams: validSearchParams,
     });
 
     expect(redirect).toHaveBeenCalledWith(
-      '/preview-submitted-letter-template/template-123',
+      '/preview-approved-letter-template/template-123',
       RedirectType.replace
     );
   });

From e5575c9c312cde292ace847537b319d98c9ff202 Mon Sep 17 00:00:00 2001
From: Michael Harrison <michael.harrison31@nhs.net>
Date: Mon, 30 Mar 2026 16:48:49 +0100
Subject: [PATCH 17/57] CCM-14758: pr feedback

---
 .../[templateId]/page.test.tsx                     |  5 ++++-
 .../edit-template-name/[templateId]/page.test.tsx  |  7 ++++++-
 .../__snapshots__/page.test.tsx.snap               |  6 ++++--
 .../preview-approved-letter-template/page.test.tsx | 12 +++++++++++-
 .../[templateId]/page.tsx                          | 14 ++++++++++++--
 5 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/frontend/src/__tests__/app/edit-template-campaign/[templateId]/page.test.tsx b/frontend/src/__tests__/app/edit-template-campaign/[templateId]/page.test.tsx
index ab42f1a01..ca793bb0b 100644
--- a/frontend/src/__tests__/app/edit-template-campaign/[templateId]/page.test.tsx
+++ b/frontend/src/__tests__/app/edit-template-campaign/[templateId]/page.test.tsx
@@ -202,7 +202,10 @@ describe('template has been submitted - authoring', () => {
   });
 
   it('redirects to preview approved letter template page', async () => {
-    await Page({ params: Promise.resolve({ templateId: 'template-123' }) });
+    await Page({
+      params: Promise.resolve({ templateId: 'template-123' }),
+      searchParams: validSearchParams,
+    });
 
     expect(redirect).toHaveBeenCalledWith(
       '/preview-approved-letter-template/template-123',
diff --git a/frontend/src/__tests__/app/edit-template-name/[templateId]/page.test.tsx b/frontend/src/__tests__/app/edit-template-name/[templateId]/page.test.tsx
index fd143c9cd..35676b791 100644
--- a/frontend/src/__tests__/app/edit-template-name/[templateId]/page.test.tsx
+++ b/frontend/src/__tests__/app/edit-template-name/[templateId]/page.test.tsx
@@ -204,7 +204,12 @@ describe('template has been submitted - authoring', () => {
   });
 
   it('redirects to preview approved letter template page', async () => {
-    await Page({ params: Promise.resolve({ templateId: 'template-123' }) });
+    await Page({
+      params: Promise.resolve({
+        templateId: 'template-123',
+      }),
+      searchParams: validSearchParams,
+    });
 
     expect(redirect).toHaveBeenCalledWith(
       '/preview-approved-letter-template/template-123',
diff --git a/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap
index 4ef13ae50..41db6eab2 100644
--- a/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap
@@ -153,7 +153,7 @@ exports[`valid authoring letter template matches snapshot 1`] = `
                   </dd>
                 </div>
                 <div
-                  class="nhsuk-summary-list__row missing-value"
+                  class="nhsuk-summary-list__row"
                   id="printing-and-postage"
                 >
                   <dt
@@ -163,7 +163,9 @@ exports[`valid authoring letter template matches snapshot 1`] = `
                   </dt>
                   <dd
                     class="nhsuk-summary-list__value"
-                  />
+                  >
+                    Example Letter Variant
+                  </dd>
                   <dd
                     aria-hidden="true"
                     class="nhsuk-summary-list__actions"
diff --git a/frontend/src/__tests__/app/preview-approved-letter-template/page.test.tsx b/frontend/src/__tests__/app/preview-approved-letter-template/page.test.tsx
index bf6a8fe4c..4cac61975 100644
--- a/frontend/src/__tests__/app/preview-approved-letter-template/page.test.tsx
+++ b/frontend/src/__tests__/app/preview-approved-letter-template/page.test.tsx
@@ -1,10 +1,11 @@
 import { render, screen } from '@testing-library/react';
 import { redirect, RedirectType } from 'next/navigation';
-import { getTemplate } from '@utils/form-actions';
+import { getTemplate, getLetterVariantById } from '@utils/form-actions';
 import { verifyFormCsrfToken } from '@utils/csrf-utils';
 import {
   AUTHORING_LETTER_TEMPLATE,
   EMAIL_TEMPLATE,
+  makeLetterVariant,
   NHS_APP_TEMPLATE,
   PDF_LETTER_TEMPLATE,
   SMS_TEMPLATE,
@@ -178,6 +179,12 @@ describe('authoring letter template is invalid', () => {
 describe('valid authoring letter template', () => {
   beforeEach(() => {
     jest.mocked(getTemplate).mockResolvedValue(mockTemplate);
+    jest.mocked(getLetterVariantById).mockResolvedValue(
+      makeLetterVariant({
+        id: mockTemplate.letterVariantId,
+        name: 'Example Letter Variant',
+      })
+    );
   });
 
   it('renders the page without redirecting', async () => {
@@ -187,6 +194,9 @@ describe('valid authoring letter template', () => {
 
     expect(page).toBeTruthy();
     expect(redirect).not.toHaveBeenCalled();
+    expect(getLetterVariantById).toHaveBeenCalledWith(
+      mockTemplate.letterVariantId
+    );
   });
 
   it('matches snapshot', async () => {
diff --git a/frontend/src/app/preview-approved-letter-template/[templateId]/page.tsx b/frontend/src/app/preview-approved-letter-template/[templateId]/page.tsx
index 6f677b077..02d33154c 100644
--- a/frontend/src/app/preview-approved-letter-template/[templateId]/page.tsx
+++ b/frontend/src/app/preview-approved-letter-template/[templateId]/page.tsx
@@ -1,5 +1,6 @@
 import { redirect, RedirectType } from 'next/navigation';
 import type { Metadata } from 'next';
+import type { LetterVariant } from 'nhs-notify-web-template-management-types';
 import type { TemplatePageProps } from 'nhs-notify-web-template-management-utils';
 import {
   $AuthoringLetterTemplate,
@@ -10,7 +11,7 @@ import { NHSNotifyMain } from '@atoms/NHSNotifyMain/NHSNotifyMain';
 import { NHSNotifyBackLink } from '@atoms/NHSNotifyBackLink/NHSNotifyBackLink';
 import { LetterRender } from '@molecules/LetterRender';
 import PreviewTemplateDetailsAuthoringLetter from '@molecules/PreviewTemplateDetails/PreviewTemplateDetailsAuthoringLetter';
-import { getTemplate } from '@utils/form-actions';
+import { getLetterVariantById, getTemplate } from '@utils/form-actions';
 import content from '@content/content';
 import { NHSNotifyContainer } from '@layouts/container/container';
 
@@ -44,6 +45,14 @@ export default async function PreviewApprovedLetterTemplatePage({
     return redirect('/invalid-template', RedirectType.replace);
   }
 
+  let letterVariant: LetterVariant | undefined;
+
+  if (validatedTemplate.letterVariantId) {
+    letterVariant = await getLetterVariantById(
+      validatedTemplate.letterVariantId
+    );
+  }
+
   return (
     <NHSNotifyContainer fullWidth>
       <NHSNotifyContainer>
@@ -57,7 +66,8 @@ export default async function PreviewApprovedLetterTemplatePage({
             <div className='nhsuk-grid-column-full'>
               <PreviewTemplateDetailsAuthoringLetter
                 template={validatedTemplate}
-                hideEditActions={true}
+                letterVariant={letterVariant}
+                hideEditActions
               />
             </div>
           </div>

From 9993ea4b51b8eebbeaadddff152aae83f0a5d30f Mon Sep 17 00:00:00 2001
From: Michael Harrison <michael.harrison31@nhs.net>
Date: Mon, 30 Mar 2026 17:06:54 +0100
Subject: [PATCH 18/57] CCM-14758: add variant check in pw test

---
 .../template-mgmt-preview-submitted-base-page.ts |  2 ++
 ...review-approved-letter-page.component.spec.ts | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/tests/test-team/pages/template-mgmt-preview-submitted-base-page.ts b/tests/test-team/pages/template-mgmt-preview-submitted-base-page.ts
index 1c04c7fec..1d3e9a284 100644
--- a/tests/test-team/pages/template-mgmt-preview-submitted-base-page.ts
+++ b/tests/test-team/pages/template-mgmt-preview-submitted-base-page.ts
@@ -5,6 +5,7 @@ export abstract class TemplateMgmtPreviewSubmittedBasePage extends TemplateMgmtB
   readonly campaignId: Locator;
   readonly copyLink: Locator;
   readonly statusTag: Locator;
+  readonly printingAndPostage: Locator;
 
   constructor(page: Page) {
     super(page);
@@ -12,5 +13,6 @@ export abstract class TemplateMgmtPreviewSubmittedBasePage extends TemplateMgmtB
     this.campaignId = page.locator('[id="campaign-id"]');
     this.copyLink = page.getByTestId('copy-link');
     this.statusTag = page.getByTestId('status-tag');
+    this.printingAndPostage = page.locator('[id="printing-and-postage"]');
   }
 }
diff --git a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts
index 3b415b884..969c7fcac 100644
--- a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-approved-letter-page.component.spec.ts
@@ -12,7 +12,9 @@ import {
 import { TestUser, testUsers } from '../../helpers/auth/cognito-auth-helper';
 import { getTestContext } from 'helpers/context/context';
 
-function createTemplates(user: TestUser) {
+async function createTemplates(user: TestUser) {
+  const [globalVariant] =
+    await getTestContext().letterVariants.getGlobalLetterVariants();
   return {
     submitted: TemplateFactory.createAuthoringLetterTemplate(
       'e8b5f3a1-2c4d-4e6f-8a9b-1c2d3e4f5a6b',
@@ -35,6 +37,7 @@ function createTemplates(user: TestUser) {
           },
           systemPersonalisationPackId: 'short-3', // Ms Sarah Jones
         },
+        letterVariantId: globalVariant.id,
       }
     ),
     proofApproved: TemplateFactory.createAuthoringLetterTemplate(
@@ -58,6 +61,7 @@ function createTemplates(user: TestUser) {
           },
           systemPersonalisationPackId: 'short-3',
         },
+        letterVariantId: globalVariant.id,
       }
     ),
     invalid: TemplateFactory.createAuthoringLetterTemplate(
@@ -82,14 +86,14 @@ function createTemplates(user: TestUser) {
 }
 
 test.describe('Preview approved letter template page', () => {
-  let templates: ReturnType<typeof createTemplates>;
+  let templates: Awaited<ReturnType<typeof createTemplates>>;
   const templateStorageHelper = new TemplateStorageHelper();
 
   test.beforeAll(async () => {
     const user = await getTestContext().auth.getTestUser(
       testUsers.User1.userId
     );
-    templates = createTemplates(user);
+    templates = await createTemplates(user);
     await templateStorageHelper.seedTemplateData(Object.values(templates));
   });
 
@@ -134,6 +138,8 @@ test.describe('Preview approved letter template page', () => {
         baseURL,
       }) => {
         const template = getTemplate();
+        const [globalVariant] =
+          await getTestContext().letterVariants.getGlobalLetterVariants();
 
         const previewSubmittedLetterTemplatePage =
           new TemplateMgmtPreviewApprovedLetterPage(page).setPathParam(
@@ -157,6 +163,10 @@ test.describe('Preview approved letter template page', () => {
           previewSubmittedLetterTemplatePage.campaignId
         ).toContainText(template.campaignId!);
 
+        await expect(
+          previewSubmittedLetterTemplatePage.printingAndPostage
+        ).toContainText(globalVariant.name);
+
         await expect(previewSubmittedLetterTemplatePage.statusTag).toHaveText(
           expectedTag
         );

From be3956ab0296733448f736d615e3bec864b09aca Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Tue, 31 Mar 2026 14:12:32 +0100
Subject: [PATCH 19/57] wip

---
 .../MessagePlanCascadePreview.tsx             |   9 +-
 frontend/src/content/content.ts               |   5 +-
 package-lock.json                             | 143 +++++++++---------
 3 files changed, 80 insertions(+), 77 deletions(-)

diff --git a/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx b/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx
index 635984945..0aac12ac3 100644
--- a/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx
+++ b/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx
@@ -107,13 +107,16 @@ export function MessagePlanCascadePreview({
                   data-testid='channel-card'
                 >
                   {cascadeItem.channel === 'LETTER' ? (
-                    <p data-testid='template-name'>
+                    <>
+                      <p data-testid='template-name'>{defaultTemplate.name}</p>
                       <Link
                         href={getLetterTemplatePreviewHref(defaultTemplate)}
+                        target='_blank'
+                        rel='noopener noreferrer'
                       >
-                        {defaultTemplate.name}
+                        {pageContent.letterTemplateLinkText}
                       </Link>
-                    </p>
+                    </>
                   ) : (
                     <>
                       <p data-testid='template-name'>{defaultTemplate.name}</p>
diff --git a/frontend/src/content/content.ts b/frontend/src/content/content.ts
index ff2868098..5c37011d1 100644
--- a/frontend/src/content/content.ts
+++ b/frontend/src/content/content.ts
@@ -1296,8 +1296,8 @@ const messagePlanConditionalLetterTemplates = {
 
 const messagePlanCascadePreview = {
   detailsOpenButton: {
-    openText: 'Close all template previews',
-    closedText: 'Open all template previews',
+    openText: 'Close all digital template previews',
+    closedText: 'Open all digital template previews',
   },
   languageFormatsCardHeading: 'Other language letters (optional)',
   accessibleFormatCardHeading: '{{format}} (optional)',
@@ -1309,6 +1309,7 @@ const messagePlanCascadePreview = {
     previewSubmitted: '/preview-submitted-letter-template/{{id}}',
     preview: '/preview-letter-template/{{id}}',
   },
+  letterTemplateLinkText: 'Preview template (opens in a new tab)',
 };
 
 const editMessagePlan = {
diff --git a/package-lock.json b/package-lock.json
index b88d153c6..df9bab624 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7814,13 +7814,13 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login": {
-      "version": "3.972.26",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.26.tgz",
-      "integrity": "sha512-EFcM8RM3TUxnZOfMJo++3PnyxFu1fL/huzmn3Vh+8IWRgqZawUD3cRwwOr+/4bE9DpyHaLOWFAjY0lfK5X9ZkQ==",
+      "version": "3.972.27",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.27.tgz",
+      "integrity": "sha512-t3ehEtHomGZwg5Gixw4fYbYtG9JBnjfAjSDabxhPEu/KLLUp0BB37/APX7MSKXQhX6ZH7pseuACFJ19NrAkNdg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.25",
-        "@aws-sdk/nested-clients": "^3.996.16",
+        "@aws-sdk/core": "^3.973.26",
+        "@aws-sdk/nested-clients": "^3.996.17",
         "@aws-sdk/types": "^3.973.6",
         "@smithy/property-provider": "^4.2.12",
         "@smithy/protocol-http": "^5.3.12",
@@ -7833,19 +7833,19 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/core": {
-      "version": "3.973.25",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.973.25.tgz",
-      "integrity": "sha512-TNrx7eq6nKNOO62HWPqoBqPLXEkW6nLZQGwjL6lq1jZtigWYbK1NbCnT7mKDzbLMHZfuOECUt3n6CzxjUW9HWQ==",
+      "version": "3.973.26",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.973.26.tgz",
+      "integrity": "sha512-A/E6n2W42ruU+sfWk+mMUOyVXbsSgGrY3MJ9/0Az5qUdG67y8I6HYzzoAa+e/lzxxl1uCYmEL6BTMi9ZiZnplQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-sdk/types": "^3.973.6",
         "@aws-sdk/xml-builder": "^3.972.16",
-        "@smithy/core": "^3.23.12",
+        "@smithy/core": "^3.23.13",
         "@smithy/node-config-provider": "^4.3.12",
         "@smithy/property-provider": "^4.2.12",
         "@smithy/protocol-http": "^5.3.12",
         "@smithy/signature-v4": "^5.3.12",
-        "@smithy/smithy-client": "^4.12.7",
+        "@smithy/smithy-client": "^4.12.8",
         "@smithy/types": "^4.13.1",
         "@smithy/util-base64": "^4.3.2",
         "@smithy/util-middleware": "^4.2.12",
@@ -7902,15 +7902,15 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-user-agent": {
-      "version": "3.972.26",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.26.tgz",
-      "integrity": "sha512-AilFIh4rI/2hKyyGN6XrB0yN96W2o7e7wyrPWCM6QjZM1mcC/pVkW3IWWRvuBWMpVP8Fg+rMpbzeLQ6dTM4gig==",
+      "version": "3.972.27",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.27.tgz",
+      "integrity": "sha512-TIRLO5UR2+FVUGmhYoAwVkKhcVzywEDX/5LzR9tjy1h8FQAXOtFg2IqgmwvxU7y933rkTn9rl6AdgcAUgQ1/Kg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.25",
+        "@aws-sdk/core": "^3.973.26",
         "@aws-sdk/types": "^3.973.6",
         "@aws-sdk/util-endpoints": "^3.996.5",
-        "@smithy/core": "^3.23.12",
+        "@smithy/core": "^3.23.13",
         "@smithy/protocol-http": "^5.3.12",
         "@smithy/types": "^4.13.1",
         "@smithy/util-retry": "^4.2.12",
@@ -7921,44 +7921,44 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/nested-clients": {
-      "version": "3.996.16",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.996.16.tgz",
-      "integrity": "sha512-L7Qzoj/qQU1cL5GnYLQP5LbI+wlLCLoINvcykR3htKcQ4tzrPf2DOs72x933BM7oArYj1SKrkb2lGlsJHIic3g==",
+      "version": "3.996.17",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.996.17.tgz",
+      "integrity": "sha512-7B0HIX0tEFmOSJuWzdHZj1WhMXSryM+h66h96ZkqSncoY7J6wq61KOu4Kr57b/YnJP3J/EeQYVFulgR281h+7A==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "^3.973.25",
+        "@aws-sdk/core": "^3.973.26",
         "@aws-sdk/middleware-host-header": "^3.972.8",
         "@aws-sdk/middleware-logger": "^3.972.8",
         "@aws-sdk/middleware-recursion-detection": "^3.972.9",
-        "@aws-sdk/middleware-user-agent": "^3.972.26",
+        "@aws-sdk/middleware-user-agent": "^3.972.27",
         "@aws-sdk/region-config-resolver": "^3.972.10",
         "@aws-sdk/types": "^3.973.6",
         "@aws-sdk/util-endpoints": "^3.996.5",
         "@aws-sdk/util-user-agent-browser": "^3.972.8",
-        "@aws-sdk/util-user-agent-node": "^3.973.12",
+        "@aws-sdk/util-user-agent-node": "^3.973.13",
         "@smithy/config-resolver": "^4.4.13",
-        "@smithy/core": "^3.23.12",
+        "@smithy/core": "^3.23.13",
         "@smithy/fetch-http-handler": "^5.3.15",
         "@smithy/hash-node": "^4.2.12",
         "@smithy/invalid-dependency": "^4.2.12",
         "@smithy/middleware-content-length": "^4.2.12",
-        "@smithy/middleware-endpoint": "^4.4.27",
-        "@smithy/middleware-retry": "^4.4.44",
-        "@smithy/middleware-serde": "^4.2.15",
+        "@smithy/middleware-endpoint": "^4.4.28",
+        "@smithy/middleware-retry": "^4.4.45",
+        "@smithy/middleware-serde": "^4.2.16",
         "@smithy/middleware-stack": "^4.2.12",
         "@smithy/node-config-provider": "^4.3.12",
-        "@smithy/node-http-handler": "^4.5.0",
+        "@smithy/node-http-handler": "^4.5.1",
         "@smithy/protocol-http": "^5.3.12",
-        "@smithy/smithy-client": "^4.12.7",
+        "@smithy/smithy-client": "^4.12.8",
         "@smithy/types": "^4.13.1",
         "@smithy/url-parser": "^4.2.12",
         "@smithy/util-base64": "^4.3.2",
         "@smithy/util-body-length-browser": "^4.2.2",
         "@smithy/util-body-length-node": "^4.2.3",
-        "@smithy/util-defaults-mode-browser": "^4.3.43",
-        "@smithy/util-defaults-mode-node": "^4.2.47",
+        "@smithy/util-defaults-mode-browser": "^4.3.44",
+        "@smithy/util-defaults-mode-node": "^4.2.48",
         "@smithy/util-endpoints": "^3.3.3",
         "@smithy/util-middleware": "^4.2.12",
         "@smithy/util-retry": "^4.2.12",
@@ -8027,12 +8027,12 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/util-user-agent-node": {
-      "version": "3.973.12",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.973.12.tgz",
-      "integrity": "sha512-8phW0TS8ntENJgDcFewYT/Q8dOmarpvSxEjATu2GUBAutiHr++oEGCiBUwxslCMNvwW2cAPZNT53S/ym8zm/gg==",
+      "version": "3.973.13",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.973.13.tgz",
+      "integrity": "sha512-s1dCJ0J9WU9UPkT3FFqhKTSquYTkqWXGRaapHFyWwwJH86ZussewhNST5R5TwXVL1VSHq4aJVl9fWK+svaRVCQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/middleware-user-agent": "^3.972.26",
+        "@aws-sdk/middleware-user-agent": "^3.972.27",
         "@aws-sdk/types": "^3.973.6",
         "@smithy/node-config-provider": "^4.3.12",
         "@smithy/types": "^4.13.1",
@@ -12991,9 +12991,9 @@
       }
     },
     "node_modules/@smithy/core": {
-      "version": "3.23.12",
-      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.23.12.tgz",
-      "integrity": "sha512-o9VycsYNtgC+Dy3I0yrwCqv9CWicDnke0L7EVOrZtJpjb2t0EjaEofmMrYc0T1Kn3yk32zm6cspxF9u9Bj7e5w==",
+      "version": "3.23.13",
+      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.23.13.tgz",
+      "integrity": "sha512-J+2TT9D6oGsUVXVEMvz8h2EmdVnkBiy2auCie4aSJMvKlzUtO5hqjEzXhoCUkIMo7gAYjbQcN0g/MMSXEhDs1Q==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/protocol-http": "^5.3.12",
@@ -13002,7 +13002,7 @@
         "@smithy/util-base64": "^4.3.2",
         "@smithy/util-body-length-browser": "^4.2.2",
         "@smithy/util-middleware": "^4.2.12",
-        "@smithy/util-stream": "^4.5.20",
+        "@smithy/util-stream": "^4.5.21",
         "@smithy/util-utf8": "^4.2.2",
         "@smithy/uuid": "^1.1.2",
         "tslib": "^2.6.2"
@@ -13211,13 +13211,13 @@
       }
     },
     "node_modules/@smithy/middleware-endpoint": {
-      "version": "4.4.27",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.4.27.tgz",
-      "integrity": "sha512-T3TFfUgXQlpcg+UdzcAISdZpj4Z+XECZ/cefgA6wLBd6V4lRi0svN2hBouN/be9dXQ31X4sLWz3fAQDf+nt6BA==",
+      "version": "4.4.28",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.4.28.tgz",
+      "integrity": "sha512-p1gfYpi91CHcs5cBq982UlGlDrxoYUX6XdHSo91cQ2KFuz6QloHosO7Jc60pJiVmkWrKOV8kFYlGFFbQ2WUKKQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/core": "^3.23.12",
-        "@smithy/middleware-serde": "^4.2.15",
+        "@smithy/core": "^3.23.13",
+        "@smithy/middleware-serde": "^4.2.16",
         "@smithy/node-config-provider": "^4.3.12",
         "@smithy/shared-ini-file-loader": "^4.4.7",
         "@smithy/types": "^4.13.1",
@@ -13230,15 +13230,15 @@
       }
     },
     "node_modules/@smithy/middleware-retry": {
-      "version": "4.4.44",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.4.44.tgz",
-      "integrity": "sha512-Y1Rav7m5CFRPQyM4CI0koD/bXjyjJu3EQxZZhtLGD88WIrBrQ7kqXM96ncd6rYnojwOo/u9MXu57JrEvu/nLrA==",
+      "version": "4.4.45",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.4.45.tgz",
+      "integrity": "sha512-td1PxpwDIaw5/oP/xIRxBGxJKoF1L4DBAwbZ8wjMuXBYOP/r2ZE/Ocou+mBHx/yk9knFEtDBwhSrYVn+Mz4pHw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/node-config-provider": "^4.3.12",
         "@smithy/protocol-http": "^5.3.12",
         "@smithy/service-error-classification": "^4.2.12",
-        "@smithy/smithy-client": "^4.12.7",
+        "@smithy/smithy-client": "^4.12.8",
         "@smithy/types": "^4.13.1",
         "@smithy/util-middleware": "^4.2.12",
         "@smithy/util-retry": "^4.2.12",
@@ -13250,12 +13250,12 @@
       }
     },
     "node_modules/@smithy/middleware-serde": {
-      "version": "4.2.15",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.2.15.tgz",
-      "integrity": "sha512-ExYhcltZSli0pgAKOpQQe1DLFBLryeZ22605y/YS+mQpdNWekum9Ujb/jMKfJKgjtz1AZldtwA/wCYuKJgjjlg==",
+      "version": "4.2.16",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.2.16.tgz",
+      "integrity": "sha512-beqfV+RZ9RSv+sQqor3xroUUYgRFCGRw6niGstPG8zO9LgTl0B0MCucxjmrH/2WwksQN7UUgI7KNANoZv+KALA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/core": "^3.23.12",
+        "@smithy/core": "^3.23.13",
         "@smithy/protocol-http": "^5.3.12",
         "@smithy/types": "^4.13.1",
         "tslib": "^2.6.2"
@@ -13293,12 +13293,11 @@
       }
     },
     "node_modules/@smithy/node-http-handler": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.5.0.tgz",
-      "integrity": "sha512-Rnq9vQWiR1+/I6NZZMNzJHV6pZYyEHt2ZnuV3MG8z2NNenC4i/8Kzttz7CjZiHSmsN5frhXhg17z3Zqjjhmz1A==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.5.1.tgz",
+      "integrity": "sha512-ejjxdAXjkPIs9lyYyVutOGNOraqUE9v/NjGMKwwFrfOM354wfSD8lmlj8hVwUzQmlLLF4+udhfCX9Exnbmvfzw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/abort-controller": "^4.2.12",
         "@smithy/protocol-http": "^5.3.12",
         "@smithy/querystring-builder": "^4.2.12",
         "@smithy/types": "^4.13.1",
@@ -13406,17 +13405,17 @@
       }
     },
     "node_modules/@smithy/smithy-client": {
-      "version": "4.12.7",
-      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.12.7.tgz",
-      "integrity": "sha512-q3gqnwml60G44FECaEEsdQMplYhDMZYCtYhMCzadCnRnnHIobZJjegmdoUo6ieLQlPUzvrMdIJUpx6DoPmzANQ==",
+      "version": "4.12.8",
+      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.12.8.tgz",
+      "integrity": "sha512-aJaAX7vHe5i66smoSSID7t4rKY08PbD8EBU7DOloixvhOozfYWdcSYE4l6/tjkZ0vBZhGjheWzB2mh31sLgCMA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/core": "^3.23.12",
-        "@smithy/middleware-endpoint": "^4.4.27",
+        "@smithy/core": "^3.23.13",
+        "@smithy/middleware-endpoint": "^4.4.28",
         "@smithy/middleware-stack": "^4.2.12",
         "@smithy/protocol-http": "^5.3.12",
         "@smithy/types": "^4.13.1",
-        "@smithy/util-stream": "^4.5.20",
+        "@smithy/util-stream": "^4.5.21",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -13513,13 +13512,13 @@
       }
     },
     "node_modules/@smithy/util-defaults-mode-browser": {
-      "version": "4.3.43",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.43.tgz",
-      "integrity": "sha512-Qd/0wCKMaXxev/z00TvNzGCH2jlKKKxXP1aDxB6oKwSQthe3Og2dMhSayGCnsma1bK/kQX1+X7SMP99t6FgiiQ==",
+      "version": "4.3.44",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.44.tgz",
+      "integrity": "sha512-eZg6XzaCbVr2S5cAErU5eGBDaOVTuTo1I65i4tQcHENRcZ8rMWhQy1DaIYUSLyZjsfXvmCqZrstSMYyGFocvHA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/property-provider": "^4.2.12",
-        "@smithy/smithy-client": "^4.12.7",
+        "@smithy/smithy-client": "^4.12.8",
         "@smithy/types": "^4.13.1",
         "tslib": "^2.6.2"
       },
@@ -13528,16 +13527,16 @@
       }
     },
     "node_modules/@smithy/util-defaults-mode-node": {
-      "version": "4.2.47",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.47.tgz",
-      "integrity": "sha512-qSRbYp1EQ7th+sPFuVcVO05AE0QH635hycdEXlpzIahqHHf2Fyd/Zl+8v0XYMJ3cgDVPa0lkMefU7oNUjAP+DQ==",
+      "version": "4.2.48",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.48.tgz",
+      "integrity": "sha512-FqOKTlqSaoV3nzO55pMs5NBnZX8EhoI0DGmn9kbYeXWppgHD6dchyuj2HLqp4INJDJbSrj6OFYJkAh/WhSzZPg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/config-resolver": "^4.4.13",
         "@smithy/credential-provider-imds": "^4.2.12",
         "@smithy/node-config-provider": "^4.3.12",
         "@smithy/property-provider": "^4.2.12",
-        "@smithy/smithy-client": "^4.12.7",
+        "@smithy/smithy-client": "^4.12.8",
         "@smithy/types": "^4.13.1",
         "tslib": "^2.6.2"
       },
@@ -13599,13 +13598,13 @@
       }
     },
     "node_modules/@smithy/util-stream": {
-      "version": "4.5.20",
-      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.5.20.tgz",
-      "integrity": "sha512-4yXLm5n/B5SRBR2p8cZ90Sbv4zL4NKsgxdzCzp/83cXw2KxLEumt5p+GAVyRNZgQOSrzXn9ARpO0lUe8XSlSDw==",
+      "version": "4.5.21",
+      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.5.21.tgz",
+      "integrity": "sha512-KzSg+7KKywLnkoKejRtIBXDmwBfjGvg1U1i/etkC7XSWUyFCoLno1IohV2c74IzQqdhX5y3uE44r/8/wuK+A7Q==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/fetch-http-handler": "^5.3.15",
-        "@smithy/node-http-handler": "^4.5.0",
+        "@smithy/node-http-handler": "^4.5.1",
         "@smithy/types": "^4.13.1",
         "@smithy/util-base64": "^4.3.2",
         "@smithy/util-buffer-from": "^4.2.2",

From 52f1641ddf883b0e4e2d7719e2f4f1eb412352d9 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Wed, 1 Apr 2026 10:50:48 +0100
Subject: [PATCH 20/57] wip

---
 .../LetterRender/LetterRenderIframe.test.tsx  | 18 ++++---
 .../preview-template/[templateId]/page.tsx    | 12 ++++-
 .../[templateId]/page.tsx                     |  4 +-
 .../LetterRender/LetterRenderIframe.tsx       | 24 ++++-----
 .../LetterRender/LetterRenderTab.tsx          |  4 +-
 .../PreviewTemplateDetailsLetter.module.scss  |  4 ++
 .../PreviewTemplateDetailsLetter.tsx          | 50 ++++++++++++++-----
 .../PreviewTemplateDetails/common.tsx         |  7 ++-
 .../PreviewTemplateFromMessagePlan.tsx        |  9 +++-
 9 files changed, 94 insertions(+), 38 deletions(-)
 create mode 100644 frontend/src/components/molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter.module.scss

diff --git a/frontend/src/__tests__/components/molecules/LetterRender/LetterRenderIframe.test.tsx b/frontend/src/__tests__/components/molecules/LetterRender/LetterRenderIframe.test.tsx
index df4c3619f..7f60e0d9d 100644
--- a/frontend/src/__tests__/components/molecules/LetterRender/LetterRenderIframe.test.tsx
+++ b/frontend/src/__tests__/components/molecules/LetterRender/LetterRenderIframe.test.tsx
@@ -6,7 +6,7 @@ describe('LetterRenderIframe', () => {
     it('renders iframe with provided pdfUrl', () => {
       render(
         <LetterRenderIframe
-          tab='shortFormRender'
+          renderType='shortFormRender'
           pdfUrl='/templates/files/client-123/renders/template-123/initial.pdf'
         />
       );
@@ -22,7 +22,7 @@ describe('LetterRenderIframe', () => {
     it('adds additional props', () => {
       render(
         <LetterRenderIframe
-          tab='longFormRender'
+          renderType='longFormRender'
           pdfUrl='/templates/files/client-123/renders/template-123/initial.pdf'
           className='additional'
         />
@@ -34,7 +34,9 @@ describe('LetterRenderIframe', () => {
     });
 
     it('renders correct title for short tab', () => {
-      render(<LetterRenderIframe tab='shortFormRender' pdfUrl='/test.pdf' />);
+      render(
+        <LetterRenderIframe renderType='shortFormRender' pdfUrl='/test.pdf' />
+      );
 
       expect(
         screen.getByTitle('Letter preview - short examples')
@@ -42,7 +44,9 @@ describe('LetterRenderIframe', () => {
     });
 
     it('renders correct title for long tab', () => {
-      render(<LetterRenderIframe tab='longFormRender' pdfUrl='/test.pdf' />);
+      render(
+        <LetterRenderIframe renderType='longFormRender' pdfUrl='/test.pdf' />
+      );
 
       expect(
         screen.getByTitle('Letter preview - long examples')
@@ -52,7 +56,7 @@ describe('LetterRenderIframe', () => {
 
   describe('missing file handling', () => {
     it('shows message when pdfUrl is null', () => {
-      render(<LetterRenderIframe tab='shortFormRender' pdfUrl={null} />);
+      render(<LetterRenderIframe renderType='shortFormRender' pdfUrl={null} />);
 
       expect(screen.getByText('No preview available')).toBeInTheDocument();
 
@@ -66,7 +70,7 @@ describe('LetterRenderIframe', () => {
     it('matches snapshot with PDF URL', () => {
       const container = render(
         <LetterRenderIframe
-          tab='shortFormRender'
+          renderType='shortFormRender'
           pdfUrl='/templates/files/client-123/renders/template-123/initial.pdf'
         />
       );
@@ -76,7 +80,7 @@ describe('LetterRenderIframe', () => {
 
     it('matches snapshot without PDF file', () => {
       const container = render(
-        <LetterRenderIframe tab='shortFormRender' pdfUrl={null} />
+        <LetterRenderIframe renderType='shortFormRender' pdfUrl={null} />
       );
 
       expect(container.asFragment()).toMatchSnapshot();
diff --git a/frontend/src/app/message-plans/choose-standard-english-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/choose-standard-english-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
index 39ecdcdec..4b6604d60 100644
--- a/frontend/src/app/message-plans/choose-standard-english-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
+++ b/frontend/src/app/message-plans/choose-standard-english-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -1,10 +1,11 @@
 'use server';
 
 import {
+  AuthoringLetterTemplate,
   MessagePlanAndTemplatePageProps,
   validateLetterTemplate,
 } from 'nhs-notify-web-template-management-utils';
-import { getTemplate } from '@utils/form-actions';
+import { getLetterVariantById, getTemplate } from '@utils/form-actions';
 import { redirect, RedirectType } from 'next/navigation';
 import { Metadata } from 'next';
 import content from '@content/content';
@@ -38,12 +39,20 @@ const PreviewStandardEnglishLetterTemplateFromMessagePlan = async (
 
   const template = await getTemplate(templateId);
 
+  // status?
   const validatedTemplate = validateLetterTemplate(template);
 
   if (!validatedTemplate) {
     return redirect('/invalid-template', RedirectType.replace);
   }
 
+  const letterVariantId = (validatedTemplate as AuthoringLetterTemplate)
+    .letterVariantId;
+
+  const letterVariant = letterVariantId
+    ? await getLetterVariantById(letterVariantId)
+    : undefined;
+
   return (
     <NHSNotifyContainer>
       <PreviewTemplateFromMessagePlan
@@ -51,6 +60,7 @@ const PreviewStandardEnglishLetterTemplateFromMessagePlan = async (
         previewComponent={PreviewTemplateDetailsLetter}
         routingConfigId={routingConfigId}
         lockNumber={lockNumberResult.data}
+        letterVariant={letterVariant}
       />
     </NHSNotifyContainer>
   );
diff --git a/frontend/src/app/review-and-approve-letter-template/[templateId]/page.tsx b/frontend/src/app/review-and-approve-letter-template/[templateId]/page.tsx
index 254cff331..6387c7b0b 100644
--- a/frontend/src/app/review-and-approve-letter-template/[templateId]/page.tsx
+++ b/frontend/src/app/review-and-approve-letter-template/[templateId]/page.tsx
@@ -101,7 +101,7 @@ const ReviewAndApproveLetterTemplatePage = async (props: TemplatePageProps) => {
               styles.iframe,
               'nhsuk-u-margin-bottom-6'
             )}
-            tab='shortFormRender'
+            renderType='shortFormRender'
             pdfUrl={buildLetterRenderUrl(
               validatedTemplate,
               shortFormRender.fileName
@@ -113,7 +113,7 @@ const ReviewAndApproveLetterTemplatePage = async (props: TemplatePageProps) => {
               styles.iframe,
               'nhsuk-u-margin-bottom-6'
             )}
-            tab='longFormRender'
+            renderType='longFormRender'
             pdfUrl={buildLetterRenderUrl(
               validatedTemplate,
               longFormRender.fileName
diff --git a/frontend/src/components/molecules/LetterRender/LetterRenderIframe.tsx b/frontend/src/components/molecules/LetterRender/LetterRenderIframe.tsx
index 3a114745e..16a7cbe96 100644
--- a/frontend/src/components/molecules/LetterRender/LetterRenderIframe.tsx
+++ b/frontend/src/components/molecules/LetterRender/LetterRenderIframe.tsx
@@ -1,24 +1,24 @@
-import type { PersonalisedRenderKey } from '@utils/types';
+import type { RenderKey } from '@utils/types';
 
 type LetterRenderIframeProps = {
-  tab: PersonalisedRenderKey;
+  renderType: RenderKey;
   pdfUrl: string | null;
 } & React.ComponentProps<'iframe'>;
 
 export function LetterRenderIframe({
-  tab,
+  renderType,
   pdfUrl,
   ...rest
 }: LetterRenderIframeProps) {
   if (!pdfUrl) return <p className='nhsuk-body'>No preview available</p>;
-  const tabDescription = tab === 'shortFormRender' ? 'short' : 'long';
 
-  return (
-    <iframe
-      src={pdfUrl}
-      title={`Letter preview - ${tabDescription} examples`}
-      aria-label={`PDF preview of letter template with ${tabDescription} example personalisation data`}
-      {...rest}
-    />
-  );
+  const tabName = renderType === 'shortFormRender' ? 'short' : 'long';
+  const tabbedViewSuffix =
+    renderType === 'initialRender' ? '' : ` - ${tabName} examples`;
+
+  const ariaLabel = `PDF preview of letter template${tabbedViewSuffix}`;
+
+  const title = `Letter preview${tabbedViewSuffix}`;
+
+  return <iframe src={pdfUrl} title={title} aria-label={ariaLabel} {...rest} />;
 }
diff --git a/frontend/src/components/molecules/LetterRender/LetterRenderTab.tsx b/frontend/src/components/molecules/LetterRender/LetterRenderTab.tsx
index cb00e21e1..649f74c8a 100644
--- a/frontend/src/components/molecules/LetterRender/LetterRenderTab.tsx
+++ b/frontend/src/components/molecules/LetterRender/LetterRenderTab.tsx
@@ -92,7 +92,7 @@ function LetterRenderTabContent({
 
       <div className={`nhsuk-grid-column-two-thirds ${styles.iframeColumn}`}>
         {hideEditActions ? (
-          <LetterRenderIframe tab={tab} pdfUrl={pdfUrl} />
+          <LetterRenderIframe renderType={tab} pdfUrl={pdfUrl} />
         ) : (
           <PollLetterRender
             template={template}
@@ -100,7 +100,7 @@ function LetterRenderTabContent({
             loadingElement={<p>{loadingText}</p>}
             forcePolling={isPending}
           >
-            <LetterRenderIframe tab={tab} pdfUrl={pdfUrl} />
+            <LetterRenderIframe renderType={tab} pdfUrl={pdfUrl} />
           </PollLetterRender>
         )}
       </div>
diff --git a/frontend/src/components/molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter.module.scss b/frontend/src/components/molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter.module.scss
new file mode 100644
index 000000000..40769cbf3
--- /dev/null
+++ b/frontend/src/components/molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter.module.scss
@@ -0,0 +1,4 @@
+.iframe {
+  width: 100%;
+  height: 1200px
+}
diff --git a/frontend/src/components/molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter.tsx b/frontend/src/components/molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter.tsx
index 89882438f..86062c05d 100644
--- a/frontend/src/components/molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter.tsx
+++ b/frontend/src/components/molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter.tsx
@@ -3,27 +3,53 @@
 import { LetterTemplate } from 'nhs-notify-web-template-management-utils';
 import PreviewTemplateDetailsPdfLetter from './PreviewTemplateDetailsPdfLetter';
 import PreviewTemplateDetailsAuthoringLetter from './PreviewTemplateDetailsAuthoringLetter';
+import { LetterRenderIframe } from '@molecules/LetterRender/LetterRenderIframe';
+import { buildLetterRenderUrl } from '@utils/letter-render-url';
+import concatClassNames from '@utils/concat-class-names';
+import styles from './PreviewTemplateDetailsLetter.module.scss';
+import type { LetterVariant } from 'nhs-notify-web-template-management-types';
 
 export default function PreviewTemplateDetailsLetter({
   template,
+  letterVariant,
   hideStatus,
   hideEditActions,
 }: {
   template: LetterTemplate;
+  letterVariant?: LetterVariant;
   hideStatus?: boolean;
   hideEditActions?: boolean;
 }) {
-  // TODO: CCM-14768 - PreviewTemplateDetailsAuthoringLetter requires the Letter Variant.
-  return template.letterVersion === 'PDF' ? (
-    <PreviewTemplateDetailsPdfLetter
-      template={template}
-      hideStatus={hideStatus}
-    />
-  ) : (
-    <PreviewTemplateDetailsAuthoringLetter
-      template={template}
-      hideStatus={hideStatus}
-      hideEditActions={hideEditActions}
-    />
+  if (template.letterVersion === 'PDF') {
+    return (
+      <PreviewTemplateDetailsPdfLetter
+        template={template}
+        hideStatus={hideStatus}
+      />
+    );
+  }
+
+  const { initialRender } = template.files;
+
+  const pdfUrl =
+    initialRender.status === 'RENDERED'
+      ? buildLetterRenderUrl(template, initialRender.fileName)
+      : null;
+
+  return (
+    <>
+      <PreviewTemplateDetailsAuthoringLetter
+        template={template}
+        letterVariant={letterVariant}
+        hideStatus={hideStatus}
+        hideEditActions={hideEditActions}
+      />
+      <h2 className='nhsuk-heading-m'>{'h2'}</h2>
+      <LetterRenderIframe
+        renderType={'initialRender'}
+        pdfUrl={pdfUrl}
+        className={concatClassNames(styles.iframe, 'nhsuk-u-margin-bottom-6')}
+      />
+    </>
   );
 }
diff --git a/frontend/src/components/molecules/PreviewTemplateDetails/common.tsx b/frontend/src/components/molecules/PreviewTemplateDetails/common.tsx
index 53dec7cf7..cf6155117 100644
--- a/frontend/src/components/molecules/PreviewTemplateDetails/common.tsx
+++ b/frontend/src/components/molecules/PreviewTemplateDetails/common.tsx
@@ -7,7 +7,10 @@ import {
 import styles from './PreviewTemplateDetails.module.scss';
 import { JSX } from 'react';
 import content from '@content/content';
-import type { TemplateDto } from 'nhs-notify-web-template-management-types';
+import type {
+  LetterVariant,
+  TemplateDto,
+} from 'nhs-notify-web-template-management-types';
 import classNames from 'classnames';
 import { toKebabCase } from '@utils/kebab-case';
 import { useFeatureFlags } from '@providers/client-config-provider';
@@ -19,10 +22,12 @@ export type PreviewTemplateComponent<T extends TemplateDto> = ({
   template,
   hideStatus,
   hideEditActions,
+  letterVariant,
 }: {
   template: T;
   hideStatus?: boolean;
   hideEditActions?: boolean;
+  letterVariant?: LetterVariant;
 }) => JSX.Element;
 
 type ContentPreviewField = {
diff --git a/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx b/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx
index 87d51134c..0044160a0 100644
--- a/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx
+++ b/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx
@@ -4,7 +4,10 @@ import baseContent from '@content/content';
 import Link from 'next/link';
 import { NHSNotifyMain } from '@atoms/NHSNotifyMain/NHSNotifyMain';
 import NotifyBackLink from '@atoms/NHSNotifyBackLink/NHSNotifyBackLink';
-import type { TemplateDto } from 'nhs-notify-web-template-management-types';
+import type {
+  LetterVariant,
+  TemplateDto,
+} from 'nhs-notify-web-template-management-types';
 import {
   templateTypeToUrlTextMappings,
   PageComponentProps,
@@ -18,6 +21,7 @@ export type MessagePlanPreviewTemplateProps<T extends TemplateDto> =
     previewComponent: PreviewTemplateComponent<T>;
     routingConfigId: string;
     lockNumber: number;
+    letterVariant?: LetterVariant;
   };
 
 export function PreviewTemplateFromMessagePlan<T extends TemplateDto>({
@@ -25,6 +29,7 @@ export function PreviewTemplateFromMessagePlan<T extends TemplateDto>({
   previewComponent,
   routingConfigId,
   lockNumber,
+  letterVariant,
 }: Readonly<MessagePlanPreviewTemplateProps<T>>) {
   const content = baseContent.components.previewTemplateFromMessagePlan;
 
@@ -32,6 +37,7 @@ export function PreviewTemplateFromMessagePlan<T extends TemplateDto>({
   if (template.templateType === 'LETTER' && 'letterType' in template) {
     const isForeignLanguage =
       'language' in template && template.language && template.language !== 'en';
+
     letterType = isForeignLanguage
       ? 'language'
       : (template.letterType as RoutingSupportedLetterType);
@@ -57,6 +63,7 @@ export function PreviewTemplateFromMessagePlan<T extends TemplateDto>({
           <div className='nhsuk-grid-column-full'>
             {previewComponent({
               template,
+              letterVariant,
               hideStatus: true,
               hideEditActions: true,
             })}

From 48c88317ed0e8cbeb15815c33c7140d202af5bf1 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Wed, 1 Apr 2026 21:25:57 +0100
Subject: [PATCH 21/57] wip

---
 .../__snapshots__/page.test.tsx.snap          | 125 ------
 .../preview-template/page.test.tsx            |  93 +---
 .../__snapshots__/page.test.tsx.snap          | 125 ------
 .../[templateId]/page.test.tsx                |  96 +---
 .../__snapshots__/page.test.tsx.snap          | 125 ------
 .../preview-template/page.test.tsx            |  89 +---
 .../__snapshots__/page.test.tsx.snap          |  15 +-
 .../preview-message-plan/page.test.tsx        |  14 +-
 .../preview-template/page.test.tsx            |  43 ++
 .../__snapshots__/page.test.tsx.snap          |  15 +-
 .../page.test.tsx                             |  17 +-
 .../preview-template/page.test.tsx            |  44 ++
 .../__snapshots__/page.test.tsx.snap          |   4 +-
 .../__snapshots__/page.test.tsx.snap          |  12 +-
 .../__snapshots__/page.test.tsx.snap          |   8 +-
 .../LetterRender/LetterRenderIframe.test.tsx  |  13 +
 .../__snapshots__/LetterRender.test.tsx.snap  |   8 +-
 .../LetterRenderIframe.test.tsx.snap          |   2 +-
 .../LetterRenderTab.test.tsx.snap             |   4 +-
 .../MessagePlanCascadePreview.test.tsx        |  54 ++-
 .../molecules/SummaryPreviewLetter.test.tsx   | 147 ++++++
 .../MessagePlanCascadePreview.test.tsx.snap   |  15 +-
 .../SummaryPreviewLetter.test.tsx.snap        | 424 ++++++++++++++++++
 .../preview-template/[templateId]/page.tsx    |  47 +-
 .../preview-template/[templateId]/page.tsx    |  47 +-
 .../preview-template/[templateId]/page.tsx    |  54 +--
 .../[routingConfigId]/page.tsx                |   1 +
 .../preview-template/[templateId]/page.tsx    |  32 ++
 .../[routingConfigId]/page.tsx                |   1 +
 .../preview-template/[templateId]/page.tsx    |  32 ++
 ...ewAndApproveLetterTemplatePage.module.scss |   4 -
 .../[templateId]/page.tsx                     |  12 +-
 .../MessagePlanCascadePreview.tsx             |  32 +-
 .../PreviewTemplateDetailsLetter.module.scss  |   4 -
 .../PreviewTemplateDetailsLetter.tsx          |   6 +-
 .../PreviewTemplateFromMessagePlan.tsx        |  26 +-
 .../SummaryPreviewLetter.tsx                  |  62 +++
 frontend/src/middleware.ts                    |   2 +
 frontend/src/styles/app.scss                  |   5 +
 tests/test-team/pages/routing/index.ts        |   2 +
 ...eview-message-plan-letter-template-page.ts |   6 +
 .../routing/preview-message-plan-page.ts      |   2 +-
 ...move-to-production-letter-template-page.ts |   6 +
 .../review-and-move-to-production-page.ts     |   2 +-
 .../route-coverage.accessibility.spec.ts      |   4 +
 .../routing.accessibility.spec.ts             |  21 +
 ...emplate-protected-routes.component.spec.ts |   4 +
 .../routing.e2e.spec.ts                       |  28 ++
 ...-letter-template.routing-component.spec.ts | 182 ++++++++
 ...iew-message-plan.routing-component.spec.ts |  70 ++-
 ...-letter-template.routing-component.spec.ts | 182 ++++++++
 ...ve-to-production.routing-component.spec.ts |  69 ++-
 52 files changed, 1621 insertions(+), 816 deletions(-)
 delete mode 100644 frontend/src/__tests__/app/message-plans/choose-large-print-letter-template/preview-template/__snapshots__/page.test.tsx.snap
 delete mode 100644 frontend/src/__tests__/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/__snapshots__/page.test.tsx.snap
 delete mode 100644 frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/preview-template/__snapshots__/page.test.tsx.snap
 create mode 100644 frontend/src/__tests__/app/message-plans/preview-message-plan/preview-template/page.test.tsx
 create mode 100644 frontend/src/__tests__/app/message-plans/review-and-move-to-production/preview-template/page.test.tsx
 create mode 100644 frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx
 create mode 100644 frontend/src/__tests__/components/molecules/__snapshots__/SummaryPreviewLetter.test.tsx.snap
 create mode 100644 frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx
 create mode 100644 frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx
 delete mode 100644 frontend/src/app/review-and-approve-letter-template/[templateId]/ReviewAndApproveLetterTemplatePage.module.scss
 delete mode 100644 frontend/src/components/molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter.module.scss
 create mode 100644 frontend/src/components/molecules/SummaryPreviewLetter/SummaryPreviewLetter.tsx
 create mode 100644 tests/test-team/pages/routing/preview-message-plan-letter-template-page.ts
 create mode 100644 tests/test-team/pages/routing/review-and-move-to-production-letter-template-page.ts
 create mode 100644 tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts
 create mode 100644 tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts

diff --git a/frontend/src/__tests__/app/message-plans/choose-large-print-letter-template/preview-template/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/choose-large-print-letter-template/preview-template/__snapshots__/page.test.tsx.snap
deleted file mode 100644
index f2746d037..000000000
--- a/frontend/src/__tests__/app/message-plans/choose-large-print-letter-template/preview-template/__snapshots__/page.test.tsx.snap
+++ /dev/null
@@ -1,125 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`PreviewLargePrintLetterTemplateFromMessagePlan page renders large print letter template preview 1`] = `
-<DocumentFragment>
-  <div
-    class="nhsuk-width-container"
-  >
-    <a
-      class="nhsuk-back-link"
-      data-testid="back-link-top"
-      href="/message-plans/choose-large-print-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=5"
-    >
-      Go back
-    </a>
-    <main
-      class="nhsuk-main-wrapper"
-      id="maincontent"
-      role="main"
-    >
-      <div
-        class="nhsuk-grid-row"
-      >
-        <div
-          class="nhsuk-grid-column-full"
-        >
-          <div
-            class="nhsuk-u-reading-width"
-          >
-            <span
-              class="nhsuk-caption-l"
-            >
-              Template
-            </span>
-            <h1
-              data-testid="preview-message__heading"
-            >
-              large print letter template name
-            </h1>
-          </div>
-          <div
-            class="nhsuk-width-container nhsuk-u-margin-bottom-6 nhsuk-body-m"
-          >
-            <dl
-              class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview"
-            >
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Template ID
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value monospace-font"
-                  data-testid="preview-template-id"
-                >
-                  large-print-letter-template-id
-                </dd>
-              </div>
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Template type
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value"
-                >
-                  Large print letter
-                </dd>
-              </div>
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Template file
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value"
-                >
-                  <div
-                    class="container"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="icon"
-                      fill="none"
-                      height="26"
-                      viewBox="0 0 20 26"
-                      width="20"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M0 0V26H20V6.59375L19.7188 6.28125L13.7188 0.28125L13.4062 0H0ZM2 2H12V8H18V24H2V2ZM14 3.4375L16.5625 6H14V3.4375Z"
-                        fill="#4C6272"
-                      />
-                    </svg>
-                    <p
-                      class="text"
-                    >
-                      large-print-template.pdf
-                    </p>
-                  </div>
-                </dd>
-              </div>
-            </dl>
-          </div>
-          <a
-            class="nhsuk-link nhsuk-body-m nhsuk-u-display-inline-block"
-            data-testid="back-link-bottom"
-            href="/message-plans/choose-large-print-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=5"
-          >
-            Go back
-          </a>
-        </div>
-      </div>
-    </main>
-  </div>
-</DocumentFragment>
-`;
diff --git a/frontend/src/__tests__/app/message-plans/choose-large-print-letter-template/preview-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/choose-large-print-letter-template/preview-template/page.test.tsx
index 8614c9c24..054c13e1e 100644
--- a/frontend/src/__tests__/app/message-plans/choose-large-print-letter-template/preview-template/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/choose-large-print-letter-template/preview-template/page.test.tsx
@@ -1,96 +1,43 @@
+import { render } from '@testing-library/react';
 import PreviewLargePrintLetterTemplateFromMessagePlan, {
   generateMetadata,
 } from '@app/message-plans/choose-large-print-letter-template/[routingConfigId]/preview-template/[templateId]/page';
-import {
-  LARGE_PRINT_LETTER_TEMPLATE,
-  ROUTING_CONFIG,
-} from '@testhelpers/helpers';
-import { render } from '@testing-library/react';
-import { getTemplate } from '@utils/form-actions';
-import { redirect } from 'next/navigation';
+import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+import { validateLargePrintLetterTemplate } from 'nhs-notify-web-template-management-utils';
 
-jest.mock('@utils/form-actions');
-jest.mock('next/navigation');
+jest.mock('@molecules/SummaryPreviewLetter/SummaryPreviewLetter');
 
-const getTemplateMock = jest.mocked(getTemplate);
-const redirectMock = jest.mocked(redirect);
+const summaryPreviewLetterMock = jest.mocked(SummaryPreviewLetter);
 
 describe('PreviewLargePrintLetterTemplateFromMessagePlan page', () => {
-  it('should redirect to the edit message plan page when lockNumber is invalid', async () => {
-    await PreviewLargePrintLetterTemplateFromMessagePlan({
-      params: Promise.resolve({
-        routingConfigId: 'routing-config-id',
-        templateId: 'template-id',
-      }),
-      searchParams: Promise.resolve({
-        lockNumber: 'invalid',
-      }),
-    });
+  it('should render SummaryPreviewLetter with validateLargePrintLetterTemplate', async () => {
+    summaryPreviewLetterMock.mockResolvedValueOnce(<div>mock</div>);
 
-    expect(redirectMock).toHaveBeenCalledWith(
-      '/message-plans/edit-message-plan/routing-config-id',
-      'replace'
-    );
-  });
-
-  it('should redirect to the edit message plan page when lockNumber is missing', async () => {
-    await PreviewLargePrintLetterTemplateFromMessagePlan({
+    const props = {
       params: Promise.resolve({
         routingConfigId: 'routing-config-id',
         templateId: 'template-id',
       }),
-      searchParams: Promise.resolve({}),
-    });
+      searchParams: Promise.resolve({ lockNumber: '5' }),
+    };
 
-    expect(redirectMock).toHaveBeenCalledWith(
-      '/message-plans/edit-message-plan/routing-config-id',
-      'replace'
-    );
-  });
+    const page = await PreviewLargePrintLetterTemplateFromMessagePlan(props);
 
-  it('should redirect to invalid page for invalid template id', async () => {
-    getTemplateMock.mockResolvedValueOnce(undefined);
+    render(page);
 
-    await PreviewLargePrintLetterTemplateFromMessagePlan({
-      params: Promise.resolve({
-        routingConfigId: 'routing-config-id',
-        templateId: 'invalid-template-id',
+    expect(summaryPreviewLetterMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        params: props.params,
+        searchParams: props.searchParams,
+        validateTemplate: validateLargePrintLetterTemplate,
       }),
-      searchParams: Promise.resolve({
-        lockNumber: '0',
-      }),
-    });
-
-    expect(getTemplateMock).toHaveBeenCalledWith('invalid-template-id');
-
-    expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
-  });
-
-  it('renders large print letter template preview', async () => {
-    getTemplateMock.mockResolvedValueOnce({
-      ...LARGE_PRINT_LETTER_TEMPLATE,
-      templateStatus: 'SUBMITTED',
-    });
-
-    const page = await PreviewLargePrintLetterTemplateFromMessagePlan({
-      params: Promise.resolve({
-        routingConfigId: ROUTING_CONFIG.id,
-        templateId: LARGE_PRINT_LETTER_TEMPLATE.id,
-      }),
-      searchParams: Promise.resolve({
-        lockNumber: '5',
-      }),
-    });
-
-    const container = render(page);
-
-    expect(getTemplateMock).toHaveBeenCalledWith(
-      LARGE_PRINT_LETTER_TEMPLATE.id
+      undefined
     );
+  });
 
+  it('should have the correct page title', async () => {
     expect(await generateMetadata()).toEqual({
       title: 'Preview large print letter template - NHS Notify',
     });
-    expect(container.asFragment()).toMatchSnapshot();
   });
 });
diff --git a/frontend/src/__tests__/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/__snapshots__/page.test.tsx.snap
deleted file mode 100644
index 2ca062b54..000000000
--- a/frontend/src/__tests__/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/__snapshots__/page.test.tsx.snap
+++ /dev/null
@@ -1,125 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`PreviewOtherLanguageLetterTemplateFromMessagePlan page renders foreign language letter template preview 1`] = `
-<DocumentFragment>
-  <div
-    class="nhsuk-width-container"
-  >
-    <a
-      class="nhsuk-back-link"
-      data-testid="back-link-top"
-      href="/message-plans/choose-other-language-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=5"
-    >
-      Go back
-    </a>
-    <main
-      class="nhsuk-main-wrapper"
-      id="maincontent"
-      role="main"
-    >
-      <div
-        class="nhsuk-grid-row"
-      >
-        <div
-          class="nhsuk-grid-column-full"
-        >
-          <div
-            class="nhsuk-u-reading-width"
-          >
-            <span
-              class="nhsuk-caption-l"
-            >
-              Template
-            </span>
-            <h1
-              data-testid="preview-message__heading"
-            >
-              French letter template
-            </h1>
-          </div>
-          <div
-            class="nhsuk-width-container nhsuk-u-margin-bottom-6 nhsuk-body-m"
-          >
-            <dl
-              class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview"
-            >
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Template ID
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value monospace-font"
-                  data-testid="preview-template-id"
-                >
-                  french-letter-id
-                </dd>
-              </div>
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Template type
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value"
-                >
-                  Standard letter - French
-                </dd>
-              </div>
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Template file
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value"
-                >
-                  <div
-                    class="container"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="icon"
-                      fill="none"
-                      height="26"
-                      viewBox="0 0 20 26"
-                      width="20"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M0 0V26H20V6.59375L19.7188 6.28125L13.7188 0.28125L13.4062 0H0ZM2 2H12V8H18V24H2V2ZM14 3.4375L16.5625 6H14V3.4375Z"
-                        fill="#4C6272"
-                      />
-                    </svg>
-                    <p
-                      class="text"
-                    >
-                      template.pdf
-                    </p>
-                  </div>
-                </dd>
-              </div>
-            </dl>
-          </div>
-          <a
-            class="nhsuk-link nhsuk-body-m nhsuk-u-display-inline-block"
-            data-testid="back-link-bottom"
-            href="/message-plans/choose-other-language-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=5"
-          >
-            Go back
-          </a>
-        </div>
-      </div>
-    </main>
-  </div>
-</DocumentFragment>
-`;
diff --git a/frontend/src/__tests__/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.test.tsx b/frontend/src/__tests__/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.test.tsx
index 37bd77a89..27fc55bff 100644
--- a/frontend/src/__tests__/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.test.tsx
@@ -1,99 +1,43 @@
+import { render } from '@testing-library/react';
 import PreviewOtherLanguageLetterTemplateFromMessagePlan, {
   generateMetadata,
 } from '@app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page';
-import { PDF_LETTER_TEMPLATE, ROUTING_CONFIG } from '@testhelpers/helpers';
-import { render } from '@testing-library/react';
-import { getTemplate } from '@utils/form-actions';
-import { redirect } from 'next/navigation';
-import { Language } from 'nhs-notify-web-template-management-types';
+import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+import { validateForeignLanguageLetterTemplate } from 'nhs-notify-web-template-management-utils';
 
-jest.mock('@utils/form-actions');
-jest.mock('next/navigation');
+jest.mock('@molecules/SummaryPreviewLetter/SummaryPreviewLetter');
 
-const getTemplateMock = jest.mocked(getTemplate);
-const redirectMock = jest.mocked(redirect);
-
-const FRENCH_LETTER_TEMPLATE = {
-  ...PDF_LETTER_TEMPLATE,
-  id: 'french-letter-id',
-  name: 'French letter template',
-  language: 'fr' as Language,
-};
+const summaryPreviewLetterMock = jest.mocked(SummaryPreviewLetter);
 
 describe('PreviewOtherLanguageLetterTemplateFromMessagePlan page', () => {
-  it('should redirect to the edit message plan page when lockNumber is invalid', async () => {
-    await PreviewOtherLanguageLetterTemplateFromMessagePlan({
-      params: Promise.resolve({
-        routingConfigId: 'routing-config-id',
-        templateId: 'template-id',
-      }),
-      searchParams: Promise.resolve({
-        lockNumber: 'invalid',
-      }),
-    });
-
-    expect(redirectMock).toHaveBeenCalledWith(
-      '/message-plans/edit-message-plan/routing-config-id',
-      'replace'
-    );
-  });
+  it('should render SummaryPreviewLetter with validateForeignLanguageLetterTemplate', async () => {
+    summaryPreviewLetterMock.mockResolvedValueOnce(<div>mock</div>);
 
-  it('should redirect to the edit message plan page when lockNumber is missing', async () => {
-    await PreviewOtherLanguageLetterTemplateFromMessagePlan({
+    const props = {
       params: Promise.resolve({
         routingConfigId: 'routing-config-id',
         templateId: 'template-id',
       }),
-      searchParams: Promise.resolve({}),
-    });
+      searchParams: Promise.resolve({ lockNumber: '5' }),
+    };
 
-    expect(redirectMock).toHaveBeenCalledWith(
-      '/message-plans/edit-message-plan/routing-config-id',
-      'replace'
-    );
-  });
+    const page = await PreviewOtherLanguageLetterTemplateFromMessagePlan(props);
 
-  it('should redirect to invalid page with invalid template id', async () => {
-    getTemplateMock.mockResolvedValueOnce(undefined);
+    render(page);
 
-    await PreviewOtherLanguageLetterTemplateFromMessagePlan({
-      params: Promise.resolve({
-        routingConfigId: 'routing-config-id',
-        templateId: 'invalid-template-id',
-      }),
-      searchParams: Promise.resolve({
-        lockNumber: '0',
+    expect(summaryPreviewLetterMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        params: props.params,
+        searchParams: props.searchParams,
+        validateTemplate: validateForeignLanguageLetterTemplate,
       }),
-    });
-
-    expect(getTemplateMock).toHaveBeenCalledWith('invalid-template-id');
-
-    expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
+      undefined
+    );
   });
 
-  it('renders foreign language letter template preview', async () => {
-    getTemplateMock.mockResolvedValueOnce({
-      ...FRENCH_LETTER_TEMPLATE,
-      templateStatus: 'SUBMITTED',
-    });
-
-    const page = await PreviewOtherLanguageLetterTemplateFromMessagePlan({
-      params: Promise.resolve({
-        routingConfigId: ROUTING_CONFIG.id,
-        templateId: FRENCH_LETTER_TEMPLATE.id,
-      }),
-      searchParams: Promise.resolve({
-        lockNumber: '5',
-      }),
-    });
-
-    const container = render(page);
-
-    expect(getTemplateMock).toHaveBeenCalledWith(FRENCH_LETTER_TEMPLATE.id);
-
+  it('should have the correct page title', async () => {
     expect(await generateMetadata()).toEqual({
       title: 'Preview other language letter template - NHS Notify',
     });
-    expect(container.asFragment()).toMatchSnapshot();
   });
 });
diff --git a/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/preview-template/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/preview-template/__snapshots__/page.test.tsx.snap
deleted file mode 100644
index d5b6d634d..000000000
--- a/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/preview-template/__snapshots__/page.test.tsx.snap
+++ /dev/null
@@ -1,125 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`PreviewStandardEnglishLetterTemplateFromMessagePlan page renders letter template preview 1`] = `
-<DocumentFragment>
-  <div
-    class="nhsuk-width-container"
-  >
-    <a
-      class="nhsuk-back-link"
-      data-testid="back-link-top"
-      href="/message-plans/choose-standard-english-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=5"
-    >
-      Go back
-    </a>
-    <main
-      class="nhsuk-main-wrapper"
-      id="maincontent"
-      role="main"
-    >
-      <div
-        class="nhsuk-grid-row"
-      >
-        <div
-          class="nhsuk-grid-column-full"
-        >
-          <div
-            class="nhsuk-u-reading-width"
-          >
-            <span
-              class="nhsuk-caption-l"
-            >
-              Template
-            </span>
-            <h1
-              data-testid="preview-message__heading"
-            >
-              letter template name
-            </h1>
-          </div>
-          <div
-            class="nhsuk-width-container nhsuk-u-margin-bottom-6 nhsuk-body-m"
-          >
-            <dl
-              class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview"
-            >
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Template ID
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value monospace-font"
-                  data-testid="preview-template-id"
-                >
-                  letter-template-id
-                </dd>
-              </div>
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Template type
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value"
-                >
-                  Standard letter
-                </dd>
-              </div>
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Template file
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value"
-                >
-                  <div
-                    class="container"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="icon"
-                      fill="none"
-                      height="26"
-                      viewBox="0 0 20 26"
-                      width="20"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M0 0V26H20V6.59375L19.7188 6.28125L13.7188 0.28125L13.4062 0H0ZM2 2H12V8H18V24H2V2ZM14 3.4375L16.5625 6H14V3.4375Z"
-                        fill="#4C6272"
-                      />
-                    </svg>
-                    <p
-                      class="text"
-                    >
-                      template.pdf
-                    </p>
-                  </div>
-                </dd>
-              </div>
-            </dl>
-          </div>
-          <a
-            class="nhsuk-link nhsuk-body-m nhsuk-u-display-inline-block"
-            data-testid="back-link-bottom"
-            href="/message-plans/choose-standard-english-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=5"
-          >
-            Go back
-          </a>
-        </div>
-      </div>
-    </main>
-  </div>
-</DocumentFragment>
-`;
diff --git a/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/preview-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/preview-template/page.test.tsx
index 935298bc7..d1223230f 100644
--- a/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/preview-template/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/preview-template/page.test.tsx
@@ -1,91 +1,44 @@
+import { render } from '@testing-library/react';
 import PreviewStandardEnglishLetterTemplateFromMessagePlan, {
   generateMetadata,
 } from '@app/message-plans/choose-standard-english-letter-template/[routingConfigId]/preview-template/[templateId]/page';
-import { PDF_LETTER_TEMPLATE, ROUTING_CONFIG } from '@testhelpers/helpers';
-import { render } from '@testing-library/react';
-import { getTemplate } from '@utils/form-actions';
-import { redirect } from 'next/navigation';
+import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+import { validateLetterTemplate } from 'nhs-notify-web-template-management-utils';
 
-jest.mock('@utils/form-actions');
-jest.mock('next/navigation');
+jest.mock('@molecules/SummaryPreviewLetter/SummaryPreviewLetter');
 
-const getTemplateMock = jest.mocked(getTemplate);
-const redirectMock = jest.mocked(redirect);
+const summaryPreviewLetterMock = jest.mocked(SummaryPreviewLetter);
 
 describe('PreviewStandardEnglishLetterTemplateFromMessagePlan page', () => {
-  it('should redirect to the edit message plan page when lockNumber is invalid', async () => {
-    await PreviewStandardEnglishLetterTemplateFromMessagePlan({
-      params: Promise.resolve({
-        routingConfigId: 'routing-config-id',
-        templateId: 'template-id',
-      }),
-      searchParams: Promise.resolve({
-        lockNumber: 'invalid',
-      }),
-    });
+  it('should render SummaryPreviewLetter with validateLetterTemplate', async () => {
+    summaryPreviewLetterMock.mockResolvedValueOnce(<div>mock</div>);
 
-    expect(redirectMock).toHaveBeenCalledWith(
-      '/message-plans/edit-message-plan/routing-config-id',
-      'replace'
-    );
-  });
-
-  it('should redirect to the edit message plan page when lockNumber is missing', async () => {
-    await PreviewStandardEnglishLetterTemplateFromMessagePlan({
+    const props = {
       params: Promise.resolve({
         routingConfigId: 'routing-config-id',
         templateId: 'template-id',
       }),
-      searchParams: Promise.resolve({}),
-    });
+      searchParams: Promise.resolve({ lockNumber: '5' }),
+    };
 
-    expect(redirectMock).toHaveBeenCalledWith(
-      '/message-plans/edit-message-plan/routing-config-id',
-      'replace'
-    );
-  });
+    const page =
+      await PreviewStandardEnglishLetterTemplateFromMessagePlan(props);
 
-  it('should redirect to invalid page with invalid template id', async () => {
-    getTemplateMock.mockResolvedValueOnce(undefined);
+    render(page);
 
-    await PreviewStandardEnglishLetterTemplateFromMessagePlan({
-      params: Promise.resolve({
-        routingConfigId: 'routing-config-id',
-        templateId: 'invalid-template-id',
-      }),
-      searchParams: Promise.resolve({
-        lockNumber: '0',
+    expect(summaryPreviewLetterMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        params: props.params,
+        searchParams: props.searchParams,
+        validateTemplate: validateLetterTemplate,
       }),
-    });
-
-    expect(getTemplateMock).toHaveBeenCalledWith('invalid-template-id');
-
-    expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
+      undefined
+    );
   });
 
-  it('renders letter template preview', async () => {
-    getTemplateMock.mockResolvedValueOnce({
-      ...PDF_LETTER_TEMPLATE,
-      templateStatus: 'SUBMITTED',
-    });
-
-    const page = await PreviewStandardEnglishLetterTemplateFromMessagePlan({
-      params: Promise.resolve({
-        routingConfigId: ROUTING_CONFIG.id,
-        templateId: PDF_LETTER_TEMPLATE.id,
-      }),
-      searchParams: Promise.resolve({
-        lockNumber: '5',
-      }),
-    });
-
-    const container = render(page);
-
-    expect(getTemplateMock).toHaveBeenCalledWith(PDF_LETTER_TEMPLATE.id);
-
+  it('should have the correct page title', async () => {
     expect(await generateMetadata()).toEqual({
       title: 'Preview letter template - NHS Notify',
     });
-    expect(container.asFragment()).toMatchSnapshot();
   });
 });
diff --git a/frontend/src/__tests__/app/message-plans/preview-message-plan/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/preview-message-plan/__snapshots__/page.test.tsx.snap
index 75addc79d..64d68002b 100644
--- a/frontend/src/__tests__/app/message-plans/preview-message-plan/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/message-plans/preview-message-plan/__snapshots__/page.test.tsx.snap
@@ -101,7 +101,7 @@ exports[`full cascade plan matches snapshot 1`] = `
               class="nhsuk-button nhsuk-button--secondary"
               type="button"
             >
-              Open all template previews
+              Open all digital template previews
             </button>
           </p>
           <ul
@@ -606,12 +606,15 @@ exports[`full cascade plan matches snapshot 1`] = `
                   <p
                     data-testid="template-name"
                   >
-                    <a
-                      href="/preview-submitted-letter-template/278e1a92-353f-42a3-b08d-565ea1c9d763"
-                    >
-                      letter template name
-                    </a>
+                    letter template name
                   </p>
+                  <a
+                    href="/preview-submitted-letter-template/278e1a92-353f-42a3-b08d-565ea1c9d763"
+                    rel="noopener noreferrer"
+                    target="_blank"
+                  >
+                    Preview template (opens in a new tab)
+                  </a>
                 </div>
               </div>
               <ul
diff --git a/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx b/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx
index 479093c15..ea295160a 100644
--- a/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx
@@ -240,7 +240,7 @@ describe('full cascade plan', () => {
     await renderPage(routingConfig);
 
     const button = screen.getByRole('button', {
-      name: 'Open all template previews',
+      name: 'Open all digital template previews',
     });
 
     const detailsSections = screen
@@ -253,7 +253,7 @@ describe('full cascade plan', () => {
 
     await user.click(button);
 
-    expect(button).toHaveTextContent('Close all template previews');
+    expect(button).toHaveTextContent('Close all digital template previews');
 
     for (const section of detailsSections) {
       expect(section.open).toBe(true);
@@ -261,7 +261,7 @@ describe('full cascade plan', () => {
 
     await user.click(button);
 
-    expect(button).toHaveTextContent('Open all template previews');
+    expect(button).toHaveTextContent('Open all digital template previews');
 
     for (const section of detailsSections) {
       expect(section.open).toBe(false);
@@ -357,7 +357,7 @@ describe('letter only', () => {
 
     expect(
       screen.queryByRole('button', {
-        name: 'Open all template previews',
+        name: 'Open all digital template previews',
       })
     ).not.toBeInTheDocument();
 
@@ -365,9 +365,13 @@ describe('letter only', () => {
 
     const card = within(block).getByTestId('channel-card');
 
+    expect(within(card).getByTestId('template-name')).toHaveTextContent(
+      template.name
+    );
+
     const link = within(card).getByRole('link');
 
-    expect(link).toHaveTextContent(template.name);
+    expect(link).toHaveTextContent('Preview template (opens in a new tab)');
 
     expect(link).toHaveAttribute(
       'href',
diff --git a/frontend/src/__tests__/app/message-plans/preview-message-plan/preview-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/preview-message-plan/preview-template/page.test.tsx
new file mode 100644
index 000000000..a1e9dafc9
--- /dev/null
+++ b/frontend/src/__tests__/app/message-plans/preview-message-plan/preview-template/page.test.tsx
@@ -0,0 +1,43 @@
+import { render } from '@testing-library/react';
+import PreviewLetterTemplateFromPreviewMessagePlan, {
+  generateMetadata,
+} from '@app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page';
+import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+
+jest.mock('@molecules/SummaryPreviewLetter/SummaryPreviewLetter');
+
+const summaryPreviewLetterMock = jest.mocked(SummaryPreviewLetter);
+
+describe('PreviewLetterTemplateFromPreviewMessagePlan page', () => {
+  it('should render SummaryPreviewLetter with hideBackLinks and authoring validator', async () => {
+    summaryPreviewLetterMock.mockResolvedValueOnce(<div>mock</div>);
+
+    const props = {
+      params: Promise.resolve({
+        routingConfigId: 'routing-config-id',
+        templateId: 'template-id',
+      }),
+      searchParams: Promise.resolve({ lockNumber: '5' }),
+    };
+
+    const page = await PreviewLetterTemplateFromPreviewMessagePlan(props);
+
+    render(page);
+
+    expect(summaryPreviewLetterMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        params: props.params,
+        searchParams: props.searchParams,
+        validateTemplate: expect.any(Function),
+        hideBackLinks: true,
+      }),
+      undefined
+    );
+  });
+
+  it('should have the correct page title', async () => {
+    expect(await generateMetadata()).toEqual({
+      title: 'Preview letter template - NHS Notify',
+    });
+  });
+});
diff --git a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/__snapshots__/page.test.tsx.snap
index 91a8159cc..05e9f902c 100644
--- a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/__snapshots__/page.test.tsx.snap
@@ -52,7 +52,7 @@ exports[`Review and move to production page matches snapshot for full cascade 1`
               class="nhsuk-button nhsuk-button--secondary"
               type="button"
             >
-              Open all template previews
+              Open all digital template previews
             </button>
           </p>
           <ul
@@ -557,12 +557,15 @@ exports[`Review and move to production page matches snapshot for full cascade 1`
                   <p
                     data-testid="template-name"
                   >
-                    <a
-                      href="/preview-letter-template/278e1a92-353f-42a3-b08d-565ea1c9d763"
-                    >
-                      letter template name
-                    </a>
+                    letter template name
                   </p>
+                  <a
+                    href="/preview-letter-template/278e1a92-353f-42a3-b08d-565ea1c9d763"
+                    rel="noopener noreferrer"
+                    target="_blank"
+                  >
+                    Preview template (opens in a new tab)
+                  </a>
                 </div>
               </div>
               <ul
diff --git a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/page.test.tsx b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/page.test.tsx
index 2e8f096d8..b93a5f13c 100644
--- a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/page.test.tsx
@@ -255,7 +255,9 @@ describe('Review and move to production page', () => {
       await renderPage(routingConfig);
 
       expect(
-        screen.getByRole('button', { name: /open all template previews/i })
+        screen.getByRole('button', {
+          name: /open all digital template previews/i,
+        })
       ).toBeInTheDocument();
     });
 
@@ -274,7 +276,9 @@ describe('Review and move to production page', () => {
       await renderPage(routingConfig);
 
       expect(
-        screen.queryByRole('button', { name: /open all template previews/i })
+        screen.queryByRole('button', {
+          name: /open all digital template previews/i,
+        })
       ).not.toBeInTheDocument();
     });
 
@@ -316,10 +320,11 @@ describe('Review and move to production page', () => {
       await renderPage(routingConfig);
 
       const block = screen.getByTestId('message-plan-block-LETTER');
-      const templateName = within(block).getByTestId('template-name');
-      const link = within(templateName).getByRole('link');
-
-      expect(link).toHaveTextContent(templates[letterTemplateId].name);
+      expect(within(block).getByTestId('template-name')).toHaveTextContent(
+        templates[letterTemplateId].name
+      );
+      const link = within(block).getByRole('link');
+      expect(link).toHaveTextContent('Preview template (opens in a new tab)');
       expect(link).toHaveAttribute(
         'href',
         `/preview-letter-template/${letterTemplateId}`
diff --git a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/preview-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/preview-template/page.test.tsx
new file mode 100644
index 000000000..a34213dd4
--- /dev/null
+++ b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/preview-template/page.test.tsx
@@ -0,0 +1,44 @@
+import { render } from '@testing-library/react';
+import PreviewLetterTemplateFromReviewAndMoveToProduction, {
+  generateMetadata,
+} from '@app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page';
+import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+
+jest.mock('@molecules/SummaryPreviewLetter/SummaryPreviewLetter');
+
+const summaryPreviewLetterMock = jest.mocked(SummaryPreviewLetter);
+
+describe('PreviewLetterTemplateFromReviewAndMoveToProduction page', () => {
+  it('should render SummaryPreviewLetter with hideBackLinks and authoring validator', async () => {
+    summaryPreviewLetterMock.mockResolvedValueOnce(<div>mock</div>);
+
+    const props = {
+      params: Promise.resolve({
+        routingConfigId: 'routing-config-id',
+        templateId: 'template-id',
+      }),
+      searchParams: Promise.resolve({ lockNumber: '5' }),
+    };
+
+    const page =
+      await PreviewLetterTemplateFromReviewAndMoveToProduction(props);
+
+    render(page);
+
+    expect(summaryPreviewLetterMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        params: props.params,
+        searchParams: props.searchParams,
+        validateTemplate: expect.any(Function),
+        hideBackLinks: true,
+      }),
+      undefined
+    );
+  });
+
+  it('should have the correct page title', async () => {
+    expect(await generateMetadata()).toEqual({
+      title: 'Preview letter template - NHS Notify',
+    });
+  });
+});
diff --git a/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap
index 6e8918194..4c334105b 100644
--- a/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap
@@ -302,7 +302,7 @@ exports[`valid authoring letter template matches snapshot 1`] = `
                 class="nhsuk-grid-column-two-thirds iframeColumn"
               >
                 <iframe
-                  aria-label="PDF preview of letter template with short example personalisation data"
+                  aria-label="PDF preview of letter template - short examples"
                   src="/templates/files/client-1/renders/authoring-letter-template-id/short-render.pdf"
                   title="Letter preview - short examples"
                 />
@@ -344,7 +344,7 @@ exports[`valid authoring letter template matches snapshot 1`] = `
                 class="nhsuk-grid-column-two-thirds iframeColumn"
               >
                 <iframe
-                  aria-label="PDF preview of letter template with long example personalisation data"
+                  aria-label="PDF preview of letter template - long examples"
                   src="/templates/files/client-1/renders/authoring-letter-template-id/long-render.pdf"
                   title="Letter preview - long examples"
                 />
diff --git a/frontend/src/__tests__/app/preview-letter-template/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/preview-letter-template/__snapshots__/page.test.tsx.snap
index 9d1f6dbf5..3dee8b9ff 100644
--- a/frontend/src/__tests__/app/preview-letter-template/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/preview-letter-template/__snapshots__/page.test.tsx.snap
@@ -414,7 +414,7 @@ exports[`authoring letter template with VALIDATION_FAILED status matches snapsho
                 class="nhsuk-grid-column-two-thirds iframeColumn"
               >
                 <iframe
-                  aria-label="PDF preview of letter template with short example personalisation data"
+                  aria-label="PDF preview of letter template - short examples"
                   src="/templates/files/client-1/renders/authoring-letter-template-id/render.pdf"
                   title="Letter preview - short examples"
                 />
@@ -563,7 +563,7 @@ exports[`authoring letter template with VALIDATION_FAILED status matches snapsho
                 class="nhsuk-grid-column-two-thirds iframeColumn"
               >
                 <iframe
-                  aria-label="PDF preview of letter template with long example personalisation data"
+                  aria-label="PDF preview of letter template - long examples"
                   src="/templates/files/client-1/renders/authoring-letter-template-id/render.pdf"
                   title="Letter preview - long examples"
                 />
@@ -971,7 +971,7 @@ exports[`authoring letter template with VALIDATION_FAILED status matches snapsho
                 class="nhsuk-grid-column-two-thirds iframeColumn"
               >
                 <iframe
-                  aria-label="PDF preview of letter template with short example personalisation data"
+                  aria-label="PDF preview of letter template - short examples"
                   src="/templates/files/client-1/renders/authoring-letter-template-id/render.pdf"
                   title="Letter preview - short examples"
                 />
@@ -1120,7 +1120,7 @@ exports[`authoring letter template with VALIDATION_FAILED status matches snapsho
                 class="nhsuk-grid-column-two-thirds iframeColumn"
               >
                 <iframe
-                  aria-label="PDF preview of letter template with long example personalisation data"
+                  aria-label="PDF preview of letter template - long examples"
                   src="/templates/files/client-1/renders/authoring-letter-template-id/render.pdf"
                   title="Letter preview - long examples"
                 />
@@ -1756,7 +1756,7 @@ exports[`valid authoring letter template matches snapshot 1`] = `
                 class="nhsuk-grid-column-two-thirds iframeColumn"
               >
                 <iframe
-                  aria-label="PDF preview of letter template with short example personalisation data"
+                  aria-label="PDF preview of letter template - short examples"
                   src="/templates/files/client-1/renders/authoring-letter-template-id/render.pdf"
                   title="Letter preview - short examples"
                 />
@@ -1905,7 +1905,7 @@ exports[`valid authoring letter template matches snapshot 1`] = `
                 class="nhsuk-grid-column-two-thirds iframeColumn"
               >
                 <iframe
-                  aria-label="PDF preview of letter template with long example personalisation data"
+                  aria-label="PDF preview of letter template - long examples"
                   src="/templates/files/client-1/renders/authoring-letter-template-id/render.pdf"
                   title="Letter preview - long examples"
                 />
diff --git a/frontend/src/__tests__/app/review-and-approve-letter-template/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/review-and-approve-letter-template/__snapshots__/page.test.tsx.snap
index 8d1b454d9..999b4ad6a 100644
--- a/frontend/src/__tests__/app/review-and-approve-letter-template/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/review-and-approve-letter-template/__snapshots__/page.test.tsx.snap
@@ -168,8 +168,8 @@ exports[`valid authoring letter template matches snapshot 1`] = `
         Short example preview
       </h2>
       <iframe
-        aria-label="PDF preview of letter template with short example personalisation data"
-        class="iframe nhsuk-u-margin-bottom-6"
+        aria-label="PDF preview of letter template - short examples"
+        class="letter-render-iframe nhsuk-u-margin-bottom-6"
         src="/templates/files/client-123/renders/authoring-letter-template-id/short-form.pdf"
         title="Letter preview - short examples"
       />
@@ -179,8 +179,8 @@ exports[`valid authoring letter template matches snapshot 1`] = `
         Long example preview
       </h2>
       <iframe
-        aria-label="PDF preview of letter template with long example personalisation data"
-        class="iframe nhsuk-u-margin-bottom-6"
+        aria-label="PDF preview of letter template - long examples"
+        class="letter-render-iframe nhsuk-u-margin-bottom-6"
         src="/templates/files/client-123/renders/authoring-letter-template-id/long-form.pdf"
         title="Letter preview - long examples"
       />
diff --git a/frontend/src/__tests__/components/molecules/LetterRender/LetterRenderIframe.test.tsx b/frontend/src/__tests__/components/molecules/LetterRender/LetterRenderIframe.test.tsx
index 7f60e0d9d..a9165afb0 100644
--- a/frontend/src/__tests__/components/molecules/LetterRender/LetterRenderIframe.test.tsx
+++ b/frontend/src/__tests__/components/molecules/LetterRender/LetterRenderIframe.test.tsx
@@ -52,6 +52,19 @@ describe('LetterRenderIframe', () => {
         screen.getByTitle('Letter preview - long examples')
       ).toBeInTheDocument();
     });
+
+    it('renders correct title and aria-label for initialRender', () => {
+      render(
+        <LetterRenderIframe renderType='initialRender' pdfUrl='/test.pdf' />
+      );
+
+      const iframe = screen.getByTitle('Letter preview');
+      expect(iframe).toBeInTheDocument();
+      expect(iframe).toHaveAttribute(
+        'aria-label',
+        'PDF preview of letter template'
+      );
+    });
   });
 
   describe('missing file handling', () => {
diff --git a/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRender.test.tsx.snap b/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRender.test.tsx.snap
index 7c7de83d3..5b6d285d6 100644
--- a/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRender.test.tsx.snap
+++ b/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRender.test.tsx.snap
@@ -252,7 +252,7 @@ exports[`LetterRender matches snapshot 1`] = `
             class="nhsuk-grid-column-two-thirds iframeColumn"
           >
             <iframe
-              aria-label="PDF preview of letter template with short example personalisation data"
+              aria-label="PDF preview of letter template - short examples"
               src="/templates/files/client-123/renders/template-123/initial.pdf"
               title="Letter preview - short examples"
             />
@@ -444,7 +444,7 @@ exports[`LetterRender matches snapshot 1`] = `
             class="nhsuk-grid-column-two-thirds iframeColumn"
           >
             <iframe
-              aria-label="PDF preview of letter template with long example personalisation data"
+              aria-label="PDF preview of letter template - long examples"
               src="/templates/files/client-123/renders/template-123/initial.pdf"
               title="Letter preview - long examples"
             />
@@ -569,7 +569,7 @@ exports[`LetterRender matches snapshot when hideEditActions is true 1`] = `
             class="nhsuk-grid-column-two-thirds iframeColumn"
           >
             <iframe
-              aria-label="PDF preview of letter template with short example personalisation data"
+              aria-label="PDF preview of letter template - short examples"
               src="/templates/files/client-123/renders/template-123/initial.pdf"
               title="Letter preview - short examples"
             />
@@ -633,7 +633,7 @@ exports[`LetterRender matches snapshot when hideEditActions is true 1`] = `
             class="nhsuk-grid-column-two-thirds iframeColumn"
           >
             <iframe
-              aria-label="PDF preview of letter template with long example personalisation data"
+              aria-label="PDF preview of letter template - long examples"
               src="/templates/files/client-123/renders/template-123/initial.pdf"
               title="Letter preview - long examples"
             />
diff --git a/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderIframe.test.tsx.snap b/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderIframe.test.tsx.snap
index d62cf1b55..e5b6b7dd7 100644
--- a/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderIframe.test.tsx.snap
+++ b/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderIframe.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`LetterRenderIframe snapshots matches snapshot with PDF URL 1`] = `
 <DocumentFragment>
   <iframe
-    aria-label="PDF preview of letter template with short example personalisation data"
+    aria-label="PDF preview of letter template - short examples"
     src="/templates/files/client-123/renders/template-123/initial.pdf"
     title="Letter preview - short examples"
   />
diff --git a/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderTab.test.tsx.snap b/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderTab.test.tsx.snap
index e2b8d34dc..63f792721 100644
--- a/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderTab.test.tsx.snap
+++ b/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderTab.test.tsx.snap
@@ -162,7 +162,7 @@ exports[`LetterRenderTab snapshots matches snapshot for long tab 1`] = `
       class="nhsuk-grid-column-two-thirds iframeColumn"
     >
       <iframe
-        aria-label="PDF preview of letter template with long example personalisation data"
+        aria-label="PDF preview of letter template - long examples"
         src="/templates/files/client-456/renders/template-123/initial.pdf"
         title="Letter preview - long examples"
       />
@@ -333,7 +333,7 @@ exports[`LetterRenderTab snapshots matches snapshot for short tab 1`] = `
       class="nhsuk-grid-column-two-thirds iframeColumn"
     >
       <iframe
-        aria-label="PDF preview of letter template with short example personalisation data"
+        aria-label="PDF preview of letter template - short examples"
         src="/templates/files/client-456/renders/template-123/initial.pdf"
         title="Letter preview - short examples"
       />
diff --git a/frontend/src/__tests__/components/molecules/MessagePlanCascadePreview.test.tsx b/frontend/src/__tests__/components/molecules/MessagePlanCascadePreview.test.tsx
index ac744ac66..2ae20978d 100644
--- a/frontend/src/__tests__/components/molecules/MessagePlanCascadePreview.test.tsx
+++ b/frontend/src/__tests__/components/molecules/MessagePlanCascadePreview.test.tsx
@@ -1,6 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import { MessagePlanCascadePreview } from '@molecules/MessagePlanCascadePreview/MessagePlanCascadePreview';
 import {
+  AUTHORING_LETTER_TEMPLATE,
   EMAIL_TEMPLATE,
   NHS_APP_TEMPLATE,
   PDF_LETTER_TEMPLATE,
@@ -56,7 +57,9 @@ describe('MessagePlanCascadePreview', () => {
     );
 
     expect(
-      screen.getByRole('button', { name: 'Open all template previews' })
+      screen.getByRole('button', {
+        name: 'Open all digital template previews',
+      })
     ).toBeInTheDocument();
   });
 
@@ -143,7 +146,7 @@ describe('MessagePlanCascadePreview', () => {
       'href',
       `/preview-letter-template/${PDF_LETTER_TEMPLATE.id}`
     );
-    expect(link).toHaveTextContent(PDF_LETTER_TEMPLATE.name);
+    expect(link).toHaveTextContent('Preview template (opens in a new tab)');
   });
 
   it('renders submitted letter template with submitted link', () => {
@@ -215,6 +218,53 @@ describe('MessagePlanCascadePreview', () => {
     expect(screen.getByTestId('message-plan-block-LETTER')).toBeInTheDocument();
   });
 
+  it('renders authoring letter template with letterPreviewHrefBase link', () => {
+    const authoringTemplates = {
+      ...templates,
+      [AUTHORING_LETTER_TEMPLATE.id]: AUTHORING_LETTER_TEMPLATE,
+    };
+    const routingConfigWithAuthoring = {
+      ...ROUTING_CONFIG,
+      cascade: ROUTING_CONFIG.cascade.map((item) =>
+        item.channel === 'LETTER'
+          ? { ...item, defaultTemplateId: AUTHORING_LETTER_TEMPLATE.id }
+          : item
+      ),
+    };
+
+    render(
+      <MessagePlanCascadePreview
+        messagePlan={routingConfigWithAuthoring}
+        templates={authoringTemplates}
+        letterPreviewHrefBase='/message-plans/review-and-move-to-production/routing-config-id'
+      />
+    );
+
+    const letterBlock = screen.getByTestId('message-plan-block-LETTER');
+    const link = letterBlock.querySelector('a');
+    expect(link).toHaveAttribute(
+      'href',
+      `/message-plans/review-and-move-to-production/routing-config-id/preview-template/${AUTHORING_LETTER_TEMPLATE.id}?lockNumber=${AUTHORING_LETTER_TEMPLATE.lockNumber}`
+    );
+  });
+
+  it('renders PDF letter template with standard link even when letterPreviewHrefBase is provided', () => {
+    render(
+      <MessagePlanCascadePreview
+        messagePlan={ROUTING_CONFIG}
+        templates={templates}
+        letterPreviewHrefBase='/message-plans/review-and-move-to-production/routing-config-id'
+      />
+    );
+
+    const letterBlock = screen.getByTestId('message-plan-block-LETTER');
+    const link = letterBlock.querySelector('a');
+    expect(link).toHaveAttribute(
+      'href',
+      `/preview-letter-template/${PDF_LETTER_TEMPLATE.id}`
+    );
+  });
+
   it('matches snapshot', () => {
     const { asFragment } = render(
       <MessagePlanCascadePreview
diff --git a/frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx b/frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx
new file mode 100644
index 000000000..853e9e3f9
--- /dev/null
+++ b/frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx
@@ -0,0 +1,147 @@
+import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+import {
+  AUTHORING_LETTER_TEMPLATE,
+  PDF_LETTER_TEMPLATE,
+  makeLetterVariant,
+  ROUTING_CONFIG,
+} from '@testhelpers/helpers';
+import { render } from '@testing-library/react';
+import { getLetterVariantById, getTemplate } from '@utils/form-actions';
+import { redirect } from 'next/navigation';
+import {
+  validateLetterTemplate,
+  LetterTemplate,
+} from 'nhs-notify-web-template-management-utils';
+import type { TemplateDto } from 'nhs-notify-web-template-management-types';
+
+jest.mock('@utils/form-actions');
+jest.mock('next/navigation');
+
+const getTemplateMock = jest.mocked(getTemplate);
+const getLetterVariantByIdMock = jest.mocked(getLetterVariantById);
+const redirectMock = jest.mocked(redirect);
+
+const defaultProps = (
+  overrides: {
+    routingConfigId?: string;
+    templateId?: string;
+    lockNumber?: string;
+    searchParams?: Record<string, string>;
+    validateTemplate?: (template?: TemplateDto) => LetterTemplate | undefined;
+    hideBackLinks?: boolean;
+  } = {}
+) => ({
+  params: Promise.resolve({
+    routingConfigId: overrides.routingConfigId ?? 'routing-config-id',
+    templateId: overrides.templateId ?? 'template-id',
+  }),
+  searchParams: Promise.resolve(
+    overrides.searchParams ?? { lockNumber: overrides.lockNumber ?? '5' }
+  ),
+  validateTemplate: overrides.validateTemplate ?? validateLetterTemplate,
+  hideBackLinks: overrides.hideBackLinks,
+});
+
+describe('SummaryPreviewLetter', () => {
+  it('should redirect to the edit message plan page when lockNumber is invalid', async () => {
+    await SummaryPreviewLetter(defaultProps({ lockNumber: 'invalid' }));
+
+    expect(redirectMock).toHaveBeenCalledWith(
+      '/message-plans/edit-message-plan/routing-config-id',
+      'replace'
+    );
+  });
+
+  it('should redirect to the edit message plan page when lockNumber is missing', async () => {
+    await SummaryPreviewLetter(defaultProps({ searchParams: {} }));
+
+    expect(redirectMock).toHaveBeenCalledWith(
+      '/message-plans/edit-message-plan/routing-config-id',
+      'replace'
+    );
+  });
+
+  it('should redirect to invalid-template when template is not found', async () => {
+    getTemplateMock.mockResolvedValueOnce(undefined);
+
+    await SummaryPreviewLetter(
+      defaultProps({ templateId: 'invalid-template-id' })
+    );
+
+    expect(getTemplateMock).toHaveBeenCalledWith('invalid-template-id');
+    expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
+  });
+
+  it('should redirect to invalid-template when template fails validation', async () => {
+    getTemplateMock.mockResolvedValueOnce({
+      ...PDF_LETTER_TEMPLATE,
+      templateType: 'EMAIL',
+    } as unknown as TemplateDto);
+
+    await SummaryPreviewLetter(defaultProps());
+
+    expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
+  });
+
+  it('renders a PDF letter template preview without letterVariant', async () => {
+    getTemplateMock.mockResolvedValueOnce({
+      ...PDF_LETTER_TEMPLATE,
+      templateStatus: 'SUBMITTED',
+    });
+
+    const page = await SummaryPreviewLetter(
+      defaultProps({
+        routingConfigId: ROUTING_CONFIG.id,
+        templateId: PDF_LETTER_TEMPLATE.id,
+      })
+    );
+
+    const container = render(page);
+
+    expect(getTemplateMock).toHaveBeenCalledWith(PDF_LETTER_TEMPLATE.id);
+    expect(getLetterVariantByIdMock).not.toHaveBeenCalled();
+    expect(container.asFragment()).toMatchSnapshot();
+  });
+
+  it('renders an authoring letter template preview with letterVariant', async () => {
+    const letterVariant = makeLetterVariant();
+
+    getTemplateMock.mockResolvedValueOnce({
+      ...AUTHORING_LETTER_TEMPLATE,
+      templateStatus: 'SUBMITTED',
+    });
+    getLetterVariantByIdMock.mockResolvedValueOnce(letterVariant);
+
+    const page = await SummaryPreviewLetter(
+      defaultProps({
+        routingConfigId: ROUTING_CONFIG.id,
+        templateId: AUTHORING_LETTER_TEMPLATE.id,
+      })
+    );
+
+    const container = render(page);
+
+    expect(getTemplateMock).toHaveBeenCalledWith(AUTHORING_LETTER_TEMPLATE.id);
+    expect(getLetterVariantByIdMock).toHaveBeenCalledWith('variant-123');
+    expect(container.asFragment()).toMatchSnapshot();
+  });
+
+  it('passes hideBackLinks to PreviewTemplateFromMessagePlan', async () => {
+    getTemplateMock.mockResolvedValueOnce({
+      ...PDF_LETTER_TEMPLATE,
+      templateStatus: 'SUBMITTED',
+    });
+
+    const page = await SummaryPreviewLetter(
+      defaultProps({
+        routingConfigId: ROUTING_CONFIG.id,
+        templateId: PDF_LETTER_TEMPLATE.id,
+        hideBackLinks: true,
+      })
+    );
+
+    const container = render(page);
+
+    expect(container.asFragment()).toMatchSnapshot();
+  });
+});
diff --git a/frontend/src/__tests__/components/molecules/__snapshots__/MessagePlanCascadePreview.test.tsx.snap b/frontend/src/__tests__/components/molecules/__snapshots__/MessagePlanCascadePreview.test.tsx.snap
index e994f40fa..e3d1d838a 100644
--- a/frontend/src/__tests__/components/molecules/__snapshots__/MessagePlanCascadePreview.test.tsx.snap
+++ b/frontend/src/__tests__/components/molecules/__snapshots__/MessagePlanCascadePreview.test.tsx.snap
@@ -8,7 +8,7 @@ exports[`MessagePlanCascadePreview matches snapshot 1`] = `
       class="nhsuk-button nhsuk-button--secondary"
       type="button"
     >
-      Open all template previews
+      Open all digital template previews
     </button>
   </p>
   <ul
@@ -513,12 +513,15 @@ exports[`MessagePlanCascadePreview matches snapshot 1`] = `
           <p
             data-testid="template-name"
           >
-            <a
-              href="/preview-letter-template/letter-template-id"
-            >
-              letter template name
-            </a>
+            letter template name
           </p>
+          <a
+            href="/preview-letter-template/letter-template-id"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            Preview template (opens in a new tab)
+          </a>
         </div>
       </div>
     </li>
diff --git a/frontend/src/__tests__/components/molecules/__snapshots__/SummaryPreviewLetter.test.tsx.snap b/frontend/src/__tests__/components/molecules/__snapshots__/SummaryPreviewLetter.test.tsx.snap
new file mode 100644
index 000000000..49a85a8f5
--- /dev/null
+++ b/frontend/src/__tests__/components/molecules/__snapshots__/SummaryPreviewLetter.test.tsx.snap
@@ -0,0 +1,424 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SummaryPreviewLetter passes hideBackLinks to PreviewTemplateFromMessagePlan 1`] = `
+<DocumentFragment>
+  <div
+    class="nhsuk-width-container"
+  >
+    <main
+      class="nhsuk-main-wrapper"
+      id="maincontent"
+      role="main"
+    >
+      <div
+        class="nhsuk-grid-row"
+      >
+        <div
+          class="nhsuk-grid-column-full"
+        >
+          <div
+            class="nhsuk-u-reading-width"
+          >
+            <span
+              class="nhsuk-caption-l"
+            >
+              Template
+            </span>
+            <h1
+              data-testid="preview-message__heading"
+            >
+              letter template name
+            </h1>
+          </div>
+          <div
+            class="nhsuk-width-container nhsuk-u-margin-bottom-6 nhsuk-body-m"
+          >
+            <dl
+              class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview"
+            >
+              <div
+                class="nhsuk-summary-list__row"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Template ID
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value monospace-font"
+                  data-testid="preview-template-id"
+                >
+                  letter-template-id
+                </dd>
+              </div>
+              <div
+                class="nhsuk-summary-list__row"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Template type
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value"
+                >
+                  Standard letter
+                </dd>
+              </div>
+              <div
+                class="nhsuk-summary-list__row"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Template file
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value"
+                >
+                  <div
+                    class="container"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="icon"
+                      fill="none"
+                      height="26"
+                      viewBox="0 0 20 26"
+                      width="20"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M0 0V26H20V6.59375L19.7188 6.28125L13.7188 0.28125L13.4062 0H0ZM2 2H12V8H18V24H2V2ZM14 3.4375L16.5625 6H14V3.4375Z"
+                        fill="#4C6272"
+                      />
+                    </svg>
+                    <p
+                      class="text"
+                    >
+                      template.pdf
+                    </p>
+                  </div>
+                </dd>
+              </div>
+            </dl>
+          </div>
+        </div>
+      </div>
+    </main>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`SummaryPreviewLetter renders a PDF letter template preview without letterVariant 1`] = `
+<DocumentFragment>
+  <div
+    class="nhsuk-width-container"
+  >
+    <a
+      class="nhsuk-back-link"
+      data-testid="back-link-top"
+      href="/message-plans/choose-standard-english-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=5"
+    >
+      Go back
+    </a>
+    <main
+      class="nhsuk-main-wrapper"
+      id="maincontent"
+      role="main"
+    >
+      <div
+        class="nhsuk-grid-row"
+      >
+        <div
+          class="nhsuk-grid-column-full"
+        >
+          <div
+            class="nhsuk-u-reading-width"
+          >
+            <span
+              class="nhsuk-caption-l"
+            >
+              Template
+            </span>
+            <h1
+              data-testid="preview-message__heading"
+            >
+              letter template name
+            </h1>
+          </div>
+          <div
+            class="nhsuk-width-container nhsuk-u-margin-bottom-6 nhsuk-body-m"
+          >
+            <dl
+              class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview"
+            >
+              <div
+                class="nhsuk-summary-list__row"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Template ID
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value monospace-font"
+                  data-testid="preview-template-id"
+                >
+                  letter-template-id
+                </dd>
+              </div>
+              <div
+                class="nhsuk-summary-list__row"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Template type
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value"
+                >
+                  Standard letter
+                </dd>
+              </div>
+              <div
+                class="nhsuk-summary-list__row"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Template file
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value"
+                >
+                  <div
+                    class="container"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="icon"
+                      fill="none"
+                      height="26"
+                      viewBox="0 0 20 26"
+                      width="20"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M0 0V26H20V6.59375L19.7188 6.28125L13.7188 0.28125L13.4062 0H0ZM2 2H12V8H18V24H2V2ZM14 3.4375L16.5625 6H14V3.4375Z"
+                        fill="#4C6272"
+                      />
+                    </svg>
+                    <p
+                      class="text"
+                    >
+                      template.pdf
+                    </p>
+                  </div>
+                </dd>
+              </div>
+            </dl>
+          </div>
+          <a
+            class="nhsuk-link nhsuk-body-m nhsuk-u-display-inline-block"
+            data-testid="back-link-bottom"
+            href="/message-plans/choose-standard-english-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=5"
+          >
+            Go back
+          </a>
+        </div>
+      </div>
+    </main>
+  </div>
+</DocumentFragment>
+`;
+
+exports[`SummaryPreviewLetter renders an authoring letter template preview with letterVariant 1`] = `
+<DocumentFragment>
+  <div
+    class="nhsuk-width-container"
+  >
+    <a
+      class="nhsuk-back-link"
+      data-testid="back-link-top"
+      href="/message-plans/choose-standard-english-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=5"
+    >
+      Go back
+    </a>
+    <main
+      class="nhsuk-main-wrapper"
+      id="maincontent"
+      role="main"
+    >
+      <div
+        class="nhsuk-grid-row"
+      >
+        <div
+          class="nhsuk-grid-column-full"
+        >
+          <div
+            class="nhsuk-u-reading-width"
+          >
+            <span
+              class="nhsuk-caption-l"
+            >
+              Template
+            </span>
+            <h1
+              data-testid="preview-message__heading"
+            >
+              authoring letter template name
+            </h1>
+          </div>
+          <div
+            class="nhsuk-width-container nhsuk-u-margin-bottom-6 nhsuk-body-m"
+          >
+            <dl
+              class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview authoringLetterDetails"
+            >
+              <div
+                class="nhsuk-summary-list__row"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Template ID
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value monospace-font"
+                  data-testid="preview-template-id"
+                >
+                  authoring-letter-template-id
+                </dd>
+                <dd
+                  class="nhsuk-summary-list__actions"
+                />
+              </div>
+              <div
+                class="nhsuk-summary-list__row"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Template type
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value"
+                >
+                  Standard letter
+                </dd>
+                <dd
+                  class="nhsuk-summary-list__actions"
+                />
+              </div>
+              <div
+                class="nhsuk-summary-list__row missing-value"
+                id="campaign-id"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Campaign
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value"
+                />
+                <dd
+                  aria-hidden="true"
+                  class="nhsuk-summary-list__actions"
+                />
+              </div>
+              <div
+                class="nhsuk-summary-list__row"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Total pages
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value"
+                >
+                  2
+                </dd>
+                <dd
+                  class="nhsuk-summary-list__actions"
+                />
+              </div>
+              <div
+                class="nhsuk-summary-list__row"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Sheets
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value"
+                >
+                  1
+                </dd>
+                <dd
+                  class="nhsuk-summary-list__actions nhsuk-u-padding-right-4"
+                >
+                  <a
+                    data-testid="sheets-action"
+                    href="https://notify.nhs.uk/pricing-and-commercial/letters"
+                    rel="noopener noreferrer"
+                    target="_blank"
+                  >
+                    Learn more
+                    <span
+                      class="nhsuk-u-visually-hidden"
+                    >
+                       about sheets
+                    </span>
+                  </a>
+                </dd>
+              </div>
+              <div
+                class="nhsuk-summary-list__row"
+                id="printing-and-postage"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Printing and postage
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value"
+                >
+                  Standard C5
+                </dd>
+                <dd
+                  aria-hidden="true"
+                  class="nhsuk-summary-list__actions"
+                />
+              </div>
+            </dl>
+          </div>
+          <h2
+            class="nhsuk-heading-m"
+          >
+            Example preview
+          </h2>
+          <iframe
+            aria-label="PDF preview of letter template"
+            class="letter-render-iframe nhsuk-u-margin-bottom-6"
+            src="/templates/files/client-1/renders/authoring-letter-template-id/render.pdf"
+            title="Letter preview"
+          />
+          <a
+            class="nhsuk-link nhsuk-body-m nhsuk-u-display-inline-block"
+            data-testid="back-link-bottom"
+            href="/message-plans/choose-standard-english-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=5"
+          >
+            Go back
+          </a>
+        </div>
+      </div>
+    </main>
+  </div>
+</DocumentFragment>
+`;
diff --git a/frontend/src/app/message-plans/choose-large-print-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/choose-large-print-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
index 584e9dad3..e0378fa6d 100644
--- a/frontend/src/app/message-plans/choose-large-print-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
+++ b/frontend/src/app/message-plans/choose-large-print-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -1,17 +1,10 @@
-'use server';
-
 import {
   MessagePlanAndTemplatePageProps,
   validateLargePrintLetterTemplate,
 } from 'nhs-notify-web-template-management-utils';
-import { getTemplate } from '@utils/form-actions';
-import { redirect, RedirectType } from 'next/navigation';
 import { Metadata } from 'next';
 import content from '@content/content';
-import { PreviewTemplateFromMessagePlan } from '@molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan';
-import PreviewTemplateDetailsLetter from '@molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter';
-import { $LockNumber } from 'nhs-notify-backend-client/schemas';
-import { NHSNotifyContainer } from '@layouts/container/container';
+import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
 
 const { pageTitle } = content.pages.previewLargePrintLetterTemplate;
 
@@ -23,37 +16,11 @@ export async function generateMetadata(): Promise<Metadata> {
 
 const PreviewLargePrintLetterTemplateFromMessagePlan = async (
   props: MessagePlanAndTemplatePageProps
-) => {
-  const { templateId, routingConfigId } = await props.params;
-  const searchParams = await props.searchParams;
-
-  const lockNumberResult = $LockNumber.safeParse(searchParams?.lockNumber);
-
-  if (!lockNumberResult.success) {
-    return redirect(
-      `/message-plans/edit-message-plan/${routingConfigId}`,
-      RedirectType.replace
-    );
-  }
-
-  const template = await getTemplate(templateId);
-
-  const validatedTemplate = validateLargePrintLetterTemplate(template);
-
-  if (!validatedTemplate) {
-    return redirect('/invalid-template', RedirectType.replace);
-  }
-
-  return (
-    <NHSNotifyContainer>
-      <PreviewTemplateFromMessagePlan
-        initialState={validatedTemplate}
-        previewComponent={PreviewTemplateDetailsLetter}
-        routingConfigId={routingConfigId}
-        lockNumber={lockNumberResult.data}
-      />
-    </NHSNotifyContainer>
-  );
-};
+) => (
+  <SummaryPreviewLetter
+    {...props}
+    validateTemplate={validateLargePrintLetterTemplate}
+  />
+);
 
 export default PreviewLargePrintLetterTemplateFromMessagePlan;
diff --git a/frontend/src/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
index 1b8df4d17..0ddc12180 100644
--- a/frontend/src/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
+++ b/frontend/src/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -1,17 +1,10 @@
-'use server';
-
 import {
   MessagePlanAndTemplatePageProps,
   validateForeignLanguageLetterTemplate,
 } from 'nhs-notify-web-template-management-utils';
-import { getTemplate } from '@utils/form-actions';
-import { redirect, RedirectType } from 'next/navigation';
 import { Metadata } from 'next';
 import content from '@content/content';
-import { PreviewTemplateFromMessagePlan } from '@molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan';
-import PreviewTemplateDetailsLetter from '@molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter';
-import { $LockNumber } from 'nhs-notify-backend-client/schemas';
-import { NHSNotifyContainer } from '@layouts/container/container';
+import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
 
 const { pageTitle } = content.pages.previewOtherLanguageLetterTemplate;
 
@@ -23,37 +16,11 @@ export async function generateMetadata(): Promise<Metadata> {
 
 const PreviewOtherLanguageLetterTemplateFromMessagePlan = async (
   props: MessagePlanAndTemplatePageProps
-) => {
-  const { templateId, routingConfigId } = await props.params;
-  const searchParams = await props.searchParams;
-
-  const lockNumberResult = $LockNumber.safeParse(searchParams?.lockNumber);
-
-  if (!lockNumberResult.success) {
-    return redirect(
-      `/message-plans/edit-message-plan/${routingConfigId}`,
-      RedirectType.replace
-    );
-  }
-
-  const template = await getTemplate(templateId);
-
-  const validatedTemplate = validateForeignLanguageLetterTemplate(template);
-
-  if (!validatedTemplate) {
-    return redirect('/invalid-template', RedirectType.replace);
-  }
-
-  return (
-    <NHSNotifyContainer>
-      <PreviewTemplateFromMessagePlan
-        initialState={validatedTemplate}
-        previewComponent={PreviewTemplateDetailsLetter}
-        routingConfigId={routingConfigId}
-        lockNumber={lockNumberResult.data}
-      />
-    </NHSNotifyContainer>
-  );
-};
+) => (
+  <SummaryPreviewLetter
+    {...props}
+    validateTemplate={validateForeignLanguageLetterTemplate}
+  />
+);
 
 export default PreviewOtherLanguageLetterTemplateFromMessagePlan;
diff --git a/frontend/src/app/message-plans/choose-standard-english-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/choose-standard-english-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
index 4b6604d60..fce61c6a1 100644
--- a/frontend/src/app/message-plans/choose-standard-english-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
+++ b/frontend/src/app/message-plans/choose-standard-english-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -1,18 +1,10 @@
-'use server';
-
 import {
-  AuthoringLetterTemplate,
   MessagePlanAndTemplatePageProps,
   validateLetterTemplate,
 } from 'nhs-notify-web-template-management-utils';
-import { getLetterVariantById, getTemplate } from '@utils/form-actions';
-import { redirect, RedirectType } from 'next/navigation';
 import { Metadata } from 'next';
 import content from '@content/content';
-import { PreviewTemplateFromMessagePlan } from '@molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan';
-import PreviewTemplateDetailsLetter from '@molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter';
-import { $LockNumber } from 'nhs-notify-backend-client/schemas';
-import { NHSNotifyContainer } from '@layouts/container/container';
+import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
 
 const { pageTitle } = content.pages.previewStandardEnglishLetterTemplate;
 
@@ -24,46 +16,8 @@ export async function generateMetadata(): Promise<Metadata> {
 
 const PreviewStandardEnglishLetterTemplateFromMessagePlan = async (
   props: MessagePlanAndTemplatePageProps
-) => {
-  const { templateId, routingConfigId } = await props.params;
-  const searchParams = await props.searchParams;
-
-  const lockNumberResult = $LockNumber.safeParse(searchParams?.lockNumber);
-
-  if (!lockNumberResult.success) {
-    return redirect(
-      `/message-plans/edit-message-plan/${routingConfigId}`,
-      RedirectType.replace
-    );
-  }
-
-  const template = await getTemplate(templateId);
-
-  // status?
-  const validatedTemplate = validateLetterTemplate(template);
-
-  if (!validatedTemplate) {
-    return redirect('/invalid-template', RedirectType.replace);
-  }
-
-  const letterVariantId = (validatedTemplate as AuthoringLetterTemplate)
-    .letterVariantId;
-
-  const letterVariant = letterVariantId
-    ? await getLetterVariantById(letterVariantId)
-    : undefined;
-
-  return (
-    <NHSNotifyContainer>
-      <PreviewTemplateFromMessagePlan
-        initialState={validatedTemplate}
-        previewComponent={PreviewTemplateDetailsLetter}
-        routingConfigId={routingConfigId}
-        lockNumber={lockNumberResult.data}
-        letterVariant={letterVariant}
-      />
-    </NHSNotifyContainer>
-  );
-};
+) => (
+  <SummaryPreviewLetter {...props} validateTemplate={validateLetterTemplate} />
+);
 
 export default PreviewStandardEnglishLetterTemplateFromMessagePlan;
diff --git a/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/page.tsx b/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/page.tsx
index 57b2c100b..f3673b38c 100644
--- a/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/page.tsx
+++ b/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/page.tsx
@@ -111,6 +111,7 @@ export default async function PreviewMessagePlanPage({
             <MessagePlanCascadePreview
               messagePlan={messagePlan}
               templates={templates}
+              letterPreviewHrefBase={`/message-plans/preview-message-plan/${routingConfigId}`}
             />
 
             <div className='nhsuk-form-group'>
diff --git a/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx
new file mode 100644
index 000000000..0d2dc1e4c
--- /dev/null
+++ b/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -0,0 +1,32 @@
+import {
+  MessagePlanAndTemplatePageProps,
+  zodValidate,
+  $AuthoringLetterTemplate,
+} from 'nhs-notify-web-template-management-utils';
+import type { TemplateDto } from 'nhs-notify-web-template-management-types';
+import { Metadata } from 'next';
+import content from '@content/content';
+import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+
+const { pageTitle } = content.pages.previewStandardEnglishLetterTemplate;
+
+export async function generateMetadata(): Promise<Metadata> {
+  return {
+    title: pageTitle,
+  };
+}
+
+const validateAuthoringLetterTemplate = (template?: TemplateDto) =>
+  zodValidate($AuthoringLetterTemplate, template);
+
+const PreviewLetterTemplateFromPreviewMessagePlan = async (
+  props: MessagePlanAndTemplatePageProps
+) => (
+  <SummaryPreviewLetter
+    {...props}
+    validateTemplate={validateAuthoringLetterTemplate}
+    hideBackLinks
+  />
+);
+
+export default PreviewLetterTemplateFromPreviewMessagePlan;
diff --git a/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/page.tsx b/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/page.tsx
index c24d7821a..8127efaba 100644
--- a/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/page.tsx
+++ b/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/page.tsx
@@ -75,6 +75,7 @@ export default async function ReviewAndMoveMessagePlanPage({
               <MessagePlanCascadePreview
                 messagePlan={messagePlan}
                 templates={templates}
+                letterPreviewHrefBase={`/message-plans/review-and-move-to-production/${routingConfigId}`}
               />
 
               <NHSNotifyForm.Form formId='review-and-move-to-production'>
diff --git a/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx
new file mode 100644
index 000000000..73248418c
--- /dev/null
+++ b/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -0,0 +1,32 @@
+import {
+  MessagePlanAndTemplatePageProps,
+  zodValidate,
+  $AuthoringLetterTemplate,
+} from 'nhs-notify-web-template-management-utils';
+import type { TemplateDto } from 'nhs-notify-web-template-management-types';
+import { Metadata } from 'next';
+import content from '@content/content';
+import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+
+const { pageTitle } = content.pages.previewStandardEnglishLetterTemplate;
+
+export async function generateMetadata(): Promise<Metadata> {
+  return {
+    title: pageTitle,
+  };
+}
+
+const validateAuthoringLetterTemplate = (template?: TemplateDto) =>
+  zodValidate($AuthoringLetterTemplate, template);
+
+const PreviewLetterTemplateFromReviewAndMoveToProduction = async (
+  props: MessagePlanAndTemplatePageProps
+) => (
+  <SummaryPreviewLetter
+    {...props}
+    validateTemplate={validateAuthoringLetterTemplate}
+    hideBackLinks
+  />
+);
+
+export default PreviewLetterTemplateFromReviewAndMoveToProduction;
diff --git a/frontend/src/app/review-and-approve-letter-template/[templateId]/ReviewAndApproveLetterTemplatePage.module.scss b/frontend/src/app/review-and-approve-letter-template/[templateId]/ReviewAndApproveLetterTemplatePage.module.scss
deleted file mode 100644
index 40769cbf3..000000000
--- a/frontend/src/app/review-and-approve-letter-template/[templateId]/ReviewAndApproveLetterTemplatePage.module.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.iframe {
-  width: 100%;
-  height: 1200px
-}
diff --git a/frontend/src/app/review-and-approve-letter-template/[templateId]/page.tsx b/frontend/src/app/review-and-approve-letter-template/[templateId]/page.tsx
index 6387c7b0b..59a0721db 100644
--- a/frontend/src/app/review-and-approve-letter-template/[templateId]/page.tsx
+++ b/frontend/src/app/review-and-approve-letter-template/[templateId]/page.tsx
@@ -17,10 +17,8 @@ import { PreviewTemplateDetailsAuthoringLetterTable } from '@molecules/PreviewTe
 import { LetterRenderIframe } from '@molecules/LetterRender/LetterRenderIframe';
 import { getBasePath } from '@utils/get-base-path';
 import { NHSNotifyButton } from '@atoms/NHSNotifyButton/NHSNotifyButton';
-import styles from './ReviewAndApproveLetterTemplatePage.module.scss';
 import { interpolate } from '@utils/interpolate';
 import { $LockNumber } from 'nhs-notify-backend-client/schemas';
-import concatClassNames from '@utils/concat-class-names';
 import { buildLetterRenderUrl } from '@utils/letter-render-url';
 
 const {
@@ -97,10 +95,7 @@ const ReviewAndApproveLetterTemplatePage = async (props: TemplatePageProps) => {
           />
           <h2 className='nhsuk-heading-m'>{shortExampleHeading}</h2>
           <LetterRenderIframe
-            className={concatClassNames(
-              styles.iframe,
-              'nhsuk-u-margin-bottom-6'
-            )}
+            className='letter-render-iframe nhsuk-u-margin-bottom-6'
             renderType='shortFormRender'
             pdfUrl={buildLetterRenderUrl(
               validatedTemplate,
@@ -109,10 +104,7 @@ const ReviewAndApproveLetterTemplatePage = async (props: TemplatePageProps) => {
           />
           <h2 className='nhsuk-heading-m'>{longExampleHeading}</h2>
           <LetterRenderIframe
-            className={concatClassNames(
-              styles.iframe,
-              'nhsuk-u-margin-bottom-6'
-            )}
+            className='letter-render-iframe nhsuk-u-margin-bottom-6'
             renderType='longFormRender'
             pdfUrl={buildLetterRenderUrl(
               validatedTemplate,
diff --git a/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx b/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx
index 0aac12ac3..d2e5bce40 100644
--- a/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx
+++ b/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx
@@ -39,7 +39,18 @@ import {
 
 const pageContent = content.components.messagePlanCascadePreview;
 
-function getLetterTemplatePreviewHref(template: TemplateDto): string {
+function getLetterTemplatePreviewHref(
+  template: TemplateDto,
+  letterPreviewHrefBase?: string
+): string {
+  if (
+    letterPreviewHrefBase &&
+    'letterVersion' in template &&
+    template.letterVersion === 'AUTHORING'
+  ) {
+    return `${letterPreviewHrefBase}/preview-template/${template.id}?lockNumber=${template.lockNumber}`;
+  }
+
   const linkTemplate =
     template.templateStatus === 'SUBMITTED'
       ? pageContent.letterTemplateLinks.previewSubmitted
@@ -50,11 +61,13 @@ function getLetterTemplatePreviewHref(template: TemplateDto): string {
 export type MessagePlanCascadePreviewProps = {
   messagePlan: RoutingConfig;
   templates: MessagePlanTemplates;
+  letterPreviewHrefBase?: string;
 };
 
 export function MessagePlanCascadePreview({
   messagePlan,
   templates,
+  letterPreviewHrefBase,
 }: MessagePlanCascadePreviewProps) {
   return (
     <DetailsOpenProvider>
@@ -110,7 +123,10 @@ export function MessagePlanCascadePreview({
                     <>
                       <p data-testid='template-name'>{defaultTemplate.name}</p>
                       <Link
-                        href={getLetterTemplatePreviewHref(defaultTemplate)}
+                        href={getLetterTemplatePreviewHref(
+                          defaultTemplate,
+                          letterPreviewHrefBase
+                        )}
                         target='_blank'
                         rel='noopener noreferrer'
                       >
@@ -167,7 +183,12 @@ export function MessagePlanCascadePreview({
                           data-testid='channel-card'
                         >
                           <p data-testid='template-name'>
-                            <Link href={getLetterTemplatePreviewHref(template)}>
+                            <Link
+                              href={getLetterTemplatePreviewHref(
+                                template,
+                                letterPreviewHrefBase
+                              )}
+                            >
                               {template.name}
                             </Link>
                           </p>
@@ -188,7 +209,10 @@ export function MessagePlanCascadePreview({
                               className='nhsuk-u-margin-bottom-0'
                             >
                               <Link
-                                href={getLetterTemplatePreviewHref(template)}
+                                href={getLetterTemplatePreviewHref(
+                                  template,
+                                  letterPreviewHrefBase
+                                )}
                               >
                                 {template.name}
                               </Link>
diff --git a/frontend/src/components/molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter.module.scss b/frontend/src/components/molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter.module.scss
deleted file mode 100644
index 40769cbf3..000000000
--- a/frontend/src/components/molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter.module.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.iframe {
-  width: 100%;
-  height: 1200px
-}
diff --git a/frontend/src/components/molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter.tsx b/frontend/src/components/molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter.tsx
index 86062c05d..12c52929b 100644
--- a/frontend/src/components/molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter.tsx
+++ b/frontend/src/components/molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter.tsx
@@ -5,8 +5,6 @@ import PreviewTemplateDetailsPdfLetter from './PreviewTemplateDetailsPdfLetter';
 import PreviewTemplateDetailsAuthoringLetter from './PreviewTemplateDetailsAuthoringLetter';
 import { LetterRenderIframe } from '@molecules/LetterRender/LetterRenderIframe';
 import { buildLetterRenderUrl } from '@utils/letter-render-url';
-import concatClassNames from '@utils/concat-class-names';
-import styles from './PreviewTemplateDetailsLetter.module.scss';
 import type { LetterVariant } from 'nhs-notify-web-template-management-types';
 
 export default function PreviewTemplateDetailsLetter({
@@ -44,11 +42,11 @@ export default function PreviewTemplateDetailsLetter({
         hideStatus={hideStatus}
         hideEditActions={hideEditActions}
       />
-      <h2 className='nhsuk-heading-m'>{'h2'}</h2>
+      <h2 className='nhsuk-heading-m'>Example preview</h2>
       <LetterRenderIframe
         renderType={'initialRender'}
         pdfUrl={pdfUrl}
-        className={concatClassNames(styles.iframe, 'nhsuk-u-margin-bottom-6')}
+        className='letter-render-iframe nhsuk-u-margin-bottom-6'
       />
     </>
   );
diff --git a/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx b/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx
index 0044160a0..766dfd4f4 100644
--- a/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx
+++ b/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx
@@ -22,6 +22,7 @@ export type MessagePlanPreviewTemplateProps<T extends TemplateDto> =
     routingConfigId: string;
     lockNumber: number;
     letterVariant?: LetterVariant;
+    hideBackLinks?: boolean;
   };
 
 export function PreviewTemplateFromMessagePlan<T extends TemplateDto>({
@@ -30,6 +31,7 @@ export function PreviewTemplateFromMessagePlan<T extends TemplateDto>({
   routingConfigId,
   lockNumber,
   letterVariant,
+  hideBackLinks,
 }: Readonly<MessagePlanPreviewTemplateProps<T>>) {
   const content = baseContent.components.previewTemplateFromMessagePlan;
 
@@ -54,9 +56,11 @@ export function PreviewTemplateFromMessagePlan<T extends TemplateDto>({
 
   return (
     <>
-      <Link href={backLinkHref} passHref legacyBehavior>
-        <NotifyBackLink>{content.backLink.text}</NotifyBackLink>
-      </Link>
+      {!hideBackLinks && (
+        <Link href={backLinkHref} passHref legacyBehavior>
+          <NotifyBackLink>{content.backLink.text}</NotifyBackLink>
+        </Link>
+      )}
 
       <NHSNotifyMain>
         <div className='nhsuk-grid-row'>
@@ -67,13 +71,15 @@ export function PreviewTemplateFromMessagePlan<T extends TemplateDto>({
               hideStatus: true,
               hideEditActions: true,
             })}
-            <Link
-              className='nhsuk-link nhsuk-body-m nhsuk-u-display-inline-block'
-              href={backLinkHref}
-              data-testid='back-link-bottom'
-            >
-              {content.backLink.text}
-            </Link>
+            {!hideBackLinks && (
+              <Link
+                className='nhsuk-link nhsuk-body-m nhsuk-u-display-inline-block'
+                href={backLinkHref}
+                data-testid='back-link-bottom'
+              >
+                {content.backLink.text}
+              </Link>
+            )}
           </div>
         </div>
       </NHSNotifyMain>
diff --git a/frontend/src/components/molecules/SummaryPreviewLetter/SummaryPreviewLetter.tsx b/frontend/src/components/molecules/SummaryPreviewLetter/SummaryPreviewLetter.tsx
new file mode 100644
index 000000000..e4028c9ea
--- /dev/null
+++ b/frontend/src/components/molecules/SummaryPreviewLetter/SummaryPreviewLetter.tsx
@@ -0,0 +1,62 @@
+import {
+  AuthoringLetterTemplate,
+  LetterTemplate,
+  MessagePlanAndTemplatePageProps,
+} from 'nhs-notify-web-template-management-utils';
+import type { TemplateDto } from 'nhs-notify-web-template-management-types';
+import { getLetterVariantById, getTemplate } from '@utils/form-actions';
+import { redirect, RedirectType } from 'next/navigation';
+import { PreviewTemplateFromMessagePlan } from '@molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan';
+import PreviewTemplateDetailsLetter from '@molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter';
+import { $LockNumber } from 'nhs-notify-backend-client/schemas';
+import { NHSNotifyContainer } from '@layouts/container/container';
+
+type SummaryPreviewLetterProps = MessagePlanAndTemplatePageProps & {
+  validateTemplate: (template?: TemplateDto) => LetterTemplate | undefined;
+  hideBackLinks?: boolean;
+};
+
+export const SummaryPreviewLetter = async (
+  props: SummaryPreviewLetterProps
+) => {
+  const { templateId, routingConfigId } = await props.params;
+  const searchParams = await props.searchParams;
+  const { validateTemplate, hideBackLinks } = props;
+
+  const lockNumberResult = $LockNumber.safeParse(searchParams?.lockNumber);
+
+  if (!lockNumberResult.success) {
+    return redirect(
+      `/message-plans/edit-message-plan/${routingConfigId}`,
+      RedirectType.replace
+    );
+  }
+
+  const template = await getTemplate(templateId);
+
+  const validatedTemplate = validateTemplate(template);
+
+  if (!validatedTemplate) {
+    return redirect('/invalid-template', RedirectType.replace);
+  }
+
+  const letterVariantId = (validatedTemplate as AuthoringLetterTemplate)
+    .letterVariantId;
+
+  const letterVariant = letterVariantId
+    ? await getLetterVariantById(letterVariantId)
+    : undefined;
+
+  return (
+    <NHSNotifyContainer>
+      <PreviewTemplateFromMessagePlan
+        initialState={validatedTemplate}
+        previewComponent={PreviewTemplateDetailsLetter}
+        routingConfigId={routingConfigId}
+        lockNumber={lockNumberResult.data}
+        letterVariant={letterVariant}
+        hideBackLinks={hideBackLinks}
+      />
+    </NHSNotifyContainer>
+  );
+};
diff --git a/frontend/src/middleware.ts b/frontend/src/middleware.ts
index 0acbcae4c..4bb3b1a28 100644
--- a/frontend/src/middleware.ts
+++ b/frontend/src/middleware.ts
@@ -42,7 +42,9 @@ const protectedPaths = [
   /^\/message-plans\/get-ready-to-move\/[^/]+$/,
   /^\/message-plans\/invalid$/,
   /^\/message-plans\/preview-message-plan\/[^/]+$/,
+  /^\/message-plans\/preview-message-plan\/[^/]+\/preview-template\/[^/]+$/,
   /^\/message-plans\/review-and-move-to-production\/[^/]+$/,
+  /^\/message-plans\/review-and-move-to-production\/[^/]+\/preview-template\/[^/]+$/,
   /^\/message-plans$/,
   /^\/message-templates$/,
   /^\/nhs-app-template-submitted\/[^/]+$/,
diff --git a/frontend/src/styles/app.scss b/frontend/src/styles/app.scss
index 57c31e281..7cea77c31 100644
--- a/frontend/src/styles/app.scss
+++ b/frontend/src/styles/app.scss
@@ -146,3 +146,8 @@ a.nhsuk-link--no-visited-state {
   background-color: var(--nhsuk-pale-yellow-colour);
   box-shadow: inset 0 0 0 3px var(--nhsuk-yellow-colour);
 }
+
+.letter-render-iframe {
+  width: 100%;
+  height: 1200px;
+}
diff --git a/tests/test-team/pages/routing/index.ts b/tests/test-team/pages/routing/index.ts
index f7420eacd..07c52426b 100644
--- a/tests/test-team/pages/routing/index.ts
+++ b/tests/test-team/pages/routing/index.ts
@@ -6,7 +6,9 @@ export * from './edit-message-plan-settings-page';
 export * from './get-ready-to-move-page';
 export * from './invalid-message-plan-page';
 export * from './message-plans-page';
+export * from './preview-message-plan-letter-template-page';
 export * from './preview-message-plan-page';
+export * from './review-and-move-to-production-letter-template-page';
 export * from './review-and-move-to-production-page';
 export * from './email';
 export * from './letter';
diff --git a/tests/test-team/pages/routing/preview-message-plan-letter-template-page.ts b/tests/test-team/pages/routing/preview-message-plan-letter-template-page.ts
new file mode 100644
index 000000000..3e47c02b6
--- /dev/null
+++ b/tests/test-team/pages/routing/preview-message-plan-letter-template-page.ts
@@ -0,0 +1,6 @@
+import { TemplateMgmtPreviewBasePage } from 'pages/template-mgmt-preview-base-page';
+
+export class RoutingPreviewMessagePlanLetterTemplatePage extends TemplateMgmtPreviewBasePage {
+  static readonly pathTemplate =
+    '/message-plans/preview-message-plan/:messagePlanId/preview-template/:templateId';
+}
diff --git a/tests/test-team/pages/routing/preview-message-plan-page.ts b/tests/test-team/pages/routing/preview-message-plan-page.ts
index 7946d53bb..d6a7f34f7 100644
--- a/tests/test-team/pages/routing/preview-message-plan-page.ts
+++ b/tests/test-team/pages/routing/preview-message-plan-page.ts
@@ -26,7 +26,7 @@ export class RoutingPreviewMessagePlanPage extends TemplateMgmtBasePage {
     this.campaignId = page.getByTestId('campaign-id');
     this.status = page.getByTestId('status');
     this.previewToggleButton = page.getByRole('button', {
-      name: /^(Open|Close) all template previews$/,
+      name: /^(Open|Close) all digital template previews$/,
     });
     this.detailsSections = page.locator('details');
   }
diff --git a/tests/test-team/pages/routing/review-and-move-to-production-letter-template-page.ts b/tests/test-team/pages/routing/review-and-move-to-production-letter-template-page.ts
new file mode 100644
index 000000000..7e7691b27
--- /dev/null
+++ b/tests/test-team/pages/routing/review-and-move-to-production-letter-template-page.ts
@@ -0,0 +1,6 @@
+import { TemplateMgmtPreviewBasePage } from 'pages/template-mgmt-preview-base-page';
+
+export class RoutingReviewAndMoveToProductionLetterTemplatePage extends TemplateMgmtPreviewBasePage {
+  static readonly pathTemplate =
+    '/message-plans/review-and-move-to-production/:messagePlanId/preview-template/:templateId';
+}
diff --git a/tests/test-team/pages/routing/review-and-move-to-production-page.ts b/tests/test-team/pages/routing/review-and-move-to-production-page.ts
index 7eeafe880..42a5047bc 100644
--- a/tests/test-team/pages/routing/review-and-move-to-production-page.ts
+++ b/tests/test-team/pages/routing/review-and-move-to-production-page.ts
@@ -24,7 +24,7 @@ export class RoutingReviewAndMoveToProductionPage extends TemplateMgmtBasePage {
 
     this.messagePlanName = page.getByTestId('plan-name');
     this.previewToggleButton = page.getByRole('button', {
-      name: /^(Open|Close) all template previews$/,
+      name: /^(Open|Close) all digital template previews$/,
     });
     this.detailsSections = page.locator('details');
     this.moveToProductionButton = page.getByTestId('move-to-production-button');
diff --git a/tests/test-team/template-mgmt-accessibility/route-coverage.accessibility.spec.ts b/tests/test-team/template-mgmt-accessibility/route-coverage.accessibility.spec.ts
index 129b58d5e..db5cb24c8 100644
--- a/tests/test-team/template-mgmt-accessibility/route-coverage.accessibility.spec.ts
+++ b/tests/test-team/template-mgmt-accessibility/route-coverage.accessibility.spec.ts
@@ -82,12 +82,14 @@ import {
   RoutingMessagePlansPage,
   RoutingPreviewEmailTemplatePage,
   RoutingPreviewLargePrintLetterTemplatePage,
+  RoutingPreviewMessagePlanLetterTemplatePage,
   RoutingPreviewMessagePlanPage,
   RoutingPreviewNhsAppTemplatePage,
   RoutingPreviewOtherLanguageLetterTemplatePage,
   RoutingPreviewSmsTemplatePage,
   RoutingPreviewStandardLetterTemplatePage,
   RoutingReviewAndMoveToProductionPage,
+  RoutingReviewAndMoveToProductionLetterTemplatePage,
 } from 'pages/routing';
 
 /**
@@ -167,12 +169,14 @@ const allPages: (typeof TemplateMgmtBasePage)[] = [
   RoutingMessagePlansPage,
   RoutingPreviewEmailTemplatePage,
   RoutingPreviewLargePrintLetterTemplatePage,
+  RoutingPreviewMessagePlanLetterTemplatePage,
   RoutingPreviewMessagePlanPage,
   RoutingPreviewNhsAppTemplatePage,
   RoutingPreviewOtherLanguageLetterTemplatePage,
   RoutingPreviewSmsTemplatePage,
   RoutingPreviewStandardLetterTemplatePage,
   RoutingReviewAndMoveToProductionPage,
+  RoutingReviewAndMoveToProductionLetterTemplatePage,
 ];
 
 test('all app routes have accessibility test coverage', async () => {
diff --git a/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts b/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts
index c51ee5447..e7f1b2f67 100644
--- a/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts
+++ b/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts
@@ -24,12 +24,14 @@ import {
   RoutingMessagePlansPage,
   RoutingPreviewEmailTemplatePage,
   RoutingPreviewLargePrintLetterTemplatePage,
+  RoutingPreviewMessagePlanLetterTemplatePage,
   RoutingPreviewMessagePlanPage,
   RoutingPreviewNhsAppTemplatePage,
   RoutingPreviewOtherLanguageLetterTemplatePage,
   RoutingPreviewSmsTemplatePage,
   RoutingPreviewStandardLetterTemplatePage,
   RoutingReviewAndMoveToProductionPage,
+  RoutingReviewAndMoveToProductionLetterTemplatePage,
 } from 'pages/routing';
 import { getTestContext } from 'helpers/context/context';
 
@@ -232,6 +234,25 @@ test.describe('Routing', () => {
           .setPathParam('templateId', templateIds.SMS)
           .setSearchParam('lockNumber', '0')
       ));
+
+    test('Preview message plan letter template', async ({ page, analyze }) =>
+      analyze(
+        new RoutingPreviewMessagePlanLetterTemplatePage(page)
+          .setPathParam('messagePlanId', productionRoutingConfigId)
+          .setPathParam('templateId', templateIds.LETTER)
+          .setSearchParam('lockNumber', '0')
+      ));
+
+    test('Review and move to production letter template', async ({
+      page,
+      analyze,
+    }) =>
+      analyze(
+        new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
+          .setPathParam('messagePlanId', draftRoutingConfigId)
+          .setPathParam('templateId', templateIds.LETTER)
+          .setSearchParam('lockNumber', '0')
+      ));
   });
 
   test('Message plans', async ({ page, analyze }) =>
diff --git a/tests/test-team/template-mgmt-component-tests/template-protected-routes.component.spec.ts b/tests/test-team/template-mgmt-component-tests/template-protected-routes.component.spec.ts
index dcad344b2..ef1f62059 100644
--- a/tests/test-team/template-mgmt-component-tests/template-protected-routes.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/template-protected-routes.component.spec.ts
@@ -17,12 +17,14 @@ import { RoutingMessagePlanCampaignIdRequiredPage } from '../pages/routing/campa
 import { RoutingMessagePlansPage } from '../pages/routing/message-plans-page';
 import { RoutingPreviewEmailTemplatePage } from 'pages/routing/email/preview-email-page';
 import { RoutingPreviewLargePrintLetterTemplatePage } from 'pages/routing/letter/preview-large-print-letter-template-page';
+import { RoutingPreviewMessagePlanLetterTemplatePage } from 'pages/routing/preview-message-plan-letter-template-page';
 import { RoutingPreviewMessagePlanPage } from 'pages/routing/preview-message-plan-page';
 import { RoutingPreviewNhsAppTemplatePage } from 'pages/routing/nhs-app/preview-nhs-app-page';
 import { RoutingPreviewOtherLanguageLetterTemplatePage } from 'pages/routing/letter/preview-other-language-letter-template-page';
 import { RoutingPreviewSmsTemplatePage } from 'pages/routing/sms/preview-sms-template-page';
 import { RoutingPreviewStandardLetterTemplatePage } from 'pages/routing/letter/preview-standard-letter-page';
 import { RoutingReviewAndMoveToProductionPage } from 'pages/routing';
+import { RoutingReviewAndMoveToProductionLetterTemplatePage } from 'pages/routing/review-and-move-to-production-letter-template-page';
 import { TemplateMgmtChoosePage } from '../pages/template-mgmt-choose-page';
 import { TemplateMgmtChoosePrintingAndPostagePage } from 'pages/letter/template-mgmt-choose-printing-and-postage-page';
 import { TemplateMgmtCopyPage } from '../pages/template-mgmt-copy-page';
@@ -86,12 +88,14 @@ const protectedPages = [
   RoutingMessagePlansPage,
   RoutingPreviewEmailTemplatePage,
   RoutingPreviewLargePrintLetterTemplatePage,
+  RoutingPreviewMessagePlanLetterTemplatePage,
   RoutingPreviewMessagePlanPage,
   RoutingPreviewNhsAppTemplatePage,
   RoutingPreviewOtherLanguageLetterTemplatePage,
   RoutingPreviewSmsTemplatePage,
   RoutingPreviewStandardLetterTemplatePage,
   RoutingReviewAndMoveToProductionPage,
+  RoutingReviewAndMoveToProductionLetterTemplatePage,
   TemplateMgmtChoosePage,
   TemplateMgmtChoosePrintingAndPostagePage,
   TemplateMgmtCopyPage,
diff --git a/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts b/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts
index b239d21fe..c2f292e13 100644
--- a/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts
+++ b/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts
@@ -18,6 +18,7 @@ import {
   RoutingChooseLargePrintLetterTemplatePage,
   RoutingGetReadyToMovePage,
   RoutingReviewAndMoveToProductionPage,
+  RoutingReviewAndMoveToProductionLetterTemplatePage,
 } from '../pages/routing';
 import { TemplateMgmtMessageTemplatesPage } from '../pages/template-mgmt-message-templates-page';
 import { RoutingChooseTemplateForMessagePlanBasePage } from '../pages/routing/choose-template-base-page';
@@ -399,6 +400,33 @@ test.describe('Routing', () => {
       expect(languageTemplateNames).toHaveLength(2);
       expect(languageTemplateNames).toContain(templates.ARABIC_LETTER.name);
       expect(languageTemplateNames).toContain(templates.POLISH_LETTER.name);
+    });
+
+    await test.step('preview letter template from review page', async () => {
+      const reviewPage = new RoutingReviewAndMoveToProductionPage(page);
+
+      const letterBlock = reviewPage.getTemplateBlock('LETTER');
+
+      await letterBlock.defaultTemplateCard.templateLink.click();
+
+      const previewLetterPage =
+        new RoutingReviewAndMoveToProductionLetterTemplatePage(page);
+
+      await expect(previewLetterPage.pageHeading).toContainText(
+        templates.LETTER.name
+      );
+
+      await expect(previewLetterPage.templateId).toContainText(
+        templates.LETTER.id
+      );
+
+      await page.goBack();
+
+      await expect(reviewPage.pageHeading).toBeVisible();
+    });
+
+    await test.step('move to production', async () => {
+      const reviewPage = new RoutingReviewAndMoveToProductionPage(page);
 
       await reviewPage.moveToProductionButton.click();
     });
diff --git a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts
new file mode 100644
index 000000000..0214573bb
--- /dev/null
+++ b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts
@@ -0,0 +1,182 @@
+import { test, expect } from '@playwright/test';
+import {
+  assertFooterLinks,
+  assertSignOutLink,
+  assertHeaderLogoLink,
+  assertSkipToMainContent,
+} from 'helpers/template-mgmt-common.steps';
+import { TestUser, testUsers } from 'helpers/auth/cognito-auth-helper';
+import { TemplateStorageHelper } from 'helpers/db/template-storage-helper';
+import { randomUUID } from 'node:crypto';
+import { TemplateFactory } from 'helpers/factories/template-factory';
+import { RoutingPreviewMessagePlanLetterTemplatePage } from 'pages/routing/preview-message-plan-letter-template-page';
+import { RoutingConfigFactory } from 'helpers/factories/routing-config-factory';
+import { RoutingConfigStorageHelper } from 'helpers/db/routing-config-storage-helper';
+import { getTestContext } from 'helpers/context/context';
+
+const routingConfigStorageHelper = new RoutingConfigStorageHelper();
+const templateStorageHelper = new TemplateStorageHelper();
+
+const invalidTemplateId = 'invalid-id';
+const notFoundTemplateId = 'dc67b576-af7d-47b3-97d7-48fa204e7525';
+
+function createMessagePlans(user: TestUser) {
+  return {
+    LETTER_ROUTING_CONFIG: RoutingConfigFactory.createForMessageOrder(
+      user,
+      'LETTER'
+    ).dbEntry,
+  };
+}
+
+function createTemplates(user: TestUser) {
+  return {
+    EMAIL: TemplateFactory.createEmailTemplate(
+      randomUUID(),
+      user,
+      'Email template name'
+    ),
+    AUTHORING_LETTER: TemplateFactory.createAuthoringLetterTemplate(
+      randomUUID(),
+      user,
+      'Authoring letter template name'
+    ),
+    PDF_LETTER: TemplateFactory.uploadLetterTemplate(
+      randomUUID(),
+      user,
+      'PDF letter template name'
+    ),
+  };
+}
+
+test.describe('Routing - Preview Message Plan Letter template page', () => {
+  let messagePlans: ReturnType<typeof createMessagePlans>;
+  let templates: ReturnType<typeof createTemplates>;
+
+  test.beforeAll(async () => {
+    const context = getTestContext();
+    const user = await context.auth.getTestUser(testUsers.User1.userId);
+
+    messagePlans = createMessagePlans(user);
+    templates = createTemplates(user);
+
+    await routingConfigStorageHelper.seed(Object.values(messagePlans));
+    await templateStorageHelper.seedTemplateData(Object.values(templates));
+  });
+
+  test.afterAll(async () => {
+    await routingConfigStorageHelper.deleteSeeded();
+    await templateStorageHelper.deleteSeededTemplates();
+  });
+
+  test('common page tests', async ({ page, baseURL }) => {
+    const props = {
+      page: new RoutingPreviewMessagePlanLetterTemplatePage(page)
+        .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+        .setPathParam('templateId', templates.AUTHORING_LETTER.id)
+        .setSearchParam('lockNumber', '0'),
+      baseURL,
+    };
+    await assertSkipToMainContent(props);
+    await assertHeaderLogoLink(props);
+    await assertFooterLinks(props);
+    await assertSignOutLink(props);
+  });
+
+  test('loads the AUTHORING letter template', async ({ page, baseURL }) => {
+    const previewLetterTemplatePage =
+      new RoutingPreviewMessagePlanLetterTemplatePage(page)
+        .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+        .setPathParam('templateId', templates.AUTHORING_LETTER.id)
+        .setSearchParam('lockNumber', '0');
+
+    await previewLetterTemplatePage.loadPage();
+
+    await expect(page).toHaveURL(
+      `${baseURL}/templates/message-plans/preview-message-plan/${messagePlans.LETTER_ROUTING_CONFIG.id}/preview-template/${templates.AUTHORING_LETTER.id}?lockNumber=0`
+    );
+
+    await expect(previewLetterTemplatePage.pageHeading).toContainText(
+      templates.AUTHORING_LETTER.name
+    );
+
+    expect(templates.AUTHORING_LETTER.campaignId).toBeTruthy();
+
+    await expect(previewLetterTemplatePage.campaignId).toContainText(
+      templates.AUTHORING_LETTER.campaignId!
+    );
+
+    await expect(previewLetterTemplatePage.templateId).toBeVisible();
+    await expect(previewLetterTemplatePage.templateId).toContainText(
+      templates.AUTHORING_LETTER.id
+    );
+
+    await expect(previewLetterTemplatePage.summaryList).toBeVisible();
+  });
+
+  test.describe('redirects to invalid template page', () => {
+    test('when template cannot be found', async ({ page, baseURL }) => {
+      const previewLetterTemplatePage =
+        new RoutingPreviewMessagePlanLetterTemplatePage(page)
+          .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+          .setPathParam('templateId', notFoundTemplateId)
+          .setSearchParam('lockNumber', '0');
+
+      await previewLetterTemplatePage.loadPage();
+
+      await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
+    });
+
+    test('when template ID is invalid', async ({ page, baseURL }) => {
+      const previewLetterTemplatePage =
+        new RoutingPreviewMessagePlanLetterTemplatePage(page)
+          .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+          .setPathParam('templateId', invalidTemplateId)
+          .setSearchParam('lockNumber', '0');
+
+      await previewLetterTemplatePage.loadPage();
+
+      await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
+    });
+
+    test('when template is not letter', async ({ page, baseURL }) => {
+      const previewLetterTemplatePage =
+        new RoutingPreviewMessagePlanLetterTemplatePage(page)
+          .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+          .setPathParam('templateId', templates.EMAIL.id)
+          .setSearchParam('lockNumber', '0');
+
+      await previewLetterTemplatePage.loadPage();
+
+      await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
+    });
+
+    test('when template is a PDF letter', async ({ page, baseURL }) => {
+      const previewLetterTemplatePage =
+        new RoutingPreviewMessagePlanLetterTemplatePage(page)
+          .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+          .setPathParam('templateId', templates.PDF_LETTER.id)
+          .setSearchParam('lockNumber', '0');
+
+      await previewLetterTemplatePage.loadPage();
+
+      await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
+    });
+  });
+
+  test('redirects to the edit message plan page when lockNumber is missing', async ({
+    page,
+    baseURL,
+  }) => {
+    const previewLetterTemplatePage =
+      new RoutingPreviewMessagePlanLetterTemplatePage(page)
+        .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+        .setPathParam('templateId', templates.AUTHORING_LETTER.id);
+
+    await previewLetterTemplatePage.loadPage();
+
+    await expect(page).toHaveURL(
+      `${baseURL}/templates/message-plans/edit-message-plan/${messagePlans.LETTER_ROUTING_CONFIG.id}`
+    );
+  });
+});
diff --git a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
index 6eedbfd3a..8a833039d 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
@@ -30,6 +30,8 @@ function createTemplates(user: TestUser) {
     LARGE_PRINT_LETTER: randomUUID(),
     FRENCH_LETTER: randomUUID(),
     SPANISH_LETTER: randomUUID(),
+    AUTHORING_LETTER: randomUUID(),
+    AUTHORING_LARGE_PRINT_LETTER: randomUUID(),
   };
 
   return {
@@ -81,6 +83,20 @@ function createTemplates(user: TestUser) {
       'PASSED',
       { language: 'es' }
     ),
+    AUTHORING_LETTER: TemplateFactory.createAuthoringLetterTemplate(
+      templateIds.AUTHORING_LETTER,
+      user,
+      `Test Authoring Letter template - ${templateIds.AUTHORING_LETTER}`,
+      'SUBMITTED'
+    ),
+    AUTHORING_LARGE_PRINT_LETTER:
+      TemplateFactory.createAuthoringLetterTemplate(
+        templateIds.AUTHORING_LARGE_PRINT_LETTER,
+        user,
+        `Test Authoring Large Print Letter template - ${templateIds.AUTHORING_LARGE_PRINT_LETTER}`,
+        'SUBMITTED',
+        { letterType: 'x1' }
+      ),
   };
 }
 
@@ -204,7 +220,7 @@ test.describe('Routing - Preview Message Plan page', () => {
       }
 
       await expect(previewMessagePlanPage.previewToggleButton).toHaveText(
-        'Open all template previews'
+        'Open all digital template previews'
       );
 
       await previewMessagePlanPage.previewToggleButton.click();
@@ -214,7 +230,7 @@ test.describe('Routing - Preview Message Plan page', () => {
       }
 
       await expect(previewMessagePlanPage.previewToggleButton).toHaveText(
-        'Close all template previews'
+        'Close all digital template previews'
       );
 
       await previewMessagePlanPage.previewToggleButton.click();
@@ -224,7 +240,7 @@ test.describe('Routing - Preview Message Plan page', () => {
       }
 
       await expect(previewMessagePlanPage.previewToggleButton).toHaveText(
-        'Open all template previews'
+        'Open all digital template previews'
       );
     });
 
@@ -313,6 +329,54 @@ test.describe('Routing - Preview Message Plan page', () => {
     });
   });
 
+  test('displays AUTHORING letter template links pointing to in-flow preview', async ({
+    page,
+  }) => {
+    const { dbEntry } = RoutingConfigFactory.createWithChannels(
+      user,
+      ['LETTER'],
+      { status: 'COMPLETED' }
+    )
+      .addTemplate('LETTER', templates.AUTHORING_LETTER.id)
+      .addAccessibleFormatTemplate(
+        'x1',
+        templates.AUTHORING_LARGE_PRINT_LETTER.id
+      );
+
+    await routingConfigStorageHelper.seed([dbEntry]);
+
+    const previewMessagePlanPage = new RoutingPreviewMessagePlanPage(
+      page
+    ).setPathParam('messagePlanId', dbEntry.id);
+
+    await previewMessagePlanPage.loadPage();
+
+    const templateBlock =
+      await previewMessagePlanPage.getTemplateBlock('LETTER');
+
+    await expect(templateBlock.defaultTemplateCard.templateLink).toHaveText(
+      templates.AUTHORING_LETTER.name
+    );
+
+    await expect(
+      templateBlock.defaultTemplateCard.templateLink
+    ).toHaveAttribute(
+      'href',
+      `/templates/message-plans/preview-message-plan/${dbEntry.id}/preview-template/${templates.AUTHORING_LETTER.id}?lockNumber=0`
+    );
+
+    await expect(
+      templateBlock.getAccessibilityFormatCard('x1').templateLink
+    ).toHaveText(templates.AUTHORING_LARGE_PRINT_LETTER.name);
+
+    await expect(
+      templateBlock.getAccessibilityFormatCard('x1').templateLink
+    ).toHaveAttribute(
+      'href',
+      `/templates/message-plans/preview-message-plan/${dbEntry.id}/preview-template/${templates.AUTHORING_LARGE_PRINT_LETTER.id}?lockNumber=0`
+    );
+  });
+
   test('letter only with no conditional templates', async ({ page }) => {
     const { dbEntry } = RoutingConfigFactory.createWithChannels(
       user,
diff --git a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts
new file mode 100644
index 000000000..ed81da884
--- /dev/null
+++ b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts
@@ -0,0 +1,182 @@
+import { test, expect } from '@playwright/test';
+import {
+  assertFooterLinks,
+  assertSignOutLink,
+  assertHeaderLogoLink,
+  assertSkipToMainContent,
+} from 'helpers/template-mgmt-common.steps';
+import { TestUser, testUsers } from 'helpers/auth/cognito-auth-helper';
+import { TemplateStorageHelper } from 'helpers/db/template-storage-helper';
+import { randomUUID } from 'node:crypto';
+import { TemplateFactory } from 'helpers/factories/template-factory';
+import { RoutingReviewAndMoveToProductionLetterTemplatePage } from 'pages/routing/review-and-move-to-production-letter-template-page';
+import { RoutingConfigFactory } from 'helpers/factories/routing-config-factory';
+import { RoutingConfigStorageHelper } from 'helpers/db/routing-config-storage-helper';
+import { getTestContext } from 'helpers/context/context';
+
+const routingConfigStorageHelper = new RoutingConfigStorageHelper();
+const templateStorageHelper = new TemplateStorageHelper();
+
+const invalidTemplateId = 'invalid-id';
+const notFoundTemplateId = 'dc67b576-af7d-47b3-97d7-48fa204e7525';
+
+function createMessagePlans(user: TestUser) {
+  return {
+    LETTER_ROUTING_CONFIG: RoutingConfigFactory.createForMessageOrder(
+      user,
+      'LETTER'
+    ).dbEntry,
+  };
+}
+
+function createTemplates(user: TestUser) {
+  return {
+    EMAIL: TemplateFactory.createEmailTemplate(
+      randomUUID(),
+      user,
+      'Email template name'
+    ),
+    AUTHORING_LETTER: TemplateFactory.createAuthoringLetterTemplate(
+      randomUUID(),
+      user,
+      'Authoring letter template name'
+    ),
+    PDF_LETTER: TemplateFactory.uploadLetterTemplate(
+      randomUUID(),
+      user,
+      'PDF letter template name'
+    ),
+  };
+}
+
+test.describe('Routing - Review and Move to Production Letter template page', () => {
+  let messagePlans: ReturnType<typeof createMessagePlans>;
+  let templates: ReturnType<typeof createTemplates>;
+
+  test.beforeAll(async () => {
+    const context = getTestContext();
+    const user = await context.auth.getTestUser(testUsers.User1.userId);
+
+    messagePlans = createMessagePlans(user);
+    templates = createTemplates(user);
+
+    await routingConfigStorageHelper.seed(Object.values(messagePlans));
+    await templateStorageHelper.seedTemplateData(Object.values(templates));
+  });
+
+  test.afterAll(async () => {
+    await routingConfigStorageHelper.deleteSeeded();
+    await templateStorageHelper.deleteSeededTemplates();
+  });
+
+  test('common page tests', async ({ page, baseURL }) => {
+    const props = {
+      page: new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
+        .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+        .setPathParam('templateId', templates.AUTHORING_LETTER.id)
+        .setSearchParam('lockNumber', '0'),
+      baseURL,
+    };
+    await assertSkipToMainContent(props);
+    await assertHeaderLogoLink(props);
+    await assertFooterLinks(props);
+    await assertSignOutLink(props);
+  });
+
+  test('loads the AUTHORING letter template', async ({ page, baseURL }) => {
+    const previewLetterTemplatePage =
+      new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
+        .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+        .setPathParam('templateId', templates.AUTHORING_LETTER.id)
+        .setSearchParam('lockNumber', '0');
+
+    await previewLetterTemplatePage.loadPage();
+
+    await expect(page).toHaveURL(
+      `${baseURL}/templates/message-plans/review-and-move-to-production/${messagePlans.LETTER_ROUTING_CONFIG.id}/preview-template/${templates.AUTHORING_LETTER.id}?lockNumber=0`
+    );
+
+    await expect(previewLetterTemplatePage.pageHeading).toContainText(
+      templates.AUTHORING_LETTER.name
+    );
+
+    expect(templates.AUTHORING_LETTER.campaignId).toBeTruthy();
+
+    await expect(previewLetterTemplatePage.campaignId).toContainText(
+      templates.AUTHORING_LETTER.campaignId!
+    );
+
+    await expect(previewLetterTemplatePage.templateId).toBeVisible();
+    await expect(previewLetterTemplatePage.templateId).toContainText(
+      templates.AUTHORING_LETTER.id
+    );
+
+    await expect(previewLetterTemplatePage.summaryList).toBeVisible();
+  });
+
+  test.describe('redirects to invalid template page', () => {
+    test('when template cannot be found', async ({ page, baseURL }) => {
+      const previewLetterTemplatePage =
+        new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
+          .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+          .setPathParam('templateId', notFoundTemplateId)
+          .setSearchParam('lockNumber', '0');
+
+      await previewLetterTemplatePage.loadPage();
+
+      await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
+    });
+
+    test('when template ID is invalid', async ({ page, baseURL }) => {
+      const previewLetterTemplatePage =
+        new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
+          .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+          .setPathParam('templateId', invalidTemplateId)
+          .setSearchParam('lockNumber', '0');
+
+      await previewLetterTemplatePage.loadPage();
+
+      await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
+    });
+
+    test('when template is not letter', async ({ page, baseURL }) => {
+      const previewLetterTemplatePage =
+        new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
+          .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+          .setPathParam('templateId', templates.EMAIL.id)
+          .setSearchParam('lockNumber', '0');
+
+      await previewLetterTemplatePage.loadPage();
+
+      await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
+    });
+
+    test('when template is a PDF letter', async ({ page, baseURL }) => {
+      const previewLetterTemplatePage =
+        new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
+          .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+          .setPathParam('templateId', templates.PDF_LETTER.id)
+          .setSearchParam('lockNumber', '0');
+
+      await previewLetterTemplatePage.loadPage();
+
+      await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
+    });
+  });
+
+  test('redirects to the edit message plan page when lockNumber is missing', async ({
+    page,
+    baseURL,
+  }) => {
+    const previewLetterTemplatePage =
+      new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
+        .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+        .setPathParam('templateId', templates.AUTHORING_LETTER.id);
+
+    await previewLetterTemplatePage.loadPage();
+
+    await expect(page).toHaveURL(
+      `${baseURL}/templates/message-plans/edit-message-plan/${messagePlans.LETTER_ROUTING_CONFIG.id}`
+    );
+  });
+});
diff --git a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
index a4e386872..1568e4b23 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
@@ -29,6 +29,8 @@ function createTemplates(user: TestUser) {
     LARGE_PRINT_LETTER: randomUUID(),
     FRENCH_LETTER: randomUUID(),
     SPANISH_LETTER: randomUUID(),
+    AUTHORING_LETTER: randomUUID(),
+    AUTHORING_LARGE_PRINT_LETTER: randomUUID(),
   };
 
   return {
@@ -80,6 +82,20 @@ function createTemplates(user: TestUser) {
       'PASSED',
       { language: 'es' }
     ),
+    AUTHORING_LETTER: TemplateFactory.createAuthoringLetterTemplate(
+      templateIds.AUTHORING_LETTER,
+      user,
+      `Test Authoring Letter template - ${templateIds.AUTHORING_LETTER}`,
+      'SUBMITTED'
+    ),
+    AUTHORING_LARGE_PRINT_LETTER:
+      TemplateFactory.createAuthoringLetterTemplate(
+        templateIds.AUTHORING_LARGE_PRINT_LETTER,
+        user,
+        `Test Authoring Large Print Letter template - ${templateIds.AUTHORING_LARGE_PRINT_LETTER}`,
+        'SUBMITTED',
+        { letterType: 'x1' }
+      ),
   };
 }
 
@@ -206,7 +222,7 @@ test.describe('Routing - Review and Move to Production page', () => {
       }
 
       await expect(reviewPage.previewToggleButton).toHaveText(
-        'Open all template previews'
+        'Open all digital template previews'
       );
 
       await reviewPage.previewToggleButton.click();
@@ -216,7 +232,7 @@ test.describe('Routing - Review and Move to Production page', () => {
       }
 
       await expect(reviewPage.previewToggleButton).toHaveText(
-        'Close all template previews'
+        'Close all digital template previews'
       );
 
       await reviewPage.previewToggleButton.click();
@@ -226,7 +242,7 @@ test.describe('Routing - Review and Move to Production page', () => {
       }
 
       await expect(reviewPage.previewToggleButton).toHaveText(
-        'Open all template previews'
+        'Open all digital template previews'
       );
     });
 
@@ -305,6 +321,53 @@ test.describe('Routing - Review and Move to Production page', () => {
     });
   });
 
+  test('displays AUTHORING letter template links pointing to in-flow preview', async ({
+    page,
+  }) => {
+    const { dbEntry } = RoutingConfigFactory.createWithChannels(
+      user,
+      ['LETTER'],
+      { status: 'DRAFT' }
+    )
+      .addTemplate('LETTER', templates.AUTHORING_LETTER.id)
+      .addAccessibleFormatTemplate(
+        'x1',
+        templates.AUTHORING_LARGE_PRINT_LETTER.id
+      );
+
+    await routingConfigStorageHelper.seed([dbEntry]);
+
+    const reviewPage = new RoutingReviewAndMoveToProductionPage(
+      page
+    ).setPathParam('messagePlanId', dbEntry.id);
+
+    await reviewPage.loadPage();
+
+    const templateBlock = await reviewPage.getTemplateBlock('LETTER');
+
+    await expect(templateBlock.defaultTemplateCard.templateLink).toHaveText(
+      templates.AUTHORING_LETTER.name
+    );
+
+    await expect(
+      templateBlock.defaultTemplateCard.templateLink
+    ).toHaveAttribute(
+      'href',
+      `/templates/message-plans/review-and-move-to-production/${dbEntry.id}/preview-template/${templates.AUTHORING_LETTER.id}?lockNumber=0`
+    );
+
+    await expect(
+      templateBlock.getAccessibilityFormatCard('x1').templateLink
+    ).toHaveText(templates.AUTHORING_LARGE_PRINT_LETTER.name);
+
+    await expect(
+      templateBlock.getAccessibilityFormatCard('x1').templateLink
+    ).toHaveAttribute(
+      'href',
+      `/templates/message-plans/review-and-move-to-production/${dbEntry.id}/preview-template/${templates.AUTHORING_LARGE_PRINT_LETTER.id}?lockNumber=0`
+    );
+  });
+
   test('keep in draft button navigates to the edit message plan page', async ({
     page,
     baseURL,

From f3acfd57aefda9762ae0facfef723a77e4b50737 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Thu, 2 Apr 2026 08:20:41 +0100
Subject: [PATCH 22/57] test refactor, rm locking on new tab previews

---
 .../preview-template/page.test.tsx            | 25 +++++-------
 .../[templateId]/page.test.tsx                | 28 ++++++--------
 .../preview-template/page.test.tsx            | 25 +++++-------
 .../preview-message-plan/page.test.tsx        |  6 +--
 .../preview-template/page.test.tsx            | 25 +++++-------
 .../preview-template/page.test.tsx            | 25 +++++-------
 .../MessagePlanCascadePreview.test.tsx        |  2 +-
 .../molecules/SummaryPreviewLetter.test.tsx   | 38 ++++++++++++++-----
 .../preview-template/[templateId]/page.tsx    | 16 +++++---
 .../preview-template/[templateId]/page.tsx    | 16 +++++---
 .../preview-template/[templateId]/page.tsx    | 13 +++++--
 .../preview-template/[templateId]/page.tsx    |  7 +---
 .../preview-template/[templateId]/page.tsx    |  7 +---
 .../MessagePlanCascadePreview.tsx             |  2 +-
 .../PreviewTemplateFromMessagePlan.tsx        | 24 ++++++------
 .../SummaryPreviewLetter.tsx                  | 22 ++++++-----
 .../routing.accessibility.spec.ts             |  2 -
 ...-letter-template.routing-component.spec.ts | 36 ++++--------------
 ...iew-message-plan.routing-component.spec.ts |  4 +-
 ...-letter-template.routing-component.spec.ts | 36 ++++--------------
 ...ve-to-production.routing-component.spec.ts |  4 +-
 utils/utils/src/zod-validators.ts             |  3 ++
 22 files changed, 165 insertions(+), 201 deletions(-)

diff --git a/frontend/src/__tests__/app/message-plans/choose-large-print-letter-template/preview-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/choose-large-print-letter-template/preview-template/page.test.tsx
index 054c13e1e..ba76ec0ce 100644
--- a/frontend/src/__tests__/app/message-plans/choose-large-print-letter-template/preview-template/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/choose-large-print-letter-template/preview-template/page.test.tsx
@@ -1,4 +1,6 @@
-import { render } from '@testing-library/react';
+/**
+ * @jest-environment node
+ */
 import PreviewLargePrintLetterTemplateFromMessagePlan, {
   generateMetadata,
 } from '@app/message-plans/choose-large-print-letter-template/[routingConfigId]/preview-template/[templateId]/page';
@@ -7,12 +9,8 @@ import { validateLargePrintLetterTemplate } from 'nhs-notify-web-template-manage
 
 jest.mock('@molecules/SummaryPreviewLetter/SummaryPreviewLetter');
 
-const summaryPreviewLetterMock = jest.mocked(SummaryPreviewLetter);
-
 describe('PreviewLargePrintLetterTemplateFromMessagePlan page', () => {
-  it('should render SummaryPreviewLetter with validateLargePrintLetterTemplate', async () => {
-    summaryPreviewLetterMock.mockResolvedValueOnce(<div>mock</div>);
-
+  it('should render SummaryPreviewLetter with validateLargePrintLetterTemplate and redirectUrl', async () => {
     const props = {
       params: Promise.resolve({
         routingConfigId: 'routing-config-id',
@@ -23,15 +21,12 @@ describe('PreviewLargePrintLetterTemplateFromMessagePlan page', () => {
 
     const page = await PreviewLargePrintLetterTemplateFromMessagePlan(props);
 
-    render(page);
-
-    expect(summaryPreviewLetterMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        params: props.params,
-        searchParams: props.searchParams,
-        validateTemplate: validateLargePrintLetterTemplate,
-      }),
-      undefined
+    expect(page).toEqual(
+      <SummaryPreviewLetter
+        {...props}
+        validateTemplate={validateLargePrintLetterTemplate}
+        redirectUrl='/message-plans/edit-message-plan/routing-config-id'
+      />
     );
   });
 
diff --git a/frontend/src/__tests__/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.test.tsx b/frontend/src/__tests__/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.test.tsx
index 27fc55bff..c488d0e7f 100644
--- a/frontend/src/__tests__/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.test.tsx
@@ -1,4 +1,6 @@
-import { render } from '@testing-library/react';
+/**
+ * @jest-environment node
+ */
 import PreviewOtherLanguageLetterTemplateFromMessagePlan, {
   generateMetadata,
 } from '@app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page';
@@ -7,12 +9,8 @@ import { validateForeignLanguageLetterTemplate } from 'nhs-notify-web-template-m
 
 jest.mock('@molecules/SummaryPreviewLetter/SummaryPreviewLetter');
 
-const summaryPreviewLetterMock = jest.mocked(SummaryPreviewLetter);
-
 describe('PreviewOtherLanguageLetterTemplateFromMessagePlan page', () => {
-  it('should render SummaryPreviewLetter with validateForeignLanguageLetterTemplate', async () => {
-    summaryPreviewLetterMock.mockResolvedValueOnce(<div>mock</div>);
-
+  it('should render SummaryPreviewLetter with validateForeignLanguageLetterTemplate and redirectUrl', async () => {
     const props = {
       params: Promise.resolve({
         routingConfigId: 'routing-config-id',
@@ -21,17 +19,15 @@ describe('PreviewOtherLanguageLetterTemplateFromMessagePlan page', () => {
       searchParams: Promise.resolve({ lockNumber: '5' }),
     };
 
-    const page = await PreviewOtherLanguageLetterTemplateFromMessagePlan(props);
+    const page =
+      await PreviewOtherLanguageLetterTemplateFromMessagePlan(props);
 
-    render(page);
-
-    expect(summaryPreviewLetterMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        params: props.params,
-        searchParams: props.searchParams,
-        validateTemplate: validateForeignLanguageLetterTemplate,
-      }),
-      undefined
+    expect(page).toEqual(
+      <SummaryPreviewLetter
+        {...props}
+        validateTemplate={validateForeignLanguageLetterTemplate}
+        redirectUrl='/message-plans/edit-message-plan/routing-config-id'
+      />
     );
   });
 
diff --git a/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/preview-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/preview-template/page.test.tsx
index d1223230f..1752a44fe 100644
--- a/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/preview-template/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/preview-template/page.test.tsx
@@ -1,4 +1,6 @@
-import { render } from '@testing-library/react';
+/**
+ * @jest-environment node
+ */
 import PreviewStandardEnglishLetterTemplateFromMessagePlan, {
   generateMetadata,
 } from '@app/message-plans/choose-standard-english-letter-template/[routingConfigId]/preview-template/[templateId]/page';
@@ -7,12 +9,8 @@ import { validateLetterTemplate } from 'nhs-notify-web-template-management-utils
 
 jest.mock('@molecules/SummaryPreviewLetter/SummaryPreviewLetter');
 
-const summaryPreviewLetterMock = jest.mocked(SummaryPreviewLetter);
-
 describe('PreviewStandardEnglishLetterTemplateFromMessagePlan page', () => {
-  it('should render SummaryPreviewLetter with validateLetterTemplate', async () => {
-    summaryPreviewLetterMock.mockResolvedValueOnce(<div>mock</div>);
-
+  it('should render SummaryPreviewLetter with validateLetterTemplate and redirectUrl', async () => {
     const props = {
       params: Promise.resolve({
         routingConfigId: 'routing-config-id',
@@ -24,15 +22,12 @@ describe('PreviewStandardEnglishLetterTemplateFromMessagePlan page', () => {
     const page =
       await PreviewStandardEnglishLetterTemplateFromMessagePlan(props);
 
-    render(page);
-
-    expect(summaryPreviewLetterMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        params: props.params,
-        searchParams: props.searchParams,
-        validateTemplate: validateLetterTemplate,
-      }),
-      undefined
+    expect(page).toEqual(
+      <SummaryPreviewLetter
+        {...props}
+        validateTemplate={validateLetterTemplate}
+        redirectUrl='/message-plans/edit-message-plan/routing-config-id'
+      />
     );
   });
 
diff --git a/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx b/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx
index ea295160a..c5ed4ddc7 100644
--- a/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx
@@ -365,9 +365,9 @@ describe('letter only', () => {
 
     const card = within(block).getByTestId('channel-card');
 
-    expect(within(card).getByTestId('template-name')).toHaveTextContent(
-      template.name
-    );
+    const name = within(card).getByTestId('template-name');
+
+    expect(name).toHaveTextContent(template.name);
 
     const link = within(card).getByRole('link');
 
diff --git a/frontend/src/__tests__/app/message-plans/preview-message-plan/preview-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/preview-message-plan/preview-template/page.test.tsx
index a1e9dafc9..43d4619e5 100644
--- a/frontend/src/__tests__/app/message-plans/preview-message-plan/preview-template/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/preview-message-plan/preview-template/page.test.tsx
@@ -1,17 +1,16 @@
-import { render } from '@testing-library/react';
+/**
+ * @jest-environment node
+ */
 import PreviewLetterTemplateFromPreviewMessagePlan, {
   generateMetadata,
 } from '@app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page';
 import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+import { validateAuthoringLetterTemplate } from 'nhs-notify-web-template-management-utils';
 
 jest.mock('@molecules/SummaryPreviewLetter/SummaryPreviewLetter');
 
-const summaryPreviewLetterMock = jest.mocked(SummaryPreviewLetter);
-
 describe('PreviewLetterTemplateFromPreviewMessagePlan page', () => {
   it('should render SummaryPreviewLetter with hideBackLinks and authoring validator', async () => {
-    summaryPreviewLetterMock.mockResolvedValueOnce(<div>mock</div>);
-
     const props = {
       params: Promise.resolve({
         routingConfigId: 'routing-config-id',
@@ -22,16 +21,12 @@ describe('PreviewLetterTemplateFromPreviewMessagePlan page', () => {
 
     const page = await PreviewLetterTemplateFromPreviewMessagePlan(props);
 
-    render(page);
-
-    expect(summaryPreviewLetterMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        params: props.params,
-        searchParams: props.searchParams,
-        validateTemplate: expect.any(Function),
-        hideBackLinks: true,
-      }),
-      undefined
+    expect(page).toEqual(
+      <SummaryPreviewLetter
+        {...props}
+        validateTemplate={validateAuthoringLetterTemplate}
+        hideBackLinks
+      />
     );
   });
 
diff --git a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/preview-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/preview-template/page.test.tsx
index a34213dd4..4e0db76f9 100644
--- a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/preview-template/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/preview-template/page.test.tsx
@@ -1,17 +1,16 @@
-import { render } from '@testing-library/react';
+/**
+ * @jest-environment node
+ */
 import PreviewLetterTemplateFromReviewAndMoveToProduction, {
   generateMetadata,
 } from '@app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page';
 import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+import { validateAuthoringLetterTemplate } from 'nhs-notify-web-template-management-utils';
 
 jest.mock('@molecules/SummaryPreviewLetter/SummaryPreviewLetter');
 
-const summaryPreviewLetterMock = jest.mocked(SummaryPreviewLetter);
-
 describe('PreviewLetterTemplateFromReviewAndMoveToProduction page', () => {
   it('should render SummaryPreviewLetter with hideBackLinks and authoring validator', async () => {
-    summaryPreviewLetterMock.mockResolvedValueOnce(<div>mock</div>);
-
     const props = {
       params: Promise.resolve({
         routingConfigId: 'routing-config-id',
@@ -23,16 +22,12 @@ describe('PreviewLetterTemplateFromReviewAndMoveToProduction page', () => {
     const page =
       await PreviewLetterTemplateFromReviewAndMoveToProduction(props);
 
-    render(page);
-
-    expect(summaryPreviewLetterMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        params: props.params,
-        searchParams: props.searchParams,
-        validateTemplate: expect.any(Function),
-        hideBackLinks: true,
-      }),
-      undefined
+    expect(page).toEqual(
+      <SummaryPreviewLetter
+        {...props}
+        validateTemplate={validateAuthoringLetterTemplate}
+        hideBackLinks
+      />
     );
   });
 
diff --git a/frontend/src/__tests__/components/molecules/MessagePlanCascadePreview.test.tsx b/frontend/src/__tests__/components/molecules/MessagePlanCascadePreview.test.tsx
index 2ae20978d..ff3567c8f 100644
--- a/frontend/src/__tests__/components/molecules/MessagePlanCascadePreview.test.tsx
+++ b/frontend/src/__tests__/components/molecules/MessagePlanCascadePreview.test.tsx
@@ -244,7 +244,7 @@ describe('MessagePlanCascadePreview', () => {
     const link = letterBlock.querySelector('a');
     expect(link).toHaveAttribute(
       'href',
-      `/message-plans/review-and-move-to-production/routing-config-id/preview-template/${AUTHORING_LETTER_TEMPLATE.id}?lockNumber=${AUTHORING_LETTER_TEMPLATE.lockNumber}`
+      `/message-plans/review-and-move-to-production/routing-config-id/preview-template/${AUTHORING_LETTER_TEMPLATE.id}`
     );
   });
 
diff --git a/frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx b/frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx
index 853e9e3f9..2d1307e10 100644
--- a/frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx
+++ b/frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx
@@ -21,6 +21,9 @@ const getTemplateMock = jest.mocked(getTemplate);
 const getLetterVariantByIdMock = jest.mocked(getLetterVariantById);
 const redirectMock = jest.mocked(redirect);
 
+const defaultRedirectUrl =
+  '/message-plans/edit-message-plan/routing-config-id';
+
 const defaultProps = (
   overrides: {
     routingConfigId?: string;
@@ -29,6 +32,7 @@ const defaultProps = (
     searchParams?: Record<string, string>;
     validateTemplate?: (template?: TemplateDto) => LetterTemplate | undefined;
     hideBackLinks?: boolean;
+    redirectUrl?: string | undefined;
   } = {}
 ) => ({
   params: Promise.resolve({
@@ -40,25 +44,40 @@ const defaultProps = (
   ),
   validateTemplate: overrides.validateTemplate ?? validateLetterTemplate,
   hideBackLinks: overrides.hideBackLinks,
+  redirectUrl:
+    'redirectUrl' in overrides
+      ? overrides.redirectUrl
+      : defaultRedirectUrl,
 });
 
 describe('SummaryPreviewLetter', () => {
-  it('should redirect to the edit message plan page when lockNumber is invalid', async () => {
-    await SummaryPreviewLetter(defaultProps({ lockNumber: 'invalid' }));
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
 
-    expect(redirectMock).toHaveBeenCalledWith(
-      '/message-plans/edit-message-plan/routing-config-id',
-      'replace'
+  it('should redirect to redirectUrl when lockNumber is invalid', async () => {
+    await SummaryPreviewLetter(
+      defaultProps({ lockNumber: 'invalid', redirectUrl: '/custom-redirect' })
     );
+
+    expect(redirectMock).toHaveBeenCalledWith('/custom-redirect', 'replace');
   });
 
-  it('should redirect to the edit message plan page when lockNumber is missing', async () => {
+  it('should redirect to redirectUrl when lockNumber is missing', async () => {
     await SummaryPreviewLetter(defaultProps({ searchParams: {} }));
 
-    expect(redirectMock).toHaveBeenCalledWith(
-      '/message-plans/edit-message-plan/routing-config-id',
-      'replace'
+    expect(redirectMock).toHaveBeenCalledWith(defaultRedirectUrl, 'replace');
+  });
+
+  it('should not redirect when redirectUrl is not provided and lockNumber is missing', async () => {
+    getTemplateMock.mockResolvedValueOnce(PDF_LETTER_TEMPLATE);
+
+    const page = await SummaryPreviewLetter(
+      defaultProps({ searchParams: {}, redirectUrl: undefined })
     );
+
+    expect(redirectMock).not.toHaveBeenCalled();
+    expect(page).toBeDefined();
   });
 
   it('should redirect to invalid-template when template is not found', async () => {
@@ -137,6 +156,7 @@ describe('SummaryPreviewLetter', () => {
         routingConfigId: ROUTING_CONFIG.id,
         templateId: PDF_LETTER_TEMPLATE.id,
         hideBackLinks: true,
+        redirectUrl: undefined,
       })
     );
 
diff --git a/frontend/src/app/message-plans/choose-large-print-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/choose-large-print-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
index e0378fa6d..feb42b33d 100644
--- a/frontend/src/app/message-plans/choose-large-print-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
+++ b/frontend/src/app/message-plans/choose-large-print-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -16,11 +16,15 @@ export async function generateMetadata(): Promise<Metadata> {
 
 const PreviewLargePrintLetterTemplateFromMessagePlan = async (
   props: MessagePlanAndTemplatePageProps
-) => (
-  <SummaryPreviewLetter
-    {...props}
-    validateTemplate={validateLargePrintLetterTemplate}
-  />
-);
+) => {
+  const { routingConfigId } = await props.params;
+  return (
+    <SummaryPreviewLetter
+      {...props}
+      validateTemplate={validateLargePrintLetterTemplate}
+      redirectUrl={`/message-plans/edit-message-plan/${routingConfigId}`}
+    />
+  );
+};
 
 export default PreviewLargePrintLetterTemplateFromMessagePlan;
diff --git a/frontend/src/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
index 0ddc12180..08e31a918 100644
--- a/frontend/src/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
+++ b/frontend/src/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -16,11 +16,15 @@ export async function generateMetadata(): Promise<Metadata> {
 
 const PreviewOtherLanguageLetterTemplateFromMessagePlan = async (
   props: MessagePlanAndTemplatePageProps
-) => (
-  <SummaryPreviewLetter
-    {...props}
-    validateTemplate={validateForeignLanguageLetterTemplate}
-  />
-);
+) => {
+  const { routingConfigId } = await props.params;
+  return (
+    <SummaryPreviewLetter
+      {...props}
+      validateTemplate={validateForeignLanguageLetterTemplate}
+      redirectUrl={`/message-plans/edit-message-plan/${routingConfigId}`}
+    />
+  );
+};
 
 export default PreviewOtherLanguageLetterTemplateFromMessagePlan;
diff --git a/frontend/src/app/message-plans/choose-standard-english-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/choose-standard-english-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
index fce61c6a1..4e26815ed 100644
--- a/frontend/src/app/message-plans/choose-standard-english-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
+++ b/frontend/src/app/message-plans/choose-standard-english-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -16,8 +16,15 @@ export async function generateMetadata(): Promise<Metadata> {
 
 const PreviewStandardEnglishLetterTemplateFromMessagePlan = async (
   props: MessagePlanAndTemplatePageProps
-) => (
-  <SummaryPreviewLetter {...props} validateTemplate={validateLetterTemplate} />
-);
+) => {
+  const { routingConfigId } = await props.params;
+  return (
+    <SummaryPreviewLetter
+      {...props}
+      validateTemplate={validateLetterTemplate}
+      redirectUrl={`/message-plans/edit-message-plan/${routingConfigId}`}
+    />
+  );
+};
 
 export default PreviewStandardEnglishLetterTemplateFromMessagePlan;
diff --git a/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx
index 0d2dc1e4c..308a8d7d9 100644
--- a/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx
+++ b/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -1,9 +1,7 @@
 import {
   MessagePlanAndTemplatePageProps,
-  zodValidate,
-  $AuthoringLetterTemplate,
+  validateAuthoringLetterTemplate,
 } from 'nhs-notify-web-template-management-utils';
-import type { TemplateDto } from 'nhs-notify-web-template-management-types';
 import { Metadata } from 'next';
 import content from '@content/content';
 import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
@@ -16,9 +14,6 @@ export async function generateMetadata(): Promise<Metadata> {
   };
 }
 
-const validateAuthoringLetterTemplate = (template?: TemplateDto) =>
-  zodValidate($AuthoringLetterTemplate, template);
-
 const PreviewLetterTemplateFromPreviewMessagePlan = async (
   props: MessagePlanAndTemplatePageProps
 ) => (
diff --git a/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx
index 73248418c..ccda23da2 100644
--- a/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx
+++ b/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -1,9 +1,7 @@
 import {
   MessagePlanAndTemplatePageProps,
-  zodValidate,
-  $AuthoringLetterTemplate,
+  validateAuthoringLetterTemplate,
 } from 'nhs-notify-web-template-management-utils';
-import type { TemplateDto } from 'nhs-notify-web-template-management-types';
 import { Metadata } from 'next';
 import content from '@content/content';
 import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
@@ -16,9 +14,6 @@ export async function generateMetadata(): Promise<Metadata> {
   };
 }
 
-const validateAuthoringLetterTemplate = (template?: TemplateDto) =>
-  zodValidate($AuthoringLetterTemplate, template);
-
 const PreviewLetterTemplateFromReviewAndMoveToProduction = async (
   props: MessagePlanAndTemplatePageProps
 ) => (
diff --git a/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx b/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx
index d2e5bce40..6cb1fb2d5 100644
--- a/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx
+++ b/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx
@@ -48,7 +48,7 @@ function getLetterTemplatePreviewHref(
     'letterVersion' in template &&
     template.letterVersion === 'AUTHORING'
   ) {
-    return `${letterPreviewHrefBase}/preview-template/${template.id}?lockNumber=${template.lockNumber}`;
+    return `${letterPreviewHrefBase}/preview-template/${template.id}`;
   }
 
   const linkTemplate =
diff --git a/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx b/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx
index 766dfd4f4..a579a1a22 100644
--- a/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx
+++ b/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx
@@ -20,7 +20,7 @@ export type MessagePlanPreviewTemplateProps<T extends TemplateDto> =
   PageComponentProps<T> & {
     previewComponent: PreviewTemplateComponent<T>;
     routingConfigId: string;
-    lockNumber: number;
+    lockNumber?: number;
     letterVariant?: LetterVariant;
     hideBackLinks?: boolean;
   };
@@ -45,18 +45,20 @@ export function PreviewTemplateFromMessagePlan<T extends TemplateDto>({
       : (template.letterType as RoutingSupportedLetterType);
   }
 
-  const backLinkHref = interpolate(content.backLink.href, {
-    templateType: templateTypeToUrlTextMappings(
-      template.templateType,
-      letterType
-    ),
-    routingConfigId,
-    lockNumber,
-  });
+  const backLinkHref = hideBackLinks
+    ? undefined
+    : interpolate(content.backLink.href, {
+        templateType: templateTypeToUrlTextMappings(
+          template.templateType,
+          letterType
+        ),
+        routingConfigId,
+        lockNumber: lockNumber as number,
+      });
 
   return (
     <>
-      {!hideBackLinks && (
+      {backLinkHref && (
         <Link href={backLinkHref} passHref legacyBehavior>
           <NotifyBackLink>{content.backLink.text}</NotifyBackLink>
         </Link>
@@ -71,7 +73,7 @@ export function PreviewTemplateFromMessagePlan<T extends TemplateDto>({
               hideStatus: true,
               hideEditActions: true,
             })}
-            {!hideBackLinks && (
+            {backLinkHref && (
               <Link
                 className='nhsuk-link nhsuk-body-m nhsuk-u-display-inline-block'
                 href={backLinkHref}
diff --git a/frontend/src/components/molecules/SummaryPreviewLetter/SummaryPreviewLetter.tsx b/frontend/src/components/molecules/SummaryPreviewLetter/SummaryPreviewLetter.tsx
index e4028c9ea..11e777c8d 100644
--- a/frontend/src/components/molecules/SummaryPreviewLetter/SummaryPreviewLetter.tsx
+++ b/frontend/src/components/molecules/SummaryPreviewLetter/SummaryPreviewLetter.tsx
@@ -14,22 +14,26 @@ import { NHSNotifyContainer } from '@layouts/container/container';
 type SummaryPreviewLetterProps = MessagePlanAndTemplatePageProps & {
   validateTemplate: (template?: TemplateDto) => LetterTemplate | undefined;
   hideBackLinks?: boolean;
+  redirectUrl?: string;
 };
 
 export const SummaryPreviewLetter = async (
   props: SummaryPreviewLetterProps
 ) => {
   const { templateId, routingConfigId } = await props.params;
-  const searchParams = await props.searchParams;
-  const { validateTemplate, hideBackLinks } = props;
+  const { validateTemplate, hideBackLinks, redirectUrl } = props;
 
-  const lockNumberResult = $LockNumber.safeParse(searchParams?.lockNumber);
+  let lockNumber: number | undefined;
 
-  if (!lockNumberResult.success) {
-    return redirect(
-      `/message-plans/edit-message-plan/${routingConfigId}`,
-      RedirectType.replace
-    );
+  if (redirectUrl) {
+    const searchParams = await props.searchParams;
+    const lockNumberResult = $LockNumber.safeParse(searchParams?.lockNumber);
+
+    if (!lockNumberResult.success) {
+      return redirect(redirectUrl, RedirectType.replace);
+    }
+
+    lockNumber = lockNumberResult.data;
   }
 
   const template = await getTemplate(templateId);
@@ -53,7 +57,7 @@ export const SummaryPreviewLetter = async (
         initialState={validatedTemplate}
         previewComponent={PreviewTemplateDetailsLetter}
         routingConfigId={routingConfigId}
-        lockNumber={lockNumberResult.data}
+        lockNumber={lockNumber}
         letterVariant={letterVariant}
         hideBackLinks={hideBackLinks}
       />
diff --git a/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts b/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts
index e7f1b2f67..9c7a66467 100644
--- a/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts
+++ b/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts
@@ -240,7 +240,6 @@ test.describe('Routing', () => {
         new RoutingPreviewMessagePlanLetterTemplatePage(page)
           .setPathParam('messagePlanId', productionRoutingConfigId)
           .setPathParam('templateId', templateIds.LETTER)
-          .setSearchParam('lockNumber', '0')
       ));
 
     test('Review and move to production letter template', async ({
@@ -251,7 +250,6 @@ test.describe('Routing', () => {
         new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
           .setPathParam('messagePlanId', draftRoutingConfigId)
           .setPathParam('templateId', templateIds.LETTER)
-          .setSearchParam('lockNumber', '0')
       ));
   });
 
diff --git a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts
index 0214573bb..ef9e3fa36 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts
@@ -73,8 +73,7 @@ test.describe('Routing - Preview Message Plan Letter template page', () => {
     const props = {
       page: new RoutingPreviewMessagePlanLetterTemplatePage(page)
         .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-        .setPathParam('templateId', templates.AUTHORING_LETTER.id)
-        .setSearchParam('lockNumber', '0'),
+        .setPathParam('templateId', templates.AUTHORING_LETTER.id),
       baseURL,
     };
     await assertSkipToMainContent(props);
@@ -87,13 +86,12 @@ test.describe('Routing - Preview Message Plan Letter template page', () => {
     const previewLetterTemplatePage =
       new RoutingPreviewMessagePlanLetterTemplatePage(page)
         .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-        .setPathParam('templateId', templates.AUTHORING_LETTER.id)
-        .setSearchParam('lockNumber', '0');
+        .setPathParam('templateId', templates.AUTHORING_LETTER.id);
 
     await previewLetterTemplatePage.loadPage();
 
     await expect(page).toHaveURL(
-      `${baseURL}/templates/message-plans/preview-message-plan/${messagePlans.LETTER_ROUTING_CONFIG.id}/preview-template/${templates.AUTHORING_LETTER.id}?lockNumber=0`
+      `${baseURL}/templates/message-plans/preview-message-plan/${messagePlans.LETTER_ROUTING_CONFIG.id}/preview-template/${templates.AUTHORING_LETTER.id}`
     );
 
     await expect(previewLetterTemplatePage.pageHeading).toContainText(
@@ -119,8 +117,7 @@ test.describe('Routing - Preview Message Plan Letter template page', () => {
       const previewLetterTemplatePage =
         new RoutingPreviewMessagePlanLetterTemplatePage(page)
           .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-          .setPathParam('templateId', notFoundTemplateId)
-          .setSearchParam('lockNumber', '0');
+          .setPathParam('templateId', notFoundTemplateId);
 
       await previewLetterTemplatePage.loadPage();
 
@@ -131,8 +128,7 @@ test.describe('Routing - Preview Message Plan Letter template page', () => {
       const previewLetterTemplatePage =
         new RoutingPreviewMessagePlanLetterTemplatePage(page)
           .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-          .setPathParam('templateId', invalidTemplateId)
-          .setSearchParam('lockNumber', '0');
+          .setPathParam('templateId', invalidTemplateId);
 
       await previewLetterTemplatePage.loadPage();
 
@@ -143,8 +139,7 @@ test.describe('Routing - Preview Message Plan Letter template page', () => {
       const previewLetterTemplatePage =
         new RoutingPreviewMessagePlanLetterTemplatePage(page)
           .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-          .setPathParam('templateId', templates.EMAIL.id)
-          .setSearchParam('lockNumber', '0');
+          .setPathParam('templateId', templates.EMAIL.id);
 
       await previewLetterTemplatePage.loadPage();
 
@@ -155,28 +150,11 @@ test.describe('Routing - Preview Message Plan Letter template page', () => {
       const previewLetterTemplatePage =
         new RoutingPreviewMessagePlanLetterTemplatePage(page)
           .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-          .setPathParam('templateId', templates.PDF_LETTER.id)
-          .setSearchParam('lockNumber', '0');
+          .setPathParam('templateId', templates.PDF_LETTER.id);
 
       await previewLetterTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
   });
-
-  test('redirects to the edit message plan page when lockNumber is missing', async ({
-    page,
-    baseURL,
-  }) => {
-    const previewLetterTemplatePage =
-      new RoutingPreviewMessagePlanLetterTemplatePage(page)
-        .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-        .setPathParam('templateId', templates.AUTHORING_LETTER.id);
-
-    await previewLetterTemplatePage.loadPage();
-
-    await expect(page).toHaveURL(
-      `${baseURL}/templates/message-plans/edit-message-plan/${messagePlans.LETTER_ROUTING_CONFIG.id}`
-    );
-  });
 });
diff --git a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
index 8a833039d..6077d4c62 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
@@ -362,7 +362,7 @@ test.describe('Routing - Preview Message Plan page', () => {
       templateBlock.defaultTemplateCard.templateLink
     ).toHaveAttribute(
       'href',
-      `/templates/message-plans/preview-message-plan/${dbEntry.id}/preview-template/${templates.AUTHORING_LETTER.id}?lockNumber=0`
+      `/templates/message-plans/preview-message-plan/${dbEntry.id}/preview-template/${templates.AUTHORING_LETTER.id}`
     );
 
     await expect(
@@ -373,7 +373,7 @@ test.describe('Routing - Preview Message Plan page', () => {
       templateBlock.getAccessibilityFormatCard('x1').templateLink
     ).toHaveAttribute(
       'href',
-      `/templates/message-plans/preview-message-plan/${dbEntry.id}/preview-template/${templates.AUTHORING_LARGE_PRINT_LETTER.id}?lockNumber=0`
+      `/templates/message-plans/preview-message-plan/${dbEntry.id}/preview-template/${templates.AUTHORING_LARGE_PRINT_LETTER.id}`
     );
   });
 
diff --git a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts
index ed81da884..cd626acf5 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts
@@ -73,8 +73,7 @@ test.describe('Routing - Review and Move to Production Letter template page', ()
     const props = {
       page: new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
         .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-        .setPathParam('templateId', templates.AUTHORING_LETTER.id)
-        .setSearchParam('lockNumber', '0'),
+        .setPathParam('templateId', templates.AUTHORING_LETTER.id),
       baseURL,
     };
     await assertSkipToMainContent(props);
@@ -87,13 +86,12 @@ test.describe('Routing - Review and Move to Production Letter template page', ()
     const previewLetterTemplatePage =
       new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
         .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-        .setPathParam('templateId', templates.AUTHORING_LETTER.id)
-        .setSearchParam('lockNumber', '0');
+        .setPathParam('templateId', templates.AUTHORING_LETTER.id);
 
     await previewLetterTemplatePage.loadPage();
 
     await expect(page).toHaveURL(
-      `${baseURL}/templates/message-plans/review-and-move-to-production/${messagePlans.LETTER_ROUTING_CONFIG.id}/preview-template/${templates.AUTHORING_LETTER.id}?lockNumber=0`
+      `${baseURL}/templates/message-plans/review-and-move-to-production/${messagePlans.LETTER_ROUTING_CONFIG.id}/preview-template/${templates.AUTHORING_LETTER.id}`
     );
 
     await expect(previewLetterTemplatePage.pageHeading).toContainText(
@@ -119,8 +117,7 @@ test.describe('Routing - Review and Move to Production Letter template page', ()
       const previewLetterTemplatePage =
         new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
           .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-          .setPathParam('templateId', notFoundTemplateId)
-          .setSearchParam('lockNumber', '0');
+          .setPathParam('templateId', notFoundTemplateId);
 
       await previewLetterTemplatePage.loadPage();
 
@@ -131,8 +128,7 @@ test.describe('Routing - Review and Move to Production Letter template page', ()
       const previewLetterTemplatePage =
         new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
           .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-          .setPathParam('templateId', invalidTemplateId)
-          .setSearchParam('lockNumber', '0');
+          .setPathParam('templateId', invalidTemplateId);
 
       await previewLetterTemplatePage.loadPage();
 
@@ -143,8 +139,7 @@ test.describe('Routing - Review and Move to Production Letter template page', ()
       const previewLetterTemplatePage =
         new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
           .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-          .setPathParam('templateId', templates.EMAIL.id)
-          .setSearchParam('lockNumber', '0');
+          .setPathParam('templateId', templates.EMAIL.id);
 
       await previewLetterTemplatePage.loadPage();
 
@@ -155,28 +150,11 @@ test.describe('Routing - Review and Move to Production Letter template page', ()
       const previewLetterTemplatePage =
         new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
           .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-          .setPathParam('templateId', templates.PDF_LETTER.id)
-          .setSearchParam('lockNumber', '0');
+          .setPathParam('templateId', templates.PDF_LETTER.id);
 
       await previewLetterTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
   });
-
-  test('redirects to the edit message plan page when lockNumber is missing', async ({
-    page,
-    baseURL,
-  }) => {
-    const previewLetterTemplatePage =
-      new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
-        .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-        .setPathParam('templateId', templates.AUTHORING_LETTER.id);
-
-    await previewLetterTemplatePage.loadPage();
-
-    await expect(page).toHaveURL(
-      `${baseURL}/templates/message-plans/edit-message-plan/${messagePlans.LETTER_ROUTING_CONFIG.id}`
-    );
-  });
 });
diff --git a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
index 1568e4b23..c584a30b5 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
@@ -353,7 +353,7 @@ test.describe('Routing - Review and Move to Production page', () => {
       templateBlock.defaultTemplateCard.templateLink
     ).toHaveAttribute(
       'href',
-      `/templates/message-plans/review-and-move-to-production/${dbEntry.id}/preview-template/${templates.AUTHORING_LETTER.id}?lockNumber=0`
+      `/templates/message-plans/review-and-move-to-production/${dbEntry.id}/preview-template/${templates.AUTHORING_LETTER.id}`
     );
 
     await expect(
@@ -364,7 +364,7 @@ test.describe('Routing - Review and Move to Production page', () => {
       templateBlock.getAccessibilityFormatCard('x1').templateLink
     ).toHaveAttribute(
       'href',
-      `/templates/message-plans/review-and-move-to-production/${dbEntry.id}/preview-template/${templates.AUTHORING_LARGE_PRINT_LETTER.id}?lockNumber=0`
+      `/templates/message-plans/review-and-move-to-production/${dbEntry.id}/preview-template/${templates.AUTHORING_LARGE_PRINT_LETTER.id}`
     );
   });
 
diff --git a/utils/utils/src/zod-validators.ts b/utils/utils/src/zod-validators.ts
index e866a940b..c41b100a9 100644
--- a/utils/utils/src/zod-validators.ts
+++ b/utils/utils/src/zod-validators.ts
@@ -143,6 +143,9 @@ export const validateEmailTemplate = (template?: TemplateDto) =>
 export const validateLetterTemplate = (template?: TemplateDto) =>
   zodValidate($LetterTemplate, template);
 
+export const validateAuthoringLetterTemplate = (template?: TemplateDto) =>
+  zodValidate($AuthoringLetterTemplate, template);
+
 export const validateLargePrintLetterTemplate = (template?: TemplateDto) =>
   zodValidate($LargePrintLetterTemplate, template);
 

From 9605866dc4e3ceef1a4d04190d5da240f69e1936 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Thu, 2 Apr 2026 09:32:46 +0100
Subject: [PATCH 23/57] wip

---
 .../preview-template/page.test.tsx            |   3 +-
 .../page.test.tsx                             |   7 +-
 .../preview-template/page.test.tsx            |   1 -
 .../__snapshots__/page.test.tsx.snap          |   4 +-
 .../__snapshots__/page.test.tsx.snap          |  12 +-
 .../__snapshots__/page.test.tsx.snap          |   4 +-
 .../__snapshots__/LetterRender.test.tsx.snap  |   8 +-
 .../LetterRenderIframe.test.tsx.snap          |   2 +-
 .../LetterRenderTab.test.tsx.snap             |   4 +-
 .../molecules/SummaryPreviewLetter.test.tsx   | 104 +++++++++---------
 .../LetterRender/LetterRenderIframe.tsx       |   8 +-
 package-lock.json                             |  52 ++++-----
 12 files changed, 104 insertions(+), 105 deletions(-)

diff --git a/frontend/src/__tests__/app/message-plans/preview-message-plan/preview-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/preview-message-plan/preview-template/page.test.tsx
index 43d4619e5..d528887e0 100644
--- a/frontend/src/__tests__/app/message-plans/preview-message-plan/preview-template/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/preview-message-plan/preview-template/page.test.tsx
@@ -10,13 +10,12 @@ import { validateAuthoringLetterTemplate } from 'nhs-notify-web-template-managem
 jest.mock('@molecules/SummaryPreviewLetter/SummaryPreviewLetter');
 
 describe('PreviewLetterTemplateFromPreviewMessagePlan page', () => {
-  it('should render SummaryPreviewLetter with hideBackLinks and authoring validator', async () => {
+  it('should render SummaryPreviewLetter with hideBackLinks and authoring letter validator', async () => {
     const props = {
       params: Promise.resolve({
         routingConfigId: 'routing-config-id',
         templateId: 'template-id',
       }),
-      searchParams: Promise.resolve({ lockNumber: '5' }),
     };
 
     const page = await PreviewLetterTemplateFromPreviewMessagePlan(props);
diff --git a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/page.test.tsx b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/page.test.tsx
index b93a5f13c..6c534e105 100644
--- a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/page.test.tsx
@@ -320,9 +320,10 @@ describe('Review and move to production page', () => {
       await renderPage(routingConfig);
 
       const block = screen.getByTestId('message-plan-block-LETTER');
-      expect(within(block).getByTestId('template-name')).toHaveTextContent(
-        templates[letterTemplateId].name
-      );
+      const templateName = within(block).getByTestId('template-name');
+
+      expect(templateName).toHaveTextContent(templates[letterTemplateId].name);
+
       const link = within(block).getByRole('link');
       expect(link).toHaveTextContent('Preview template (opens in a new tab)');
       expect(link).toHaveAttribute(
diff --git a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/preview-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/preview-template/page.test.tsx
index 4e0db76f9..fe8717820 100644
--- a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/preview-template/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/preview-template/page.test.tsx
@@ -16,7 +16,6 @@ describe('PreviewLetterTemplateFromReviewAndMoveToProduction page', () => {
         routingConfigId: 'routing-config-id',
         templateId: 'template-id',
       }),
-      searchParams: Promise.resolve({ lockNumber: '5' }),
     };
 
     const page =
diff --git a/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap
index 4c334105b..6e8918194 100644
--- a/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/preview-approved-letter-template/__snapshots__/page.test.tsx.snap
@@ -302,7 +302,7 @@ exports[`valid authoring letter template matches snapshot 1`] = `
                 class="nhsuk-grid-column-two-thirds iframeColumn"
               >
                 <iframe
-                  aria-label="PDF preview of letter template - short examples"
+                  aria-label="PDF preview of letter template with short example personalisation data"
                   src="/templates/files/client-1/renders/authoring-letter-template-id/short-render.pdf"
                   title="Letter preview - short examples"
                 />
@@ -344,7 +344,7 @@ exports[`valid authoring letter template matches snapshot 1`] = `
                 class="nhsuk-grid-column-two-thirds iframeColumn"
               >
                 <iframe
-                  aria-label="PDF preview of letter template - long examples"
+                  aria-label="PDF preview of letter template with long example personalisation data"
                   src="/templates/files/client-1/renders/authoring-letter-template-id/long-render.pdf"
                   title="Letter preview - long examples"
                 />
diff --git a/frontend/src/__tests__/app/preview-letter-template/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/preview-letter-template/__snapshots__/page.test.tsx.snap
index 3dee8b9ff..9d1f6dbf5 100644
--- a/frontend/src/__tests__/app/preview-letter-template/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/preview-letter-template/__snapshots__/page.test.tsx.snap
@@ -414,7 +414,7 @@ exports[`authoring letter template with VALIDATION_FAILED status matches snapsho
                 class="nhsuk-grid-column-two-thirds iframeColumn"
               >
                 <iframe
-                  aria-label="PDF preview of letter template - short examples"
+                  aria-label="PDF preview of letter template with short example personalisation data"
                   src="/templates/files/client-1/renders/authoring-letter-template-id/render.pdf"
                   title="Letter preview - short examples"
                 />
@@ -563,7 +563,7 @@ exports[`authoring letter template with VALIDATION_FAILED status matches snapsho
                 class="nhsuk-grid-column-two-thirds iframeColumn"
               >
                 <iframe
-                  aria-label="PDF preview of letter template - long examples"
+                  aria-label="PDF preview of letter template with long example personalisation data"
                   src="/templates/files/client-1/renders/authoring-letter-template-id/render.pdf"
                   title="Letter preview - long examples"
                 />
@@ -971,7 +971,7 @@ exports[`authoring letter template with VALIDATION_FAILED status matches snapsho
                 class="nhsuk-grid-column-two-thirds iframeColumn"
               >
                 <iframe
-                  aria-label="PDF preview of letter template - short examples"
+                  aria-label="PDF preview of letter template with short example personalisation data"
                   src="/templates/files/client-1/renders/authoring-letter-template-id/render.pdf"
                   title="Letter preview - short examples"
                 />
@@ -1120,7 +1120,7 @@ exports[`authoring letter template with VALIDATION_FAILED status matches snapsho
                 class="nhsuk-grid-column-two-thirds iframeColumn"
               >
                 <iframe
-                  aria-label="PDF preview of letter template - long examples"
+                  aria-label="PDF preview of letter template with long example personalisation data"
                   src="/templates/files/client-1/renders/authoring-letter-template-id/render.pdf"
                   title="Letter preview - long examples"
                 />
@@ -1756,7 +1756,7 @@ exports[`valid authoring letter template matches snapshot 1`] = `
                 class="nhsuk-grid-column-two-thirds iframeColumn"
               >
                 <iframe
-                  aria-label="PDF preview of letter template - short examples"
+                  aria-label="PDF preview of letter template with short example personalisation data"
                   src="/templates/files/client-1/renders/authoring-letter-template-id/render.pdf"
                   title="Letter preview - short examples"
                 />
@@ -1905,7 +1905,7 @@ exports[`valid authoring letter template matches snapshot 1`] = `
                 class="nhsuk-grid-column-two-thirds iframeColumn"
               >
                 <iframe
-                  aria-label="PDF preview of letter template - long examples"
+                  aria-label="PDF preview of letter template with long example personalisation data"
                   src="/templates/files/client-1/renders/authoring-letter-template-id/render.pdf"
                   title="Letter preview - long examples"
                 />
diff --git a/frontend/src/__tests__/app/review-and-approve-letter-template/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/review-and-approve-letter-template/__snapshots__/page.test.tsx.snap
index 999b4ad6a..074365a3a 100644
--- a/frontend/src/__tests__/app/review-and-approve-letter-template/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/review-and-approve-letter-template/__snapshots__/page.test.tsx.snap
@@ -168,7 +168,7 @@ exports[`valid authoring letter template matches snapshot 1`] = `
         Short example preview
       </h2>
       <iframe
-        aria-label="PDF preview of letter template - short examples"
+        aria-label="PDF preview of letter template with short example personalisation data"
         class="letter-render-iframe nhsuk-u-margin-bottom-6"
         src="/templates/files/client-123/renders/authoring-letter-template-id/short-form.pdf"
         title="Letter preview - short examples"
@@ -179,7 +179,7 @@ exports[`valid authoring letter template matches snapshot 1`] = `
         Long example preview
       </h2>
       <iframe
-        aria-label="PDF preview of letter template - long examples"
+        aria-label="PDF preview of letter template with long example personalisation data"
         class="letter-render-iframe nhsuk-u-margin-bottom-6"
         src="/templates/files/client-123/renders/authoring-letter-template-id/long-form.pdf"
         title="Letter preview - long examples"
diff --git a/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRender.test.tsx.snap b/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRender.test.tsx.snap
index 5b6d285d6..7c7de83d3 100644
--- a/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRender.test.tsx.snap
+++ b/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRender.test.tsx.snap
@@ -252,7 +252,7 @@ exports[`LetterRender matches snapshot 1`] = `
             class="nhsuk-grid-column-two-thirds iframeColumn"
           >
             <iframe
-              aria-label="PDF preview of letter template - short examples"
+              aria-label="PDF preview of letter template with short example personalisation data"
               src="/templates/files/client-123/renders/template-123/initial.pdf"
               title="Letter preview - short examples"
             />
@@ -444,7 +444,7 @@ exports[`LetterRender matches snapshot 1`] = `
             class="nhsuk-grid-column-two-thirds iframeColumn"
           >
             <iframe
-              aria-label="PDF preview of letter template - long examples"
+              aria-label="PDF preview of letter template with long example personalisation data"
               src="/templates/files/client-123/renders/template-123/initial.pdf"
               title="Letter preview - long examples"
             />
@@ -569,7 +569,7 @@ exports[`LetterRender matches snapshot when hideEditActions is true 1`] = `
             class="nhsuk-grid-column-two-thirds iframeColumn"
           >
             <iframe
-              aria-label="PDF preview of letter template - short examples"
+              aria-label="PDF preview of letter template with short example personalisation data"
               src="/templates/files/client-123/renders/template-123/initial.pdf"
               title="Letter preview - short examples"
             />
@@ -633,7 +633,7 @@ exports[`LetterRender matches snapshot when hideEditActions is true 1`] = `
             class="nhsuk-grid-column-two-thirds iframeColumn"
           >
             <iframe
-              aria-label="PDF preview of letter template - long examples"
+              aria-label="PDF preview of letter template with long example personalisation data"
               src="/templates/files/client-123/renders/template-123/initial.pdf"
               title="Letter preview - long examples"
             />
diff --git a/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderIframe.test.tsx.snap b/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderIframe.test.tsx.snap
index e5b6b7dd7..d62cf1b55 100644
--- a/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderIframe.test.tsx.snap
+++ b/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderIframe.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`LetterRenderIframe snapshots matches snapshot with PDF URL 1`] = `
 <DocumentFragment>
   <iframe
-    aria-label="PDF preview of letter template - short examples"
+    aria-label="PDF preview of letter template with short example personalisation data"
     src="/templates/files/client-123/renders/template-123/initial.pdf"
     title="Letter preview - short examples"
   />
diff --git a/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderTab.test.tsx.snap b/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderTab.test.tsx.snap
index 63f792721..e2b8d34dc 100644
--- a/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderTab.test.tsx.snap
+++ b/frontend/src/__tests__/components/molecules/LetterRender/__snapshots__/LetterRenderTab.test.tsx.snap
@@ -162,7 +162,7 @@ exports[`LetterRenderTab snapshots matches snapshot for long tab 1`] = `
       class="nhsuk-grid-column-two-thirds iframeColumn"
     >
       <iframe
-        aria-label="PDF preview of letter template - long examples"
+        aria-label="PDF preview of letter template with long example personalisation data"
         src="/templates/files/client-456/renders/template-123/initial.pdf"
         title="Letter preview - long examples"
       />
@@ -333,7 +333,7 @@ exports[`LetterRenderTab snapshots matches snapshot for short tab 1`] = `
       class="nhsuk-grid-column-two-thirds iframeColumn"
     >
       <iframe
-        aria-label="PDF preview of letter template - short examples"
+        aria-label="PDF preview of letter template with short example personalisation data"
         src="/templates/files/client-456/renders/template-123/initial.pdf"
         title="Letter preview - short examples"
       />
diff --git a/frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx b/frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx
index 2d1307e10..ea4092339 100644
--- a/frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx
+++ b/frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx
@@ -8,10 +8,7 @@ import {
 import { render } from '@testing-library/react';
 import { getLetterVariantById, getTemplate } from '@utils/form-actions';
 import { redirect } from 'next/navigation';
-import {
-  validateLetterTemplate,
-  LetterTemplate,
-} from 'nhs-notify-web-template-management-utils';
+import { validateLetterTemplate } from 'nhs-notify-web-template-management-utils';
 import type { TemplateDto } from 'nhs-notify-web-template-management-types';
 
 jest.mock('@utils/form-actions');
@@ -21,34 +18,17 @@ const getTemplateMock = jest.mocked(getTemplate);
 const getLetterVariantByIdMock = jest.mocked(getLetterVariantById);
 const redirectMock = jest.mocked(redirect);
 
-const defaultRedirectUrl =
-  '/message-plans/edit-message-plan/routing-config-id';
-
-const defaultProps = (
-  overrides: {
-    routingConfigId?: string;
-    templateId?: string;
-    lockNumber?: string;
-    searchParams?: Record<string, string>;
-    validateTemplate?: (template?: TemplateDto) => LetterTemplate | undefined;
-    hideBackLinks?: boolean;
-    redirectUrl?: string | undefined;
-  } = {}
-) => ({
+const defaultRedirectUrl = '/message-plans/edit-message-plan/routing-config-id';
+
+const defaultProps = {
   params: Promise.resolve({
-    routingConfigId: overrides.routingConfigId ?? 'routing-config-id',
-    templateId: overrides.templateId ?? 'template-id',
+    routingConfigId: 'routing-config-id',
+    templateId: 'template-id',
   }),
-  searchParams: Promise.resolve(
-    overrides.searchParams ?? { lockNumber: overrides.lockNumber ?? '5' }
-  ),
-  validateTemplate: overrides.validateTemplate ?? validateLetterTemplate,
-  hideBackLinks: overrides.hideBackLinks,
-  redirectUrl:
-    'redirectUrl' in overrides
-      ? overrides.redirectUrl
-      : defaultRedirectUrl,
-});
+  searchParams: Promise.resolve({ lockNumber: '5' }),
+  validateTemplate: validateLetterTemplate,
+  redirectUrl: defaultRedirectUrl,
+};
 
 describe('SummaryPreviewLetter', () => {
   beforeEach(() => {
@@ -56,15 +36,20 @@ describe('SummaryPreviewLetter', () => {
   });
 
   it('should redirect to redirectUrl when lockNumber is invalid', async () => {
-    await SummaryPreviewLetter(
-      defaultProps({ lockNumber: 'invalid', redirectUrl: '/custom-redirect' })
-    );
+    await SummaryPreviewLetter({
+      ...defaultProps,
+      searchParams: Promise.resolve({ lockNumber: 'invalid' }),
+      redirectUrl: '/custom-redirect',
+    });
 
     expect(redirectMock).toHaveBeenCalledWith('/custom-redirect', 'replace');
   });
 
   it('should redirect to redirectUrl when lockNumber is missing', async () => {
-    await SummaryPreviewLetter(defaultProps({ searchParams: {} }));
+    await SummaryPreviewLetter({
+      ...defaultProps,
+      searchParams: Promise.resolve({}),
+    });
 
     expect(redirectMock).toHaveBeenCalledWith(defaultRedirectUrl, 'replace');
   });
@@ -72,9 +57,11 @@ describe('SummaryPreviewLetter', () => {
   it('should not redirect when redirectUrl is not provided and lockNumber is missing', async () => {
     getTemplateMock.mockResolvedValueOnce(PDF_LETTER_TEMPLATE);
 
-    const page = await SummaryPreviewLetter(
-      defaultProps({ searchParams: {}, redirectUrl: undefined })
-    );
+    const page = await SummaryPreviewLetter({
+      ...defaultProps,
+      searchParams: Promise.resolve({}),
+      redirectUrl: undefined,
+    });
 
     expect(redirectMock).not.toHaveBeenCalled();
     expect(page).toBeDefined();
@@ -83,9 +70,13 @@ describe('SummaryPreviewLetter', () => {
   it('should redirect to invalid-template when template is not found', async () => {
     getTemplateMock.mockResolvedValueOnce(undefined);
 
-    await SummaryPreviewLetter(
-      defaultProps({ templateId: 'invalid-template-id' })
-    );
+    await SummaryPreviewLetter({
+      ...defaultProps,
+      params: Promise.resolve({
+        routingConfigId: 'routing-config-id',
+        templateId: 'invalid-template-id',
+      }),
+    });
 
     expect(getTemplateMock).toHaveBeenCalledWith('invalid-template-id');
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
@@ -97,7 +88,7 @@ describe('SummaryPreviewLetter', () => {
       templateType: 'EMAIL',
     } as unknown as TemplateDto);
 
-    await SummaryPreviewLetter(defaultProps());
+    await SummaryPreviewLetter(defaultProps);
 
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
   });
@@ -108,12 +99,13 @@ describe('SummaryPreviewLetter', () => {
       templateStatus: 'SUBMITTED',
     });
 
-    const page = await SummaryPreviewLetter(
-      defaultProps({
+    const page = await SummaryPreviewLetter({
+      ...defaultProps,
+      params: Promise.resolve({
         routingConfigId: ROUTING_CONFIG.id,
         templateId: PDF_LETTER_TEMPLATE.id,
-      })
-    );
+      }),
+    });
 
     const container = render(page);
 
@@ -131,12 +123,13 @@ describe('SummaryPreviewLetter', () => {
     });
     getLetterVariantByIdMock.mockResolvedValueOnce(letterVariant);
 
-    const page = await SummaryPreviewLetter(
-      defaultProps({
+    const page = await SummaryPreviewLetter({
+      ...defaultProps,
+      params: Promise.resolve({
         routingConfigId: ROUTING_CONFIG.id,
         templateId: AUTHORING_LETTER_TEMPLATE.id,
-      })
-    );
+      }),
+    });
 
     const container = render(page);
 
@@ -151,14 +144,15 @@ describe('SummaryPreviewLetter', () => {
       templateStatus: 'SUBMITTED',
     });
 
-    const page = await SummaryPreviewLetter(
-      defaultProps({
+    const page = await SummaryPreviewLetter({
+      ...defaultProps,
+      params: Promise.resolve({
         routingConfigId: ROUTING_CONFIG.id,
         templateId: PDF_LETTER_TEMPLATE.id,
-        hideBackLinks: true,
-        redirectUrl: undefined,
-      })
-    );
+      }),
+      hideBackLinks: true,
+      redirectUrl: undefined,
+    });
 
     const container = render(page);
 
diff --git a/frontend/src/components/molecules/LetterRender/LetterRenderIframe.tsx b/frontend/src/components/molecules/LetterRender/LetterRenderIframe.tsx
index 16a7cbe96..1d79e3e19 100644
--- a/frontend/src/components/molecules/LetterRender/LetterRenderIframe.tsx
+++ b/frontend/src/components/molecules/LetterRender/LetterRenderIframe.tsx
@@ -13,10 +13,16 @@ export function LetterRenderIframe({
   if (!pdfUrl) return <p className='nhsuk-body'>No preview available</p>;
 
   const tabName = renderType === 'shortFormRender' ? 'short' : 'long';
+
   const tabbedViewSuffix =
     renderType === 'initialRender' ? '' : ` - ${tabName} examples`;
 
-  const ariaLabel = `PDF preview of letter template${tabbedViewSuffix}`;
+  const ariaLabelSuffix =
+    renderType === 'initialRender'
+      ? ''
+      : ` with ${tabName} example personalisation data`;
+
+  const ariaLabel = `PDF preview of letter template${ariaLabelSuffix}`;
 
   const title = `Letter preview${tabbedViewSuffix}`;
 
diff --git a/package-lock.json b/package-lock.json
index df9bab624..2a8917f4f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7814,13 +7814,13 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login": {
-      "version": "3.972.27",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.27.tgz",
-      "integrity": "sha512-t3ehEtHomGZwg5Gixw4fYbYtG9JBnjfAjSDabxhPEu/KLLUp0BB37/APX7MSKXQhX6ZH7pseuACFJ19NrAkNdg==",
+      "version": "3.972.28",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.28.tgz",
+      "integrity": "sha512-ZSTfO6jqUTCysbdBPtEX5OUR//3rbD0lN7jO3sQeS2Gjr/Y+DT6SbIJ0oT2cemNw3UzKu97sNONd1CwNMthuZQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-sdk/core": "^3.973.26",
-        "@aws-sdk/nested-clients": "^3.996.17",
+        "@aws-sdk/nested-clients": "^3.996.18",
         "@aws-sdk/types": "^3.973.6",
         "@smithy/property-provider": "^4.2.12",
         "@smithy/protocol-http": "^5.3.12",
@@ -7902,9 +7902,9 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-user-agent": {
-      "version": "3.972.27",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.27.tgz",
-      "integrity": "sha512-TIRLO5UR2+FVUGmhYoAwVkKhcVzywEDX/5LzR9tjy1h8FQAXOtFg2IqgmwvxU7y933rkTn9rl6AdgcAUgQ1/Kg==",
+      "version": "3.972.28",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.28.tgz",
+      "integrity": "sha512-cfWZFlVh7Va9lRay4PN2A9ARFzaBYcA097InT5M2CdRS05ECF5yaz86jET8Wsl2WcyKYEvVr/QNmKtYtafUHtQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-sdk/core": "^3.973.26",
@@ -7913,7 +7913,7 @@
         "@smithy/core": "^3.23.13",
         "@smithy/protocol-http": "^5.3.12",
         "@smithy/types": "^4.13.1",
-        "@smithy/util-retry": "^4.2.12",
+        "@smithy/util-retry": "^4.2.13",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -7921,9 +7921,9 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/nested-clients": {
-      "version": "3.996.17",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.996.17.tgz",
-      "integrity": "sha512-7B0HIX0tEFmOSJuWzdHZj1WhMXSryM+h66h96ZkqSncoY7J6wq61KOu4Kr57b/YnJP3J/EeQYVFulgR281h+7A==",
+      "version": "3.996.18",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.996.18.tgz",
+      "integrity": "sha512-c7ZSIXrESxHKx2Mcopgd8AlzZgoXMr20fkx5ViPWPOLBvmyhw9VwJx/Govg8Ef/IhEon5R9l53Z8fdYSEmp6VA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
@@ -7932,12 +7932,12 @@
         "@aws-sdk/middleware-host-header": "^3.972.8",
         "@aws-sdk/middleware-logger": "^3.972.8",
         "@aws-sdk/middleware-recursion-detection": "^3.972.9",
-        "@aws-sdk/middleware-user-agent": "^3.972.27",
+        "@aws-sdk/middleware-user-agent": "^3.972.28",
         "@aws-sdk/region-config-resolver": "^3.972.10",
         "@aws-sdk/types": "^3.973.6",
         "@aws-sdk/util-endpoints": "^3.996.5",
         "@aws-sdk/util-user-agent-browser": "^3.972.8",
-        "@aws-sdk/util-user-agent-node": "^3.973.13",
+        "@aws-sdk/util-user-agent-node": "^3.973.14",
         "@smithy/config-resolver": "^4.4.13",
         "@smithy/core": "^3.23.13",
         "@smithy/fetch-http-handler": "^5.3.15",
@@ -7945,7 +7945,7 @@
         "@smithy/invalid-dependency": "^4.2.12",
         "@smithy/middleware-content-length": "^4.2.12",
         "@smithy/middleware-endpoint": "^4.4.28",
-        "@smithy/middleware-retry": "^4.4.45",
+        "@smithy/middleware-retry": "^4.4.46",
         "@smithy/middleware-serde": "^4.2.16",
         "@smithy/middleware-stack": "^4.2.12",
         "@smithy/node-config-provider": "^4.3.12",
@@ -7961,7 +7961,7 @@
         "@smithy/util-defaults-mode-node": "^4.2.48",
         "@smithy/util-endpoints": "^3.3.3",
         "@smithy/util-middleware": "^4.2.12",
-        "@smithy/util-retry": "^4.2.12",
+        "@smithy/util-retry": "^4.2.13",
         "@smithy/util-utf8": "^4.2.2",
         "tslib": "^2.6.2"
       },
@@ -8027,12 +8027,12 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/util-user-agent-node": {
-      "version": "3.973.13",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.973.13.tgz",
-      "integrity": "sha512-s1dCJ0J9WU9UPkT3FFqhKTSquYTkqWXGRaapHFyWwwJH86ZussewhNST5R5TwXVL1VSHq4aJVl9fWK+svaRVCQ==",
+      "version": "3.973.14",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.973.14.tgz",
+      "integrity": "sha512-vNSB/DYaPOyujVZBg/zUznH9QC142MaTHVmaFlF7uzzfg3CgT9f/l4C0Yi+vU/tbBhxVcXVB90Oohk5+o+ZbWw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/middleware-user-agent": "^3.972.27",
+        "@aws-sdk/middleware-user-agent": "^3.972.28",
         "@aws-sdk/types": "^3.973.6",
         "@smithy/node-config-provider": "^4.3.12",
         "@smithy/types": "^4.13.1",
@@ -13230,9 +13230,9 @@
       }
     },
     "node_modules/@smithy/middleware-retry": {
-      "version": "4.4.45",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.4.45.tgz",
-      "integrity": "sha512-td1PxpwDIaw5/oP/xIRxBGxJKoF1L4DBAwbZ8wjMuXBYOP/r2ZE/Ocou+mBHx/yk9knFEtDBwhSrYVn+Mz4pHw==",
+      "version": "4.4.46",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.4.46.tgz",
+      "integrity": "sha512-SpvWNNOPOrKQGUqZbEPO+es+FRXMWvIyzUKUOYdDgdlA6BdZj/R58p4umoQ76c2oJC44PiM7mKizyyex1IJzow==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/node-config-provider": "^4.3.12",
@@ -13241,7 +13241,7 @@
         "@smithy/smithy-client": "^4.12.8",
         "@smithy/types": "^4.13.1",
         "@smithy/util-middleware": "^4.2.12",
-        "@smithy/util-retry": "^4.2.12",
+        "@smithy/util-retry": "^4.2.13",
         "@smithy/uuid": "^1.1.2",
         "tslib": "^2.6.2"
       },
@@ -13584,9 +13584,9 @@
       }
     },
     "node_modules/@smithy/util-retry": {
-      "version": "4.2.12",
-      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.2.12.tgz",
-      "integrity": "sha512-1zopLDUEOwumjcHdJ1mwBHddubYF8GMQvstVCLC54Y46rqoHwlIU+8ZzUeaBcD+WCJHyDGSeZ2ml9YSe9aqcoQ==",
+      "version": "4.2.13",
+      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.2.13.tgz",
+      "integrity": "sha512-qQQsIvL0MGIbUjeSrg0/VlQ3jGNKyM3/2iU3FPNgy01z+Sp4OvcaxbgIoFOTvB61ZoohtutuOvOcgmhbD0katQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/service-error-classification": "^4.2.12",

From 9bee5f802659e9b85dbfc175829ce5a9a1cdebf8 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Thu, 2 Apr 2026 10:44:27 +0100
Subject: [PATCH 24/57] fix routing component test

---
 .../[templateId]/page.test.tsx                |  3 +--
 ...-letter-template.routing-component.spec.ts | 18 ++++++++++++------
 ...iew-message-plan.routing-component.spec.ts | 19 +++++++++++++++----
 ...-letter-template.routing-component.spec.ts | 18 ++++++++++++------
 ...ve-to-production.routing-component.spec.ts | 10 ++++++++--
 5 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/frontend/src/__tests__/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.test.tsx b/frontend/src/__tests__/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.test.tsx
index c488d0e7f..490e64272 100644
--- a/frontend/src/__tests__/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.test.tsx
@@ -19,8 +19,7 @@ describe('PreviewOtherLanguageLetterTemplateFromMessagePlan page', () => {
       searchParams: Promise.resolve({ lockNumber: '5' }),
     };
 
-    const page =
-      await PreviewOtherLanguageLetterTemplateFromMessagePlan(props);
+    const page = await PreviewOtherLanguageLetterTemplateFromMessagePlan(props);
 
     expect(page).toEqual(
       <SummaryPreviewLetter
diff --git a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts
index ef9e3fa36..e17336bda 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts
@@ -30,21 +30,27 @@ function createMessagePlans(user: TestUser) {
 }
 
 function createTemplates(user: TestUser) {
+  const templateIds = {
+    EMAIL: randomUUID(),
+    AUTHORING_LETTER: randomUUID(),
+    PDF_LETTER: randomUUID(),
+  };
+
   return {
     EMAIL: TemplateFactory.createEmailTemplate(
-      randomUUID(),
+      templateIds.EMAIL,
       user,
-      'Email template name'
+      `Test Email template - ${templateIds.EMAIL}`
     ),
     AUTHORING_LETTER: TemplateFactory.createAuthoringLetterTemplate(
-      randomUUID(),
+      templateIds.AUTHORING_LETTER,
       user,
-      'Authoring letter template name'
+      `Test Authoring Letter template - ${templateIds.AUTHORING_LETTER}`
     ),
     PDF_LETTER: TemplateFactory.uploadLetterTemplate(
-      randomUUID(),
+      templateIds.PDF_LETTER,
       user,
-      'PDF letter template name'
+      `Test PDF Letter template - ${templateIds.PDF_LETTER}`
     ),
   };
 }
diff --git a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
index 6077d4c62..0290a2409 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
@@ -286,9 +286,12 @@ test.describe('Routing - Preview Message Plan page', () => {
         templateBlock.defaultTemplateCard.previewTemplateSummary
       ).toBeHidden();
 
-      await expect(templateBlock.defaultTemplateCard.templateLink).toHaveText(
+      await expect(templateBlock.defaultTemplateCard.templateName).toHaveText(
         templates.LETTER.name
       );
+      await expect(templateBlock.defaultTemplateCard.templateLink).toHaveText(
+        'Preview template (opens in a new tab)'
+      );
       await expect(
         templateBlock.defaultTemplateCard.templateLink
       ).toHaveAttribute(
@@ -321,11 +324,16 @@ test.describe('Routing - Preview Message Plan page', () => {
         );
       }
 
-      await templateBlock.defaultTemplateCard.templateLink.click();
+      const [popup] = await Promise.all([
+        page.waitForEvent('popup'),
+        templateBlock.defaultTemplateCard.templateLink.click(),
+      ]);
 
-      await expect(page).toHaveURL(
+      await expect(popup).toHaveURL(
         `/templates/preview-submitted-letter-template/${templates.LETTER.id}`
       );
+
+      await popup.close();
     });
   });
 
@@ -354,9 +362,12 @@ test.describe('Routing - Preview Message Plan page', () => {
     const templateBlock =
       await previewMessagePlanPage.getTemplateBlock('LETTER');
 
-    await expect(templateBlock.defaultTemplateCard.templateLink).toHaveText(
+    await expect(templateBlock.defaultTemplateCard.templateName).toHaveText(
       templates.AUTHORING_LETTER.name
     );
+    await expect(templateBlock.defaultTemplateCard.templateLink).toHaveText(
+      'Preview template (opens in a new tab)'
+    );
 
     await expect(
       templateBlock.defaultTemplateCard.templateLink
diff --git a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts
index cd626acf5..abf5d44ca 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts
@@ -30,21 +30,27 @@ function createMessagePlans(user: TestUser) {
 }
 
 function createTemplates(user: TestUser) {
+  const templateIds = {
+    EMAIL: randomUUID(),
+    AUTHORING_LETTER: randomUUID(),
+    PDF_LETTER: randomUUID(),
+  };
+
   return {
     EMAIL: TemplateFactory.createEmailTemplate(
-      randomUUID(),
+      templateIds.EMAIL,
       user,
-      'Email template name'
+      `Test Email template - ${templateIds.EMAIL}`
     ),
     AUTHORING_LETTER: TemplateFactory.createAuthoringLetterTemplate(
-      randomUUID(),
+      templateIds.AUTHORING_LETTER,
       user,
-      'Authoring letter template name'
+      `Test Authoring Letter template - ${templateIds.AUTHORING_LETTER}`
     ),
     PDF_LETTER: TemplateFactory.uploadLetterTemplate(
-      randomUUID(),
+      templateIds.PDF_LETTER,
       user,
-      'PDF letter template name'
+      `Test PDF Letter template - ${templateIds.PDF_LETTER}`
     ),
   };
 }
diff --git a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
index c584a30b5..08469388c 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
@@ -284,9 +284,12 @@ test.describe('Routing - Review and Move to Production page', () => {
         templateBlock.defaultTemplateCard.previewTemplateSummary
       ).toBeHidden();
 
-      await expect(templateBlock.defaultTemplateCard.templateLink).toHaveText(
+      await expect(templateBlock.defaultTemplateCard.templateName).toHaveText(
         templates.LETTER.name
       );
+      await expect(templateBlock.defaultTemplateCard.templateLink).toHaveText(
+        'Preview template (opens in a new tab)'
+      );
       await expect(
         templateBlock.defaultTemplateCard.templateLink
       ).toHaveAttribute(
@@ -345,9 +348,12 @@ test.describe('Routing - Review and Move to Production page', () => {
 
     const templateBlock = await reviewPage.getTemplateBlock('LETTER');
 
-    await expect(templateBlock.defaultTemplateCard.templateLink).toHaveText(
+    await expect(templateBlock.defaultTemplateCard.templateName).toHaveText(
       templates.AUTHORING_LETTER.name
     );
+    await expect(templateBlock.defaultTemplateCard.templateLink).toHaveText(
+      'Preview template (opens in a new tab)'
+    );
 
     await expect(
       templateBlock.defaultTemplateCard.templateLink

From 9211c9841f1ab74de4ac8ebcc6a0991dea8f9ced Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Thu, 2 Apr 2026 11:00:56 +0100
Subject: [PATCH 25/57] coverage

---
 .../molecules/PreviewTemplateDetails.test.tsx | 19 +++++++++++++++++++
 .../config/vocabularies/words/accept.txt      |  2 +-
 ...iew-message-plan.routing-component.spec.ts | 15 +++++++--------
 ...ve-to-production.routing-component.spec.ts | 15 +++++++--------
 4 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/frontend/src/__tests__/components/molecules/PreviewTemplateDetails.test.tsx b/frontend/src/__tests__/components/molecules/PreviewTemplateDetails.test.tsx
index 65f8f02b2..be14fbe21 100644
--- a/frontend/src/__tests__/components/molecules/PreviewTemplateDetails.test.tsx
+++ b/frontend/src/__tests__/components/molecules/PreviewTemplateDetails.test.tsx
@@ -569,4 +569,23 @@ describe('PreviewTemplateDetailsLetter', () => {
     expect(screen.queryByTestId('edit-name-link')).not.toBeInTheDocument();
     expect(screen.queryByTestId('campaign-action')).not.toBeInTheDocument();
   });
+
+  it('renders "No preview available" when initialRender is not RENDERED', () => {
+    render(
+      <PreviewTemplateDetailsLetter
+        template={{
+          ...baseAuthoringLetter,
+          files: {
+            docxTemplate: baseAuthoringLetter.files.docxTemplate,
+            initialRender: {
+              status: 'PENDING',
+              requestedAt: '2026-02-27T09:42:04.142Z',
+            },
+          },
+        }}
+      />
+    );
+
+    expect(screen.getByText('No preview available')).toBeInTheDocument();
+  });
 });
diff --git a/scripts/config/vale/styles/config/vocabularies/words/accept.txt b/scripts/config/vale/styles/config/vocabularies/words/accept.txt
index 4824dbba9..a19984914 100644
--- a/scripts/config/vale/styles/config/vocabularies/words/accept.txt
+++ b/scripts/config/vale/styles/config/vocabularies/words/accept.txt
@@ -26,5 +26,5 @@ Syft
 Terraform
 toolchain
 Trufflehog
-Zod
 [Vv]alidators
+Zod
diff --git a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
index 0290a2409..eea1d9fc5 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
@@ -89,14 +89,13 @@ function createTemplates(user: TestUser) {
       `Test Authoring Letter template - ${templateIds.AUTHORING_LETTER}`,
       'SUBMITTED'
     ),
-    AUTHORING_LARGE_PRINT_LETTER:
-      TemplateFactory.createAuthoringLetterTemplate(
-        templateIds.AUTHORING_LARGE_PRINT_LETTER,
-        user,
-        `Test Authoring Large Print Letter template - ${templateIds.AUTHORING_LARGE_PRINT_LETTER}`,
-        'SUBMITTED',
-        { letterType: 'x1' }
-      ),
+    AUTHORING_LARGE_PRINT_LETTER: TemplateFactory.createAuthoringLetterTemplate(
+      templateIds.AUTHORING_LARGE_PRINT_LETTER,
+      user,
+      `Test Authoring Large Print Letter template - ${templateIds.AUTHORING_LARGE_PRINT_LETTER}`,
+      'SUBMITTED',
+      { letterType: 'x1' }
+    ),
   };
 }
 
diff --git a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
index 08469388c..09be5ce02 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
@@ -88,14 +88,13 @@ function createTemplates(user: TestUser) {
       `Test Authoring Letter template - ${templateIds.AUTHORING_LETTER}`,
       'SUBMITTED'
     ),
-    AUTHORING_LARGE_PRINT_LETTER:
-      TemplateFactory.createAuthoringLetterTemplate(
-        templateIds.AUTHORING_LARGE_PRINT_LETTER,
-        user,
-        `Test Authoring Large Print Letter template - ${templateIds.AUTHORING_LARGE_PRINT_LETTER}`,
-        'SUBMITTED',
-        { letterType: 'x1' }
-      ),
+    AUTHORING_LARGE_PRINT_LETTER: TemplateFactory.createAuthoringLetterTemplate(
+      templateIds.AUTHORING_LARGE_PRINT_LETTER,
+      user,
+      `Test Authoring Large Print Letter template - ${templateIds.AUTHORING_LARGE_PRINT_LETTER}`,
+      'SUBMITTED',
+      { letterType: 'x1' }
+    ),
   };
 }
 

From 062af9d49dd93d87fdc142b1b29a358114eddbc7 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Thu, 2 Apr 2026 11:32:21 +0100
Subject: [PATCH 26/57] fix a11y test fixtures

---
 .../PreviewTemplateFromMessagePlan.tsx        | 21 +++++++++---------
 .../routing.accessibility.spec.ts             | 22 ++++++++++++++-----
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx b/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx
index a579a1a22..a3dc3971c 100644
--- a/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx
+++ b/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx
@@ -45,16 +45,17 @@ export function PreviewTemplateFromMessagePlan<T extends TemplateDto>({
       : (template.letterType as RoutingSupportedLetterType);
   }
 
-  const backLinkHref = hideBackLinks
-    ? undefined
-    : interpolate(content.backLink.href, {
-        templateType: templateTypeToUrlTextMappings(
-          template.templateType,
-          letterType
-        ),
-        routingConfigId,
-        lockNumber: lockNumber as number,
-      });
+  const backLinkHref =
+    hideBackLinks || lockNumber === undefined
+      ? undefined
+      : interpolate(content.backLink.href, {
+          templateType: templateTypeToUrlTextMappings(
+            template.templateType,
+            letterType
+          ),
+          routingConfigId,
+          lockNumber,
+        });
 
   return (
     <>
diff --git a/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts b/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts
index 9c7a66467..8f6c10cd0 100644
--- a/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts
+++ b/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts
@@ -118,21 +118,33 @@ test.describe('Routing', () => {
         templateIds.LETTER,
         user,
         `Test Letter template - ${templateIds.LETTER}`,
-        'NOT_YET_SUBMITTED'
+        'PROOF_APPROVED',
+        {
+          shortFormRender: { status: 'RENDERED' },
+          longFormRender: { status: 'RENDERED' },
+        }
       ),
       TemplateFactory.createAuthoringLetterTemplate(
         templateIds.LETTER_LARGE_PRINT,
         user,
         `Test Large Print Letter template - ${templateIds.LETTER_LARGE_PRINT}`,
-        'NOT_YET_SUBMITTED',
-        { letterType: 'x1' }
+        'PROOF_APPROVED',
+        {
+          letterType: 'x1',
+          shortFormRender: { status: 'RENDERED' },
+          longFormRender: { status: 'RENDERED' },
+        }
       ),
       TemplateFactory.createAuthoringLetterTemplate(
         templateIds.LETTER_OTHER_LANGUAGE,
         user,
         `Test Letter template French - ${templateIds.LETTER_OTHER_LANGUAGE}`,
-        'NOT_YET_SUBMITTED',
-        { language: 'fr' }
+        'PROOF_APPROVED',
+        {
+          language: 'fr',
+          shortFormRender: { status: 'RENDERED' },
+          longFormRender: { status: 'RENDERED' },
+        }
       ),
     ]);
   });

From 1990537fb480574e9da0b90e15c78cbef42b5cc4 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Thu, 2 Apr 2026 11:58:39 +0100
Subject: [PATCH 27/57] e2e fix

---
 .../test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts b/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts
index c2f292e13..9ac3cfad7 100644
--- a/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts
+++ b/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts
@@ -407,10 +407,13 @@ test.describe('Routing', () => {
 
       const letterBlock = reviewPage.getTemplateBlock('LETTER');
 
+      const newPagePromise = page.context().waitForEvent('page');
       await letterBlock.defaultTemplateCard.templateLink.click();
+      const newPage = await newPagePromise;
+      await newPage.waitForLoadState();
 
       const previewLetterPage =
-        new RoutingReviewAndMoveToProductionLetterTemplatePage(page);
+        new RoutingReviewAndMoveToProductionLetterTemplatePage(newPage);
 
       await expect(previewLetterPage.pageHeading).toContainText(
         templates.LETTER.name
@@ -420,7 +423,7 @@ test.describe('Routing', () => {
         templates.LETTER.id
       );
 
-      await page.goBack();
+      await newPage.close();
 
       await expect(reviewPage.pageHeading).toBeVisible();
     });

From 7646a611918c506bfce578794579975541dbeb82 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Thu, 2 Apr 2026 14:22:49 +0100
Subject: [PATCH 28/57] iframe assertions

---
 .../preview-large-print-letter-template-page.ts    | 12 ++++++++++++
 .../preview-other-language-letter-template-page.ts | 12 ++++++++++++
 .../routing/letter/preview-standard-letter-page.ts | 12 ++++++++++++
 .../preview-message-plan-letter-template-page.ts   | 12 ++++++++++++
 ...-and-move-to-production-letter-template-page.ts | 12 ++++++++++++
 ...print-letter-template.routing-component.spec.ts | 14 ++++++++++++++
 ...guage-letter-template.routing-component.spec.ts | 14 ++++++++++++++
 ...ndard-letter-template.routing-component.spec.ts |  8 ++++++++
 ...-plan-letter-template.routing-component.spec.ts |  8 ++++++++
 ...ction-letter-template.routing-component.spec.ts |  8 ++++++++
 10 files changed, 112 insertions(+)

diff --git a/tests/test-team/pages/routing/letter/preview-large-print-letter-template-page.ts b/tests/test-team/pages/routing/letter/preview-large-print-letter-template-page.ts
index 5b025da39..8bcea6ed5 100644
--- a/tests/test-team/pages/routing/letter/preview-large-print-letter-template-page.ts
+++ b/tests/test-team/pages/routing/letter/preview-large-print-letter-template-page.ts
@@ -1,6 +1,18 @@
+import { Locator, Page } from '@playwright/test';
 import { TemplateMgmtPreviewBasePage } from 'pages/template-mgmt-preview-base-page';
 
 export class RoutingPreviewLargePrintLetterTemplatePage extends TemplateMgmtPreviewBasePage {
   static readonly pathTemplate =
     '/message-plans/choose-large-print-letter-template/:messagePlanId/preview-template/:templateId';
+
+  public readonly letterPreviewHeading: Locator;
+  public readonly letterPreviewIframe: Locator;
+
+  constructor(page: Page) {
+    super(page);
+    this.letterPreviewHeading = page.getByRole('heading', {
+      name: 'Example preview',
+    });
+    this.letterPreviewIframe = page.locator('iframe[title="Letter preview"]');
+  }
 }
diff --git a/tests/test-team/pages/routing/letter/preview-other-language-letter-template-page.ts b/tests/test-team/pages/routing/letter/preview-other-language-letter-template-page.ts
index 08028315f..66d67a2e7 100644
--- a/tests/test-team/pages/routing/letter/preview-other-language-letter-template-page.ts
+++ b/tests/test-team/pages/routing/letter/preview-other-language-letter-template-page.ts
@@ -1,6 +1,18 @@
+import { Locator, Page } from '@playwright/test';
 import { TemplateMgmtPreviewBasePage } from 'pages/template-mgmt-preview-base-page';
 
 export class RoutingPreviewOtherLanguageLetterTemplatePage extends TemplateMgmtPreviewBasePage {
   static readonly pathTemplate =
     '/message-plans/choose-other-language-letter-template/:messagePlanId/preview-template/:templateId';
+
+  public readonly letterPreviewHeading: Locator;
+  public readonly letterPreviewIframe: Locator;
+
+  constructor(page: Page) {
+    super(page);
+    this.letterPreviewHeading = page.getByRole('heading', {
+      name: 'Example preview',
+    });
+    this.letterPreviewIframe = page.locator('iframe[title="Letter preview"]');
+  }
 }
diff --git a/tests/test-team/pages/routing/letter/preview-standard-letter-page.ts b/tests/test-team/pages/routing/letter/preview-standard-letter-page.ts
index 597930cb8..d820a9677 100644
--- a/tests/test-team/pages/routing/letter/preview-standard-letter-page.ts
+++ b/tests/test-team/pages/routing/letter/preview-standard-letter-page.ts
@@ -1,6 +1,18 @@
+import { Locator, Page } from '@playwright/test';
 import { TemplateMgmtPreviewBasePage } from 'pages/template-mgmt-preview-base-page';
 
 export class RoutingPreviewStandardLetterTemplatePage extends TemplateMgmtPreviewBasePage {
   static readonly pathTemplate =
     '/message-plans/choose-standard-english-letter-template/:messagePlanId/preview-template/:templateId';
+
+  public readonly letterPreviewHeading: Locator;
+  public readonly letterPreviewIframe: Locator;
+
+  constructor(page: Page) {
+    super(page);
+    this.letterPreviewHeading = page.getByRole('heading', {
+      name: 'Example preview',
+    });
+    this.letterPreviewIframe = page.locator('iframe[title="Letter preview"]');
+  }
 }
diff --git a/tests/test-team/pages/routing/preview-message-plan-letter-template-page.ts b/tests/test-team/pages/routing/preview-message-plan-letter-template-page.ts
index 3e47c02b6..9d9c3a9f4 100644
--- a/tests/test-team/pages/routing/preview-message-plan-letter-template-page.ts
+++ b/tests/test-team/pages/routing/preview-message-plan-letter-template-page.ts
@@ -1,6 +1,18 @@
+import { Locator, Page } from '@playwright/test';
 import { TemplateMgmtPreviewBasePage } from 'pages/template-mgmt-preview-base-page';
 
 export class RoutingPreviewMessagePlanLetterTemplatePage extends TemplateMgmtPreviewBasePage {
   static readonly pathTemplate =
     '/message-plans/preview-message-plan/:messagePlanId/preview-template/:templateId';
+
+  public readonly letterPreviewHeading: Locator;
+  public readonly letterPreviewIframe: Locator;
+
+  constructor(page: Page) {
+    super(page);
+    this.letterPreviewHeading = page.getByRole('heading', {
+      name: 'Example preview',
+    });
+    this.letterPreviewIframe = page.locator('iframe[title="Letter preview"]');
+  }
 }
diff --git a/tests/test-team/pages/routing/review-and-move-to-production-letter-template-page.ts b/tests/test-team/pages/routing/review-and-move-to-production-letter-template-page.ts
index 7e7691b27..2981a6941 100644
--- a/tests/test-team/pages/routing/review-and-move-to-production-letter-template-page.ts
+++ b/tests/test-team/pages/routing/review-and-move-to-production-letter-template-page.ts
@@ -1,6 +1,18 @@
+import { Locator, Page } from '@playwright/test';
 import { TemplateMgmtPreviewBasePage } from 'pages/template-mgmt-preview-base-page';
 
 export class RoutingReviewAndMoveToProductionLetterTemplatePage extends TemplateMgmtPreviewBasePage {
   static readonly pathTemplate =
     '/message-plans/review-and-move-to-production/:messagePlanId/preview-template/:templateId';
+
+  public readonly letterPreviewHeading: Locator;
+  public readonly letterPreviewIframe: Locator;
+
+  constructor(page: Page) {
+    super(page);
+    this.letterPreviewHeading = page.getByRole('heading', {
+      name: 'Example preview',
+    });
+    this.letterPreviewIframe = page.locator('iframe[title="Letter preview"]');
+  }
 }
diff --git a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-large-print-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-large-print-letter-template.routing-component.spec.ts
index e35c187f6..f9cbf9236 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-large-print-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-large-print-letter-template.routing-component.spec.ts
@@ -206,6 +206,20 @@ test.describe('Routing - Preview large print letter template page', () => {
     await expect(previewLargePrintLetterTemplatePage.campaignId).toContainText(
       templates.AUTHORING_LARGE_PRINT_LETTER.campaignId!
     );
+
+    await expect(
+      previewLargePrintLetterTemplatePage.letterPreviewHeading
+    ).toBeVisible();
+    await expect(
+      previewLargePrintLetterTemplatePage.letterPreviewIframe
+    ).toBeVisible();
+
+    await expect(
+      previewLargePrintLetterTemplatePage.letterPreviewIframe
+    ).toHaveAttribute(
+      'src',
+      `/templates/files/${templates.AUTHORING_LARGE_PRINT_LETTER.clientId}/renders/${templates.AUTHORING_LARGE_PRINT_LETTER.id}/initial-render.pdf`
+    );
   });
 
   test.describe('redirects to invalid template page', () => {
diff --git a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-other-language-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-other-language-letter-template.routing-component.spec.ts
index acf9bb33d..693a00753 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-other-language-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-other-language-letter-template.routing-component.spec.ts
@@ -230,6 +230,20 @@ test.describe('Routing - Preview foreign language letter template page', () => {
     await expect(
       previewForeignLanguageLetterTemplatePage.campaignId
     ).toContainText(templates.AUTHORING_FRENCH_LETTER.campaignId!);
+
+    await expect(
+      previewForeignLanguageLetterTemplatePage.letterPreviewHeading
+    ).toBeVisible();
+    await expect(
+      previewForeignLanguageLetterTemplatePage.letterPreviewIframe
+    ).toBeVisible();
+
+    await expect(
+      previewForeignLanguageLetterTemplatePage.letterPreviewIframe
+    ).toHaveAttribute(
+      'src',
+      `/templates/files/${templates.AUTHORING_FRENCH_LETTER.clientId}/renders/${templates.AUTHORING_FRENCH_LETTER.id}/initial-render.pdf`
+    );
   });
 
   test.describe('redirects to invalid template page', () => {
diff --git a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-standard-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-standard-letter-template.routing-component.spec.ts
index d035bd332..33ce18fd6 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-standard-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-standard-letter-template.routing-component.spec.ts
@@ -149,6 +149,14 @@ test.describe('Routing - Preview Letter template page', () => {
     );
 
     await expect(previewLetterTemplatePage.summaryList).toBeVisible();
+
+    await expect(previewLetterTemplatePage.letterPreviewHeading).toBeVisible();
+    await expect(previewLetterTemplatePage.letterPreviewIframe).toBeVisible();
+
+    await expect(previewLetterTemplatePage.letterPreviewIframe).toHaveAttribute(
+      'src',
+      `/templates/files/${templates.AUTHORING_LETTER.clientId}/renders/${templates.AUTHORING_LETTER.id}/initial-render.pdf`
+    );
   });
 
   test.describe('redirects to invalid template page', () => {
diff --git a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts
index e17336bda..eaf223390 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts
@@ -116,6 +116,14 @@ test.describe('Routing - Preview Message Plan Letter template page', () => {
     );
 
     await expect(previewLetterTemplatePage.summaryList).toBeVisible();
+
+    await expect(previewLetterTemplatePage.letterPreviewHeading).toBeVisible();
+    await expect(previewLetterTemplatePage.letterPreviewIframe).toBeVisible();
+
+    await expect(previewLetterTemplatePage.letterPreviewIframe).toHaveAttribute(
+      'src',
+      `/templates/files/${templates.AUTHORING_LETTER.clientId}/renders/${templates.AUTHORING_LETTER.id}/initial-render.pdf`
+    );
   });
 
   test.describe('redirects to invalid template page', () => {
diff --git a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts
index abf5d44ca..e740980be 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts
@@ -116,6 +116,14 @@ test.describe('Routing - Review and Move to Production Letter template page', ()
     );
 
     await expect(previewLetterTemplatePage.summaryList).toBeVisible();
+
+    await expect(previewLetterTemplatePage.letterPreviewHeading).toBeVisible();
+    await expect(previewLetterTemplatePage.letterPreviewIframe).toBeVisible();
+
+    await expect(previewLetterTemplatePage.letterPreviewIframe).toHaveAttribute(
+      'src',
+      `/templates/files/${templates.AUTHORING_LETTER.clientId}/renders/${templates.AUTHORING_LETTER.id}/initial-render.pdf`
+    );
   });
 
   test.describe('redirects to invalid template page', () => {

From 45ab3136655629eceffff5d0117c1cee66d819a6 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Thu, 2 Apr 2026 14:38:40 +0100
Subject: [PATCH 29/57] test titles

---
 .../molecules/SummaryPreviewLetter.test.tsx   |  12 +-
 .../SummaryPreviewLetter.test.tsx.snap        | 224 +++++++++---------
 2 files changed, 118 insertions(+), 118 deletions(-)

diff --git a/frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx b/frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx
index ea4092339..d750a9537 100644
--- a/frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx
+++ b/frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx
@@ -35,7 +35,7 @@ describe('SummaryPreviewLetter', () => {
     jest.resetAllMocks();
   });
 
-  it('should redirect to redirectUrl when lockNumber is invalid', async () => {
+  it('should redirect when lockNumber is invalid', async () => {
     await SummaryPreviewLetter({
       ...defaultProps,
       searchParams: Promise.resolve({ lockNumber: 'invalid' }),
@@ -45,7 +45,7 @@ describe('SummaryPreviewLetter', () => {
     expect(redirectMock).toHaveBeenCalledWith('/custom-redirect', 'replace');
   });
 
-  it('should redirect to redirectUrl when lockNumber is missing', async () => {
+  it('should redirect when lockNumber is missing', async () => {
     await SummaryPreviewLetter({
       ...defaultProps,
       searchParams: Promise.resolve({}),
@@ -54,7 +54,7 @@ describe('SummaryPreviewLetter', () => {
     expect(redirectMock).toHaveBeenCalledWith(defaultRedirectUrl, 'replace');
   });
 
-  it('should not redirect when redirectUrl is not provided and lockNumber is missing', async () => {
+  it('should skip lockNumber validation when redirectUrl is not provided', async () => {
     getTemplateMock.mockResolvedValueOnce(PDF_LETTER_TEMPLATE);
 
     const page = await SummaryPreviewLetter({
@@ -93,7 +93,7 @@ describe('SummaryPreviewLetter', () => {
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
   });
 
-  it('renders a PDF letter template preview without letterVariant', async () => {
+  it('renders a PDF letter template preview', async () => {
     getTemplateMock.mockResolvedValueOnce({
       ...PDF_LETTER_TEMPLATE,
       templateStatus: 'SUBMITTED',
@@ -114,7 +114,7 @@ describe('SummaryPreviewLetter', () => {
     expect(container.asFragment()).toMatchSnapshot();
   });
 
-  it('renders an authoring letter template preview with letterVariant', async () => {
+  it('renders an authoring letter template preview', async () => {
     const letterVariant = makeLetterVariant();
 
     getTemplateMock.mockResolvedValueOnce({
@@ -138,7 +138,7 @@ describe('SummaryPreviewLetter', () => {
     expect(container.asFragment()).toMatchSnapshot();
   });
 
-  it('passes hideBackLinks to PreviewTemplateFromMessagePlan', async () => {
+  it('renders without back links when hideBackLinks is true', async () => {
     getTemplateMock.mockResolvedValueOnce({
       ...PDF_LETTER_TEMPLATE,
       templateStatus: 'SUBMITTED',
diff --git a/frontend/src/__tests__/components/molecules/__snapshots__/SummaryPreviewLetter.test.tsx.snap b/frontend/src/__tests__/components/molecules/__snapshots__/SummaryPreviewLetter.test.tsx.snap
index 49a85a8f5..7cc3fe4ca 100644
--- a/frontend/src/__tests__/components/molecules/__snapshots__/SummaryPreviewLetter.test.tsx.snap
+++ b/frontend/src/__tests__/components/molecules/__snapshots__/SummaryPreviewLetter.test.tsx.snap
@@ -1,116 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`SummaryPreviewLetter passes hideBackLinks to PreviewTemplateFromMessagePlan 1`] = `
-<DocumentFragment>
-  <div
-    class="nhsuk-width-container"
-  >
-    <main
-      class="nhsuk-main-wrapper"
-      id="maincontent"
-      role="main"
-    >
-      <div
-        class="nhsuk-grid-row"
-      >
-        <div
-          class="nhsuk-grid-column-full"
-        >
-          <div
-            class="nhsuk-u-reading-width"
-          >
-            <span
-              class="nhsuk-caption-l"
-            >
-              Template
-            </span>
-            <h1
-              data-testid="preview-message__heading"
-            >
-              letter template name
-            </h1>
-          </div>
-          <div
-            class="nhsuk-width-container nhsuk-u-margin-bottom-6 nhsuk-body-m"
-          >
-            <dl
-              class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview"
-            >
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Template ID
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value monospace-font"
-                  data-testid="preview-template-id"
-                >
-                  letter-template-id
-                </dd>
-              </div>
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Template type
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value"
-                >
-                  Standard letter
-                </dd>
-              </div>
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Template file
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value"
-                >
-                  <div
-                    class="container"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="icon"
-                      fill="none"
-                      height="26"
-                      viewBox="0 0 20 26"
-                      width="20"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M0 0V26H20V6.59375L19.7188 6.28125L13.7188 0.28125L13.4062 0H0ZM2 2H12V8H18V24H2V2ZM14 3.4375L16.5625 6H14V3.4375Z"
-                        fill="#4C6272"
-                      />
-                    </svg>
-                    <p
-                      class="text"
-                    >
-                      template.pdf
-                    </p>
-                  </div>
-                </dd>
-              </div>
-            </dl>
-          </div>
-        </div>
-      </div>
-    </main>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`SummaryPreviewLetter renders a PDF letter template preview without letterVariant 1`] = `
+exports[`SummaryPreviewLetter renders a PDF letter template preview 1`] = `
 <DocumentFragment>
   <div
     class="nhsuk-width-container"
@@ -234,7 +124,7 @@ exports[`SummaryPreviewLetter renders a PDF letter template preview without lett
 </DocumentFragment>
 `;
 
-exports[`SummaryPreviewLetter renders an authoring letter template preview with letterVariant 1`] = `
+exports[`SummaryPreviewLetter renders an authoring letter template preview 1`] = `
 <DocumentFragment>
   <div
     class="nhsuk-width-container"
@@ -422,3 +312,113 @@ exports[`SummaryPreviewLetter renders an authoring letter template preview with
   </div>
 </DocumentFragment>
 `;
+
+exports[`SummaryPreviewLetter renders without back links when hideBackLinks is true 1`] = `
+<DocumentFragment>
+  <div
+    class="nhsuk-width-container"
+  >
+    <main
+      class="nhsuk-main-wrapper"
+      id="maincontent"
+      role="main"
+    >
+      <div
+        class="nhsuk-grid-row"
+      >
+        <div
+          class="nhsuk-grid-column-full"
+        >
+          <div
+            class="nhsuk-u-reading-width"
+          >
+            <span
+              class="nhsuk-caption-l"
+            >
+              Template
+            </span>
+            <h1
+              data-testid="preview-message__heading"
+            >
+              letter template name
+            </h1>
+          </div>
+          <div
+            class="nhsuk-width-container nhsuk-u-margin-bottom-6 nhsuk-body-m"
+          >
+            <dl
+              class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview"
+            >
+              <div
+                class="nhsuk-summary-list__row"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Template ID
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value monospace-font"
+                  data-testid="preview-template-id"
+                >
+                  letter-template-id
+                </dd>
+              </div>
+              <div
+                class="nhsuk-summary-list__row"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Template type
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value"
+                >
+                  Standard letter
+                </dd>
+              </div>
+              <div
+                class="nhsuk-summary-list__row"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Template file
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value"
+                >
+                  <div
+                    class="container"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="icon"
+                      fill="none"
+                      height="26"
+                      viewBox="0 0 20 26"
+                      width="20"
+                      xmlns="http://www.w3.org/2000/svg"
+                    >
+                      <path
+                        d="M0 0V26H20V6.59375L19.7188 6.28125L13.7188 0.28125L13.4062 0H0ZM2 2H12V8H18V24H2V2ZM14 3.4375L16.5625 6H14V3.4375Z"
+                        fill="#4C6272"
+                      />
+                    </svg>
+                    <p
+                      class="text"
+                    >
+                      template.pdf
+                    </p>
+                  </div>
+                </dd>
+              </div>
+            </dl>
+          </div>
+        </div>
+      </div>
+    </main>
+  </div>
+</DocumentFragment>
+`;

From 7163dc9c41dd4f0c54100e7ac73c2d340914b173 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Thu, 2 Apr 2026 14:45:34 +0100
Subject: [PATCH 30/57] add renders to fixtures

---
 .../preview-message-plan.routing-component.spec.ts   | 12 ++++++++++--
 ...-and-move-to-production.routing-component.spec.ts | 12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
index eea1d9fc5..2419497b5 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
@@ -87,14 +87,22 @@ function createTemplates(user: TestUser) {
       templateIds.AUTHORING_LETTER,
       user,
       `Test Authoring Letter template - ${templateIds.AUTHORING_LETTER}`,
-      'SUBMITTED'
+      'SUBMITTED',
+      {
+        longFormRender: { status: 'RENDERED' },
+        shortFormRender: { status: 'RENDERED' },
+      }
     ),
     AUTHORING_LARGE_PRINT_LETTER: TemplateFactory.createAuthoringLetterTemplate(
       templateIds.AUTHORING_LARGE_PRINT_LETTER,
       user,
       `Test Authoring Large Print Letter template - ${templateIds.AUTHORING_LARGE_PRINT_LETTER}`,
       'SUBMITTED',
-      { letterType: 'x1' }
+      {
+        letterType: 'x1',
+        longFormRender: { status: 'RENDERED' },
+        shortFormRender: { status: 'RENDERED' },
+      }
     ),
   };
 }
diff --git a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
index 09be5ce02..d4e670e77 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
@@ -86,14 +86,22 @@ function createTemplates(user: TestUser) {
       templateIds.AUTHORING_LETTER,
       user,
       `Test Authoring Letter template - ${templateIds.AUTHORING_LETTER}`,
-      'SUBMITTED'
+      'SUBMITTED',
+      {
+        longFormRender: { status: 'RENDERED' },
+        shortFormRender: { status: 'RENDERED' },
+      }
     ),
     AUTHORING_LARGE_PRINT_LETTER: TemplateFactory.createAuthoringLetterTemplate(
       templateIds.AUTHORING_LARGE_PRINT_LETTER,
       user,
       `Test Authoring Large Print Letter template - ${templateIds.AUTHORING_LARGE_PRINT_LETTER}`,
       'SUBMITTED',
-      { letterType: 'x1' }
+      {
+        letterType: 'x1',
+        longFormRender: { status: 'RENDERED' },
+        shortFormRender: { status: 'RENDERED' },
+      }
     ),
   };
 }

From f74db4fe5ce7d988f5c24d039d466812492c50e7 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Tue, 7 Apr 2026 07:20:05 +0100
Subject: [PATCH 31/57] hide learn more

---
 ...eviewTemplateFromMessagePlan.test.tsx.snap | 19 +++----------------
 .../PreviewTemplateDetails/common.tsx         |  2 ++
 .../PreviewTemplateFromMessagePlan.tsx        |  1 +
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/frontend/src/__tests__/components/molecules/__snapshots__/PreviewTemplateFromMessagePlan.test.tsx.snap b/frontend/src/__tests__/components/molecules/__snapshots__/PreviewTemplateFromMessagePlan.test.tsx.snap
index ee69f8628..7a17f7f79 100644
--- a/frontend/src/__tests__/components/molecules/__snapshots__/PreviewTemplateFromMessagePlan.test.tsx.snap
+++ b/frontend/src/__tests__/components/molecules/__snapshots__/PreviewTemplateFromMessagePlan.test.tsx.snap
@@ -123,22 +123,9 @@ exports[`PreviewTemplateFromMessagePlan renders Authoring Letter template previe
                 1
               </dd>
               <dd
-                class="nhsuk-summary-list__actions nhsuk-u-padding-right-4"
-              >
-                <a
-                  data-testid="sheets-action"
-                  href="https://notify.nhs.uk/pricing-and-commercial/letters"
-                  rel="noopener noreferrer"
-                  target="_blank"
-                >
-                  Learn more
-                  <span
-                    class="nhsuk-u-visually-hidden"
-                  >
-                     about sheets
-                  </span>
-                </a>
-              </dd>
+                aria-hidden="true"
+                class="nhsuk-summary-list__actions"
+              />
             </div>
             <div
               class="nhsuk-summary-list__row missing-value"
diff --git a/frontend/src/components/molecules/PreviewTemplateDetails/common.tsx b/frontend/src/components/molecules/PreviewTemplateDetails/common.tsx
index cf6155117..a68ae7cb2 100644
--- a/frontend/src/components/molecules/PreviewTemplateDetails/common.tsx
+++ b/frontend/src/components/molecules/PreviewTemplateDetails/common.tsx
@@ -22,11 +22,13 @@ export type PreviewTemplateComponent<T extends TemplateDto> = ({
   template,
   hideStatus,
   hideEditActions,
+  hideLearnMore,
   letterVariant,
 }: {
   template: T;
   hideStatus?: boolean;
   hideEditActions?: boolean;
+  hideLearnMore?: boolean;
   letterVariant?: LetterVariant;
 }) => JSX.Element;
 
diff --git a/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx b/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx
index a3dc3971c..f40c5acb5 100644
--- a/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx
+++ b/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx
@@ -73,6 +73,7 @@ export function PreviewTemplateFromMessagePlan<T extends TemplateDto>({
               letterVariant,
               hideStatus: true,
               hideEditActions: true,
+              hideLearnMore: true,
             })}
             {backLinkHref && (
               <Link

From a72095c20af2cf611459670c5941622ca6cbb7f6 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Tue, 7 Apr 2026 07:36:42 +0100
Subject: [PATCH 32/57] fix passing learn more prop

---
 .../SummaryPreviewLetter.test.tsx.snap        | 19 +++----------------
 .../PreviewTemplateDetailsLetter.tsx          |  3 +++
 ...ve-to-production.routing-component.spec.ts |  2 +-
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/frontend/src/__tests__/components/molecules/__snapshots__/SummaryPreviewLetter.test.tsx.snap b/frontend/src/__tests__/components/molecules/__snapshots__/SummaryPreviewLetter.test.tsx.snap
index 7cc3fe4ca..5dd575cfe 100644
--- a/frontend/src/__tests__/components/molecules/__snapshots__/SummaryPreviewLetter.test.tsx.snap
+++ b/frontend/src/__tests__/components/molecules/__snapshots__/SummaryPreviewLetter.test.tsx.snap
@@ -250,22 +250,9 @@ exports[`SummaryPreviewLetter renders an authoring letter template preview 1`] =
                   1
                 </dd>
                 <dd
-                  class="nhsuk-summary-list__actions nhsuk-u-padding-right-4"
-                >
-                  <a
-                    data-testid="sheets-action"
-                    href="https://notify.nhs.uk/pricing-and-commercial/letters"
-                    rel="noopener noreferrer"
-                    target="_blank"
-                  >
-                    Learn more
-                    <span
-                      class="nhsuk-u-visually-hidden"
-                    >
-                       about sheets
-                    </span>
-                  </a>
-                </dd>
+                  aria-hidden="true"
+                  class="nhsuk-summary-list__actions"
+                />
               </div>
               <div
                 class="nhsuk-summary-list__row"
diff --git a/frontend/src/components/molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter.tsx b/frontend/src/components/molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter.tsx
index 12c52929b..3f43b5172 100644
--- a/frontend/src/components/molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter.tsx
+++ b/frontend/src/components/molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter.tsx
@@ -12,11 +12,13 @@ export default function PreviewTemplateDetailsLetter({
   letterVariant,
   hideStatus,
   hideEditActions,
+  hideLearnMore,
 }: {
   template: LetterTemplate;
   letterVariant?: LetterVariant;
   hideStatus?: boolean;
   hideEditActions?: boolean;
+  hideLearnMore?: boolean;
 }) {
   if (template.letterVersion === 'PDF') {
     return (
@@ -41,6 +43,7 @@ export default function PreviewTemplateDetailsLetter({
         letterVariant={letterVariant}
         hideStatus={hideStatus}
         hideEditActions={hideEditActions}
+        hideLearnMore={hideLearnMore}
       />
       <h2 className='nhsuk-heading-m'>Example preview</h2>
       <LetterRenderIframe
diff --git a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
index d4e670e77..94d729510 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
@@ -331,7 +331,7 @@ test.describe('Routing - Review and Move to Production page', () => {
     });
   });
 
-  test('displays AUTHORING letter template links pointing to in-flow preview', async ({
+  test('displays AUTHORING letter template links pointing to summary preview', async ({
     page,
   }) => {
     const { dbEntry } = RoutingConfigFactory.createWithChannels(

From c9502b16659bfd521741e0eaa2fd775bb77c4fbb Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Tue, 7 Apr 2026 07:51:39 +0100
Subject: [PATCH 33/57] ignore non-ip addr

---
 .gitleaksignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitleaksignore b/.gitleaksignore
index 76fe6a1c9..9a6ce6704 100644
--- a/.gitleaksignore
+++ b/.gitleaksignore
@@ -8,3 +8,4 @@ b19d88d1d92b0530f065feefcf25d8cdd82a876a:tests/test-team/auth/user.json:jwt:25
 bc79df4f82052918ae6bf69d36279e5dd391d61e:tests/test-team/auth/user.json:jwt:15
 bc79df4f82052918ae6bf69d36279e5dd391d61e:tests/test-team/auth/user.json:jwt:25
 306d9ec55d3498b86d5506da9a90ac486fc66563:frontend/src/components/molecules/MessagePlanFallbackConditions/MessagePlanFallbackConditions.tsx:ipv4:92
+a408293ecbc3a95684246fd16b111b6e09d6e194:lambdas/backend-client/src/__tests__/schemas/contact-details/email.test.ts:ipv4:80

From 4b52ede539452756f30d0e499293720ebe1ad7ce Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Tue, 7 Apr 2026 08:14:16 +0100
Subject: [PATCH 34/57] ignore non-ip addr

---
 .gitleaksignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitleaksignore b/.gitleaksignore
index 9a6ce6704..196f6cb44 100644
--- a/.gitleaksignore
+++ b/.gitleaksignore
@@ -9,3 +9,4 @@ bc79df4f82052918ae6bf69d36279e5dd391d61e:tests/test-team/auth/user.json:jwt:15
 bc79df4f82052918ae6bf69d36279e5dd391d61e:tests/test-team/auth/user.json:jwt:25
 306d9ec55d3498b86d5506da9a90ac486fc66563:frontend/src/components/molecules/MessagePlanFallbackConditions/MessagePlanFallbackConditions.tsx:ipv4:92
 a408293ecbc3a95684246fd16b111b6e09d6e194:lambdas/backend-client/src/__tests__/schemas/contact-details/email.test.ts:ipv4:80
+a408293ecbc3a95684246fd16b111b6e09d6e194:lambdas/backend-client/src/__tests__/schemas/contact-details/email.test.ts:ipv4:81

From 09cf582e470eb9c917ee3ebd87814fc57410a090 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Tue, 7 Apr 2026 12:31:10 +0100
Subject: [PATCH 35/57] add open in new page attr assertions

---
 .../preview-message-plan.routing-component.spec.ts   | 12 ++++++++++++
 ...-and-move-to-production.routing-component.spec.ts | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
index 2419497b5..a6ad6544f 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
@@ -306,6 +306,10 @@ test.describe('Routing - Preview Message Plan page', () => {
         `/templates/preview-submitted-letter-template/${templates.LETTER.id}`
       );
 
+      await expect(
+        templateBlock.defaultTemplateCard.templateLink
+      ).toHaveAttribute('target', '_blank');
+
       await expect(
         templateBlock.getAccessibilityFormatCard('x1').templateLink
       ).toHaveText(templates.LARGE_PRINT_LETTER.name);
@@ -383,6 +387,10 @@ test.describe('Routing - Preview Message Plan page', () => {
       `/templates/message-plans/preview-message-plan/${dbEntry.id}/preview-template/${templates.AUTHORING_LETTER.id}`
     );
 
+    await expect(
+      templateBlock.defaultTemplateCard.templateLink
+    ).toHaveAttribute('target', '_blank');
+
     await expect(
       templateBlock.getAccessibilityFormatCard('x1').templateLink
     ).toHaveText(templates.AUTHORING_LARGE_PRINT_LETTER.name);
@@ -393,6 +401,10 @@ test.describe('Routing - Preview Message Plan page', () => {
       'href',
       `/templates/message-plans/preview-message-plan/${dbEntry.id}/preview-template/${templates.AUTHORING_LARGE_PRINT_LETTER.id}`
     );
+
+    await expect(
+      templateBlock.getAccessibilityFormatCard('x1').templateLink
+    ).toHaveAttribute('target', '_blank');
   });
 
   test('letter only with no conditional templates', async ({ page }) => {
diff --git a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
index 94d729510..cd9407d7c 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
@@ -304,6 +304,10 @@ test.describe('Routing - Review and Move to Production page', () => {
         `/templates/preview-submitted-letter-template/${templates.LETTER.id}`
       );
 
+      await expect(
+        templateBlock.defaultTemplateCard.templateLink
+      ).toHaveAttribute('target', '_blank');
+
       await expect(
         templateBlock.getAccessibilityFormatCard('x1').templateLink
       ).toHaveText(templates.LARGE_PRINT_LETTER.name);
@@ -369,6 +373,10 @@ test.describe('Routing - Review and Move to Production page', () => {
       `/templates/message-plans/review-and-move-to-production/${dbEntry.id}/preview-template/${templates.AUTHORING_LETTER.id}`
     );
 
+    await expect(
+      templateBlock.defaultTemplateCard.templateLink
+    ).toHaveAttribute('target', '_blank');
+
     await expect(
       templateBlock.getAccessibilityFormatCard('x1').templateLink
     ).toHaveText(templates.AUTHORING_LARGE_PRINT_LETTER.name);
@@ -379,6 +387,10 @@ test.describe('Routing - Review and Move to Production page', () => {
       'href',
       `/templates/message-plans/review-and-move-to-production/${dbEntry.id}/preview-template/${templates.AUTHORING_LARGE_PRINT_LETTER.id}`
     );
+
+    await expect(
+      templateBlock.getAccessibilityFormatCard('x1').templateLink
+    ).toHaveAttribute('target', '_blank');
   });
 
   test('keep in draft button navigates to the edit message plan page', async ({

From 84a134868991a51a9bbd3847cb75d3183a1daefd Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Tue, 7 Apr 2026 14:29:22 +0100
Subject: [PATCH 36/57] fix links for other language and accessible

---
 .../__snapshots__/page.test.tsx.snap          | 41 +++++++++++--------
 .../preview-message-plan/page.test.tsx        | 13 +++++-
 .../__snapshots__/page.test.tsx.snap          | 41 +++++++++++--------
 .../MessagePlanCascadePreview.tsx             | 23 ++++++-----
 4 files changed, 72 insertions(+), 46 deletions(-)

diff --git a/frontend/src/__tests__/app/message-plans/preview-message-plan/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/preview-message-plan/__snapshots__/page.test.tsx.snap
index 64d68002b..a3853802e 100644
--- a/frontend/src/__tests__/app/message-plans/preview-message-plan/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/message-plans/preview-message-plan/__snapshots__/page.test.tsx.snap
@@ -722,12 +722,15 @@ exports[`full cascade plan matches snapshot 1`] = `
                       <p
                         data-testid="template-name"
                       >
-                        <a
-                          href="/preview-submitted-letter-template/72ebc15c-d950-4e2e-99d4-3de7f174fba6"
-                        >
-                          letter template name
-                        </a>
+                        letter template name
                       </p>
+                      <a
+                        href="/preview-submitted-letter-template/72ebc15c-d950-4e2e-99d4-3de7f174fba6"
+                        rel="noopener noreferrer"
+                        target="_blank"
+                      >
+                        Preview template (opens in a new tab)
+                      </a>
                     </div>
                   </div>
                 </li>
@@ -748,25 +751,29 @@ exports[`full cascade plan matches snapshot 1`] = `
                         Other language letters (optional)
                       </h3>
                       <p
-                        class="nhsuk-u-margin-bottom-0"
                         data-testid="template-name"
                       >
-                        <a
-                          href="/preview-submitted-letter-template/31399023-08a2-4dc7-81c7-e25b284b2aab"
-                        >
-                          letter template name
-                        </a>
+                        letter template name
                       </p>
+                      <a
+                        href="/preview-submitted-letter-template/31399023-08a2-4dc7-81c7-e25b284b2aab"
+                        rel="noopener noreferrer"
+                        target="_blank"
+                      >
+                        Preview template (opens in a new tab)
+                      </a>
                       <p
-                        class="nhsuk-u-margin-bottom-0"
                         data-testid="template-name"
                       >
-                        <a
-                          href="/preview-submitted-letter-template/35746144-cac4-4e1f-b92b-4f58e9f1154f"
-                        >
-                          letter template name
-                        </a>
+                        letter template name
                       </p>
+                      <a
+                        href="/preview-submitted-letter-template/35746144-cac4-4e1f-b92b-4f58e9f1154f"
+                        rel="noopener noreferrer"
+                        target="_blank"
+                      >
+                        Preview template (opens in a new tab)
+                      </a>
                     </div>
                   </div>
                 </li>
diff --git a/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx b/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx
index c5ed4ddc7..bf95e37be 100644
--- a/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx
@@ -418,9 +418,13 @@ describe('letter only', () => {
       within(conditionalTemplatesList).getByTestId('conditional-template-x1')
     ).getByTestId('channel-card');
 
+    const name = within(largePrintCard).getByTestId('template-name');
+
+    expect(name).toHaveTextContent(template.name);
+
     const link = within(largePrintCard).getByRole('link');
 
-    expect(link).toHaveTextContent(template.name);
+    expect(link).toHaveTextContent('Preview template (opens in a new tab)');
 
     expect(link).toHaveAttribute(
       'href',
@@ -465,8 +469,10 @@ describe('letter only', () => {
     ).getByTestId('channel-card');
 
     const links = within(languagesCard).getAllByRole('link');
+    const names = within(languagesCard).getAllByTestId('template-name');
 
     expect(links).toHaveLength(2);
+    expect(names).toHaveLength(2);
 
     for (const [
       index,
@@ -474,7 +480,10 @@ describe('letter only', () => {
     ] of routingConfig.cascade[0].conditionalTemplates!.entries()) {
       const template = templates[templateId!];
 
-      expect(links[index]).toHaveTextContent(template.name);
+      expect(names[index]).toHaveTextContent(template.name);
+      expect(links[index]).toHaveTextContent(
+        'Preview template (opens in a new tab)'
+      );
 
       expect(links[index]).toHaveAttribute(
         'href',
diff --git a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/__snapshots__/page.test.tsx.snap
index 05e9f902c..de1ea0d03 100644
--- a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/__snapshots__/page.test.tsx.snap
@@ -673,12 +673,15 @@ exports[`Review and move to production page matches snapshot for full cascade 1`
                       <p
                         data-testid="template-name"
                       >
-                        <a
-                          href="/preview-submitted-letter-template/72ebc15c-d950-4e2e-99d4-3de7f174fba6"
-                        >
-                          letter template name
-                        </a>
+                        letter template name
                       </p>
+                      <a
+                        href="/preview-submitted-letter-template/72ebc15c-d950-4e2e-99d4-3de7f174fba6"
+                        rel="noopener noreferrer"
+                        target="_blank"
+                      >
+                        Preview template (opens in a new tab)
+                      </a>
                     </div>
                   </div>
                 </li>
@@ -699,25 +702,29 @@ exports[`Review and move to production page matches snapshot for full cascade 1`
                         Other language letters (optional)
                       </h3>
                       <p
-                        class="nhsuk-u-margin-bottom-0"
                         data-testid="template-name"
                       >
-                        <a
-                          href="/preview-letter-template/31399023-08a2-4dc7-81c7-e25b284b2aab"
-                        >
-                          letter template name
-                        </a>
+                        letter template name
                       </p>
+                      <a
+                        href="/preview-letter-template/31399023-08a2-4dc7-81c7-e25b284b2aab"
+                        rel="noopener noreferrer"
+                        target="_blank"
+                      >
+                        Preview template (opens in a new tab)
+                      </a>
                       <p
-                        class="nhsuk-u-margin-bottom-0"
                         data-testid="template-name"
                       >
-                        <a
-                          href="/preview-letter-template/35746144-cac4-4e1f-b92b-4f58e9f1154f"
-                        >
-                          letter template name
-                        </a>
+                        letter template name
                       </p>
+                      <a
+                        href="/preview-letter-template/35746144-cac4-4e1f-b92b-4f58e9f1154f"
+                        rel="noopener noreferrer"
+                        target="_blank"
+                      >
+                        Preview template (opens in a new tab)
+                      </a>
                     </div>
                   </div>
                 </li>
diff --git a/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx b/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx
index 6cb1fb2d5..8463d2acd 100644
--- a/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx
+++ b/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx
@@ -182,16 +182,19 @@ export function MessagePlanCascadePreview({
                           )}
                           data-testid='channel-card'
                         >
-                          <p data-testid='template-name'>
+                          <>
+                            <p data-testid='template-name'>{template.name}</p>
                             <Link
                               href={getLetterTemplatePreviewHref(
                                 template,
                                 letterPreviewHrefBase
                               )}
+                              target='_blank'
+                              rel='noopener noreferrer'
                             >
-                              {template.name}
+                              {pageContent.letterTemplateLinkText}
                             </Link>
-                          </p>
+                          </>
                         </MessagePlanChannelCard>
                       </MessagePlanConditionalTemplatesListItem>
                     ))}
@@ -203,20 +206,20 @@ export function MessagePlanCascadePreview({
                           data-testid='channel-card'
                         >
                           {languageTemplates.map((template) => (
-                            <p
-                              data-testid='template-name'
-                              key={template.id}
-                              className='nhsuk-u-margin-bottom-0'
-                            >
+                            <>
+                              <p data-testid='template-name'>{template.name}</p>
                               <Link
                                 href={getLetterTemplatePreviewHref(
                                   template,
                                   letterPreviewHrefBase
                                 )}
+                                target='_blank'
+                                rel='noopener noreferrer'
+                                // className='nhsuk-u-margin-bottom-0'
                               >
-                                {template.name}
+                                {pageContent.letterTemplateLinkText}
                               </Link>
-                            </p>
+                            </>
                           ))}
                         </MessagePlanChannelCard>
                       </MessagePlanConditionalTemplatesListItem>

From 37547f82052ae2acbdf75df0cfc1d50ea9d9c589 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Tue, 7 Apr 2026 15:46:45 +0100
Subject: [PATCH 37/57] add missing unit tests

---
 .../__snapshots__/page.test.tsx.snap          |  4 +-
 .../page.test.tsx                             | 42 ++++++++++++++++++-
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/__snapshots__/page.test.tsx.snap
index de1ea0d03..d3186996b 100644
--- a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/__snapshots__/page.test.tsx.snap
@@ -673,10 +673,10 @@ exports[`Review and move to production page matches snapshot for full cascade 1`
                       <p
                         data-testid="template-name"
                       >
-                        letter template name
+                        authoring letter template name
                       </p>
                       <a
-                        href="/preview-submitted-letter-template/72ebc15c-d950-4e2e-99d4-3de7f174fba6"
+                        href="/message-plans/review-and-move-to-production/rc-123/preview-template/770ed5da-765d-431c-b4b4-4068d11ffed1"
                         rel="noopener noreferrer"
                         target="_blank"
                       >
diff --git a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/page.test.tsx b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/page.test.tsx
index 6c534e105..2d6bf2b02 100644
--- a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/page.test.tsx
@@ -9,6 +9,7 @@ import {
   PDF_LETTER_TEMPLATE,
   NHS_APP_TEMPLATE,
   SMS_TEMPLATE,
+  AUTHORING_LETTER_TEMPLATE,
 } from '@testhelpers/helpers';
 import { RoutingConfigFactory } from '@testhelpers/routing-config-factory';
 import {
@@ -59,6 +60,7 @@ const letterTemplateId = '278e1a92-353f-42a3-b08d-565ea1c9d763';
 const kuTemplateId = '31399023-08a2-4dc7-81c7-e25b284b2aab';
 const sqTemplateId = '35746144-cac4-4e1f-b92b-4f58e9f1154f';
 const largePrintTemplateId = '72ebc15c-d950-4e2e-99d4-3de7f174fba6';
+const authoringLetterTemplateId = '770ed5da-765d-431c-b4b4-4068d11ffed1';
 
 const templates: MessagePlanTemplates = {
   [appTemplateId]: { ...NHS_APP_TEMPLATE, id: appTemplateId },
@@ -72,6 +74,11 @@ const templates: MessagePlanTemplates = {
     id: largePrintTemplateId,
     templateStatus: 'SUBMITTED',
   },
+  [authoringLetterTemplateId]: {
+    ...AUTHORING_LETTER_TEMPLATE,
+    id: authoringLetterTemplateId,
+    templateStatus: 'PROOF_APPROVED',
+  },
 };
 
 beforeEach(() => {
@@ -305,7 +312,7 @@ describe('Review and move to production page', () => {
       ).toBeInTheDocument();
     });
 
-    it('renders letter template as link', async () => {
+    it('renders PDF letter template as link', async () => {
       const routingConfig = createRoutingConfig({
         cascade: [
           {
@@ -330,6 +337,37 @@ describe('Review and move to production page', () => {
         'href',
         `/preview-letter-template/${letterTemplateId}`
       );
+      expect(link).toHaveAttribute('target', '_blank');
+    });
+
+    it('renders AUTHORING letter template as link', async () => {
+      const routingConfig = createRoutingConfig({
+        cascade: [
+          {
+            channel: 'LETTER',
+            channelType: 'primary',
+            defaultTemplateId: authoringLetterTemplateId,
+            cascadeGroups: ['standard'],
+          },
+        ],
+      });
+
+      await renderPage(routingConfig);
+
+      const block = screen.getByTestId('message-plan-block-LETTER');
+      const templateName = within(block).getByTestId('template-name');
+
+      expect(templateName).toHaveTextContent(
+        templates[authoringLetterTemplateId].name
+      );
+
+      const link = within(block).getByRole('link');
+      expect(link).toHaveTextContent('Preview template (opens in a new tab)');
+      expect(link).toHaveAttribute(
+        'href',
+        `/message-plans/review-and-move-to-production/${routingConfig.id}/preview-template/${authoringLetterTemplateId}`
+      );
+      expect(link).toHaveAttribute('target', '_blank');
     });
 
     it('renders fallback conditions between channels', async () => {
@@ -453,7 +491,7 @@ describe('Review and move to production page', () => {
           conditionalTemplates: [
             { templateId: kuTemplateId, language: 'ku' },
             { templateId: sqTemplateId, language: 'sq' },
-            { templateId: largePrintTemplateId, accessibleFormat: 'x1' },
+            { templateId: authoringLetterTemplateId, accessibleFormat: 'x1' },
           ],
         },
       ],

From 5346b71d90d51c3b3b042682f9743a62fd697187 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Tue, 7 Apr 2026 16:25:23 +0100
Subject: [PATCH 38/57] fix post merge

---
 .../__snapshots__/page.test.tsx.snap          | 177 ------------------
 .../preview-template/page.test.tsx            |  94 +++-------
 .../__snapshots__/page.test.tsx.snap          |  35 +++-
 .../preview-message-plan/page.test.tsx        |  65 ++++++-
 .../__snapshots__/page.test.tsx.snap          |  33 ++++
 .../preview-template/[templateId]/page.tsx    |  41 +---
 .../MessagePlanCascadePreview.tsx             |   2 +-
 7 files changed, 158 insertions(+), 289 deletions(-)
 delete mode 100644 frontend/src/__tests__/app/message-plans/choose-british-sign-language-letter-template/preview-template/__snapshots__/page.test.tsx.snap

diff --git a/frontend/src/__tests__/app/message-plans/choose-british-sign-language-letter-template/preview-template/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/choose-british-sign-language-letter-template/preview-template/__snapshots__/page.test.tsx.snap
deleted file mode 100644
index e06f57ef0..000000000
--- a/frontend/src/__tests__/app/message-plans/choose-british-sign-language-letter-template/preview-template/__snapshots__/page.test.tsx.snap
+++ /dev/null
@@ -1,177 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`PreviewBritishSignLanguageLetterTemplateFromMessagePlan page renders British Sign Language letter template preview 1`] = `
-<DocumentFragment>
-  <div
-    class="nhsuk-width-container"
-  >
-    <a
-      class="nhsuk-back-link"
-      data-testid="back-link-top"
-      href="/message-plans/choose-british-sign-language-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=5"
-    >
-      Go back
-    </a>
-    <main
-      class="nhsuk-main-wrapper"
-      id="maincontent"
-      role="main"
-    >
-      <div
-        class="nhsuk-grid-row"
-      >
-        <div
-          class="nhsuk-grid-column-full"
-        >
-          <div
-            class="nhsuk-u-reading-width"
-          >
-            <span
-              class="nhsuk-caption-l"
-            >
-              Template
-            </span>
-            <h1
-              data-testid="preview-message__heading"
-            >
-              British Sign Language letter template name
-            </h1>
-          </div>
-          <div
-            class="nhsuk-width-container nhsuk-u-margin-bottom-6 nhsuk-body-m"
-          >
-            <dl
-              class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview authoringLetterDetails"
-            >
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Template ID
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value monospace-font"
-                  data-testid="preview-template-id"
-                >
-                  bsl-letter-template-id
-                </dd>
-                <dd
-                  class="nhsuk-summary-list__actions"
-                />
-              </div>
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Template type
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value"
-                >
-                  British Sign Language letter
-                </dd>
-                <dd
-                  class="nhsuk-summary-list__actions"
-                />
-              </div>
-              <div
-                class="nhsuk-summary-list__row missing-value"
-                id="campaign-id"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Campaign
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value"
-                />
-                <dd
-                  aria-hidden="true"
-                  class="nhsuk-summary-list__actions"
-                />
-              </div>
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Total pages
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value"
-                >
-                  2
-                </dd>
-                <dd
-                  class="nhsuk-summary-list__actions"
-                />
-              </div>
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Sheets
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value"
-                >
-                  1
-                </dd>
-                <dd
-                  class="nhsuk-summary-list__actions nhsuk-u-padding-right-4"
-                >
-                  <a
-                    data-testid="sheets-action"
-                    href="https://notify.nhs.uk/pricing-and-commercial/letters"
-                    rel="noopener noreferrer"
-                    target="_blank"
-                  >
-                    Learn more
-                    <span
-                      class="nhsuk-u-visually-hidden"
-                    >
-                       about sheets
-                    </span>
-                  </a>
-                </dd>
-              </div>
-              <div
-                class="nhsuk-summary-list__row missing-value"
-                id="printing-and-postage"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Printing and postage
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value"
-                />
-                <dd
-                  aria-hidden="true"
-                  class="nhsuk-summary-list__actions"
-                />
-              </div>
-            </dl>
-          </div>
-          <a
-            class="nhsuk-link nhsuk-body-m nhsuk-u-display-inline-block"
-            data-testid="back-link-bottom"
-            href="/message-plans/choose-british-sign-language-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=5"
-          >
-            Go back
-          </a>
-        </div>
-      </div>
-    </main>
-  </div>
-</DocumentFragment>
-`;
diff --git a/frontend/src/__tests__/app/message-plans/choose-british-sign-language-letter-template/preview-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/choose-british-sign-language-letter-template/preview-template/page.test.tsx
index 47d1a52b4..c7540d2f2 100644
--- a/frontend/src/__tests__/app/message-plans/choose-british-sign-language-letter-template/preview-template/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/choose-british-sign-language-letter-template/preview-template/page.test.tsx
@@ -1,91 +1,39 @@
+/**
+ * @jest-environment node
+ */
 import PreviewBritishSignLanguageLetterTemplateFromMessagePlan, {
   generateMetadata,
 } from '@app/message-plans/choose-british-sign-language-letter-template/[routingConfigId]/preview-template/[templateId]/page';
-import { BSL_LETTER_TEMPLATE, ROUTING_CONFIG } from '@testhelpers/helpers';
-import { render } from '@testing-library/react';
-import { getTemplate } from '@utils/form-actions';
-import { redirect } from 'next/navigation';
+import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+import { validateBritishSignLanguageLetterTemplate } from 'nhs-notify-web-template-management-utils';
 
-jest.mock('@utils/form-actions');
-jest.mock('next/navigation');
-
-const getTemplateMock = jest.mocked(getTemplate);
-const redirectMock = jest.mocked(redirect);
+jest.mock('@molecules/SummaryPreviewLetter/SummaryPreviewLetter');
 
 describe('PreviewBritishSignLanguageLetterTemplateFromMessagePlan page', () => {
-  it('should redirect to the edit message plan page when lockNumber is invalid', async () => {
-    await PreviewBritishSignLanguageLetterTemplateFromMessagePlan({
-      params: Promise.resolve({
-        routingConfigId: 'routing-config-id',
-        templateId: 'template-id',
-      }),
-      searchParams: Promise.resolve({
-        lockNumber: 'invalid',
-      }),
-    });
-
-    expect(redirectMock).toHaveBeenCalledWith(
-      '/message-plans/edit-message-plan/routing-config-id',
-      'replace'
-    );
-  });
-
-  it('should redirect to the edit message plan page when lockNumber is missing', async () => {
-    await PreviewBritishSignLanguageLetterTemplateFromMessagePlan({
+  it('should render SummaryPreviewLetter with validateBritishSignLanguageLetterTemplate and redirectUrl', async () => {
+    const props = {
       params: Promise.resolve({
         routingConfigId: 'routing-config-id',
         templateId: 'template-id',
       }),
-      searchParams: Promise.resolve({}),
-    });
-
-    expect(redirectMock).toHaveBeenCalledWith(
-      '/message-plans/edit-message-plan/routing-config-id',
-      'replace'
+      searchParams: Promise.resolve({ lockNumber: '5' }),
+    };
+
+    const page =
+      await PreviewBritishSignLanguageLetterTemplateFromMessagePlan(props);
+
+    expect(page).toEqual(
+      <SummaryPreviewLetter
+        {...props}
+        validateTemplate={validateBritishSignLanguageLetterTemplate}
+        redirectUrl='/message-plans/edit-message-plan/routing-config-id'
+      />
     );
   });
 
-  it('should redirect to invalid page for invalid template id', async () => {
-    getTemplateMock.mockResolvedValueOnce(undefined);
-
-    await PreviewBritishSignLanguageLetterTemplateFromMessagePlan({
-      params: Promise.resolve({
-        routingConfigId: 'routing-config-id',
-        templateId: 'invalid-template-id',
-      }),
-      searchParams: Promise.resolve({
-        lockNumber: '0',
-      }),
-    });
-
-    expect(getTemplateMock).toHaveBeenCalledWith('invalid-template-id');
-
-    expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
-  });
-
-  it('renders British Sign Language letter template preview', async () => {
-    getTemplateMock.mockResolvedValueOnce({
-      ...BSL_LETTER_TEMPLATE,
-      templateStatus: 'SUBMITTED',
-    });
-
-    const page = await PreviewBritishSignLanguageLetterTemplateFromMessagePlan({
-      params: Promise.resolve({
-        routingConfigId: ROUTING_CONFIG.id,
-        templateId: BSL_LETTER_TEMPLATE.id,
-      }),
-      searchParams: Promise.resolve({
-        lockNumber: '5',
-      }),
-    });
-
-    const container = render(page);
-
-    expect(getTemplateMock).toHaveBeenCalledWith(BSL_LETTER_TEMPLATE.id);
-
+  it('should have the correct page title', async () => {
     expect(await generateMetadata()).toEqual({
       title: 'Preview British Sign Language letter template - NHS Notify',
     });
-    expect(container.asFragment()).toMatchSnapshot();
   });
 });
diff --git a/frontend/src/__tests__/app/message-plans/preview-message-plan/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/preview-message-plan/__snapshots__/page.test.tsx.snap
index a3853802e..02b9160d2 100644
--- a/frontend/src/__tests__/app/message-plans/preview-message-plan/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/message-plans/preview-message-plan/__snapshots__/page.test.tsx.snap
@@ -722,7 +722,7 @@ exports[`full cascade plan matches snapshot 1`] = `
                       <p
                         data-testid="template-name"
                       >
-                        letter template name
+                        large print letter template name
                       </p>
                       <a
                         href="/preview-submitted-letter-template/72ebc15c-d950-4e2e-99d4-3de7f174fba6"
@@ -734,6 +734,37 @@ exports[`full cascade plan matches snapshot 1`] = `
                     </div>
                   </div>
                 </li>
+                <li
+                  class="message-plan-conditional-templates__list-item"
+                  data-testid="conditional-template-q4"
+                >
+                  <div
+                    class="channel-template-outer"
+                    data-testid="channel-card"
+                  >
+                    <div
+                      class="channel-template-inner"
+                    >
+                      <h3
+                        class="nhsuk-heading-s"
+                      >
+                        British Sign Language letter (optional)
+                      </h3>
+                      <p
+                        data-testid="template-name"
+                      >
+                        British Sign Language letter template name
+                      </p>
+                      <a
+                        href="/message-plans/preview-message-plan/39ee95ca-0500-4fe0-b1d6-c7f1b28bc267/preview-template/a4e82c0f-3b91-47d5-86e2-5c9f1a7d3b04"
+                        rel="noopener noreferrer"
+                        target="_blank"
+                      >
+                        Preview template (opens in a new tab)
+                      </a>
+                    </div>
+                  </div>
+                </li>
                 <li
                   class="message-plan-conditional-templates__list-item"
                   data-testid="conditional-template-languages"
@@ -756,6 +787,7 @@ exports[`full cascade plan matches snapshot 1`] = `
                         letter template name
                       </p>
                       <a
+                        class="nhsuk-u-margin-bottom-0"
                         href="/preview-submitted-letter-template/31399023-08a2-4dc7-81c7-e25b284b2aab"
                         rel="noopener noreferrer"
                         target="_blank"
@@ -768,6 +800,7 @@ exports[`full cascade plan matches snapshot 1`] = `
                         letter template name
                       </p>
                       <a
+                        class="nhsuk-u-margin-bottom-0"
                         href="/preview-submitted-letter-template/35746144-cac4-4e1f-b92b-4f58e9f1154f"
                         rel="noopener noreferrer"
                         target="_blank"
diff --git a/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx b/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx
index 39a4a09ef..7d6acdae8 100644
--- a/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx
@@ -10,6 +10,7 @@ import {
   ORDINALS,
 } from 'nhs-notify-web-template-management-utils';
 import {
+  AUTHORING_LETTER_TEMPLATE,
   BSL_LETTER_TEMPLATE,
   EMAIL_TEMPLATE,
   LARGE_PRINT_LETTER_TEMPLATE,
@@ -59,6 +60,7 @@ const kuTemplateId = '31399023-08a2-4dc7-81c7-e25b284b2aab';
 const sqTemplateId = '35746144-cac4-4e1f-b92b-4f58e9f1154f';
 const largePrintTemplateId = '72ebc15c-d950-4e2e-99d4-3de7f174fba6';
 const bslTemplateId = 'a4e82c0f-3b91-47d5-86e2-5c9f1a7d3b04';
+const authoringLetterTemplateId = '770ed5da-765d-431c-b4b4-4068d11ffed1';
 
 const templates: MessagePlanTemplates = {
   [appTemplateId]: {
@@ -101,6 +103,11 @@ const templates: MessagePlanTemplates = {
     id: bslTemplateId,
     templateStatus: 'SUBMITTED',
   },
+  [authoringLetterTemplateId]: {
+    ...AUTHORING_LETTER_TEMPLATE,
+    id: authoringLetterTemplateId,
+    templateStatus: 'PROOF_APPROVED',
+  },
 };
 
 beforeEach(() => {
@@ -348,7 +355,7 @@ describe.each(digitalChannels)(
 );
 
 describe('letter only', () => {
-  it('shows only the card for the default template when no conditional templates are included', async () => {
+  it('shows only the card for the default template when no conditional templates are included (PDF letter)', async () => {
     const routingConfig = createRoutingConfig({
       cascade: [
         {
@@ -392,6 +399,52 @@ describe('letter only', () => {
     ).not.toBeInTheDocument();
   });
 
+  it('shows only the card for the default template when no conditional templates are included (AUTHORING letter)', async () => {
+    const routingConfig = createRoutingConfig({
+      cascade: [
+        {
+          channel: 'LETTER',
+          channelType: 'primary',
+          defaultTemplateId: authoringLetterTemplateId,
+          cascadeGroups: ['standard'],
+        },
+      ],
+    });
+
+    const template = templates[authoringLetterTemplateId];
+
+    await renderPage(routingConfig);
+
+    expect(
+      screen.queryByRole('button', {
+        name: 'Open all digital template previews',
+      })
+    ).not.toBeInTheDocument();
+
+    const block = screen.getByTestId('message-plan-block-LETTER');
+
+    const card = within(block).getByTestId('channel-card');
+
+    const name = within(card).getByTestId('template-name');
+
+    expect(name).toHaveTextContent(template.name);
+
+    const link = within(card).getByRole('link');
+
+    expect(link).toHaveTextContent('Preview template (opens in a new tab)');
+
+    expect(link).toHaveAttribute(
+      'href',
+      `/message-plans/preview-message-plan/${routingConfig.id}/preview-template/${template.id}`
+    );
+
+    expect(link).toHaveAttribute('target', '_blank');
+
+    expect(
+      within(block).queryByTestId('conditional-templates')
+    ).not.toBeInTheDocument();
+  });
+
   it('shows the fallback conditions and card for large print accessible format', async () => {
     const routingConfig = createRoutingConfig({
       cascade: [
@@ -476,14 +529,20 @@ describe('letter only', () => {
       within(conditionalTemplatesList).getByTestId('conditional-template-q4')
     ).getByTestId('channel-card');
 
+    const name = within(bslCard).getByTestId('template-name');
+
+    expect(name).toHaveTextContent(template.name);
+
     const link = within(bslCard).getByRole('link');
 
-    expect(link).toHaveTextContent(template.name);
+    expect(link).toHaveTextContent('Preview template (opens in a new tab)');
 
     expect(link).toHaveAttribute(
       'href',
-      `/preview-submitted-letter-template/${template.id}`
+      `/message-plans/preview-message-plan/${routingConfig.id}/preview-template/${template.id}`
     );
+
+    expect(link).toHaveAttribute('target', '_blank');
   });
 
   it('shows the card for the other language templates', async () => {
diff --git a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/__snapshots__/page.test.tsx.snap
index d3186996b..9a14747a1 100644
--- a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/__snapshots__/page.test.tsx.snap
@@ -685,6 +685,37 @@ exports[`Review and move to production page matches snapshot for full cascade 1`
                     </div>
                   </div>
                 </li>
+                <li
+                  class="message-plan-conditional-templates__list-item"
+                  data-testid="conditional-template-q4"
+                >
+                  <div
+                    class="channel-template-outer"
+                    data-testid="channel-card"
+                  >
+                    <div
+                      class="channel-template-inner"
+                    >
+                      <h3
+                        class="nhsuk-heading-s"
+                      >
+                        British Sign Language letter (optional)
+                      </h3>
+                      <p
+                        data-testid="template-name"
+                      >
+                        British Sign Language letter template name
+                      </p>
+                      <a
+                        href="/message-plans/review-and-move-to-production/rc-123/preview-template/c7d93e1a-4b05-48f6-97a3-6d2e3b8c5f17"
+                        rel="noopener noreferrer"
+                        target="_blank"
+                      >
+                        Preview template (opens in a new tab)
+                      </a>
+                    </div>
+                  </div>
+                </li>
                 <li
                   class="message-plan-conditional-templates__list-item"
                   data-testid="conditional-template-languages"
@@ -707,6 +738,7 @@ exports[`Review and move to production page matches snapshot for full cascade 1`
                         letter template name
                       </p>
                       <a
+                        class="nhsuk-u-margin-bottom-0"
                         href="/preview-letter-template/31399023-08a2-4dc7-81c7-e25b284b2aab"
                         rel="noopener noreferrer"
                         target="_blank"
@@ -719,6 +751,7 @@ exports[`Review and move to production page matches snapshot for full cascade 1`
                         letter template name
                       </p>
                       <a
+                        class="nhsuk-u-margin-bottom-0"
                         href="/preview-letter-template/35746144-cac4-4e1f-b92b-4f58e9f1154f"
                         rel="noopener noreferrer"
                         target="_blank"
diff --git a/frontend/src/app/message-plans/choose-british-sign-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/choose-british-sign-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
index 8b08a8ae1..01f00eaa1 100644
--- a/frontend/src/app/message-plans/choose-british-sign-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
+++ b/frontend/src/app/message-plans/choose-british-sign-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -4,14 +4,9 @@ import {
   MessagePlanAndTemplatePageProps,
   validateBritishSignLanguageLetterTemplate,
 } from 'nhs-notify-web-template-management-utils';
-import { getTemplate } from '@utils/form-actions';
-import { redirect, RedirectType } from 'next/navigation';
 import { Metadata } from 'next';
 import content from '@content/content';
-import { PreviewTemplateFromMessagePlan } from '@molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan';
-import PreviewTemplateDetailsLetter from '@molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter';
-import { $LockNumber } from 'nhs-notify-backend-client/schemas';
-import { NHSNotifyContainer } from '@layouts/container/container';
+import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
 
 const { pageTitle } = content.pages.previewBritishSignLanguageLetterTemplate;
 
@@ -24,35 +19,13 @@ export async function generateMetadata(): Promise<Metadata> {
 const PreviewBritishSignLanguageLetterTemplateFromMessagePlan = async (
   props: MessagePlanAndTemplatePageProps
 ) => {
-  const { templateId, routingConfigId } = await props.params;
-  const searchParams = await props.searchParams;
-
-  const lockNumberResult = $LockNumber.safeParse(searchParams?.lockNumber);
-
-  if (!lockNumberResult.success) {
-    return redirect(
-      `/message-plans/edit-message-plan/${routingConfigId}`,
-      RedirectType.replace
-    );
-  }
-
-  const template = await getTemplate(templateId);
-
-  const validatedTemplate = validateBritishSignLanguageLetterTemplate(template);
-
-  if (!validatedTemplate) {
-    return redirect('/invalid-template', RedirectType.replace);
-  }
-
+  const { routingConfigId } = await props.params;
   return (
-    <NHSNotifyContainer>
-      <PreviewTemplateFromMessagePlan
-        initialState={validatedTemplate}
-        previewComponent={PreviewTemplateDetailsLetter}
-        routingConfigId={routingConfigId}
-        lockNumber={lockNumberResult.data}
-      />
-    </NHSNotifyContainer>
+    <SummaryPreviewLetter
+      {...props}
+      validateTemplate={validateBritishSignLanguageLetterTemplate}
+      redirectUrl={`/message-plans/edit-message-plan/${routingConfigId}`}
+    />
   );
 };
 
diff --git a/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx b/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx
index 8463d2acd..ed29a6498 100644
--- a/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx
+++ b/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx
@@ -215,7 +215,7 @@ export function MessagePlanCascadePreview({
                                 )}
                                 target='_blank'
                                 rel='noopener noreferrer'
-                                // className='nhsuk-u-margin-bottom-0'
+                                className='nhsuk-u-margin-bottom-0'
                               >
                                 {pageContent.letterTemplateLinkText}
                               </Link>

From 656b83138d3c3a5c62add8338ac88d4ec0a2b36e Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Tue, 7 Apr 2026 16:28:53 +0100
Subject: [PATCH 39/57] fix post merge

---
 ...eview-message-plan-letter-template.routing-component.spec.ts | 2 +-
 ...move-to-production-letter-template.routing-component.spec.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts
index eaf223390..e9ffd29ea 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts
@@ -47,7 +47,7 @@ function createTemplates(user: TestUser) {
       user,
       `Test Authoring Letter template - ${templateIds.AUTHORING_LETTER}`
     ),
-    PDF_LETTER: TemplateFactory.uploadLetterTemplate(
+    PDF_LETTER: TemplateFactory.uploadPdfLetterTemplate(
       templateIds.PDF_LETTER,
       user,
       `Test PDF Letter template - ${templateIds.PDF_LETTER}`
diff --git a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts
index e740980be..5b2845112 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts
@@ -47,7 +47,7 @@ function createTemplates(user: TestUser) {
       user,
       `Test Authoring Letter template - ${templateIds.AUTHORING_LETTER}`
     ),
-    PDF_LETTER: TemplateFactory.uploadLetterTemplate(
+    PDF_LETTER: TemplateFactory.uploadPdfLetterTemplate(
       templateIds.PDF_LETTER,
       user,
       `Test PDF Letter template - ${templateIds.PDF_LETTER}`

From a92b8bdb0c7867ccf725dd1c782db5046fbf9636 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Tue, 7 Apr 2026 16:39:32 +0100
Subject: [PATCH 40/57] more target blank assertions

---
 .../app/message-plans/preview-message-plan/page.test.tsx      | 4 ++++
 .../components/molecules/MessagePlanCascadePreview.test.tsx   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx b/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx
index 7d6acdae8..9d90094c5 100644
--- a/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx
@@ -492,6 +492,8 @@ describe('letter only', () => {
       'href',
       `/preview-submitted-letter-template/${template.id}`
     );
+
+    expect(link).toHaveAttribute('target', '_blank');
   });
 
   it('shows the fallback conditions and card for BSL accessible format', async () => {
@@ -602,6 +604,8 @@ describe('letter only', () => {
         'href',
         `/preview-submitted-letter-template/${template.id}`
       );
+
+      expect(links[index]).toHaveAttribute('target', '_blank');
     }
   });
 });
diff --git a/frontend/src/__tests__/components/molecules/MessagePlanCascadePreview.test.tsx b/frontend/src/__tests__/components/molecules/MessagePlanCascadePreview.test.tsx
index ff3567c8f..0c14fb810 100644
--- a/frontend/src/__tests__/components/molecules/MessagePlanCascadePreview.test.tsx
+++ b/frontend/src/__tests__/components/molecules/MessagePlanCascadePreview.test.tsx
@@ -146,6 +146,7 @@ describe('MessagePlanCascadePreview', () => {
       'href',
       `/preview-letter-template/${PDF_LETTER_TEMPLATE.id}`
     );
+    expect(link).toHaveAttribute('target', '_blank');
     expect(link).toHaveTextContent('Preview template (opens in a new tab)');
   });
 
@@ -181,6 +182,7 @@ describe('MessagePlanCascadePreview', () => {
       'href',
       `/preview-submitted-letter-template/${submittedTemplate.id}`
     );
+    expect(link).toHaveAttribute('target', '_blank');
   });
 
   it('renders non-letter templates with preview details', () => {
@@ -246,6 +248,7 @@ describe('MessagePlanCascadePreview', () => {
       'href',
       `/message-plans/review-and-move-to-production/routing-config-id/preview-template/${AUTHORING_LETTER_TEMPLATE.id}`
     );
+    expect(link).toHaveAttribute('target', '_blank');
   });
 
   it('renders PDF letter template with standard link even when letterPreviewHrefBase is provided', () => {
@@ -263,6 +266,7 @@ describe('MessagePlanCascadePreview', () => {
       'href',
       `/preview-letter-template/${PDF_LETTER_TEMPLATE.id}`
     );
+    expect(link).toHaveAttribute('target', '_blank');
   });
 
   it('matches snapshot', () => {

From 5ed6d092891a02a1a1d25bb155ce55f95f7474f9 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Tue, 7 Apr 2026 16:55:00 +0100
Subject: [PATCH 41/57] add missing iframe tests on BSL

---
 .../molecules/SummaryPreviewLetter.test.tsx   |  11 +-
 .../SummaryPreviewLetter.test.tsx.snap        | 108 +++++++++++++-----
 .../preview-template/[templateId]/page.tsx    |   2 +-
 .../preview-template/[templateId]/page.tsx    |   2 +-
 ...tish-sign-language-letter-template-page.ts |  12 ++
 ...-letter-template.routing-component.spec.ts |  14 +++
 6 files changed, 117 insertions(+), 32 deletions(-)

diff --git a/frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx b/frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx
index d750a9537..21a33af49 100644
--- a/frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx
+++ b/frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx
@@ -139,23 +139,28 @@ describe('SummaryPreviewLetter', () => {
   });
 
   it('renders without back links when hideBackLinks is true', async () => {
+    const letterVariant = makeLetterVariant();
+
     getTemplateMock.mockResolvedValueOnce({
-      ...PDF_LETTER_TEMPLATE,
+      ...AUTHORING_LETTER_TEMPLATE,
       templateStatus: 'SUBMITTED',
+      campaignId: 'campaign',
+      letterVariantId: 'letter-variant',
     });
 
+    getLetterVariantByIdMock.mockResolvedValueOnce(letterVariant);
+
     const page = await SummaryPreviewLetter({
       ...defaultProps,
       params: Promise.resolve({
         routingConfigId: ROUTING_CONFIG.id,
-        templateId: PDF_LETTER_TEMPLATE.id,
+        templateId: AUTHORING_LETTER_TEMPLATE.id,
       }),
       hideBackLinks: true,
       redirectUrl: undefined,
     });
 
     const container = render(page);
-
     expect(container.asFragment()).toMatchSnapshot();
   });
 });
diff --git a/frontend/src/__tests__/components/molecules/__snapshots__/SummaryPreviewLetter.test.tsx.snap b/frontend/src/__tests__/components/molecules/__snapshots__/SummaryPreviewLetter.test.tsx.snap
index 5dd575cfe..f0b53f9e8 100644
--- a/frontend/src/__tests__/components/molecules/__snapshots__/SummaryPreviewLetter.test.tsx.snap
+++ b/frontend/src/__tests__/components/molecules/__snapshots__/SummaryPreviewLetter.test.tsx.snap
@@ -327,14 +327,14 @@ exports[`SummaryPreviewLetter renders without back links when hideBackLinks is t
             <h1
               data-testid="preview-message__heading"
             >
-              letter template name
+              authoring letter template name
             </h1>
           </div>
           <div
             class="nhsuk-width-container nhsuk-u-margin-bottom-6 nhsuk-body-m"
           >
             <dl
-              class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview"
+              class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview authoringLetterDetails"
             >
               <div
                 class="nhsuk-summary-list__row"
@@ -348,8 +348,11 @@ exports[`SummaryPreviewLetter renders without back links when hideBackLinks is t
                   class="nhsuk-summary-list__value monospace-font"
                   data-testid="preview-template-id"
                 >
-                  letter-template-id
+                  authoring-letter-template-id
                 </dd>
+                <dd
+                  class="nhsuk-summary-list__actions"
+                />
               </div>
               <div
                 class="nhsuk-summary-list__row"
@@ -364,45 +367,96 @@ exports[`SummaryPreviewLetter renders without back links when hideBackLinks is t
                 >
                   Standard letter
                 </dd>
+                <dd
+                  class="nhsuk-summary-list__actions"
+                />
               </div>
               <div
                 class="nhsuk-summary-list__row"
+                id="campaign-id"
               >
                 <dt
                   class="nhsuk-summary-list__key"
                 >
-                  Template file
+                  Campaign
                 </dt>
                 <dd
                   class="nhsuk-summary-list__value"
                 >
-                  <div
-                    class="container"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="icon"
-                      fill="none"
-                      height="26"
-                      viewBox="0 0 20 26"
-                      width="20"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M0 0V26H20V6.59375L19.7188 6.28125L13.7188 0.28125L13.4062 0H0ZM2 2H12V8H18V24H2V2ZM14 3.4375L16.5625 6H14V3.4375Z"
-                        fill="#4C6272"
-                      />
-                    </svg>
-                    <p
-                      class="text"
-                    >
-                      template.pdf
-                    </p>
-                  </div>
+                  campaign
                 </dd>
+                <dd
+                  aria-hidden="true"
+                  class="nhsuk-summary-list__actions"
+                />
+              </div>
+              <div
+                class="nhsuk-summary-list__row"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Total pages
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value"
+                >
+                  2
+                </dd>
+                <dd
+                  class="nhsuk-summary-list__actions"
+                />
+              </div>
+              <div
+                class="nhsuk-summary-list__row"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Sheets
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value"
+                >
+                  1
+                </dd>
+                <dd
+                  aria-hidden="true"
+                  class="nhsuk-summary-list__actions"
+                />
+              </div>
+              <div
+                class="nhsuk-summary-list__row"
+                id="printing-and-postage"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Printing and postage
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value"
+                >
+                  Standard C5
+                </dd>
+                <dd
+                  aria-hidden="true"
+                  class="nhsuk-summary-list__actions"
+                />
               </div>
             </dl>
           </div>
+          <h2
+            class="nhsuk-heading-m"
+          >
+            Example preview
+          </h2>
+          <iframe
+            aria-label="PDF preview of letter template"
+            class="letter-render-iframe nhsuk-u-margin-bottom-6"
+            src="/templates/files/client-1/renders/authoring-letter-template-id/render.pdf"
+            title="Letter preview"
+          />
         </div>
       </div>
     </main>
diff --git a/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx
index 308a8d7d9..bf9c54558 100644
--- a/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx
+++ b/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -6,7 +6,7 @@ import { Metadata } from 'next';
 import content from '@content/content';
 import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
 
-const { pageTitle } = content.pages.previewStandardEnglishLetterTemplate;
+const { pageTitle } = content.pages.previewLetterTemplate;
 
 export async function generateMetadata(): Promise<Metadata> {
   return {
diff --git a/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx
index ccda23da2..cdc6a60b3 100644
--- a/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx
+++ b/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -6,7 +6,7 @@ import { Metadata } from 'next';
 import content from '@content/content';
 import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
 
-const { pageTitle } = content.pages.previewStandardEnglishLetterTemplate;
+const { pageTitle } = content.pages.previewLetterTemplate;
 
 export async function generateMetadata(): Promise<Metadata> {
   return {
diff --git a/tests/test-team/pages/routing/letter/preview-british-sign-language-letter-template-page.ts b/tests/test-team/pages/routing/letter/preview-british-sign-language-letter-template-page.ts
index 09737b0a9..4ed016468 100644
--- a/tests/test-team/pages/routing/letter/preview-british-sign-language-letter-template-page.ts
+++ b/tests/test-team/pages/routing/letter/preview-british-sign-language-letter-template-page.ts
@@ -1,6 +1,18 @@
+import { Locator, Page } from '@playwright/test';
 import { TemplateMgmtPreviewBasePage } from 'pages/template-mgmt-preview-base-page';
 
 export class RoutingPreviewBritishSignLanguageLetterTemplatePage extends TemplateMgmtPreviewBasePage {
   static readonly pathTemplate =
     '/message-plans/choose-british-sign-language-letter-template/:messagePlanId/preview-template/:templateId';
+
+  public readonly letterPreviewHeading: Locator;
+  public readonly letterPreviewIframe: Locator;
+
+  constructor(page: Page) {
+    super(page);
+    this.letterPreviewHeading = page.getByRole('heading', {
+      name: 'Example preview',
+    });
+    this.letterPreviewIframe = page.locator('iframe[title="Letter preview"]');
+  }
 }
diff --git a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-british-sign-language-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-british-sign-language-letter-template.routing-component.spec.ts
index 26776a43c..39ea4d9e9 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-british-sign-language-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-british-sign-language-letter-template.routing-component.spec.ts
@@ -158,6 +158,20 @@ test.describe('Routing - Preview British Sign Language letter template page', ()
     await expect(previewBSLLetterTemplatePage.campaignId).toContainText(
       templates.BSL_LETTER.campaignId!
     );
+
+    await expect(
+      previewBSLLetterTemplatePage.letterPreviewHeading
+    ).toBeVisible();
+    await expect(
+      previewBSLLetterTemplatePage.letterPreviewIframe
+    ).toBeVisible();
+
+    await expect(
+      previewBSLLetterTemplatePage.letterPreviewIframe
+    ).toHaveAttribute(
+      'src',
+      `/templates/files/${templates.BSL_LETTER.clientId}/renders/${templates.BSL_LETTER.id}/initial-render.pdf`
+    );
   });
 
   test.describe('redirects to invalid template page', () => {

From 3bbfed96111f99066b6ae451b68204b54d01510b Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Tue, 7 Apr 2026 19:17:38 +0100
Subject: [PATCH 42/57] routing component test fixes

---
 ...iew-message-plan.routing-component.spec.ts | 17 ++++++++------
 ...ve-to-production.routing-component.spec.ts | 23 ++++++++++++-------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
index cf9645669..678c52ee5 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
@@ -334,24 +334,24 @@ test.describe('Routing - Preview Message Plan page', () => {
 
       await expect(
         templateBlock.getAccessibilityFormatCard('x1').templateLink
-      ).toHaveText(templates.LARGE_PRINT_LETTER.name);
+      ).toHaveText('Preview template (opens in a new tab)');
 
       await expect(
         templateBlock.getAccessibilityFormatCard('x1').templateLink
       ).toHaveAttribute(
         'href',
-        `/templates/preview-submitted-letter-template/${templates.LARGE_PRINT_LETTER.id}`
+        `/templates/message-plans/preview-message-plan/${dbEntry.id}/preview-template/${templates.LARGE_PRINT_LETTER.id}`
       );
 
       await expect(
         templateBlock.getAccessibilityFormatCard('q4').templateLink
-      ).toHaveText(templates.BSL_LETTER.name);
+      ).toHaveText('Preview template (opens in a new tab)');
 
       await expect(
         templateBlock.getAccessibilityFormatCard('q4').templateLink
       ).toHaveAttribute(
         'href',
-        `/templates/preview-submitted-letter-template/${templates.BSL_LETTER.id}`
+        `/templates/message-plans/preview-message-plan/${dbEntry.id}/preview-template/${templates.BSL_LETTER.id}`
       );
 
       for (const [index, language] of (
@@ -360,12 +360,15 @@ test.describe('Routing - Preview Message Plan page', () => {
         >)[]
       ).entries()) {
         const links = await templateBlock.getLanguagesCard().templateLink.all();
-        await expect(links[index]).toHaveText(templates[language].name);
+        await expect(links[index]).toHaveText(
+          'Preview template (opens in a new tab)'
+        );
 
         await expect(links[index]).toHaveAttribute(
           'href',
-          `/templates/preview-submitted-letter-template/${templates[language].id}`
+          `/templates/message-plans/preview-message-plan/${dbEntry.id}/preview-template/${templates[language].id}`
         );
+        await expect(links[index]).toHaveAttribute('target', '_blank');
       }
 
       const [popup] = await Promise.all([
@@ -426,7 +429,7 @@ test.describe('Routing - Preview Message Plan page', () => {
 
     await expect(
       templateBlock.getAccessibilityFormatCard('x1').templateLink
-    ).toHaveText(templates.AUTHORING_LARGE_PRINT_LETTER.name);
+    ).toHaveText('Preview template (opens in a new tab)');
 
     await expect(
       templateBlock.getAccessibilityFormatCard('x1').templateLink
diff --git a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
index 8c11e69e1..34f78cb15 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
@@ -325,7 +325,7 @@ test.describe('Routing - Review and Move to Production page', () => {
         templateBlock.defaultTemplateCard.templateLink
       ).toHaveAttribute(
         'href',
-        `/templates/preview-submitted-letter-template/${templates.LETTER.id}`
+        `/templates/message-plans/review-and-move-to-production/${dbEntry.id}/preview-template/${templates.LETTER.id}`
       );
 
       await expect(
@@ -334,38 +334,45 @@ test.describe('Routing - Review and Move to Production page', () => {
 
       await expect(
         templateBlock.getAccessibilityFormatCard('x1').templateLink
-      ).toHaveText(templates.LARGE_PRINT_LETTER.name);
+      ).toHaveText('Preview template (opens in a new tab)');
 
       await expect(
         templateBlock.getAccessibilityFormatCard('x1').templateLink
       ).toHaveAttribute(
         'href',
-        `/templates/preview-letter-template/${templates.LARGE_PRINT_LETTER.id}`
+        `/templates/message-plans/review-and-move-to-production/${dbEntry.id}/preview-template/${templates.LARGE_PRINT_LETTER.id}`
       );
 
       await expect(
         templateBlock.getAccessibilityFormatCard('q4').templateLink
-      ).toHaveText(templates.BSL_LETTER.name);
+      ).toHaveText('Preview template (opens in a new tab)');
 
       await expect(
         templateBlock.getAccessibilityFormatCard('q4').templateLink
       ).toHaveAttribute(
         'href',
-        `/templates/preview-letter-template/${templates.BSL_LETTER.id}`
+        `/templates/message-plans/review-and-move-to-production/${dbEntry.id}/preview-template/${templates.BSL_LETTER.id}`
       );
 
+      await expect(
+        templateBlock.getAccessibilityFormatCard('q4').templateLink
+      ).toHaveAttribute('target', '_blank');
+
       for (const [index, language] of (
         ['FRENCH_LETTER', 'SPANISH_LETTER'] satisfies (keyof ReturnType<
           typeof createTemplates
         >)[]
       ).entries()) {
         const links = await templateBlock.getLanguagesCard().templateLink.all();
-        await expect(links[index]).toHaveText(templates[language].name);
+        await expect(links[index]).toHaveText(
+          'Preview template (opens in a new tab)'
+        );
 
         await expect(links[index]).toHaveAttribute(
           'href',
-          `/templates/preview-letter-template/${templates[language].id}`
+          `/templates/message-plans/review-and-move-to-production/${dbEntry.id}/preview-template/${templates[language].id}`
         );
+        await expect(links[index]).toHaveAttribute('target', '_blank');
       }
     });
   });
@@ -414,7 +421,7 @@ test.describe('Routing - Review and Move to Production page', () => {
 
     await expect(
       templateBlock.getAccessibilityFormatCard('x1').templateLink
-    ).toHaveText(templates.AUTHORING_LARGE_PRINT_LETTER.name);
+    ).toHaveText('Preview template (opens in a new tab)');
 
     await expect(
       templateBlock.getAccessibilityFormatCard('x1').templateLink

From daf5bb168ad427d59a76116c0e06e31ffc330fa6 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Wed, 8 Apr 2026 08:45:50 +0100
Subject: [PATCH 43/57] dedupe tests post merge, extend e2e

---
 .../preview-template/[templateId]/page.tsx    |  2 +-
 .../preview-template/[templateId]/page.tsx    |  2 +-
 frontend/src/content/content.ts               | 10 +++
 ...eview-message-plan-letter-template-page.ts |  2 +-
 ...move-to-production-letter-template-page.ts |  2 +-
 .../route-coverage.accessibility.spec.ts      |  8 +--
 .../routing.accessibility.spec.ts             | 15 ++--
 ...emplate-protected-routes.component.spec.ts |  8 +--
 .../routing.e2e.spec.ts                       | 35 +++++++++-
 ...letter-template.routing-component.spec.ts} | 44 ++++++------
 ...iew-message-plan.routing-component.spec.ts | 67 ++++++------------
 ...letter-template.routing-component.spec.ts} | 40 +++++------
 ...ve-to-production.routing-component.spec.ts | 70 +++++++------------
 13 files changed, 152 insertions(+), 153 deletions(-)
 rename tests/test-team/template-mgmt-routing-component-tests/{preview-message-plan-letter-template.routing-component.spec.ts => preview-message-plan-preview-letter-template.routing-component.spec.ts} (78%)
 rename tests/test-team/template-mgmt-routing-component-tests/{review-and-move-to-production-letter-template.routing-component.spec.ts => review-and-move-to-production-preview-letter-template.routing-component.spec.ts} (79%)

diff --git a/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx
index bf9c54558..9b62b2215 100644
--- a/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx
+++ b/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -6,7 +6,7 @@ import { Metadata } from 'next';
 import content from '@content/content';
 import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
 
-const { pageTitle } = content.pages.previewLetterTemplate;
+const { pageTitle } = content.pages.previewMessagePlanPreviewLetter;
 
 export async function generateMetadata(): Promise<Metadata> {
   return {
diff --git a/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx
index cdc6a60b3..eca1d1942 100644
--- a/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx
+++ b/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -6,7 +6,7 @@ import { Metadata } from 'next';
 import content from '@content/content';
 import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
 
-const { pageTitle } = content.pages.previewLetterTemplate;
+const { pageTitle } = content.pages.reviewAndMoveToProductionPreviewLetter;
 
 export async function generateMetadata(): Promise<Metadata> {
   return {
diff --git a/frontend/src/content/content.ts b/frontend/src/content/content.ts
index ddb67658f..3f130a385 100644
--- a/frontend/src/content/content.ts
+++ b/frontend/src/content/content.ts
@@ -573,6 +573,14 @@ const previewSubmittedLetterTemplate = {
   pageTitle: previewLetterTitle,
 };
 
+const previewMessagePlanPreviewLetter = {
+  pageTitle: previewLetterTitle,
+};
+
+const reviewAndMoveToProductionPreviewLetter = {
+  pageTitle: previewLetterTitle,
+};
+
 const letterRender = {
   heading: 'Letter preview',
   guidance: 'Check how your personalisation fields will appear in your letter.',
@@ -2021,11 +2029,13 @@ const content = {
     previewLargePrintLetterTemplate,
     previewLetterTemplate,
     previewMessagePlan,
+    previewMessagePlanPreviewLetter,
     previewOtherLanguageLetterTemplate,
     previewStandardEnglishLetterTemplate,
     previewSubmittedLetterTemplate,
     reviewAndApproveLetterTemplate,
     reviewAndMoveToProduction,
+    reviewAndMoveToProductionPreviewLetter,
     submitLetterTemplate: submitLetterTemplatePage,
     uploadDocxLetterTemplatePage,
   },
diff --git a/tests/test-team/pages/routing/preview-message-plan-letter-template-page.ts b/tests/test-team/pages/routing/preview-message-plan-letter-template-page.ts
index 9d9c3a9f4..eb1f74c39 100644
--- a/tests/test-team/pages/routing/preview-message-plan-letter-template-page.ts
+++ b/tests/test-team/pages/routing/preview-message-plan-letter-template-page.ts
@@ -1,7 +1,7 @@
 import { Locator, Page } from '@playwright/test';
 import { TemplateMgmtPreviewBasePage } from 'pages/template-mgmt-preview-base-page';
 
-export class RoutingPreviewMessagePlanLetterTemplatePage extends TemplateMgmtPreviewBasePage {
+export class RoutingPreviewMessagePlanPreviewLetterTemplatePage extends TemplateMgmtPreviewBasePage {
   static readonly pathTemplate =
     '/message-plans/preview-message-plan/:messagePlanId/preview-template/:templateId';
 
diff --git a/tests/test-team/pages/routing/review-and-move-to-production-letter-template-page.ts b/tests/test-team/pages/routing/review-and-move-to-production-letter-template-page.ts
index 2981a6941..5af076ee2 100644
--- a/tests/test-team/pages/routing/review-and-move-to-production-letter-template-page.ts
+++ b/tests/test-team/pages/routing/review-and-move-to-production-letter-template-page.ts
@@ -1,7 +1,7 @@
 import { Locator, Page } from '@playwright/test';
 import { TemplateMgmtPreviewBasePage } from 'pages/template-mgmt-preview-base-page';
 
-export class RoutingReviewAndMoveToProductionLetterTemplatePage extends TemplateMgmtPreviewBasePage {
+export class RoutingReviewAndMoveToProductionPreviewLetterTemplatePage extends TemplateMgmtPreviewBasePage {
   static readonly pathTemplate =
     '/message-plans/review-and-move-to-production/:messagePlanId/preview-template/:templateId';
 
diff --git a/tests/test-team/template-mgmt-accessibility/route-coverage.accessibility.spec.ts b/tests/test-team/template-mgmt-accessibility/route-coverage.accessibility.spec.ts
index f109eb7a6..a99a5458c 100644
--- a/tests/test-team/template-mgmt-accessibility/route-coverage.accessibility.spec.ts
+++ b/tests/test-team/template-mgmt-accessibility/route-coverage.accessibility.spec.ts
@@ -84,14 +84,14 @@ import {
   RoutingPreviewBritishSignLanguageLetterTemplatePage,
   RoutingPreviewEmailTemplatePage,
   RoutingPreviewLargePrintLetterTemplatePage,
-  RoutingPreviewMessagePlanLetterTemplatePage,
+  RoutingPreviewMessagePlanPreviewLetterTemplatePage,
   RoutingPreviewMessagePlanPage,
   RoutingPreviewNhsAppTemplatePage,
   RoutingPreviewOtherLanguageLetterTemplatePage,
   RoutingPreviewSmsTemplatePage,
   RoutingPreviewStandardLetterTemplatePage,
   RoutingReviewAndMoveToProductionPage,
-  RoutingReviewAndMoveToProductionLetterTemplatePage,
+  RoutingReviewAndMoveToProductionPreviewLetterTemplatePage,
 } from 'pages/routing';
 
 /**
@@ -173,14 +173,14 @@ const allPages: (typeof TemplateMgmtBasePage)[] = [
   RoutingPreviewBritishSignLanguageLetterTemplatePage,
   RoutingPreviewEmailTemplatePage,
   RoutingPreviewLargePrintLetterTemplatePage,
-  RoutingPreviewMessagePlanLetterTemplatePage,
+  RoutingPreviewMessagePlanPreviewLetterTemplatePage,
   RoutingPreviewMessagePlanPage,
   RoutingPreviewNhsAppTemplatePage,
   RoutingPreviewOtherLanguageLetterTemplatePage,
   RoutingPreviewSmsTemplatePage,
   RoutingPreviewStandardLetterTemplatePage,
   RoutingReviewAndMoveToProductionPage,
-  RoutingReviewAndMoveToProductionLetterTemplatePage,
+  RoutingReviewAndMoveToProductionPreviewLetterTemplatePage,
 ];
 
 test('all app routes have accessibility test coverage', async () => {
diff --git a/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts b/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts
index 19579b716..593bd540f 100644
--- a/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts
+++ b/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts
@@ -26,14 +26,14 @@ import {
   RoutingPreviewBritishSignLanguageLetterTemplatePage,
   RoutingPreviewEmailTemplatePage,
   RoutingPreviewLargePrintLetterTemplatePage,
-  RoutingPreviewMessagePlanLetterTemplatePage,
+  RoutingPreviewMessagePlanPreviewLetterTemplatePage,
   RoutingPreviewMessagePlanPage,
   RoutingPreviewNhsAppTemplatePage,
   RoutingPreviewOtherLanguageLetterTemplatePage,
   RoutingPreviewSmsTemplatePage,
   RoutingPreviewStandardLetterTemplatePage,
   RoutingReviewAndMoveToProductionPage,
-  RoutingReviewAndMoveToProductionLetterTemplatePage,
+  RoutingReviewAndMoveToProductionPreviewLetterTemplatePage,
 } from 'pages/routing';
 import { getTestContext } from 'helpers/context/context';
 
@@ -283,19 +283,22 @@ test.describe('Routing', () => {
           .setSearchParam('lockNumber', '0')
       ));
 
-    test('Preview message plan letter template', async ({ page, analyze }) =>
+    test('Preview message plan / preview letter template', async ({
+      page,
+      analyze,
+    }) =>
       analyze(
-        new RoutingPreviewMessagePlanLetterTemplatePage(page)
+        new RoutingPreviewMessagePlanPreviewLetterTemplatePage(page)
           .setPathParam('messagePlanId', productionRoutingConfigId)
           .setPathParam('templateId', templateIds.LETTER)
       ));
 
-    test('Review and move to production letter template', async ({
+    test('Review and move to production / preview letter template', async ({
       page,
       analyze,
     }) =>
       analyze(
-        new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
+        new RoutingReviewAndMoveToProductionPreviewLetterTemplatePage(page)
           .setPathParam('messagePlanId', draftRoutingConfigId)
           .setPathParam('templateId', templateIds.LETTER)
       ));
diff --git a/tests/test-team/template-mgmt-component-tests/template-protected-routes.component.spec.ts b/tests/test-team/template-mgmt-component-tests/template-protected-routes.component.spec.ts
index 3fef8f8cf..e3379259c 100644
--- a/tests/test-team/template-mgmt-component-tests/template-protected-routes.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/template-protected-routes.component.spec.ts
@@ -17,13 +17,13 @@ import { RoutingMessagePlanCampaignIdRequiredPage } from '../pages/routing/campa
 import { RoutingMessagePlansPage } from '../pages/routing/message-plans-page';
 import { RoutingPreviewEmailTemplatePage } from 'pages/routing/email/preview-email-page';
 import { RoutingPreviewLargePrintLetterTemplatePage } from 'pages/routing/letter/preview-large-print-letter-template-page';
-import { RoutingPreviewMessagePlanLetterTemplatePage } from 'pages/routing/preview-message-plan-letter-template-page';
+import { RoutingPreviewMessagePlanPreviewLetterTemplatePage } from 'pages/routing/preview-message-plan-letter-template-page';
 import { RoutingPreviewMessagePlanPage } from 'pages/routing/preview-message-plan-page';
 import { RoutingPreviewNhsAppTemplatePage } from 'pages/routing/nhs-app/preview-nhs-app-page';
 import { RoutingPreviewOtherLanguageLetterTemplatePage } from 'pages/routing/letter/preview-other-language-letter-template-page';
 import { RoutingPreviewSmsTemplatePage } from 'pages/routing/sms/preview-sms-template-page';
 import { RoutingPreviewStandardLetterTemplatePage } from 'pages/routing/letter/preview-standard-letter-page';
-import { RoutingReviewAndMoveToProductionLetterTemplatePage } from 'pages/routing/review-and-move-to-production-letter-template-page';
+import { RoutingReviewAndMoveToProductionPreviewLetterTemplatePage } from 'pages/routing/review-and-move-to-production-letter-template-page';
 import {
   RoutingChooseBritishSignLanguageLetterTemplatePage,
   RoutingPreviewBritishSignLanguageLetterTemplatePage,
@@ -94,14 +94,14 @@ const protectedPages = [
   RoutingPreviewBritishSignLanguageLetterTemplatePage,
   RoutingPreviewEmailTemplatePage,
   RoutingPreviewLargePrintLetterTemplatePage,
-  RoutingPreviewMessagePlanLetterTemplatePage,
+  RoutingPreviewMessagePlanPreviewLetterTemplatePage,
   RoutingPreviewMessagePlanPage,
   RoutingPreviewNhsAppTemplatePage,
   RoutingPreviewOtherLanguageLetterTemplatePage,
   RoutingPreviewSmsTemplatePage,
   RoutingPreviewStandardLetterTemplatePage,
   RoutingReviewAndMoveToProductionPage,
-  RoutingReviewAndMoveToProductionLetterTemplatePage,
+  RoutingReviewAndMoveToProductionPreviewLetterTemplatePage,
   TemplateMgmtChoosePage,
   TemplateMgmtChoosePrintingAndPostagePage,
   TemplateMgmtCopyPage,
diff --git a/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts b/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts
index a7ad16216..f92681e12 100644
--- a/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts
+++ b/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts
@@ -18,8 +18,10 @@ import {
   RoutingChooseLargePrintLetterTemplatePage,
   RoutingGetReadyToMovePage,
   RoutingReviewAndMoveToProductionPage,
-  RoutingReviewAndMoveToProductionLetterTemplatePage,
+  RoutingReviewAndMoveToProductionPreviewLetterTemplatePage,
   RoutingChooseBritishSignLanguageLetterTemplatePage,
+  RoutingPreviewMessagePlanPage,
+  RoutingPreviewMessagePlanPreviewLetterTemplatePage,
 } from '../pages/routing';
 import { TemplateMgmtMessageTemplatesPage } from '../pages/template-mgmt-message-templates-page';
 import { RoutingChooseTemplateForMessagePlanBasePage } from '../pages/routing/choose-template-base-page';
@@ -199,6 +201,7 @@ test.describe('Routing', () => {
     const messageTemplatesPage = new TemplateMgmtMessageTemplatesPage(page);
     const messagePlansPage = new RoutingMessagePlansPage(page);
     const editMessagePlanPage = new RoutingEditMessagePlanPage(page);
+    const previewMessagePlanPage = new RoutingPreviewMessagePlanPage(page);
 
     await test.step('check initial template statuses', async () => {
       await messageTemplatesPage.loadPage();
@@ -459,7 +462,7 @@ test.describe('Routing', () => {
       await newPage.waitForLoadState();
 
       const previewLetterPage =
-        new RoutingReviewAndMoveToProductionLetterTemplatePage(newPage);
+        new RoutingReviewAndMoveToProductionPreviewLetterTemplatePage(newPage);
 
       await expect(previewLetterPage.pageHeading).toContainText(
         templates.LETTER.name
@@ -494,8 +497,34 @@ test.describe('Routing', () => {
       );
     });
 
+    await test.step('preview letter template from preview message plan page', async () => {
+      await expect(previewMessagePlanPage.pageHeading).toBeVisible();
+
+      const letterBlock = previewMessagePlanPage.getTemplateBlock('LETTER');
+
+      const newPagePromise = page.context().waitForEvent('page');
+      await letterBlock.defaultTemplateCard.templateLink.click();
+      const newPage = await newPagePromise;
+      await newPage.waitForLoadState();
+
+      const previewLetterPage =
+        new RoutingPreviewMessagePlanPreviewLetterTemplatePage(newPage);
+
+      await expect(previewLetterPage.pageHeading).toContainText(
+        templates.LETTER.name
+      );
+
+      await expect(previewLetterPage.templateId).toContainText(
+        templates.LETTER.id
+      );
+
+      await newPage.close();
+
+      await expect(previewMessagePlanPage.pageHeading).toBeVisible();
+    });
+
     await test.step('verify all templates are locked (except removed large print letter)', async () => {
-      await messagePlansPage.clickTemplatesHeaderLink();
+      await previewMessagePlanPage.clickTemplatesHeaderLink();
 
       await expect(messageTemplatesPage.pageHeading).toBeVisible();
 
diff --git a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-preview-letter-template.routing-component.spec.ts
similarity index 78%
rename from tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts
rename to tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-preview-letter-template.routing-component.spec.ts
index e9ffd29ea..10afb0e90 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-preview-letter-template.routing-component.spec.ts
@@ -9,7 +9,7 @@ import { TestUser, testUsers } from 'helpers/auth/cognito-auth-helper';
 import { TemplateStorageHelper } from 'helpers/db/template-storage-helper';
 import { randomUUID } from 'node:crypto';
 import { TemplateFactory } from 'helpers/factories/template-factory';
-import { RoutingPreviewMessagePlanLetterTemplatePage } from 'pages/routing/preview-message-plan-letter-template-page';
+import { RoutingPreviewMessagePlanPreviewLetterTemplatePage } from 'pages/routing/preview-message-plan-letter-template-page';
 import { RoutingConfigFactory } from 'helpers/factories/routing-config-factory';
 import { RoutingConfigStorageHelper } from 'helpers/db/routing-config-storage-helper';
 import { getTestContext } from 'helpers/context/context';
@@ -32,7 +32,7 @@ function createMessagePlans(user: TestUser) {
 function createTemplates(user: TestUser) {
   const templateIds = {
     EMAIL: randomUUID(),
-    AUTHORING_LETTER: randomUUID(),
+    LETTER: randomUUID(),
     PDF_LETTER: randomUUID(),
   };
 
@@ -42,10 +42,10 @@ function createTemplates(user: TestUser) {
       user,
       `Test Email template - ${templateIds.EMAIL}`
     ),
-    AUTHORING_LETTER: TemplateFactory.createAuthoringLetterTemplate(
-      templateIds.AUTHORING_LETTER,
+    LETTER: TemplateFactory.createAuthoringLetterTemplate(
+      templateIds.LETTER,
       user,
-      `Test Authoring Letter template - ${templateIds.AUTHORING_LETTER}`
+      `Test Authoring Letter template - ${templateIds.LETTER}`
     ),
     PDF_LETTER: TemplateFactory.uploadPdfLetterTemplate(
       templateIds.PDF_LETTER,
@@ -55,7 +55,7 @@ function createTemplates(user: TestUser) {
   };
 }
 
-test.describe('Routing - Preview Message Plan Letter template page', () => {
+test.describe('Routing - Preview Message Plan / Preview Letter template page', () => {
   let messagePlans: ReturnType<typeof createMessagePlans>;
   let templates: ReturnType<typeof createTemplates>;
 
@@ -77,9 +77,9 @@ test.describe('Routing - Preview Message Plan Letter template page', () => {
 
   test('common page tests', async ({ page, baseURL }) => {
     const props = {
-      page: new RoutingPreviewMessagePlanLetterTemplatePage(page)
+      page: new RoutingPreviewMessagePlanPreviewLetterTemplatePage(page)
         .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-        .setPathParam('templateId', templates.AUTHORING_LETTER.id),
+        .setPathParam('templateId', templates.LETTER.id),
       baseURL,
     };
     await assertSkipToMainContent(props);
@@ -88,31 +88,31 @@ test.describe('Routing - Preview Message Plan Letter template page', () => {
     await assertSignOutLink(props);
   });
 
-  test('loads the AUTHORING letter template', async ({ page, baseURL }) => {
+  test('loads the letter template', async ({ page, baseURL }) => {
     const previewLetterTemplatePage =
-      new RoutingPreviewMessagePlanLetterTemplatePage(page)
+      new RoutingPreviewMessagePlanPreviewLetterTemplatePage(page)
         .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-        .setPathParam('templateId', templates.AUTHORING_LETTER.id);
+        .setPathParam('templateId', templates.LETTER.id);
 
     await previewLetterTemplatePage.loadPage();
 
     await expect(page).toHaveURL(
-      `${baseURL}/templates/message-plans/preview-message-plan/${messagePlans.LETTER_ROUTING_CONFIG.id}/preview-template/${templates.AUTHORING_LETTER.id}`
+      `${baseURL}/templates/message-plans/preview-message-plan/${messagePlans.LETTER_ROUTING_CONFIG.id}/preview-template/${templates.LETTER.id}`
     );
 
     await expect(previewLetterTemplatePage.pageHeading).toContainText(
-      templates.AUTHORING_LETTER.name
+      templates.LETTER.name
     );
 
-    expect(templates.AUTHORING_LETTER.campaignId).toBeTruthy();
+    expect(templates.LETTER.campaignId).toBeTruthy();
 
     await expect(previewLetterTemplatePage.campaignId).toContainText(
-      templates.AUTHORING_LETTER.campaignId!
+      templates.LETTER.campaignId!
     );
 
     await expect(previewLetterTemplatePage.templateId).toBeVisible();
     await expect(previewLetterTemplatePage.templateId).toContainText(
-      templates.AUTHORING_LETTER.id
+      templates.LETTER.id
     );
 
     await expect(previewLetterTemplatePage.summaryList).toBeVisible();
@@ -122,14 +122,14 @@ test.describe('Routing - Preview Message Plan Letter template page', () => {
 
     await expect(previewLetterTemplatePage.letterPreviewIframe).toHaveAttribute(
       'src',
-      `/templates/files/${templates.AUTHORING_LETTER.clientId}/renders/${templates.AUTHORING_LETTER.id}/initial-render.pdf`
+      `/templates/files/${templates.LETTER.clientId}/renders/${templates.LETTER.id}/initial-render.pdf`
     );
   });
 
   test.describe('redirects to invalid template page', () => {
     test('when template cannot be found', async ({ page, baseURL }) => {
       const previewLetterTemplatePage =
-        new RoutingPreviewMessagePlanLetterTemplatePage(page)
+        new RoutingPreviewMessagePlanPreviewLetterTemplatePage(page)
           .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
           .setPathParam('templateId', notFoundTemplateId);
 
@@ -140,7 +140,7 @@ test.describe('Routing - Preview Message Plan Letter template page', () => {
 
     test('when template ID is invalid', async ({ page, baseURL }) => {
       const previewLetterTemplatePage =
-        new RoutingPreviewMessagePlanLetterTemplatePage(page)
+        new RoutingPreviewMessagePlanPreviewLetterTemplatePage(page)
           .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
           .setPathParam('templateId', invalidTemplateId);
 
@@ -149,9 +149,9 @@ test.describe('Routing - Preview Message Plan Letter template page', () => {
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
 
-    test('when template is not letter', async ({ page, baseURL }) => {
+    test('when template is not a letter', async ({ page, baseURL }) => {
       const previewLetterTemplatePage =
-        new RoutingPreviewMessagePlanLetterTemplatePage(page)
+        new RoutingPreviewMessagePlanPreviewLetterTemplatePage(page)
           .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
           .setPathParam('templateId', templates.EMAIL.id);
 
@@ -162,7 +162,7 @@ test.describe('Routing - Preview Message Plan Letter template page', () => {
 
     test('when template is a PDF letter', async ({ page, baseURL }) => {
       const previewLetterTemplatePage =
-        new RoutingPreviewMessagePlanLetterTemplatePage(page)
+        new RoutingPreviewMessagePlanPreviewLetterTemplatePage(page)
           .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
           .setPathParam('templateId', templates.PDF_LETTER.id);
 
diff --git a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
index 678c52ee5..a9198450f 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
@@ -31,8 +31,7 @@ function createTemplates(user: TestUser) {
     BSL_LETTER: randomUUID(),
     FRENCH_LETTER: randomUUID(),
     SPANISH_LETTER: randomUUID(),
-    AUTHORING_LETTER: randomUUID(),
-    AUTHORING_LARGE_PRINT_LETTER: randomUUID(),
+    PDF_LETTER: randomUUID(),
   };
 
   return {
@@ -104,26 +103,11 @@ function createTemplates(user: TestUser) {
         longFormRender: { status: 'RENDERED' },
       }
     ),
-    AUTHORING_LETTER: TemplateFactory.createAuthoringLetterTemplate(
-      templateIds.AUTHORING_LETTER,
+    PDF_LETTER: TemplateFactory.uploadPdfLetterTemplate(
+      templateIds.PDF_LETTER,
       user,
-      `Test Authoring Letter template - ${templateIds.AUTHORING_LETTER}`,
-      'SUBMITTED',
-      {
-        longFormRender: { status: 'RENDERED' },
-        shortFormRender: { status: 'RENDERED' },
-      }
-    ),
-    AUTHORING_LARGE_PRINT_LETTER: TemplateFactory.createAuthoringLetterTemplate(
-      templateIds.AUTHORING_LARGE_PRINT_LETTER,
-      user,
-      `Test Authoring Large Print Letter template - ${templateIds.AUTHORING_LARGE_PRINT_LETTER}`,
-      'SUBMITTED',
-      {
-        letterType: 'x1',
-        longFormRender: { status: 'RENDERED' },
-        shortFormRender: { status: 'RENDERED' },
-      }
+      `Test PDF Letter template - ${templateIds.PDF_LETTER}`,
+      'SUBMITTED'
     ),
   };
 }
@@ -371,32 +355,27 @@ test.describe('Routing - Preview Message Plan page', () => {
         await expect(links[index]).toHaveAttribute('target', '_blank');
       }
 
-      const [popup] = await Promise.all([
-        page.waitForEvent('popup'),
+      const [newTab] = await Promise.all([
+        page.context().waitForEvent('page'),
         templateBlock.defaultTemplateCard.templateLink.click(),
       ]);
 
-      await expect(popup).toHaveURL(
+      await expect(newTab).toHaveURL(
         `/templates/preview-submitted-letter-template/${templates.LETTER.id}`
       );
 
-      await popup.close();
+      await newTab.close();
     });
   });
 
-  test('displays AUTHORING letter template links pointing to in-flow preview', async ({
+  test('displays PDF letter template link pointing to submitted letter page', async ({
     page,
   }) => {
     const { dbEntry } = RoutingConfigFactory.createWithChannels(
       user,
       ['LETTER'],
       { status: 'COMPLETED' }
-    )
-      .addTemplate('LETTER', templates.AUTHORING_LETTER.id)
-      .addAccessibleFormatTemplate(
-        'x1',
-        templates.AUTHORING_LARGE_PRINT_LETTER.id
-      );
+    ).addTemplate('LETTER', templates.PDF_LETTER.id);
 
     await routingConfigStorageHelper.seed([dbEntry]);
 
@@ -410,37 +389,31 @@ test.describe('Routing - Preview Message Plan page', () => {
       await previewMessagePlanPage.getTemplateBlock('LETTER');
 
     await expect(templateBlock.defaultTemplateCard.templateName).toHaveText(
-      templates.AUTHORING_LETTER.name
+      templates.PDF_LETTER.name
     );
     await expect(templateBlock.defaultTemplateCard.templateLink).toHaveText(
       'Preview template (opens in a new tab)'
     );
-
     await expect(
       templateBlock.defaultTemplateCard.templateLink
     ).toHaveAttribute(
       'href',
-      `/templates/message-plans/preview-message-plan/${dbEntry.id}/preview-template/${templates.AUTHORING_LETTER.id}`
+      `/templates/preview-submitted-letter-template/${templates.PDF_LETTER.id}`
     );
-
     await expect(
       templateBlock.defaultTemplateCard.templateLink
     ).toHaveAttribute('target', '_blank');
 
-    await expect(
-      templateBlock.getAccessibilityFormatCard('x1').templateLink
-    ).toHaveText('Preview template (opens in a new tab)');
+    const [newTab] = await Promise.all([
+      page.context().waitForEvent('page'),
+      templateBlock.defaultTemplateCard.templateLink.click(),
+    ]);
 
-    await expect(
-      templateBlock.getAccessibilityFormatCard('x1').templateLink
-    ).toHaveAttribute(
-      'href',
-      `/templates/message-plans/preview-message-plan/${dbEntry.id}/preview-template/${templates.AUTHORING_LARGE_PRINT_LETTER.id}`
+    await expect(newTab).toHaveURL(
+      `/templates/preview-submitted-letter-template/${templates.PDF_LETTER.id}`
     );
 
-    await expect(
-      templateBlock.getAccessibilityFormatCard('x1').templateLink
-    ).toHaveAttribute('target', '_blank');
+    await newTab.close();
   });
 
   test('letter only with no conditional templates', async ({ page }) => {
diff --git a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-preview-letter-template.routing-component.spec.ts
similarity index 79%
rename from tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts
rename to tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-preview-letter-template.routing-component.spec.ts
index 5b2845112..de340ff42 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-preview-letter-template.routing-component.spec.ts
@@ -9,7 +9,7 @@ import { TestUser, testUsers } from 'helpers/auth/cognito-auth-helper';
 import { TemplateStorageHelper } from 'helpers/db/template-storage-helper';
 import { randomUUID } from 'node:crypto';
 import { TemplateFactory } from 'helpers/factories/template-factory';
-import { RoutingReviewAndMoveToProductionLetterTemplatePage } from 'pages/routing/review-and-move-to-production-letter-template-page';
+import { RoutingReviewAndMoveToProductionPreviewLetterTemplatePage } from 'pages/routing/review-and-move-to-production-letter-template-page';
 import { RoutingConfigFactory } from 'helpers/factories/routing-config-factory';
 import { RoutingConfigStorageHelper } from 'helpers/db/routing-config-storage-helper';
 import { getTestContext } from 'helpers/context/context';
@@ -32,7 +32,7 @@ function createMessagePlans(user: TestUser) {
 function createTemplates(user: TestUser) {
   const templateIds = {
     EMAIL: randomUUID(),
-    AUTHORING_LETTER: randomUUID(),
+    LETTER: randomUUID(),
     PDF_LETTER: randomUUID(),
   };
 
@@ -42,10 +42,10 @@ function createTemplates(user: TestUser) {
       user,
       `Test Email template - ${templateIds.EMAIL}`
     ),
-    AUTHORING_LETTER: TemplateFactory.createAuthoringLetterTemplate(
-      templateIds.AUTHORING_LETTER,
+    LETTER: TemplateFactory.createAuthoringLetterTemplate(
+      templateIds.LETTER,
       user,
-      `Test Authoring Letter template - ${templateIds.AUTHORING_LETTER}`
+      `Test Letter template - ${templateIds.LETTER}`
     ),
     PDF_LETTER: TemplateFactory.uploadPdfLetterTemplate(
       templateIds.PDF_LETTER,
@@ -55,7 +55,7 @@ function createTemplates(user: TestUser) {
   };
 }
 
-test.describe('Routing - Review and Move to Production Letter template page', () => {
+test.describe('Routing - Review and Move to Production / Preview Letter template page', () => {
   let messagePlans: ReturnType<typeof createMessagePlans>;
   let templates: ReturnType<typeof createTemplates>;
 
@@ -77,9 +77,9 @@ test.describe('Routing - Review and Move to Production Letter template page', ()
 
   test('common page tests', async ({ page, baseURL }) => {
     const props = {
-      page: new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
+      page: new RoutingReviewAndMoveToProductionPreviewLetterTemplatePage(page)
         .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-        .setPathParam('templateId', templates.AUTHORING_LETTER.id),
+        .setPathParam('templateId', templates.LETTER.id),
       baseURL,
     };
     await assertSkipToMainContent(props);
@@ -90,29 +90,29 @@ test.describe('Routing - Review and Move to Production Letter template page', ()
 
   test('loads the AUTHORING letter template', async ({ page, baseURL }) => {
     const previewLetterTemplatePage =
-      new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
+      new RoutingReviewAndMoveToProductionPreviewLetterTemplatePage(page)
         .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-        .setPathParam('templateId', templates.AUTHORING_LETTER.id);
+        .setPathParam('templateId', templates.LETTER.id);
 
     await previewLetterTemplatePage.loadPage();
 
     await expect(page).toHaveURL(
-      `${baseURL}/templates/message-plans/review-and-move-to-production/${messagePlans.LETTER_ROUTING_CONFIG.id}/preview-template/${templates.AUTHORING_LETTER.id}`
+      `${baseURL}/templates/message-plans/review-and-move-to-production/${messagePlans.LETTER_ROUTING_CONFIG.id}/preview-template/${templates.LETTER.id}`
     );
 
     await expect(previewLetterTemplatePage.pageHeading).toContainText(
-      templates.AUTHORING_LETTER.name
+      templates.LETTER.name
     );
 
-    expect(templates.AUTHORING_LETTER.campaignId).toBeTruthy();
+    expect(templates.LETTER.campaignId).toBeTruthy();
 
     await expect(previewLetterTemplatePage.campaignId).toContainText(
-      templates.AUTHORING_LETTER.campaignId!
+      templates.LETTER.campaignId!
     );
 
     await expect(previewLetterTemplatePage.templateId).toBeVisible();
     await expect(previewLetterTemplatePage.templateId).toContainText(
-      templates.AUTHORING_LETTER.id
+      templates.LETTER.id
     );
 
     await expect(previewLetterTemplatePage.summaryList).toBeVisible();
@@ -122,14 +122,14 @@ test.describe('Routing - Review and Move to Production Letter template page', ()
 
     await expect(previewLetterTemplatePage.letterPreviewIframe).toHaveAttribute(
       'src',
-      `/templates/files/${templates.AUTHORING_LETTER.clientId}/renders/${templates.AUTHORING_LETTER.id}/initial-render.pdf`
+      `/templates/files/${templates.LETTER.clientId}/renders/${templates.LETTER.id}/initial-render.pdf`
     );
   });
 
   test.describe('redirects to invalid template page', () => {
     test('when template cannot be found', async ({ page, baseURL }) => {
       const previewLetterTemplatePage =
-        new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
+        new RoutingReviewAndMoveToProductionPreviewLetterTemplatePage(page)
           .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
           .setPathParam('templateId', notFoundTemplateId);
 
@@ -140,7 +140,7 @@ test.describe('Routing - Review and Move to Production Letter template page', ()
 
     test('when template ID is invalid', async ({ page, baseURL }) => {
       const previewLetterTemplatePage =
-        new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
+        new RoutingReviewAndMoveToProductionPreviewLetterTemplatePage(page)
           .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
           .setPathParam('templateId', invalidTemplateId);
 
@@ -151,7 +151,7 @@ test.describe('Routing - Review and Move to Production Letter template page', ()
 
     test('when template is not letter', async ({ page, baseURL }) => {
       const previewLetterTemplatePage =
-        new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
+        new RoutingReviewAndMoveToProductionPreviewLetterTemplatePage(page)
           .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
           .setPathParam('templateId', templates.EMAIL.id);
 
@@ -162,7 +162,7 @@ test.describe('Routing - Review and Move to Production Letter template page', ()
 
     test('when template is a PDF letter', async ({ page, baseURL }) => {
       const previewLetterTemplatePage =
-        new RoutingReviewAndMoveToProductionLetterTemplatePage(page)
+        new RoutingReviewAndMoveToProductionPreviewLetterTemplatePage(page)
           .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
           .setPathParam('templateId', templates.PDF_LETTER.id);
 
diff --git a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
index 34f78cb15..98f7d8d76 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
@@ -30,8 +30,7 @@ function createTemplates(user: TestUser) {
     BSL_LETTER: randomUUID(),
     FRENCH_LETTER: randomUUID(),
     SPANISH_LETTER: randomUUID(),
-    AUTHORING_LETTER: randomUUID(),
-    AUTHORING_LARGE_PRINT_LETTER: randomUUID(),
+    PDF_LETTER: randomUUID(),
   };
 
   return {
@@ -105,26 +104,11 @@ function createTemplates(user: TestUser) {
         longFormRender: { status: 'RENDERED' },
       }
     ),
-    AUTHORING_LETTER: TemplateFactory.createAuthoringLetterTemplate(
-      templateIds.AUTHORING_LETTER,
+    PDF_LETTER: TemplateFactory.uploadPdfLetterTemplate(
+      templateIds.PDF_LETTER,
       user,
-      `Test Authoring Letter template - ${templateIds.AUTHORING_LETTER}`,
-      'SUBMITTED',
-      {
-        longFormRender: { status: 'RENDERED' },
-        shortFormRender: { status: 'RENDERED' },
-      }
-    ),
-    AUTHORING_LARGE_PRINT_LETTER: TemplateFactory.createAuthoringLetterTemplate(
-      templateIds.AUTHORING_LARGE_PRINT_LETTER,
-      user,
-      `Test Authoring Large Print Letter template - ${templateIds.AUTHORING_LARGE_PRINT_LETTER}`,
-      'SUBMITTED',
-      {
-        letterType: 'x1',
-        longFormRender: { status: 'RENDERED' },
-        shortFormRender: { status: 'RENDERED' },
-      }
+      `Test PDF Letter template - ${templateIds.PDF_LETTER}`,
+      'SUBMITTED'
     ),
   };
 }
@@ -374,22 +358,28 @@ test.describe('Routing - Review and Move to Production page', () => {
         );
         await expect(links[index]).toHaveAttribute('target', '_blank');
       }
+
+      const [newTab] = await Promise.all([
+        page.context().waitForEvent('page'),
+        templateBlock.defaultTemplateCard.templateLink.click(),
+      ]);
+
+      await expect(newTab).toHaveURL(
+        `/templates/message-plans/review-and-move-to-production/${dbEntry.id}/preview-template/${templates.LETTER.id}`
+      );
+
+      await newTab.close();
     });
   });
 
-  test('displays AUTHORING letter template links pointing to summary preview', async ({
+  test('displays PDF letter template link pointing to submitted letter page', async ({
     page,
   }) => {
     const { dbEntry } = RoutingConfigFactory.createWithChannels(
       user,
       ['LETTER'],
       { status: 'DRAFT' }
-    )
-      .addTemplate('LETTER', templates.AUTHORING_LETTER.id)
-      .addAccessibleFormatTemplate(
-        'x1',
-        templates.AUTHORING_LARGE_PRINT_LETTER.id
-      );
+    ).addTemplate('LETTER', templates.PDF_LETTER.id);
 
     await routingConfigStorageHelper.seed([dbEntry]);
 
@@ -402,37 +392,31 @@ test.describe('Routing - Review and Move to Production page', () => {
     const templateBlock = await reviewPage.getTemplateBlock('LETTER');
 
     await expect(templateBlock.defaultTemplateCard.templateName).toHaveText(
-      templates.AUTHORING_LETTER.name
+      templates.PDF_LETTER.name
     );
     await expect(templateBlock.defaultTemplateCard.templateLink).toHaveText(
       'Preview template (opens in a new tab)'
     );
-
     await expect(
       templateBlock.defaultTemplateCard.templateLink
     ).toHaveAttribute(
       'href',
-      `/templates/message-plans/review-and-move-to-production/${dbEntry.id}/preview-template/${templates.AUTHORING_LETTER.id}`
+      `/templates/preview-submitted-letter-template/${templates.PDF_LETTER.id}`
     );
-
     await expect(
       templateBlock.defaultTemplateCard.templateLink
     ).toHaveAttribute('target', '_blank');
 
-    await expect(
-      templateBlock.getAccessibilityFormatCard('x1').templateLink
-    ).toHaveText('Preview template (opens in a new tab)');
+    const [newTab] = await Promise.all([
+      page.context().waitForEvent('page'),
+      templateBlock.defaultTemplateCard.templateLink.click(),
+    ]);
 
-    await expect(
-      templateBlock.getAccessibilityFormatCard('x1').templateLink
-    ).toHaveAttribute(
-      'href',
-      `/templates/message-plans/review-and-move-to-production/${dbEntry.id}/preview-template/${templates.AUTHORING_LARGE_PRINT_LETTER.id}`
+    await expect(newTab).toHaveURL(
+      `/templates/preview-submitted-letter-template/${templates.PDF_LETTER.id}`
     );
 
-    await expect(
-      templateBlock.getAccessibilityFormatCard('x1').templateLink
-    ).toHaveAttribute('target', '_blank');
+    await newTab.close();
   });
 
   test('keep in draft button navigates to the edit message plan page', async ({

From 1719bf642097036e7a38b802e1179a1c052cca42 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Wed, 8 Apr 2026 09:13:48 +0100
Subject: [PATCH 44/57] lockfile

---
 package-lock.json | 575 +++++++++++++++++++++++-----------------------
 1 file changed, 288 insertions(+), 287 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 785fd1429..7607f489b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7826,18 +7826,18 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login": {
-      "version": "3.972.28",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.28.tgz",
-      "integrity": "sha512-ZSTfO6jqUTCysbdBPtEX5OUR//3rbD0lN7jO3sQeS2Gjr/Y+DT6SbIJ0oT2cemNw3UzKu97sNONd1CwNMthuZQ==",
+      "version": "3.972.29",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.29.tgz",
+      "integrity": "sha512-OGOslTbOlxXexKMqhxCEbBQbUIfuhGxU5UXw3Fm56ypXHvrXH4aTt/xb5Y884LOoteP1QST1lVZzHfcTnWhiPQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.26",
-        "@aws-sdk/nested-clients": "^3.996.18",
-        "@aws-sdk/types": "^3.973.6",
-        "@smithy/property-provider": "^4.2.12",
-        "@smithy/protocol-http": "^5.3.12",
-        "@smithy/shared-ini-file-loader": "^4.4.7",
-        "@smithy/types": "^4.13.1",
+        "@aws-sdk/core": "^3.973.27",
+        "@aws-sdk/nested-clients": "^3.996.19",
+        "@aws-sdk/types": "^3.973.7",
+        "@smithy/property-provider": "^4.2.13",
+        "@smithy/protocol-http": "^5.3.13",
+        "@smithy/shared-ini-file-loader": "^4.4.8",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -7845,22 +7845,22 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/core": {
-      "version": "3.973.26",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.973.26.tgz",
-      "integrity": "sha512-A/E6n2W42ruU+sfWk+mMUOyVXbsSgGrY3MJ9/0Az5qUdG67y8I6HYzzoAa+e/lzxxl1uCYmEL6BTMi9ZiZnplQ==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/types": "^3.973.6",
-        "@aws-sdk/xml-builder": "^3.972.16",
-        "@smithy/core": "^3.23.13",
-        "@smithy/node-config-provider": "^4.3.12",
-        "@smithy/property-provider": "^4.2.12",
-        "@smithy/protocol-http": "^5.3.12",
-        "@smithy/signature-v4": "^5.3.12",
-        "@smithy/smithy-client": "^4.12.8",
-        "@smithy/types": "^4.13.1",
+      "version": "3.973.27",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.973.27.tgz",
+      "integrity": "sha512-CUZ5m8hwMCH6OYI4Li/WgMfIEx10Q2PLI9Y3XOUTPGZJ53aZ0007jCv+X/ywsaERyKPdw5MRZWk877roQksQ4A==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/types": "^3.973.7",
+        "@aws-sdk/xml-builder": "^3.972.17",
+        "@smithy/core": "^3.23.14",
+        "@smithy/node-config-provider": "^4.3.13",
+        "@smithy/property-provider": "^4.2.13",
+        "@smithy/protocol-http": "^5.3.13",
+        "@smithy/signature-v4": "^5.3.13",
+        "@smithy/smithy-client": "^4.12.9",
+        "@smithy/types": "^4.14.0",
         "@smithy/util-base64": "^4.3.2",
-        "@smithy/util-middleware": "^4.2.12",
+        "@smithy/util-middleware": "^4.2.13",
         "@smithy/util-utf8": "^4.2.2",
         "tslib": "^2.6.2"
       },
@@ -7869,14 +7869,14 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-host-header": {
-      "version": "3.972.8",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.972.8.tgz",
-      "integrity": "sha512-wAr2REfKsqoKQ+OkNqvOShnBoh+nkPurDKW7uAeVSu6kUECnWlSJiPvnoqxGlfousEY/v9LfS9sNc46hjSYDIQ==",
+      "version": "3.972.9",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.972.9.tgz",
+      "integrity": "sha512-je5vRdNw4SkuTnmRbFZLdye4sQ0faLt8kwka5wnnSU30q1mHO4X+idGEJOOE+Tn1ME7Oryn05xxkDvIb3UaLaQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.6",
-        "@smithy/protocol-http": "^5.3.12",
-        "@smithy/types": "^4.13.1",
+        "@aws-sdk/types": "^3.973.7",
+        "@smithy/protocol-http": "^5.3.13",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -7884,13 +7884,13 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-logger": {
-      "version": "3.972.8",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.972.8.tgz",
-      "integrity": "sha512-CWl5UCM57WUFaFi5kB7IBY1UmOeLvNZAZ2/OZ5l20ldiJ3TiIz1pC65gYj8X0BCPWkeR1E32mpsCk1L1I4n+lA==",
+      "version": "3.972.9",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.972.9.tgz",
+      "integrity": "sha512-HsVgDrruhqI28RkaXALm8grJ7Agc1wF6Et0xh6pom8NdO2VdO/SD9U/tPwUjewwK/pVoka+EShBxyCvgsPCtog==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.6",
-        "@smithy/types": "^4.13.1",
+        "@aws-sdk/types": "^3.973.7",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -7898,15 +7898,15 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-recursion-detection": {
-      "version": "3.972.9",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.972.9.tgz",
-      "integrity": "sha512-/Wt5+CT8dpTFQxEJ9iGy/UGrXr7p2wlIOEHvIr/YcHYByzoLjrqkYqXdJjd9UIgWjv7eqV2HnFJen93UTuwfTQ==",
+      "version": "3.972.10",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.972.10.tgz",
+      "integrity": "sha512-RVQQbq5orQ/GHUnXvqEOj2HHPBJm+mM+ySwZKS5UaLBwra5ugRtiH09PLUoOZRl7a1YzaOzXSuGbn9iD5j60WQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.6",
+        "@aws-sdk/types": "^3.973.7",
         "@aws/lambda-invoke-store": "^0.2.2",
-        "@smithy/protocol-http": "^5.3.12",
-        "@smithy/types": "^4.13.1",
+        "@smithy/protocol-http": "^5.3.13",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -7914,18 +7914,18 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-user-agent": {
-      "version": "3.972.28",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.28.tgz",
-      "integrity": "sha512-cfWZFlVh7Va9lRay4PN2A9ARFzaBYcA097InT5M2CdRS05ECF5yaz86jET8Wsl2WcyKYEvVr/QNmKtYtafUHtQ==",
+      "version": "3.972.29",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.29.tgz",
+      "integrity": "sha512-f/sIRzuTfEjg6NsbMYvye2VsmnQoNgntntleQyx5uGacUYzszbfIlO3GcI6G6daWUmTm0IDZc11qMHWwF0o0mQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.26",
-        "@aws-sdk/types": "^3.973.6",
-        "@aws-sdk/util-endpoints": "^3.996.5",
-        "@smithy/core": "^3.23.13",
-        "@smithy/protocol-http": "^5.3.12",
-        "@smithy/types": "^4.13.1",
-        "@smithy/util-retry": "^4.2.13",
+        "@aws-sdk/core": "^3.973.27",
+        "@aws-sdk/types": "^3.973.7",
+        "@aws-sdk/util-endpoints": "^3.996.6",
+        "@smithy/core": "^3.23.14",
+        "@smithy/protocol-http": "^5.3.13",
+        "@smithy/types": "^4.14.0",
+        "@smithy/util-retry": "^4.3.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -7933,47 +7933,47 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/nested-clients": {
-      "version": "3.996.18",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.996.18.tgz",
-      "integrity": "sha512-c7ZSIXrESxHKx2Mcopgd8AlzZgoXMr20fkx5ViPWPOLBvmyhw9VwJx/Govg8Ef/IhEon5R9l53Z8fdYSEmp6VA==",
+      "version": "3.996.19",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.996.19.tgz",
+      "integrity": "sha512-uFkmCDXvmQYLanlYdOFS0+MQWkrj9wPMt/ZCc/0J0fjPim6F5jBVBmEomvGY/j77ILW6GTPwN22Jc174Mhkw6Q==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "^3.973.26",
-        "@aws-sdk/middleware-host-header": "^3.972.8",
-        "@aws-sdk/middleware-logger": "^3.972.8",
-        "@aws-sdk/middleware-recursion-detection": "^3.972.9",
-        "@aws-sdk/middleware-user-agent": "^3.972.28",
-        "@aws-sdk/region-config-resolver": "^3.972.10",
-        "@aws-sdk/types": "^3.973.6",
-        "@aws-sdk/util-endpoints": "^3.996.5",
-        "@aws-sdk/util-user-agent-browser": "^3.972.8",
-        "@aws-sdk/util-user-agent-node": "^3.973.14",
-        "@smithy/config-resolver": "^4.4.13",
-        "@smithy/core": "^3.23.13",
-        "@smithy/fetch-http-handler": "^5.3.15",
-        "@smithy/hash-node": "^4.2.12",
-        "@smithy/invalid-dependency": "^4.2.12",
-        "@smithy/middleware-content-length": "^4.2.12",
-        "@smithy/middleware-endpoint": "^4.4.28",
-        "@smithy/middleware-retry": "^4.4.46",
-        "@smithy/middleware-serde": "^4.2.16",
-        "@smithy/middleware-stack": "^4.2.12",
-        "@smithy/node-config-provider": "^4.3.12",
-        "@smithy/node-http-handler": "^4.5.1",
-        "@smithy/protocol-http": "^5.3.12",
-        "@smithy/smithy-client": "^4.12.8",
-        "@smithy/types": "^4.13.1",
-        "@smithy/url-parser": "^4.2.12",
+        "@aws-sdk/core": "^3.973.27",
+        "@aws-sdk/middleware-host-header": "^3.972.9",
+        "@aws-sdk/middleware-logger": "^3.972.9",
+        "@aws-sdk/middleware-recursion-detection": "^3.972.10",
+        "@aws-sdk/middleware-user-agent": "^3.972.29",
+        "@aws-sdk/region-config-resolver": "^3.972.11",
+        "@aws-sdk/types": "^3.973.7",
+        "@aws-sdk/util-endpoints": "^3.996.6",
+        "@aws-sdk/util-user-agent-browser": "^3.972.9",
+        "@aws-sdk/util-user-agent-node": "^3.973.15",
+        "@smithy/config-resolver": "^4.4.14",
+        "@smithy/core": "^3.23.14",
+        "@smithy/fetch-http-handler": "^5.3.16",
+        "@smithy/hash-node": "^4.2.13",
+        "@smithy/invalid-dependency": "^4.2.13",
+        "@smithy/middleware-content-length": "^4.2.13",
+        "@smithy/middleware-endpoint": "^4.4.29",
+        "@smithy/middleware-retry": "^4.5.0",
+        "@smithy/middleware-serde": "^4.2.17",
+        "@smithy/middleware-stack": "^4.2.13",
+        "@smithy/node-config-provider": "^4.3.13",
+        "@smithy/node-http-handler": "^4.5.2",
+        "@smithy/protocol-http": "^5.3.13",
+        "@smithy/smithy-client": "^4.12.9",
+        "@smithy/types": "^4.14.0",
+        "@smithy/url-parser": "^4.2.13",
         "@smithy/util-base64": "^4.3.2",
         "@smithy/util-body-length-browser": "^4.2.2",
         "@smithy/util-body-length-node": "^4.2.3",
-        "@smithy/util-defaults-mode-browser": "^4.3.44",
-        "@smithy/util-defaults-mode-node": "^4.2.48",
-        "@smithy/util-endpoints": "^3.3.3",
-        "@smithy/util-middleware": "^4.2.12",
-        "@smithy/util-retry": "^4.2.13",
+        "@smithy/util-defaults-mode-browser": "^4.3.45",
+        "@smithy/util-defaults-mode-node": "^4.2.49",
+        "@smithy/util-endpoints": "^3.3.4",
+        "@smithy/util-middleware": "^4.2.13",
+        "@smithy/util-retry": "^4.3.0",
         "@smithy/util-utf8": "^4.2.2",
         "tslib": "^2.6.2"
       },
@@ -7982,15 +7982,15 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/region-config-resolver": {
-      "version": "3.972.10",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.972.10.tgz",
-      "integrity": "sha512-1dq9ToC6e070QvnVhhbAs3bb5r6cQ10gTVc6cyRV5uvQe7P138TV2uG2i6+Yok4bAkVAcx5AqkTEBUvWEtBlsQ==",
+      "version": "3.972.11",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.972.11.tgz",
+      "integrity": "sha512-6Q8B1dcx6BBqUTY1Mc/eROKA0FImEEY5VPSd6AGPEUf0ErjExz4snVqa9kNJSoVDV1rKaNf3qrWojgcKW+SdDg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.6",
-        "@smithy/config-resolver": "^4.4.13",
-        "@smithy/node-config-provider": "^4.3.12",
-        "@smithy/types": "^4.13.1",
+        "@aws-sdk/types": "^3.973.7",
+        "@smithy/config-resolver": "^4.4.14",
+        "@smithy/node-config-provider": "^4.3.13",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -7998,12 +7998,12 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/types": {
-      "version": "3.973.6",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.6.tgz",
-      "integrity": "sha512-Atfcy4E++beKtwJHiDln2Nby8W/mam64opFPTiHEqgsthqeydFS1pY+OUlN1ouNOmf8ArPU/6cDS65anOP3KQw==",
+      "version": "3.973.7",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.7.tgz",
+      "integrity": "sha512-reXRwoJ6CfChoqAsBszUYajAF8Z2LRE+CRcKocvFSMpIiLOtYU3aJ9trmn6VVPAzbbY5LXF+FfmUslbXk1SYFg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.13.1",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -8011,15 +8011,15 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/util-endpoints": {
-      "version": "3.996.5",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.996.5.tgz",
-      "integrity": "sha512-Uh93L5sXFNbyR5sEPMzUU8tJ++Ku97EY4udmC01nB8Zu+xfBPwpIwJ6F7snqQeq8h2pf+8SGN5/NoytfKgYPIw==",
+      "version": "3.996.6",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.996.6.tgz",
+      "integrity": "sha512-2nUQ+2ih7CShuKHpGSIYvvAIOHy52dOZguYG36zptBukhw6iFwcvGfG0tes0oZFWQqEWvgZe9HLWaNlvXGdOrg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.6",
-        "@smithy/types": "^4.13.1",
-        "@smithy/url-parser": "^4.2.12",
-        "@smithy/util-endpoints": "^3.3.3",
+        "@aws-sdk/types": "^3.973.7",
+        "@smithy/types": "^4.14.0",
+        "@smithy/url-parser": "^4.2.13",
+        "@smithy/util-endpoints": "^3.3.4",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -8027,27 +8027,27 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/util-user-agent-browser": {
-      "version": "3.972.8",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.972.8.tgz",
-      "integrity": "sha512-B3KGXJviV2u6Cdw2SDY2aDhoJkVfY/Q/Trwk2CMSkikE1Oi6gRzxhvhIfiRpHfmIsAhV4EA54TVEX8K6CbHbkA==",
+      "version": "3.972.9",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.972.9.tgz",
+      "integrity": "sha512-sn/LMzTbGjYqCCF24390WxPd6hkpoSptiUn5DzVp4cD71yqw+yGEGm1YCxyEoPXyc8qciM8UzLJcZBFslxo5Uw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.6",
-        "@smithy/types": "^4.13.1",
+        "@aws-sdk/types": "^3.973.7",
+        "@smithy/types": "^4.14.0",
         "bowser": "^2.11.0",
         "tslib": "^2.6.2"
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/util-user-agent-node": {
-      "version": "3.973.14",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.973.14.tgz",
-      "integrity": "sha512-vNSB/DYaPOyujVZBg/zUznH9QC142MaTHVmaFlF7uzzfg3CgT9f/l4C0Yi+vU/tbBhxVcXVB90Oohk5+o+ZbWw==",
+      "version": "3.973.15",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.973.15.tgz",
+      "integrity": "sha512-fYn3s9PtKdgQkczGZCFMgkNEe8aq1JCVbnRqjqN9RSVW43xn2RV9xdcZ3z01a48Jpkuh/xCmBKJxdLOo4Ozg7w==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/middleware-user-agent": "^3.972.28",
-        "@aws-sdk/types": "^3.973.6",
-        "@smithy/node-config-provider": "^4.3.12",
-        "@smithy/types": "^4.13.1",
+        "@aws-sdk/middleware-user-agent": "^3.972.29",
+        "@aws-sdk/types": "^3.973.7",
+        "@smithy/node-config-provider": "^4.3.13",
+        "@smithy/types": "^4.14.0",
         "@smithy/util-config-provider": "^4.2.2",
         "tslib": "^2.6.2"
       },
@@ -8064,12 +8064,12 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/xml-builder": {
-      "version": "3.972.16",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.16.tgz",
-      "integrity": "sha512-iu2pyvaqmeatIJLURLqx9D+4jKAdTH20ntzB6BFwjyN7V960r4jK32mx0Zf7YbtOYAbmbtQfDNuL60ONinyw7A==",
+      "version": "3.972.17",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.17.tgz",
+      "integrity": "sha512-Ra7hjqAZf1OXRRMueB13qex7mFJRDK/pgCvdSFemXBT8KCGnQDPoKzHY1SjN+TjJVmnpSF14W5tJ1vDamFu+Gg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.13.1",
+        "@smithy/types": "^4.14.0",
         "fast-xml-parser": "5.5.8",
         "tslib": "^2.6.2"
       },
@@ -12986,16 +12986,16 @@
       }
     },
     "node_modules/@smithy/config-resolver": {
-      "version": "4.4.13",
-      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.4.13.tgz",
-      "integrity": "sha512-iIzMC5NmOUP6WL6o8iPBjFhUhBZ9pPjpUpQYWMUFQqKyXXzOftbfK8zcQCz/jFV1Psmf05BK5ypx4K2r4Tnwdg==",
+      "version": "4.4.14",
+      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.4.14.tgz",
+      "integrity": "sha512-N55f8mPEccpzKetUagdvmAy8oohf0J5cuj9jLI1TaSceRlq0pJsIZepY3kmAXAhyxqXPV6hDerDQhqQPKWgAoQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/node-config-provider": "^4.3.12",
-        "@smithy/types": "^4.13.1",
+        "@smithy/node-config-provider": "^4.3.13",
+        "@smithy/types": "^4.14.0",
         "@smithy/util-config-provider": "^4.2.2",
-        "@smithy/util-endpoints": "^3.3.3",
-        "@smithy/util-middleware": "^4.2.12",
+        "@smithy/util-endpoints": "^3.3.4",
+        "@smithy/util-middleware": "^4.2.13",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -13003,18 +13003,18 @@
       }
     },
     "node_modules/@smithy/core": {
-      "version": "3.23.13",
-      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.23.13.tgz",
-      "integrity": "sha512-J+2TT9D6oGsUVXVEMvz8h2EmdVnkBiy2auCie4aSJMvKlzUtO5hqjEzXhoCUkIMo7gAYjbQcN0g/MMSXEhDs1Q==",
+      "version": "3.23.14",
+      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.23.14.tgz",
+      "integrity": "sha512-vJ0IhpZxZAkFYOegMKSrxw7ujhhT2pass/1UEcZ4kfl5srTAqtPU5I7MdYQoreVas3204ykCiNhY1o7Xlz6Yyg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/protocol-http": "^5.3.12",
-        "@smithy/types": "^4.13.1",
-        "@smithy/url-parser": "^4.2.12",
+        "@smithy/protocol-http": "^5.3.13",
+        "@smithy/types": "^4.14.0",
+        "@smithy/url-parser": "^4.2.13",
         "@smithy/util-base64": "^4.3.2",
         "@smithy/util-body-length-browser": "^4.2.2",
-        "@smithy/util-middleware": "^4.2.12",
-        "@smithy/util-stream": "^4.5.21",
+        "@smithy/util-middleware": "^4.2.13",
+        "@smithy/util-stream": "^4.5.22",
         "@smithy/util-utf8": "^4.2.2",
         "@smithy/uuid": "^1.1.2",
         "tslib": "^2.6.2"
@@ -13024,15 +13024,15 @@
       }
     },
     "node_modules/@smithy/credential-provider-imds": {
-      "version": "4.2.12",
-      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.2.12.tgz",
-      "integrity": "sha512-cr2lR792vNZcYMriSIj+Um3x9KWrjcu98kn234xA6reOAFMmbRpQMOv8KPgEmLLtx3eldU6c5wALKFqNOhugmg==",
+      "version": "4.2.13",
+      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.2.13.tgz",
+      "integrity": "sha512-wboCPijzf6RJKLOvnjDAiBxGSmSnGXj35o5ZAWKDaHa/cvQ5U3ZJ13D4tMCE8JG4dxVAZFy/P0x/V9CwwdfULQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/node-config-provider": "^4.3.12",
-        "@smithy/property-provider": "^4.2.12",
-        "@smithy/types": "^4.13.1",
-        "@smithy/url-parser": "^4.2.12",
+        "@smithy/node-config-provider": "^4.3.13",
+        "@smithy/property-provider": "^4.2.13",
+        "@smithy/types": "^4.14.0",
+        "@smithy/url-parser": "^4.2.13",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -13110,14 +13110,14 @@
       }
     },
     "node_modules/@smithy/fetch-http-handler": {
-      "version": "5.3.15",
-      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.3.15.tgz",
-      "integrity": "sha512-T4jFU5N/yiIfrtrsb9uOQn7RdELdM/7HbyLNr6uO/mpkj1ctiVs7CihVr51w4LyQlXWDpXFn4BElf1WmQvZu/A==",
+      "version": "5.3.16",
+      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.3.16.tgz",
+      "integrity": "sha512-nYDRUIvNd4mFmuXraRWt6w5UsZTNqtj4hXJA/iiOD4tuseIdLP9Lq38teH/SZTcIFCa2f+27o7hYpIsWktJKEQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/protocol-http": "^5.3.12",
-        "@smithy/querystring-builder": "^4.2.12",
-        "@smithy/types": "^4.13.1",
+        "@smithy/protocol-http": "^5.3.13",
+        "@smithy/querystring-builder": "^4.2.13",
+        "@smithy/types": "^4.14.0",
         "@smithy/util-base64": "^4.3.2",
         "tslib": "^2.6.2"
       },
@@ -13141,12 +13141,12 @@
       }
     },
     "node_modules/@smithy/hash-node": {
-      "version": "4.2.12",
-      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.2.12.tgz",
-      "integrity": "sha512-QhBYbGrbxTkZ43QoTPrK72DoYviDeg6YKDrHTMJbbC+A0sml3kSjzFtXP7BtbyJnXojLfTQldGdUR0RGD8dA3w==",
+      "version": "4.2.13",
+      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.2.13.tgz",
+      "integrity": "sha512-4/oy9h0jjmY80a2gOIo75iLl8TOPhmtx4E2Hz+PfMjvx/vLtGY4TMU/35WRyH2JHPfT5CVB38u4JRow7gnmzJA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.13.1",
+        "@smithy/types": "^4.14.0",
         "@smithy/util-buffer-from": "^4.2.2",
         "@smithy/util-utf8": "^4.2.2",
         "tslib": "^2.6.2"
@@ -13170,12 +13170,12 @@
       }
     },
     "node_modules/@smithy/invalid-dependency": {
-      "version": "4.2.12",
-      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.2.12.tgz",
-      "integrity": "sha512-/4F1zb7Z8LOu1PalTdESFHR0RbPwHd3FcaG1sI3UEIriQTWakysgJr65lc1jj6QY5ye7aFsisajotH6UhWfm/g==",
+      "version": "4.2.13",
+      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.2.13.tgz",
+      "integrity": "sha512-jvC0RB/8BLj2SMIkY0Npl425IdnxZJxInpZJbu563zIRnVjpDMXevU3VMCRSabaLB0kf/eFIOusdGstrLJ8IDg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.13.1",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -13209,13 +13209,13 @@
       }
     },
     "node_modules/@smithy/middleware-content-length": {
-      "version": "4.2.12",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.2.12.tgz",
-      "integrity": "sha512-YE58Yz+cvFInWI/wOTrB+DbvUVz/pLn5mC5MvOV4fdRUc6qGwygyngcucRQjAhiCEbmfLOXX0gntSIcgMvAjmA==",
+      "version": "4.2.13",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.2.13.tgz",
+      "integrity": "sha512-IPMLm/LE4AZwu6qiE8Rr8vJsWhs9AtOdySRXrOM7xnvclp77Tyh7hMs/FRrMf26kgIe67vFJXXOSmVxS7oKeig==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/protocol-http": "^5.3.12",
-        "@smithy/types": "^4.13.1",
+        "@smithy/protocol-http": "^5.3.13",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -13223,18 +13223,18 @@
       }
     },
     "node_modules/@smithy/middleware-endpoint": {
-      "version": "4.4.28",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.4.28.tgz",
-      "integrity": "sha512-p1gfYpi91CHcs5cBq982UlGlDrxoYUX6XdHSo91cQ2KFuz6QloHosO7Jc60pJiVmkWrKOV8kFYlGFFbQ2WUKKQ==",
+      "version": "4.4.29",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.4.29.tgz",
+      "integrity": "sha512-R9Q/58U+qBiSARGWbAbFLczECg/RmysRksX6Q8BaQEpt75I7LI6WGDZnjuC9GXSGKljEbA7N118LhGaMbfrTXw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/core": "^3.23.13",
-        "@smithy/middleware-serde": "^4.2.16",
-        "@smithy/node-config-provider": "^4.3.12",
-        "@smithy/shared-ini-file-loader": "^4.4.7",
-        "@smithy/types": "^4.13.1",
-        "@smithy/url-parser": "^4.2.12",
-        "@smithy/util-middleware": "^4.2.12",
+        "@smithy/core": "^3.23.14",
+        "@smithy/middleware-serde": "^4.2.17",
+        "@smithy/node-config-provider": "^4.3.13",
+        "@smithy/shared-ini-file-loader": "^4.4.8",
+        "@smithy/types": "^4.14.0",
+        "@smithy/url-parser": "^4.2.13",
+        "@smithy/util-middleware": "^4.2.13",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -13242,18 +13242,19 @@
       }
     },
     "node_modules/@smithy/middleware-retry": {
-      "version": "4.4.46",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.4.46.tgz",
-      "integrity": "sha512-SpvWNNOPOrKQGUqZbEPO+es+FRXMWvIyzUKUOYdDgdlA6BdZj/R58p4umoQ76c2oJC44PiM7mKizyyex1IJzow==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/node-config-provider": "^4.3.12",
-        "@smithy/protocol-http": "^5.3.12",
-        "@smithy/service-error-classification": "^4.2.12",
-        "@smithy/smithy-client": "^4.12.8",
-        "@smithy/types": "^4.13.1",
-        "@smithy/util-middleware": "^4.2.12",
-        "@smithy/util-retry": "^4.2.13",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.5.0.tgz",
+      "integrity": "sha512-/NzISn4grj/BRFVua/xnQwF+7fakYZgimpw2dfmlPgcqecBMKxpB9g5mLYRrmBD5OrPoODokw4Vi1hrSR4zRyw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@smithy/core": "^3.23.14",
+        "@smithy/node-config-provider": "^4.3.13",
+        "@smithy/protocol-http": "^5.3.13",
+        "@smithy/service-error-classification": "^4.2.13",
+        "@smithy/smithy-client": "^4.12.9",
+        "@smithy/types": "^4.14.0",
+        "@smithy/util-middleware": "^4.2.13",
+        "@smithy/util-retry": "^4.3.0",
         "@smithy/uuid": "^1.1.2",
         "tslib": "^2.6.2"
       },
@@ -13262,14 +13263,14 @@
       }
     },
     "node_modules/@smithy/middleware-serde": {
-      "version": "4.2.16",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.2.16.tgz",
-      "integrity": "sha512-beqfV+RZ9RSv+sQqor3xroUUYgRFCGRw6niGstPG8zO9LgTl0B0MCucxjmrH/2WwksQN7UUgI7KNANoZv+KALA==",
+      "version": "4.2.17",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.2.17.tgz",
+      "integrity": "sha512-0T2mcaM6v9W1xku86Dk0bEW7aEseG6KenFkPK98XNw0ZhOqOiD1MrMsdnQw9QsL3/Oa85T53iSMlm0SZdSuIEQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/core": "^3.23.13",
-        "@smithy/protocol-http": "^5.3.12",
-        "@smithy/types": "^4.13.1",
+        "@smithy/core": "^3.23.14",
+        "@smithy/protocol-http": "^5.3.13",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -13277,12 +13278,12 @@
       }
     },
     "node_modules/@smithy/middleware-stack": {
-      "version": "4.2.12",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.2.12.tgz",
-      "integrity": "sha512-kruC5gRHwsCOuyCd4ouQxYjgRAym2uDlCvQ5acuMtRrcdfg7mFBg6blaxcJ09STpt3ziEkis6bhg1uwrWU7txw==",
+      "version": "4.2.13",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.2.13.tgz",
+      "integrity": "sha512-g72jN/sGDLyTanrCLH9fhg3oysO3f7tQa6eWWsMyn2BiYNCgjF24n4/I9wff/5XidFvjj9ilipAoQrurTUrLvw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.13.1",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -13290,14 +13291,14 @@
       }
     },
     "node_modules/@smithy/node-config-provider": {
-      "version": "4.3.12",
-      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.3.12.tgz",
-      "integrity": "sha512-tr2oKX2xMcO+rBOjobSwVAkV05SIfUKz8iI53rzxEmgW3GOOPOv0UioSDk+J8OpRQnpnhsO3Af6IEBabQBVmiw==",
+      "version": "4.3.13",
+      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.3.13.tgz",
+      "integrity": "sha512-iGxQ04DsKXLckbgnX4ipElrOTk+IHgTyu0q0WssZfYhDm9CQWHmu6cOeI5wmWRxpXbBDhIIfXMWz5tPEtcVqbw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/property-provider": "^4.2.12",
-        "@smithy/shared-ini-file-loader": "^4.4.7",
-        "@smithy/types": "^4.13.1",
+        "@smithy/property-provider": "^4.2.13",
+        "@smithy/shared-ini-file-loader": "^4.4.8",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -13305,14 +13306,14 @@
       }
     },
     "node_modules/@smithy/node-http-handler": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.5.1.tgz",
-      "integrity": "sha512-ejjxdAXjkPIs9lyYyVutOGNOraqUE9v/NjGMKwwFrfOM354wfSD8lmlj8hVwUzQmlLLF4+udhfCX9Exnbmvfzw==",
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.5.2.tgz",
+      "integrity": "sha512-/oD7u8M0oj2ZTFw7GkuuHWpIxtWdLlnyNkbrWcyVYhd5RJNDuczdkb0wfnQICyNFrVPlr8YHOhamjNy3zidhmA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/protocol-http": "^5.3.12",
-        "@smithy/querystring-builder": "^4.2.12",
-        "@smithy/types": "^4.13.1",
+        "@smithy/protocol-http": "^5.3.13",
+        "@smithy/querystring-builder": "^4.2.13",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -13320,12 +13321,12 @@
       }
     },
     "node_modules/@smithy/property-provider": {
-      "version": "4.2.12",
-      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.2.12.tgz",
-      "integrity": "sha512-jqve46eYU1v7pZ5BM+fmkbq3DerkSluPr5EhvOcHxygxzD05ByDRppRwRPPpFrsFo5yDtCYLKu+kreHKVrvc7A==",
+      "version": "4.2.13",
+      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.2.13.tgz",
+      "integrity": "sha512-bGzUCthxRmezuxkbu9wD33wWg9KX3hJpCXpQ93vVkPrHn9ZW6KNNdY5xAUWNuRCwQ+VyboFuWirG1lZhhkcyRQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.13.1",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -13333,12 +13334,12 @@
       }
     },
     "node_modules/@smithy/protocol-http": {
-      "version": "5.3.12",
-      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.3.12.tgz",
-      "integrity": "sha512-fit0GZK9I1xoRlR4jXmbLhoN0OdEpa96ul8M65XdmXnxXkuMxM0Y8HDT0Fh0Xb4I85MBvBClOzgSrV1X2s1Hxw==",
+      "version": "5.3.13",
+      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.3.13.tgz",
+      "integrity": "sha512-+HsmuJUF4u8POo6s8/a2Yb/AQ5t/YgLovCuHF9oxbocqv+SZ6gd8lC2duBFiCA/vFHoHQhoq7QjqJqZC6xOxxg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.13.1",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -13346,12 +13347,12 @@
       }
     },
     "node_modules/@smithy/querystring-builder": {
-      "version": "4.2.12",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.2.12.tgz",
-      "integrity": "sha512-6wTZjGABQufekycfDGMEB84BgtdOE/rCVTov+EDXQ8NHKTUNIp/j27IliwP7tjIU9LR+sSzyGBOXjeEtVgzCHg==",
+      "version": "4.2.13",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.2.13.tgz",
+      "integrity": "sha512-tG4aOYFCZdPMjbgfhnIQ322H//ojujldp1SrHPHpBSb3NqgUp3dwiUGRJzie87hS1DYwWGqDuPaowoDF+rYCbQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.13.1",
+        "@smithy/types": "^4.14.0",
         "@smithy/util-uri-escape": "^4.2.2",
         "tslib": "^2.6.2"
       },
@@ -13360,12 +13361,12 @@
       }
     },
     "node_modules/@smithy/querystring-parser": {
-      "version": "4.2.12",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.2.12.tgz",
-      "integrity": "sha512-P2OdvrgiAKpkPNKlKUtWbNZKB1XjPxM086NeVhK+W+wI46pIKdWBe5QyXvhUm3MEcyS/rkLvY8rZzyUdmyDZBw==",
+      "version": "4.2.13",
+      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.2.13.tgz",
+      "integrity": "sha512-hqW3Q4P+CDzUyQ87GrboGMeD7XYNMOF+CuTwu936UQRB/zeYn3jys8C3w+wMkDfY7CyyyVwZQ5cNFoG0x1pYmA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.13.1",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -13373,24 +13374,24 @@
       }
     },
     "node_modules/@smithy/service-error-classification": {
-      "version": "4.2.12",
-      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.2.12.tgz",
-      "integrity": "sha512-LlP29oSQN0Tw0b6D0Xo6BIikBswuIiGYbRACy5ujw/JgWSzTdYj46U83ssf6Ux0GyNJVivs2uReU8pt7Eu9okQ==",
+      "version": "4.2.13",
+      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.2.13.tgz",
+      "integrity": "sha512-a0s8XZMfOC/qpqq7RCPvJlk93rWFrElH6O++8WJKz0FqnA4Y7fkNi/0mnGgSH1C4x6MFsuBA8VKu4zxFrMe5Vw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.13.1"
+        "@smithy/types": "^4.14.0"
       },
       "engines": {
         "node": ">=18.0.0"
       }
     },
     "node_modules/@smithy/shared-ini-file-loader": {
-      "version": "4.4.7",
-      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.4.7.tgz",
-      "integrity": "sha512-HrOKWsUb+otTeo1HxVWeEb99t5ER1XrBi/xka2Wv6NVmTbuCUC1dvlrksdvxFtODLBjsC+PHK+fuy2x/7Ynyiw==",
+      "version": "4.4.8",
+      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.4.8.tgz",
+      "integrity": "sha512-VZCZx2bZasxdqxVgEAhREvDSlkatTPnkdWy1+Kiy8w7kYPBosW0V5IeDwzDUMvWBt56zpK658rx1cOBFOYaPaw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.13.1",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -13398,16 +13399,16 @@
       }
     },
     "node_modules/@smithy/signature-v4": {
-      "version": "5.3.12",
-      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.3.12.tgz",
-      "integrity": "sha512-B/FBwO3MVOL00DaRSXfXfa/TRXRheagt/q5A2NM13u7q+sHS59EOVGQNfG7DkmVtdQm5m3vOosoKAXSqn/OEgw==",
+      "version": "5.3.13",
+      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.3.13.tgz",
+      "integrity": "sha512-YpYSyM0vMDwKbHD/JA7bVOF6kToVRpa+FM5ateEVRpsTNu564g1muBlkTubXhSKKYXInhpADF46FPyrZcTLpXg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/is-array-buffer": "^4.2.2",
-        "@smithy/protocol-http": "^5.3.12",
-        "@smithy/types": "^4.13.1",
+        "@smithy/protocol-http": "^5.3.13",
+        "@smithy/types": "^4.14.0",
         "@smithy/util-hex-encoding": "^4.2.2",
-        "@smithy/util-middleware": "^4.2.12",
+        "@smithy/util-middleware": "^4.2.13",
         "@smithy/util-uri-escape": "^4.2.2",
         "@smithy/util-utf8": "^4.2.2",
         "tslib": "^2.6.2"
@@ -13417,17 +13418,17 @@
       }
     },
     "node_modules/@smithy/smithy-client": {
-      "version": "4.12.8",
-      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.12.8.tgz",
-      "integrity": "sha512-aJaAX7vHe5i66smoSSID7t4rKY08PbD8EBU7DOloixvhOozfYWdcSYE4l6/tjkZ0vBZhGjheWzB2mh31sLgCMA==",
+      "version": "4.12.9",
+      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.12.9.tgz",
+      "integrity": "sha512-ovaLEcTU5olSeHcRXcxV6viaKtpkHZumn6Ps0yn7dRf2rRSfy794vpjOtrWDO0d1auDSvAqxO+lyhERSXQ03EQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/core": "^3.23.13",
-        "@smithy/middleware-endpoint": "^4.4.28",
-        "@smithy/middleware-stack": "^4.2.12",
-        "@smithy/protocol-http": "^5.3.12",
-        "@smithy/types": "^4.13.1",
-        "@smithy/util-stream": "^4.5.21",
+        "@smithy/core": "^3.23.14",
+        "@smithy/middleware-endpoint": "^4.4.29",
+        "@smithy/middleware-stack": "^4.2.13",
+        "@smithy/protocol-http": "^5.3.13",
+        "@smithy/types": "^4.14.0",
+        "@smithy/util-stream": "^4.5.22",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -13435,9 +13436,9 @@
       }
     },
     "node_modules/@smithy/types": {
-      "version": "4.13.1",
-      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.13.1.tgz",
-      "integrity": "sha512-787F3yzE2UiJIQ+wYW1CVg2odHjmaWLGksnKQHUrK/lYZSEcy1msuLVvxaR/sI2/aDe9U+TBuLsXnr3vod1g0g==",
+      "version": "4.14.0",
+      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.14.0.tgz",
+      "integrity": "sha512-OWgntFLW88kx2qvf/c/67Vno1yuXm/f9M7QFAtVkkO29IJXGBIg0ycEaBTH0kvCtwmvZxRujrgP5a86RvsXJAQ==",
       "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.6.2"
@@ -13447,13 +13448,13 @@
       }
     },
     "node_modules/@smithy/url-parser": {
-      "version": "4.2.12",
-      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.2.12.tgz",
-      "integrity": "sha512-wOPKPEpso+doCZGIlr+e1lVI6+9VAKfL4kZWFgzVgGWY2hZxshNKod4l2LXS3PRC9otH/JRSjtEHqQ/7eLciRA==",
+      "version": "4.2.13",
+      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.2.13.tgz",
+      "integrity": "sha512-2G03yoboIRZlZze2+PT4GZEjgwQsJjUgn6iTsvxA02bVceHR6vp4Cuk7TUnPFWKF+ffNUk3kj4COwkENS2K3vw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/querystring-parser": "^4.2.12",
-        "@smithy/types": "^4.13.1",
+        "@smithy/querystring-parser": "^4.2.13",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -13524,14 +13525,14 @@
       }
     },
     "node_modules/@smithy/util-defaults-mode-browser": {
-      "version": "4.3.44",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.44.tgz",
-      "integrity": "sha512-eZg6XzaCbVr2S5cAErU5eGBDaOVTuTo1I65i4tQcHENRcZ8rMWhQy1DaIYUSLyZjsfXvmCqZrstSMYyGFocvHA==",
+      "version": "4.3.45",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.45.tgz",
+      "integrity": "sha512-ag9sWc6/nWZAuK3Wm9KlFJUnRkXLrXn33RFjIAmCTFThqLHY+7wCst10BGq56FxslsDrjhSie46c8OULS+BiIw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/property-provider": "^4.2.12",
-        "@smithy/smithy-client": "^4.12.8",
-        "@smithy/types": "^4.13.1",
+        "@smithy/property-provider": "^4.2.13",
+        "@smithy/smithy-client": "^4.12.9",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -13539,17 +13540,17 @@
       }
     },
     "node_modules/@smithy/util-defaults-mode-node": {
-      "version": "4.2.48",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.48.tgz",
-      "integrity": "sha512-FqOKTlqSaoV3nzO55pMs5NBnZX8EhoI0DGmn9kbYeXWppgHD6dchyuj2HLqp4INJDJbSrj6OFYJkAh/WhSzZPg==",
+      "version": "4.2.49",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.49.tgz",
+      "integrity": "sha512-jlN6vHwE8gY5AfiFBavtD3QtCX2f7lM3BKkz7nFKSNfFR5nXLXLg6sqXTJEEyDwtxbztIDBQCfjsGVXlIru2lQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/config-resolver": "^4.4.13",
-        "@smithy/credential-provider-imds": "^4.2.12",
-        "@smithy/node-config-provider": "^4.3.12",
-        "@smithy/property-provider": "^4.2.12",
-        "@smithy/smithy-client": "^4.12.8",
-        "@smithy/types": "^4.13.1",
+        "@smithy/config-resolver": "^4.4.14",
+        "@smithy/credential-provider-imds": "^4.2.13",
+        "@smithy/node-config-provider": "^4.3.13",
+        "@smithy/property-provider": "^4.2.13",
+        "@smithy/smithy-client": "^4.12.9",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -13557,13 +13558,13 @@
       }
     },
     "node_modules/@smithy/util-endpoints": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.3.3.tgz",
-      "integrity": "sha512-VACQVe50j0HZPjpwWcjyT51KUQ4AnsvEaQ2lKHOSL4mNLD0G9BjEniQ+yCt1qqfKfiAHRAts26ud7hBjamrwig==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.3.4.tgz",
+      "integrity": "sha512-BKoR/ubPp9KNKFxPpg1J28N1+bgu8NGAtJblBP7yHy8yQPBWhIAv9+l92SlQLpolGm71CVO+btB60gTgzT0wog==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/node-config-provider": "^4.3.12",
-        "@smithy/types": "^4.13.1",
+        "@smithy/node-config-provider": "^4.3.13",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -13583,12 +13584,12 @@
       }
     },
     "node_modules/@smithy/util-middleware": {
-      "version": "4.2.12",
-      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.2.12.tgz",
-      "integrity": "sha512-Er805uFUOvgc0l8nv0e0su0VFISoxhJ/AwOn3gL2NWNY2LUEldP5WtVcRYSQBcjg0y9NfG8JYrCJaYDpupBHJQ==",
+      "version": "4.2.13",
+      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.2.13.tgz",
+      "integrity": "sha512-GTooyrlmRTqvUen4eK7/K1p6kryF7bnDfq6XsAbIsf2mo51B/utaH+XThY6dKgNCWzMAaH/+OLmqaBuLhLWRow==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/types": "^4.13.1",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -13596,13 +13597,13 @@
       }
     },
     "node_modules/@smithy/util-retry": {
-      "version": "4.2.13",
-      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.2.13.tgz",
-      "integrity": "sha512-qQQsIvL0MGIbUjeSrg0/VlQ3jGNKyM3/2iU3FPNgy01z+Sp4OvcaxbgIoFOTvB61ZoohtutuOvOcgmhbD0katQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.3.0.tgz",
+      "integrity": "sha512-tSOPQNT/4KfbvqeMovWC3g23KSYy8czHd3tlN+tOYVNIDLSfxIsrPJihYi5TpNcoV789KWtgChUVedh2y6dDPg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/service-error-classification": "^4.2.12",
-        "@smithy/types": "^4.13.1",
+        "@smithy/service-error-classification": "^4.2.13",
+        "@smithy/types": "^4.14.0",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -13610,14 +13611,14 @@
       }
     },
     "node_modules/@smithy/util-stream": {
-      "version": "4.5.21",
-      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.5.21.tgz",
-      "integrity": "sha512-KzSg+7KKywLnkoKejRtIBXDmwBfjGvg1U1i/etkC7XSWUyFCoLno1IohV2c74IzQqdhX5y3uE44r/8/wuK+A7Q==",
+      "version": "4.5.22",
+      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.5.22.tgz",
+      "integrity": "sha512-3H8iq/0BfQjUs2/4fbHZ9aG9yNzcuZs24LPkcX1Q7Z+qpqaGM8+qbGmE8zo9m2nCRgamyvS98cHdcWvR6YUsew==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/fetch-http-handler": "^5.3.15",
-        "@smithy/node-http-handler": "^4.5.1",
-        "@smithy/types": "^4.13.1",
+        "@smithy/fetch-http-handler": "^5.3.16",
+        "@smithy/node-http-handler": "^4.5.2",
+        "@smithy/types": "^4.14.0",
         "@smithy/util-base64": "^4.3.2",
         "@smithy/util-buffer-from": "^4.2.2",
         "@smithy/util-hex-encoding": "^4.2.2",

From 561846c547f38aa4fc611597df1272ccf95ca88b Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Wed, 8 Apr 2026 10:51:57 +0100
Subject: [PATCH 45/57] rm unnecessary wrapping in link

---
 .../PreviewTemplateFromMessagePlan.tsx                      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx b/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx
index ac0396bab..698902d67 100644
--- a/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx
+++ b/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx
@@ -61,9 +61,9 @@ export function PreviewTemplateFromMessagePlan<T extends TemplateDto>({
   return (
     <>
       {backLinkHref && (
-        <Link href={backLinkHref} passHref legacyBehavior>
-          <NotifyBackLink>{content.backLink.text}</NotifyBackLink>
-        </Link>
+        <NotifyBackLink href={backLinkHref}>
+          {content.backLink.text}
+        </NotifyBackLink>
       )}
 
       <NHSNotifyMain>

From 2f3ae7228f581d58ba87c31c8d613c6c33ceb0b7 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Wed, 8 Apr 2026 10:58:40 +0100
Subject: [PATCH 46/57] use NHSNotifyBackLink

---
 .../PreviewTemplateFromMessagePlan.tsx                      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx b/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx
index 698902d67..20934cf6b 100644
--- a/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx
+++ b/frontend/src/components/molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan.tsx
@@ -3,7 +3,7 @@
 import baseContent from '@content/content';
 import Link from 'next/link';
 import { NHSNotifyMain } from '@atoms/NHSNotifyMain/NHSNotifyMain';
-import NotifyBackLink from '@atoms/NHSNotifyBackLink/NHSNotifyBackLink';
+import { NHSNotifyBackLink } from '@atoms/NHSNotifyBackLink/NHSNotifyBackLink';
 import type {
   LetterVariant,
   TemplateDto,
@@ -61,9 +61,9 @@ export function PreviewTemplateFromMessagePlan<T extends TemplateDto>({
   return (
     <>
       {backLinkHref && (
-        <NotifyBackLink href={backLinkHref}>
+        <NHSNotifyBackLink href={backLinkHref}>
           {content.backLink.text}
-        </NotifyBackLink>
+        </NHSNotifyBackLink>
       )}
 
       <NHSNotifyMain>

From 5427efa2cfde198964af84b5ef0bc24011d59e8e Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Wed, 8 Apr 2026 12:12:35 +0100
Subject: [PATCH 47/57] use lookup object for iframe content

---
 .../LetterRender/LetterRenderIframe.tsx       | 35 ++++++++++---------
 frontend/src/content/content.ts               | 16 +++++++++
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/molecules/LetterRender/LetterRenderIframe.tsx b/frontend/src/components/molecules/LetterRender/LetterRenderIframe.tsx
index 1d79e3e19..855e15b94 100644
--- a/frontend/src/components/molecules/LetterRender/LetterRenderIframe.tsx
+++ b/frontend/src/components/molecules/LetterRender/LetterRenderIframe.tsx
@@ -1,4 +1,5 @@
 import type { RenderKey } from '@utils/types';
+import content from '@content/content';
 
 type LetterRenderIframeProps = {
   renderType: RenderKey;
@@ -10,21 +11,21 @@ export function LetterRenderIframe({
   pdfUrl,
   ...rest
 }: LetterRenderIframeProps) {
-  if (!pdfUrl) return <p className='nhsuk-body'>No preview available</p>;
-
-  const tabName = renderType === 'shortFormRender' ? 'short' : 'long';
-
-  const tabbedViewSuffix =
-    renderType === 'initialRender' ? '' : ` - ${tabName} examples`;
-
-  const ariaLabelSuffix =
-    renderType === 'initialRender'
-      ? ''
-      : ` with ${tabName} example personalisation data`;
-
-  const ariaLabel = `PDF preview of letter template${ariaLabelSuffix}`;
-
-  const title = `Letter preview${tabbedViewSuffix}`;
-
-  return <iframe src={pdfUrl} title={title} aria-label={ariaLabel} {...rest} />;
+  if (!pdfUrl)
+    return (
+      <p className='nhsuk-body'>
+        {content.components.letterRender.iframe.noPreview}
+      </p>
+    );
+
+  const { title, ariaLabel } = content.components.letterRender.iframe;
+
+  return (
+    <iframe
+      src={pdfUrl}
+      title={title[renderType]}
+      aria-label={ariaLabel[renderType]}
+      {...rest}
+    />
+  );
 }
diff --git a/frontend/src/content/content.ts b/frontend/src/content/content.ts
index 3f130a385..44db7e4fa 100644
--- a/frontend/src/content/content.ts
+++ b/frontend/src/content/content.ts
@@ -3,6 +3,7 @@ import type {
   TemplateStatus,
   TemplateType,
 } from 'nhs-notify-web-template-management-types';
+import type { RenderKey } from '@utils/types';
 import type {
   DigitalTemplateType,
   FrontendSupportedLetterType,
@@ -594,6 +595,21 @@ const letterRender = {
     long: 'Long examples',
   },
   loadingText: 'Loading letter preview',
+  iframe: {
+    noPreview: 'No preview available',
+    title: {
+      initialRender: 'Letter preview',
+      shortFormRender: 'Letter preview - short examples',
+      longFormRender: 'Letter preview - long examples',
+    } satisfies Record<RenderKey, string>,
+    ariaLabel: {
+      initialRender: 'PDF preview of letter template',
+      shortFormRender:
+        'PDF preview of letter template with short example personalisation data',
+      longFormRender:
+        'PDF preview of letter template with long example personalisation data',
+    } satisfies Record<RenderKey, string>,
+  },
   pdsSection: {
     heading: 'PDS personalisation fields',
     hint: 'The PDS fields will be pre-filled with example data when you choose a test recipient.',

From 6b0b77f751b86ba945f1d06ba2727a02816ebd70 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Wed, 8 Apr 2026 13:13:01 +0100
Subject: [PATCH 48/57] split summary server component

---
 .../preview-template/page.test.tsx            |  10 +-
 .../preview-template/page.test.tsx            |  10 +-
 .../[templateId]/page.test.tsx                |  10 +-
 .../preview-template/page.test.tsx            |  10 +-
 .../preview-template/page.test.tsx            |  11 +-
 .../preview-template/page.test.tsx            |  11 +-
 ....test.tsx => SummaryChooseLetter.test.tsx} |  59 ++----
 .../SummaryLetterFromMessagePlan.test.tsx     |  83 +++++++++
 ...snap => SummaryChooseLetter.test.tsx.snap} | 168 +-----------------
 ...SummaryLetterFromMessagePlan.test.tsx.snap | 163 +++++++++++++++++
 .../preview-template/[templateId]/page.tsx    |   6 +-
 .../preview-template/[templateId]/page.tsx    |   6 +-
 .../preview-template/[templateId]/page.tsx    |   6 +-
 .../preview-template/[templateId]/page.tsx    |   6 +-
 .../preview-template/[templateId]/page.tsx    |   5 +-
 .../preview-template/[templateId]/page.tsx    |   5 +-
 .../SummaryChooseLetter.tsx}                  |  28 ++-
 .../SummaryLetterFromMessagePlan.tsx          |  49 +++++
 .../modules/backend-api/spec.tmpl.json        |   4 +-
 package.json                                  |   8 +-
 .../examples/ProofRequested/v1/email.json     |  10 +-
 .../examples/ProofRequested/v1/nhsapp.json    |  12 +-
 .../examples/ProofRequested/v1/sms.json       |  10 +-
 23 files changed, 387 insertions(+), 303 deletions(-)
 rename frontend/src/__tests__/components/molecules/{SummaryPreviewLetter.test.tsx => SummaryChooseLetter.test.tsx} (69%)
 create mode 100644 frontend/src/__tests__/components/molecules/SummaryLetterFromMessagePlan.test.tsx
 rename frontend/src/__tests__/components/molecules/__snapshots__/{SummaryPreviewLetter.test.tsx.snap => SummaryChooseLetter.test.tsx.snap} (64%)
 create mode 100644 frontend/src/__tests__/components/molecules/__snapshots__/SummaryLetterFromMessagePlan.test.tsx.snap
 rename frontend/src/components/molecules/{SummaryPreviewLetter/SummaryPreviewLetter.tsx => SummaryChooseLetter/SummaryChooseLetter.tsx} (71%)
 create mode 100644 frontend/src/components/molecules/SummaryLetterFromMessagePlan/SummaryLetterFromMessagePlan.tsx

diff --git a/frontend/src/__tests__/app/message-plans/choose-british-sign-language-letter-template/preview-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/choose-british-sign-language-letter-template/preview-template/page.test.tsx
index c7540d2f2..12c6253b5 100644
--- a/frontend/src/__tests__/app/message-plans/choose-british-sign-language-letter-template/preview-template/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/choose-british-sign-language-letter-template/preview-template/page.test.tsx
@@ -4,13 +4,13 @@
 import PreviewBritishSignLanguageLetterTemplateFromMessagePlan, {
   generateMetadata,
 } from '@app/message-plans/choose-british-sign-language-letter-template/[routingConfigId]/preview-template/[templateId]/page';
-import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+import { SummaryChooseLetter } from '@molecules/SummaryChooseLetter/SummaryChooseLetter';
 import { validateBritishSignLanguageLetterTemplate } from 'nhs-notify-web-template-management-utils';
 
-jest.mock('@molecules/SummaryPreviewLetter/SummaryPreviewLetter');
+jest.mock('@molecules/SummaryChooseLetter/SummaryChooseLetter');
 
 describe('PreviewBritishSignLanguageLetterTemplateFromMessagePlan page', () => {
-  it('should render SummaryPreviewLetter with validateBritishSignLanguageLetterTemplate and redirectUrl', async () => {
+  it('should render SummaryChooseLetter with validateBritishSignLanguageLetterTemplate and redirectUrlOnLockNumberFailure', async () => {
     const props = {
       params: Promise.resolve({
         routingConfigId: 'routing-config-id',
@@ -23,10 +23,10 @@ describe('PreviewBritishSignLanguageLetterTemplateFromMessagePlan page', () => {
       await PreviewBritishSignLanguageLetterTemplateFromMessagePlan(props);
 
     expect(page).toEqual(
-      <SummaryPreviewLetter
+      <SummaryChooseLetter
         {...props}
         validateTemplate={validateBritishSignLanguageLetterTemplate}
-        redirectUrl='/message-plans/edit-message-plan/routing-config-id'
+        redirectUrlOnLockNumberFailure='/message-plans/edit-message-plan/routing-config-id'
       />
     );
   });
diff --git a/frontend/src/__tests__/app/message-plans/choose-large-print-letter-template/preview-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/choose-large-print-letter-template/preview-template/page.test.tsx
index ba76ec0ce..c2cad0e6d 100644
--- a/frontend/src/__tests__/app/message-plans/choose-large-print-letter-template/preview-template/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/choose-large-print-letter-template/preview-template/page.test.tsx
@@ -4,13 +4,13 @@
 import PreviewLargePrintLetterTemplateFromMessagePlan, {
   generateMetadata,
 } from '@app/message-plans/choose-large-print-letter-template/[routingConfigId]/preview-template/[templateId]/page';
-import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+import { SummaryChooseLetter } from '@molecules/SummaryChooseLetter/SummaryChooseLetter';
 import { validateLargePrintLetterTemplate } from 'nhs-notify-web-template-management-utils';
 
-jest.mock('@molecules/SummaryPreviewLetter/SummaryPreviewLetter');
+jest.mock('@molecules/SummaryChooseLetter/SummaryChooseLetter');
 
 describe('PreviewLargePrintLetterTemplateFromMessagePlan page', () => {
-  it('should render SummaryPreviewLetter with validateLargePrintLetterTemplate and redirectUrl', async () => {
+  it('should render SummaryChooseLetter with validateLargePrintLetterTemplate and redirectUrlOnLockNumberFailure', async () => {
     const props = {
       params: Promise.resolve({
         routingConfigId: 'routing-config-id',
@@ -22,10 +22,10 @@ describe('PreviewLargePrintLetterTemplateFromMessagePlan page', () => {
     const page = await PreviewLargePrintLetterTemplateFromMessagePlan(props);
 
     expect(page).toEqual(
-      <SummaryPreviewLetter
+      <SummaryChooseLetter
         {...props}
         validateTemplate={validateLargePrintLetterTemplate}
-        redirectUrl='/message-plans/edit-message-plan/routing-config-id'
+        redirectUrlOnLockNumberFailure='/message-plans/edit-message-plan/routing-config-id'
       />
     );
   });
diff --git a/frontend/src/__tests__/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.test.tsx b/frontend/src/__tests__/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.test.tsx
index 490e64272..df207660f 100644
--- a/frontend/src/__tests__/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.test.tsx
@@ -4,13 +4,13 @@
 import PreviewOtherLanguageLetterTemplateFromMessagePlan, {
   generateMetadata,
 } from '@app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page';
-import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+import { SummaryChooseLetter } from '@molecules/SummaryChooseLetter/SummaryChooseLetter';
 import { validateForeignLanguageLetterTemplate } from 'nhs-notify-web-template-management-utils';
 
-jest.mock('@molecules/SummaryPreviewLetter/SummaryPreviewLetter');
+jest.mock('@molecules/SummaryChooseLetter/SummaryChooseLetter');
 
 describe('PreviewOtherLanguageLetterTemplateFromMessagePlan page', () => {
-  it('should render SummaryPreviewLetter with validateForeignLanguageLetterTemplate and redirectUrl', async () => {
+  it('should render SummaryChooseLetter with validateForeignLanguageLetterTemplate and redirectUrlOnLockNumberFailure', async () => {
     const props = {
       params: Promise.resolve({
         routingConfigId: 'routing-config-id',
@@ -22,10 +22,10 @@ describe('PreviewOtherLanguageLetterTemplateFromMessagePlan page', () => {
     const page = await PreviewOtherLanguageLetterTemplateFromMessagePlan(props);
 
     expect(page).toEqual(
-      <SummaryPreviewLetter
+      <SummaryChooseLetter
         {...props}
         validateTemplate={validateForeignLanguageLetterTemplate}
-        redirectUrl='/message-plans/edit-message-plan/routing-config-id'
+        redirectUrlOnLockNumberFailure='/message-plans/edit-message-plan/routing-config-id'
       />
     );
   });
diff --git a/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/preview-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/preview-template/page.test.tsx
index 1752a44fe..47616be14 100644
--- a/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/preview-template/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/preview-template/page.test.tsx
@@ -4,13 +4,13 @@
 import PreviewStandardEnglishLetterTemplateFromMessagePlan, {
   generateMetadata,
 } from '@app/message-plans/choose-standard-english-letter-template/[routingConfigId]/preview-template/[templateId]/page';
-import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+import { SummaryChooseLetter } from '@molecules/SummaryChooseLetter/SummaryChooseLetter';
 import { validateLetterTemplate } from 'nhs-notify-web-template-management-utils';
 
-jest.mock('@molecules/SummaryPreviewLetter/SummaryPreviewLetter');
+jest.mock('@molecules/SummaryChooseLetter/SummaryChooseLetter');
 
 describe('PreviewStandardEnglishLetterTemplateFromMessagePlan page', () => {
-  it('should render SummaryPreviewLetter with validateLetterTemplate and redirectUrl', async () => {
+  it('should render SummaryChooseLetter with validateLetterTemplate and redirectUrlOnLockNumberFailure', async () => {
     const props = {
       params: Promise.resolve({
         routingConfigId: 'routing-config-id',
@@ -23,10 +23,10 @@ describe('PreviewStandardEnglishLetterTemplateFromMessagePlan page', () => {
       await PreviewStandardEnglishLetterTemplateFromMessagePlan(props);
 
     expect(page).toEqual(
-      <SummaryPreviewLetter
+      <SummaryChooseLetter
         {...props}
         validateTemplate={validateLetterTemplate}
-        redirectUrl='/message-plans/edit-message-plan/routing-config-id'
+        redirectUrlOnLockNumberFailure='/message-plans/edit-message-plan/routing-config-id'
       />
     );
   });
diff --git a/frontend/src/__tests__/app/message-plans/preview-message-plan/preview-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/preview-message-plan/preview-template/page.test.tsx
index d528887e0..f6a86979d 100644
--- a/frontend/src/__tests__/app/message-plans/preview-message-plan/preview-template/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/preview-message-plan/preview-template/page.test.tsx
@@ -4,13 +4,15 @@
 import PreviewLetterTemplateFromPreviewMessagePlan, {
   generateMetadata,
 } from '@app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page';
-import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+import { SummaryLetterFromMessagePlan } from '@molecules/SummaryLetterFromMessagePlan/SummaryLetterFromMessagePlan';
 import { validateAuthoringLetterTemplate } from 'nhs-notify-web-template-management-utils';
 
-jest.mock('@molecules/SummaryPreviewLetter/SummaryPreviewLetter');
+jest.mock(
+  '@molecules/SummaryLetterFromMessagePlan/SummaryLetterFromMessagePlan'
+);
 
 describe('PreviewLetterTemplateFromPreviewMessagePlan page', () => {
-  it('should render SummaryPreviewLetter with hideBackLinks and authoring letter validator', async () => {
+  it('should render SummaryLetterFromMessagePlan with authoring letter validator', async () => {
     const props = {
       params: Promise.resolve({
         routingConfigId: 'routing-config-id',
@@ -21,10 +23,9 @@ describe('PreviewLetterTemplateFromPreviewMessagePlan page', () => {
     const page = await PreviewLetterTemplateFromPreviewMessagePlan(props);
 
     expect(page).toEqual(
-      <SummaryPreviewLetter
+      <SummaryLetterFromMessagePlan
         {...props}
         validateTemplate={validateAuthoringLetterTemplate}
-        hideBackLinks
       />
     );
   });
diff --git a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/preview-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/preview-template/page.test.tsx
index fe8717820..ba10c5993 100644
--- a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/preview-template/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/preview-template/page.test.tsx
@@ -4,13 +4,15 @@
 import PreviewLetterTemplateFromReviewAndMoveToProduction, {
   generateMetadata,
 } from '@app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page';
-import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+import { SummaryLetterFromMessagePlan } from '@molecules/SummaryLetterFromMessagePlan/SummaryLetterFromMessagePlan';
 import { validateAuthoringLetterTemplate } from 'nhs-notify-web-template-management-utils';
 
-jest.mock('@molecules/SummaryPreviewLetter/SummaryPreviewLetter');
+jest.mock(
+  '@molecules/SummaryLetterFromMessagePlan/SummaryLetterFromMessagePlan'
+);
 
 describe('PreviewLetterTemplateFromReviewAndMoveToProduction page', () => {
-  it('should render SummaryPreviewLetter with hideBackLinks and authoring validator', async () => {
+  it('should render SummaryLetterFromMessagePlan with authoring letter validator', async () => {
     const props = {
       params: Promise.resolve({
         routingConfigId: 'routing-config-id',
@@ -22,10 +24,9 @@ describe('PreviewLetterTemplateFromReviewAndMoveToProduction page', () => {
       await PreviewLetterTemplateFromReviewAndMoveToProduction(props);
 
     expect(page).toEqual(
-      <SummaryPreviewLetter
+      <SummaryLetterFromMessagePlan
         {...props}
         validateTemplate={validateAuthoringLetterTemplate}
-        hideBackLinks
       />
     );
   });
diff --git a/frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx b/frontend/src/__tests__/components/molecules/SummaryChooseLetter.test.tsx
similarity index 69%
rename from frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx
rename to frontend/src/__tests__/components/molecules/SummaryChooseLetter.test.tsx
index 21a33af49..002b712a8 100644
--- a/frontend/src/__tests__/components/molecules/SummaryPreviewLetter.test.tsx
+++ b/frontend/src/__tests__/components/molecules/SummaryChooseLetter.test.tsx
@@ -1,4 +1,4 @@
-import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+import { SummaryChooseLetter } from '@molecules/SummaryChooseLetter/SummaryChooseLetter';
 import {
   AUTHORING_LETTER_TEMPLATE,
   PDF_LETTER_TEMPLATE,
@@ -27,26 +27,26 @@ const defaultProps = {
   }),
   searchParams: Promise.resolve({ lockNumber: '5' }),
   validateTemplate: validateLetterTemplate,
-  redirectUrl: defaultRedirectUrl,
+  redirectUrlOnLockNumberFailure: defaultRedirectUrl,
 };
 
-describe('SummaryPreviewLetter', () => {
+describe('SummaryChooseLetter', () => {
   beforeEach(() => {
     jest.resetAllMocks();
   });
 
   it('should redirect when lockNumber is invalid', async () => {
-    await SummaryPreviewLetter({
+    await SummaryChooseLetter({
       ...defaultProps,
       searchParams: Promise.resolve({ lockNumber: 'invalid' }),
-      redirectUrl: '/custom-redirect',
+      redirectUrlOnLockNumberFailure: '/custom-redirect',
     });
 
     expect(redirectMock).toHaveBeenCalledWith('/custom-redirect', 'replace');
   });
 
   it('should redirect when lockNumber is missing', async () => {
-    await SummaryPreviewLetter({
+    await SummaryChooseLetter({
       ...defaultProps,
       searchParams: Promise.resolve({}),
     });
@@ -54,23 +54,10 @@ describe('SummaryPreviewLetter', () => {
     expect(redirectMock).toHaveBeenCalledWith(defaultRedirectUrl, 'replace');
   });
 
-  it('should skip lockNumber validation when redirectUrl is not provided', async () => {
-    getTemplateMock.mockResolvedValueOnce(PDF_LETTER_TEMPLATE);
-
-    const page = await SummaryPreviewLetter({
-      ...defaultProps,
-      searchParams: Promise.resolve({}),
-      redirectUrl: undefined,
-    });
-
-    expect(redirectMock).not.toHaveBeenCalled();
-    expect(page).toBeDefined();
-  });
-
   it('should redirect to invalid-template when template is not found', async () => {
     getTemplateMock.mockResolvedValueOnce(undefined);
 
-    await SummaryPreviewLetter({
+    await SummaryChooseLetter({
       ...defaultProps,
       params: Promise.resolve({
         routingConfigId: 'routing-config-id',
@@ -88,7 +75,7 @@ describe('SummaryPreviewLetter', () => {
       templateType: 'EMAIL',
     } as unknown as TemplateDto);
 
-    await SummaryPreviewLetter(defaultProps);
+    await SummaryChooseLetter(defaultProps);
 
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
   });
@@ -99,7 +86,7 @@ describe('SummaryPreviewLetter', () => {
       templateStatus: 'SUBMITTED',
     });
 
-    const page = await SummaryPreviewLetter({
+    const page = await SummaryChooseLetter({
       ...defaultProps,
       params: Promise.resolve({
         routingConfigId: ROUTING_CONFIG.id,
@@ -123,7 +110,7 @@ describe('SummaryPreviewLetter', () => {
     });
     getLetterVariantByIdMock.mockResolvedValueOnce(letterVariant);
 
-    const page = await SummaryPreviewLetter({
+    const page = await SummaryChooseLetter({
       ...defaultProps,
       params: Promise.resolve({
         routingConfigId: ROUTING_CONFIG.id,
@@ -137,30 +124,4 @@ describe('SummaryPreviewLetter', () => {
     expect(getLetterVariantByIdMock).toHaveBeenCalledWith('variant-123');
     expect(container.asFragment()).toMatchSnapshot();
   });
-
-  it('renders without back links when hideBackLinks is true', async () => {
-    const letterVariant = makeLetterVariant();
-
-    getTemplateMock.mockResolvedValueOnce({
-      ...AUTHORING_LETTER_TEMPLATE,
-      templateStatus: 'SUBMITTED',
-      campaignId: 'campaign',
-      letterVariantId: 'letter-variant',
-    });
-
-    getLetterVariantByIdMock.mockResolvedValueOnce(letterVariant);
-
-    const page = await SummaryPreviewLetter({
-      ...defaultProps,
-      params: Promise.resolve({
-        routingConfigId: ROUTING_CONFIG.id,
-        templateId: AUTHORING_LETTER_TEMPLATE.id,
-      }),
-      hideBackLinks: true,
-      redirectUrl: undefined,
-    });
-
-    const container = render(page);
-    expect(container.asFragment()).toMatchSnapshot();
-  });
 });
diff --git a/frontend/src/__tests__/components/molecules/SummaryLetterFromMessagePlan.test.tsx b/frontend/src/__tests__/components/molecules/SummaryLetterFromMessagePlan.test.tsx
new file mode 100644
index 000000000..864883577
--- /dev/null
+++ b/frontend/src/__tests__/components/molecules/SummaryLetterFromMessagePlan.test.tsx
@@ -0,0 +1,83 @@
+import { SummaryLetterFromMessagePlan } from '@molecules/SummaryLetterFromMessagePlan/SummaryLetterFromMessagePlan';
+import {
+  AUTHORING_LETTER_TEMPLATE,
+  makeLetterVariant,
+  ROUTING_CONFIG,
+} from '@testhelpers/helpers';
+import { render } from '@testing-library/react';
+import { getLetterVariantById, getTemplate } from '@utils/form-actions';
+import { redirect } from 'next/navigation';
+import { validateAuthoringLetterTemplate } from 'nhs-notify-web-template-management-utils';
+import type { TemplateDto } from 'nhs-notify-web-template-management-types';
+
+jest.mock('@utils/form-actions');
+jest.mock('next/navigation');
+
+const getTemplateMock = jest.mocked(getTemplate);
+const getLetterVariantByIdMock = jest.mocked(getLetterVariantById);
+const redirectMock = jest.mocked(redirect);
+
+const defaultProps = {
+  params: Promise.resolve({
+    routingConfigId: 'routing-config-id',
+    templateId: 'template-id',
+  }),
+  searchParams: Promise.resolve({}),
+  validateTemplate: validateAuthoringLetterTemplate,
+};
+
+describe('SummaryLetterFromMessagePlan', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('should redirect to invalid-template when template is not found', async () => {
+    getTemplateMock.mockResolvedValueOnce(undefined);
+
+    await SummaryLetterFromMessagePlan({
+      ...defaultProps,
+      params: Promise.resolve({
+        routingConfigId: 'routing-config-id',
+        templateId: 'invalid-template-id',
+      }),
+    });
+
+    expect(getTemplateMock).toHaveBeenCalledWith('invalid-template-id');
+    expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
+  });
+
+  it('should redirect to invalid-template when template fails validation', async () => {
+    getTemplateMock.mockResolvedValueOnce({
+      ...AUTHORING_LETTER_TEMPLATE,
+      templateType: 'EMAIL',
+    } as unknown as TemplateDto);
+
+    await SummaryLetterFromMessagePlan(defaultProps);
+
+    expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
+  });
+
+  it('renders an authoring letter template preview', async () => {
+    const letterVariant = makeLetterVariant();
+
+    getTemplateMock.mockResolvedValueOnce({
+      ...AUTHORING_LETTER_TEMPLATE,
+      templateStatus: 'SUBMITTED',
+    });
+    getLetterVariantByIdMock.mockResolvedValueOnce(letterVariant);
+
+    const page = await SummaryLetterFromMessagePlan({
+      ...defaultProps,
+      params: Promise.resolve({
+        routingConfigId: ROUTING_CONFIG.id,
+        templateId: AUTHORING_LETTER_TEMPLATE.id,
+      }),
+    });
+
+    const container = render(page);
+
+    expect(getTemplateMock).toHaveBeenCalledWith(AUTHORING_LETTER_TEMPLATE.id);
+    expect(getLetterVariantByIdMock).toHaveBeenCalledWith('variant-123');
+    expect(container.asFragment()).toMatchSnapshot();
+  });
+});
diff --git a/frontend/src/__tests__/components/molecules/__snapshots__/SummaryPreviewLetter.test.tsx.snap b/frontend/src/__tests__/components/molecules/__snapshots__/SummaryChooseLetter.test.tsx.snap
similarity index 64%
rename from frontend/src/__tests__/components/molecules/__snapshots__/SummaryPreviewLetter.test.tsx.snap
rename to frontend/src/__tests__/components/molecules/__snapshots__/SummaryChooseLetter.test.tsx.snap
index f0b53f9e8..1df7f8661 100644
--- a/frontend/src/__tests__/components/molecules/__snapshots__/SummaryPreviewLetter.test.tsx.snap
+++ b/frontend/src/__tests__/components/molecules/__snapshots__/SummaryChooseLetter.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`SummaryPreviewLetter renders a PDF letter template preview 1`] = `
+exports[`SummaryChooseLetter renders a PDF letter template preview 1`] = `
 <DocumentFragment>
   <div
     class="nhsuk-width-container"
@@ -124,7 +124,7 @@ exports[`SummaryPreviewLetter renders a PDF letter template preview 1`] = `
 </DocumentFragment>
 `;
 
-exports[`SummaryPreviewLetter renders an authoring letter template preview 1`] = `
+exports[`SummaryChooseLetter renders an authoring letter template preview 1`] = `
 <DocumentFragment>
   <div
     class="nhsuk-width-container"
@@ -299,167 +299,3 @@ exports[`SummaryPreviewLetter renders an authoring letter template preview 1`] =
   </div>
 </DocumentFragment>
 `;
-
-exports[`SummaryPreviewLetter renders without back links when hideBackLinks is true 1`] = `
-<DocumentFragment>
-  <div
-    class="nhsuk-width-container"
-  >
-    <main
-      class="nhsuk-main-wrapper"
-      id="maincontent"
-      role="main"
-    >
-      <div
-        class="nhsuk-grid-row"
-      >
-        <div
-          class="nhsuk-grid-column-full"
-        >
-          <div
-            class="nhsuk-u-reading-width"
-          >
-            <span
-              class="nhsuk-caption-l"
-            >
-              Template
-            </span>
-            <h1
-              data-testid="preview-message__heading"
-            >
-              authoring letter template name
-            </h1>
-          </div>
-          <div
-            class="nhsuk-width-container nhsuk-u-margin-bottom-6 nhsuk-body-m"
-          >
-            <dl
-              class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview authoringLetterDetails"
-            >
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Template ID
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value monospace-font"
-                  data-testid="preview-template-id"
-                >
-                  authoring-letter-template-id
-                </dd>
-                <dd
-                  class="nhsuk-summary-list__actions"
-                />
-              </div>
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Template type
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value"
-                >
-                  Standard letter
-                </dd>
-                <dd
-                  class="nhsuk-summary-list__actions"
-                />
-              </div>
-              <div
-                class="nhsuk-summary-list__row"
-                id="campaign-id"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Campaign
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value"
-                >
-                  campaign
-                </dd>
-                <dd
-                  aria-hidden="true"
-                  class="nhsuk-summary-list__actions"
-                />
-              </div>
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Total pages
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value"
-                >
-                  2
-                </dd>
-                <dd
-                  class="nhsuk-summary-list__actions"
-                />
-              </div>
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Sheets
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value"
-                >
-                  1
-                </dd>
-                <dd
-                  aria-hidden="true"
-                  class="nhsuk-summary-list__actions"
-                />
-              </div>
-              <div
-                class="nhsuk-summary-list__row"
-                id="printing-and-postage"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Printing and postage
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value"
-                >
-                  Standard C5
-                </dd>
-                <dd
-                  aria-hidden="true"
-                  class="nhsuk-summary-list__actions"
-                />
-              </div>
-            </dl>
-          </div>
-          <h2
-            class="nhsuk-heading-m"
-          >
-            Example preview
-          </h2>
-          <iframe
-            aria-label="PDF preview of letter template"
-            class="letter-render-iframe nhsuk-u-margin-bottom-6"
-            src="/templates/files/client-1/renders/authoring-letter-template-id/render.pdf"
-            title="Letter preview"
-          />
-        </div>
-      </div>
-    </main>
-  </div>
-</DocumentFragment>
-`;
diff --git a/frontend/src/__tests__/components/molecules/__snapshots__/SummaryLetterFromMessagePlan.test.tsx.snap b/frontend/src/__tests__/components/molecules/__snapshots__/SummaryLetterFromMessagePlan.test.tsx.snap
new file mode 100644
index 000000000..b5285b2a4
--- /dev/null
+++ b/frontend/src/__tests__/components/molecules/__snapshots__/SummaryLetterFromMessagePlan.test.tsx.snap
@@ -0,0 +1,163 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SummaryLetterFromMessagePlan renders an authoring letter template preview 1`] = `
+<DocumentFragment>
+  <div
+    class="nhsuk-width-container"
+  >
+    <main
+      class="nhsuk-main-wrapper"
+      id="maincontent"
+      role="main"
+    >
+      <div
+        class="nhsuk-grid-row"
+      >
+        <div
+          class="nhsuk-grid-column-full"
+        >
+          <div
+            class="nhsuk-u-reading-width"
+          >
+            <span
+              class="nhsuk-caption-l"
+            >
+              Template
+            </span>
+            <h1
+              data-testid="preview-message__heading"
+            >
+              authoring letter template name
+            </h1>
+          </div>
+          <div
+            class="nhsuk-width-container nhsuk-u-margin-bottom-6 nhsuk-body-m"
+          >
+            <dl
+              class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview authoringLetterDetails"
+            >
+              <div
+                class="nhsuk-summary-list__row"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Template ID
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value monospace-font"
+                  data-testid="preview-template-id"
+                >
+                  authoring-letter-template-id
+                </dd>
+                <dd
+                  class="nhsuk-summary-list__actions"
+                />
+              </div>
+              <div
+                class="nhsuk-summary-list__row"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Template type
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value"
+                >
+                  Standard letter
+                </dd>
+                <dd
+                  class="nhsuk-summary-list__actions"
+                />
+              </div>
+              <div
+                class="nhsuk-summary-list__row missing-value"
+                id="campaign-id"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Campaign
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value"
+                />
+                <dd
+                  aria-hidden="true"
+                  class="nhsuk-summary-list__actions"
+                />
+              </div>
+              <div
+                class="nhsuk-summary-list__row"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Total pages
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value"
+                >
+                  2
+                </dd>
+                <dd
+                  class="nhsuk-summary-list__actions"
+                />
+              </div>
+              <div
+                class="nhsuk-summary-list__row"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Sheets
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value"
+                >
+                  1
+                </dd>
+                <dd
+                  aria-hidden="true"
+                  class="nhsuk-summary-list__actions"
+                />
+              </div>
+              <div
+                class="nhsuk-summary-list__row"
+                id="printing-and-postage"
+              >
+                <dt
+                  class="nhsuk-summary-list__key"
+                >
+                  Printing and postage
+                </dt>
+                <dd
+                  class="nhsuk-summary-list__value"
+                >
+                  Standard C5
+                </dd>
+                <dd
+                  aria-hidden="true"
+                  class="nhsuk-summary-list__actions"
+                />
+              </div>
+            </dl>
+          </div>
+          <h2
+            class="nhsuk-heading-m"
+          >
+            Example preview
+          </h2>
+          <iframe
+            aria-label="PDF preview of letter template"
+            class="letter-render-iframe nhsuk-u-margin-bottom-6"
+            src="/templates/files/client-1/renders/authoring-letter-template-id/render.pdf"
+            title="Letter preview"
+          />
+        </div>
+      </div>
+    </main>
+  </div>
+</DocumentFragment>
+`;
diff --git a/frontend/src/app/message-plans/choose-british-sign-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/choose-british-sign-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
index 01f00eaa1..92868ef3e 100644
--- a/frontend/src/app/message-plans/choose-british-sign-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
+++ b/frontend/src/app/message-plans/choose-british-sign-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -6,7 +6,7 @@ import {
 } from 'nhs-notify-web-template-management-utils';
 import { Metadata } from 'next';
 import content from '@content/content';
-import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+import { SummaryChooseLetter } from '@molecules/SummaryChooseLetter/SummaryChooseLetter';
 
 const { pageTitle } = content.pages.previewBritishSignLanguageLetterTemplate;
 
@@ -21,10 +21,10 @@ const PreviewBritishSignLanguageLetterTemplateFromMessagePlan = async (
 ) => {
   const { routingConfigId } = await props.params;
   return (
-    <SummaryPreviewLetter
+    <SummaryChooseLetter
       {...props}
       validateTemplate={validateBritishSignLanguageLetterTemplate}
-      redirectUrl={`/message-plans/edit-message-plan/${routingConfigId}`}
+      redirectUrlOnLockNumberFailure={`/message-plans/edit-message-plan/${routingConfigId}`}
     />
   );
 };
diff --git a/frontend/src/app/message-plans/choose-large-print-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/choose-large-print-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
index feb42b33d..09a133f00 100644
--- a/frontend/src/app/message-plans/choose-large-print-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
+++ b/frontend/src/app/message-plans/choose-large-print-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -4,7 +4,7 @@ import {
 } from 'nhs-notify-web-template-management-utils';
 import { Metadata } from 'next';
 import content from '@content/content';
-import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+import { SummaryChooseLetter } from '@molecules/SummaryChooseLetter/SummaryChooseLetter';
 
 const { pageTitle } = content.pages.previewLargePrintLetterTemplate;
 
@@ -19,10 +19,10 @@ const PreviewLargePrintLetterTemplateFromMessagePlan = async (
 ) => {
   const { routingConfigId } = await props.params;
   return (
-    <SummaryPreviewLetter
+    <SummaryChooseLetter
       {...props}
       validateTemplate={validateLargePrintLetterTemplate}
-      redirectUrl={`/message-plans/edit-message-plan/${routingConfigId}`}
+      redirectUrlOnLockNumberFailure={`/message-plans/edit-message-plan/${routingConfigId}`}
     />
   );
 };
diff --git a/frontend/src/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
index 08e31a918..22911b99d 100644
--- a/frontend/src/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
+++ b/frontend/src/app/message-plans/choose-other-language-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -4,7 +4,7 @@ import {
 } from 'nhs-notify-web-template-management-utils';
 import { Metadata } from 'next';
 import content from '@content/content';
-import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+import { SummaryChooseLetter } from '@molecules/SummaryChooseLetter/SummaryChooseLetter';
 
 const { pageTitle } = content.pages.previewOtherLanguageLetterTemplate;
 
@@ -19,10 +19,10 @@ const PreviewOtherLanguageLetterTemplateFromMessagePlan = async (
 ) => {
   const { routingConfigId } = await props.params;
   return (
-    <SummaryPreviewLetter
+    <SummaryChooseLetter
       {...props}
       validateTemplate={validateForeignLanguageLetterTemplate}
-      redirectUrl={`/message-plans/edit-message-plan/${routingConfigId}`}
+      redirectUrlOnLockNumberFailure={`/message-plans/edit-message-plan/${routingConfigId}`}
     />
   );
 };
diff --git a/frontend/src/app/message-plans/choose-standard-english-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/choose-standard-english-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
index 4e26815ed..5821e8756 100644
--- a/frontend/src/app/message-plans/choose-standard-english-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
+++ b/frontend/src/app/message-plans/choose-standard-english-letter-template/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -4,7 +4,7 @@ import {
 } from 'nhs-notify-web-template-management-utils';
 import { Metadata } from 'next';
 import content from '@content/content';
-import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+import { SummaryChooseLetter } from '@molecules/SummaryChooseLetter/SummaryChooseLetter';
 
 const { pageTitle } = content.pages.previewStandardEnglishLetterTemplate;
 
@@ -19,10 +19,10 @@ const PreviewStandardEnglishLetterTemplateFromMessagePlan = async (
 ) => {
   const { routingConfigId } = await props.params;
   return (
-    <SummaryPreviewLetter
+    <SummaryChooseLetter
       {...props}
       validateTemplate={validateLetterTemplate}
-      redirectUrl={`/message-plans/edit-message-plan/${routingConfigId}`}
+      redirectUrlOnLockNumberFailure={`/message-plans/edit-message-plan/${routingConfigId}`}
     />
   );
 };
diff --git a/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx
index 9b62b2215..81f4cea08 100644
--- a/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx
+++ b/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -4,7 +4,7 @@ import {
 } from 'nhs-notify-web-template-management-utils';
 import { Metadata } from 'next';
 import content from '@content/content';
-import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+import { SummaryLetterFromMessagePlan } from '@molecules/SummaryLetterFromMessagePlan/SummaryLetterFromMessagePlan';
 
 const { pageTitle } = content.pages.previewMessagePlanPreviewLetter;
 
@@ -17,10 +17,9 @@ export async function generateMetadata(): Promise<Metadata> {
 const PreviewLetterTemplateFromPreviewMessagePlan = async (
   props: MessagePlanAndTemplatePageProps
 ) => (
-  <SummaryPreviewLetter
+  <SummaryLetterFromMessagePlan
     {...props}
     validateTemplate={validateAuthoringLetterTemplate}
-    hideBackLinks
   />
 );
 
diff --git a/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx
index eca1d1942..b3723ca56 100644
--- a/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx
+++ b/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -4,7 +4,7 @@ import {
 } from 'nhs-notify-web-template-management-utils';
 import { Metadata } from 'next';
 import content from '@content/content';
-import { SummaryPreviewLetter } from '@molecules/SummaryPreviewLetter/SummaryPreviewLetter';
+import { SummaryLetterFromMessagePlan } from '@molecules/SummaryLetterFromMessagePlan/SummaryLetterFromMessagePlan';
 
 const { pageTitle } = content.pages.reviewAndMoveToProductionPreviewLetter;
 
@@ -17,10 +17,9 @@ export async function generateMetadata(): Promise<Metadata> {
 const PreviewLetterTemplateFromReviewAndMoveToProduction = async (
   props: MessagePlanAndTemplatePageProps
 ) => (
-  <SummaryPreviewLetter
+  <SummaryLetterFromMessagePlan
     {...props}
     validateTemplate={validateAuthoringLetterTemplate}
-    hideBackLinks
   />
 );
 
diff --git a/frontend/src/components/molecules/SummaryPreviewLetter/SummaryPreviewLetter.tsx b/frontend/src/components/molecules/SummaryChooseLetter/SummaryChooseLetter.tsx
similarity index 71%
rename from frontend/src/components/molecules/SummaryPreviewLetter/SummaryPreviewLetter.tsx
rename to frontend/src/components/molecules/SummaryChooseLetter/SummaryChooseLetter.tsx
index 11e777c8d..f918c60f7 100644
--- a/frontend/src/components/molecules/SummaryPreviewLetter/SummaryPreviewLetter.tsx
+++ b/frontend/src/components/molecules/SummaryChooseLetter/SummaryChooseLetter.tsx
@@ -11,31 +11,24 @@ import PreviewTemplateDetailsLetter from '@molecules/PreviewTemplateDetails/Prev
 import { $LockNumber } from 'nhs-notify-backend-client/schemas';
 import { NHSNotifyContainer } from '@layouts/container/container';
 
-type SummaryPreviewLetterProps = MessagePlanAndTemplatePageProps & {
+type SummaryChooseLetterProps = MessagePlanAndTemplatePageProps & {
   validateTemplate: (template?: TemplateDto) => LetterTemplate | undefined;
-  hideBackLinks?: boolean;
-  redirectUrl?: string;
+  redirectUrlOnLockNumberFailure: string;
 };
 
-export const SummaryPreviewLetter = async (
-  props: SummaryPreviewLetterProps
-) => {
+export const SummaryChooseLetter = async (props: SummaryChooseLetterProps) => {
   const { templateId, routingConfigId } = await props.params;
-  const { validateTemplate, hideBackLinks, redirectUrl } = props;
+  const { validateTemplate, redirectUrlOnLockNumberFailure } = props;
 
-  let lockNumber: number | undefined;
+  const searchParams = await props.searchParams;
+  const lockNumberResult = $LockNumber.safeParse(searchParams?.lockNumber);
 
-  if (redirectUrl) {
-    const searchParams = await props.searchParams;
-    const lockNumberResult = $LockNumber.safeParse(searchParams?.lockNumber);
-
-    if (!lockNumberResult.success) {
-      return redirect(redirectUrl, RedirectType.replace);
-    }
-
-    lockNumber = lockNumberResult.data;
+  if (!lockNumberResult.success) {
+    return redirect(redirectUrlOnLockNumberFailure, RedirectType.replace);
   }
 
+  const lockNumber = lockNumberResult.data;
+
   const template = await getTemplate(templateId);
 
   const validatedTemplate = validateTemplate(template);
@@ -59,7 +52,6 @@ export const SummaryPreviewLetter = async (
         routingConfigId={routingConfigId}
         lockNumber={lockNumber}
         letterVariant={letterVariant}
-        hideBackLinks={hideBackLinks}
       />
     </NHSNotifyContainer>
   );
diff --git a/frontend/src/components/molecules/SummaryLetterFromMessagePlan/SummaryLetterFromMessagePlan.tsx b/frontend/src/components/molecules/SummaryLetterFromMessagePlan/SummaryLetterFromMessagePlan.tsx
new file mode 100644
index 000000000..c11646fbe
--- /dev/null
+++ b/frontend/src/components/molecules/SummaryLetterFromMessagePlan/SummaryLetterFromMessagePlan.tsx
@@ -0,0 +1,49 @@
+import {
+  AuthoringLetterTemplate,
+  LetterTemplate,
+  MessagePlanAndTemplatePageProps,
+} from 'nhs-notify-web-template-management-utils';
+import type { TemplateDto } from 'nhs-notify-web-template-management-types';
+import { getLetterVariantById, getTemplate } from '@utils/form-actions';
+import { redirect, RedirectType } from 'next/navigation';
+import { PreviewTemplateFromMessagePlan } from '@molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan';
+import PreviewTemplateDetailsLetter from '@molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter';
+import { NHSNotifyContainer } from '@layouts/container/container';
+
+type SummaryLetterFromMessagePlanProps = MessagePlanAndTemplatePageProps & {
+  validateTemplate: (template?: TemplateDto) => LetterTemplate | undefined;
+};
+
+export const SummaryLetterFromMessagePlan = async (
+  props: SummaryLetterFromMessagePlanProps
+) => {
+  const { templateId, routingConfigId } = await props.params;
+  const { validateTemplate } = props;
+
+  const template = await getTemplate(templateId);
+
+  const validatedTemplate = validateTemplate(template);
+
+  if (!validatedTemplate) {
+    return redirect('/invalid-template', RedirectType.replace);
+  }
+
+  const letterVariantId = (validatedTemplate as AuthoringLetterTemplate)
+    .letterVariantId;
+
+  const letterVariant = letterVariantId
+    ? await getLetterVariantById(letterVariantId)
+    : undefined;
+
+  return (
+    <NHSNotifyContainer>
+      <PreviewTemplateFromMessagePlan
+        initialState={validatedTemplate}
+        previewComponent={PreviewTemplateDetailsLetter}
+        routingConfigId={routingConfigId}
+        letterVariant={letterVariant}
+        hideBackLinks
+      />
+    </NHSNotifyContainer>
+  );
+};
diff --git a/infrastructure/terraform/modules/backend-api/spec.tmpl.json b/infrastructure/terraform/modules/backend-api/spec.tmpl.json
index 5ead94504..3c5096b45 100644
--- a/infrastructure/terraform/modules/backend-api/spec.tmpl.json
+++ b/infrastructure/terraform/modules/backend-api/spec.tmpl.json
@@ -411,10 +411,10 @@
           "digitalProofingSms": {
             "type": "boolean"
           },
-          "letterAuthoring": {
+          "legacyLetters": {
             "type": "boolean"
           },
-          "legacyLetters": {
+          "letterAuthoring": {
             "type": "boolean"
           },
           "proofing": {
diff --git a/package.json b/package.json
index 7cef783ed..bf54db2c0 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,9 @@
   },
   "name": "nhs-notify-web-template-management",
   "overrides": {
+    "@aws-sdk/xml-builder": {
+      "fast-xml-parser": "5.5.6"
+    },
     "fast-xml-parser": "^5.5.6",
     "flatted": "^3.4.0",
     "immutable": "^5.1.5",
@@ -38,10 +41,7 @@
       "react-is": "19.0.0"
     },
     "react": "^19.0.0",
-    "underscore": "^1.13.8",
-    "@aws-sdk/xml-builder": {
-      "fast-xml-parser": "5.5.6"
-    }
+    "underscore": "^1.13.8"
   },
   "scripts": {
     "build": "npm run create-env-file && npm run build --workspace frontend",
diff --git a/packages/event-schemas/examples/ProofRequested/v1/email.json b/packages/event-schemas/examples/ProofRequested/v1/email.json
index 63fa0783b..7c5d33918 100644
--- a/packages/event-schemas/examples/ProofRequested/v1/email.json
+++ b/packages/event-schemas/examples/ProofRequested/v1/email.json
@@ -1,16 +1,16 @@
 {
   "data": {
-    "id": "c3d4e5f6-a7b8-4012-8def-123456789012",
-    "templateId": "8c7ae592-97cd-4900-897e-ef4794c8a745",
-    "templateType": "EMAIL",
-    "testPatientNhsNumber": "9000000009",
     "contactDetails": {
       "email": "test.patient@example.com"
     },
+    "id": "c3d4e5f6-a7b8-4012-8def-123456789012",
     "personalisation": {
       "firstName": "Jane",
       "surgeryName": "Test Surgery"
-    }
+    },
+    "templateId": "8c7ae592-97cd-4900-897e-ef4794c8a745",
+    "templateType": "EMAIL",
+    "testPatientNhsNumber": "9000000009"
   },
   "datacontenttype": "application/json",
   "dataschema": "https://notify.nhs.uk/events/schemas/ProofRequested/v1.json",
diff --git a/packages/event-schemas/examples/ProofRequested/v1/nhsapp.json b/packages/event-schemas/examples/ProofRequested/v1/nhsapp.json
index 063600877..e5f39efe8 100644
--- a/packages/event-schemas/examples/ProofRequested/v1/nhsapp.json
+++ b/packages/event-schemas/examples/ProofRequested/v1/nhsapp.json
@@ -1,15 +1,15 @@
 {
   "data": {
     "id": "a1b2c3d4-e5f6-7890-abcd-ef1234567890",
-    "templateId": "3a58a370-75ab-4788-a75e-cd2572a68523",
-    "templateType": "NHS_APP",
-    "testPatientNhsNumber": "9000000009",
     "personalisation": {
-      "firstName": "Jane",
-      "appointmentTime": "10:00",
       "appointmentDate": "2025-08-01",
+      "appointmentTime": "10:00",
+      "firstName": "Jane",
       "surgeryName": "Test Surgery"
-    }
+    },
+    "templateId": "3a58a370-75ab-4788-a75e-cd2572a68523",
+    "templateType": "NHS_APP",
+    "testPatientNhsNumber": "9000000009"
   },
   "datacontenttype": "application/json",
   "dataschema": "https://notify.nhs.uk/events/schemas/ProofRequested/v1.json",
diff --git a/packages/event-schemas/examples/ProofRequested/v1/sms.json b/packages/event-schemas/examples/ProofRequested/v1/sms.json
index a80d05afc..68e63070c 100644
--- a/packages/event-schemas/examples/ProofRequested/v1/sms.json
+++ b/packages/event-schemas/examples/ProofRequested/v1/sms.json
@@ -1,15 +1,15 @@
 {
   "data": {
-    "id": "b2c3d4e5-f6a7-8901-bcde-f12345678901",
-    "templateId": "7b69c481-86bc-5899-b86f-de3683b79634",
-    "templateType": "SMS",
-    "testPatientNhsNumber": "9000000009",
     "contactDetails": {
       "sms": "07700900000"
     },
+    "id": "b2c3d4e5-f6a7-8901-bcde-f12345678901",
     "personalisation": {
       "firstName": "Jane"
-    }
+    },
+    "templateId": "7b69c481-86bc-5899-b86f-de3683b79634",
+    "templateType": "SMS",
+    "testPatientNhsNumber": "9000000009"
   },
   "datacontenttype": "application/json",
   "dataschema": "https://notify.nhs.uk/events/schemas/ProofRequested/v1.json",

From 0fe27b0524ce1b98e068f8ef27ab1afcffaa09f4 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Wed, 8 Apr 2026 13:24:00 +0100
Subject: [PATCH 49/57] bump events version

---
 packages/event-schemas/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/event-schemas/package.json b/packages/event-schemas/package.json
index 019942e26..463022a25 100644
--- a/packages/event-schemas/package.json
+++ b/packages/event-schemas/package.json
@@ -56,5 +56,5 @@
   },
   "type": "commonjs",
   "types": "./dist/index.d.ts",
-  "version": "1.4.6"
+  "version": "1.4.7"
 }

From 245d6f036cc435a6ec62e864923d3c58fc1a4880 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Wed, 8 Apr 2026 15:15:52 +0100
Subject: [PATCH 50/57] revert reformatting due to commit hook

---
 .../terraform/modules/backend-api/spec.tmpl.json     |  4 ++--
 package.json                                         |  8 ++++----
 .../examples/ProofRequested/v1/email.json            | 10 +++++-----
 .../examples/ProofRequested/v1/nhsapp.json           | 12 ++++++------
 .../examples/ProofRequested/v1/sms.json              | 10 +++++-----
 packages/event-schemas/package.json                  |  2 +-
 scripts/config/pre-commit.yaml                       |  4 ++--
 7 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/infrastructure/terraform/modules/backend-api/spec.tmpl.json b/infrastructure/terraform/modules/backend-api/spec.tmpl.json
index 3c5096b45..5ead94504 100644
--- a/infrastructure/terraform/modules/backend-api/spec.tmpl.json
+++ b/infrastructure/terraform/modules/backend-api/spec.tmpl.json
@@ -411,10 +411,10 @@
           "digitalProofingSms": {
             "type": "boolean"
           },
-          "legacyLetters": {
+          "letterAuthoring": {
             "type": "boolean"
           },
-          "letterAuthoring": {
+          "legacyLetters": {
             "type": "boolean"
           },
           "proofing": {
diff --git a/package.json b/package.json
index bf54db2c0..7cef783ed 100644
--- a/package.json
+++ b/package.json
@@ -28,9 +28,6 @@
   },
   "name": "nhs-notify-web-template-management",
   "overrides": {
-    "@aws-sdk/xml-builder": {
-      "fast-xml-parser": "5.5.6"
-    },
     "fast-xml-parser": "^5.5.6",
     "flatted": "^3.4.0",
     "immutable": "^5.1.5",
@@ -41,7 +38,10 @@
       "react-is": "19.0.0"
     },
     "react": "^19.0.0",
-    "underscore": "^1.13.8"
+    "underscore": "^1.13.8",
+    "@aws-sdk/xml-builder": {
+      "fast-xml-parser": "5.5.6"
+    }
   },
   "scripts": {
     "build": "npm run create-env-file && npm run build --workspace frontend",
diff --git a/packages/event-schemas/examples/ProofRequested/v1/email.json b/packages/event-schemas/examples/ProofRequested/v1/email.json
index 7c5d33918..63fa0783b 100644
--- a/packages/event-schemas/examples/ProofRequested/v1/email.json
+++ b/packages/event-schemas/examples/ProofRequested/v1/email.json
@@ -1,16 +1,16 @@
 {
   "data": {
+    "id": "c3d4e5f6-a7b8-4012-8def-123456789012",
+    "templateId": "8c7ae592-97cd-4900-897e-ef4794c8a745",
+    "templateType": "EMAIL",
+    "testPatientNhsNumber": "9000000009",
     "contactDetails": {
       "email": "test.patient@example.com"
     },
-    "id": "c3d4e5f6-a7b8-4012-8def-123456789012",
     "personalisation": {
       "firstName": "Jane",
       "surgeryName": "Test Surgery"
-    },
-    "templateId": "8c7ae592-97cd-4900-897e-ef4794c8a745",
-    "templateType": "EMAIL",
-    "testPatientNhsNumber": "9000000009"
+    }
   },
   "datacontenttype": "application/json",
   "dataschema": "https://notify.nhs.uk/events/schemas/ProofRequested/v1.json",
diff --git a/packages/event-schemas/examples/ProofRequested/v1/nhsapp.json b/packages/event-schemas/examples/ProofRequested/v1/nhsapp.json
index e5f39efe8..063600877 100644
--- a/packages/event-schemas/examples/ProofRequested/v1/nhsapp.json
+++ b/packages/event-schemas/examples/ProofRequested/v1/nhsapp.json
@@ -1,15 +1,15 @@
 {
   "data": {
     "id": "a1b2c3d4-e5f6-7890-abcd-ef1234567890",
+    "templateId": "3a58a370-75ab-4788-a75e-cd2572a68523",
+    "templateType": "NHS_APP",
+    "testPatientNhsNumber": "9000000009",
     "personalisation": {
-      "appointmentDate": "2025-08-01",
-      "appointmentTime": "10:00",
       "firstName": "Jane",
+      "appointmentTime": "10:00",
+      "appointmentDate": "2025-08-01",
       "surgeryName": "Test Surgery"
-    },
-    "templateId": "3a58a370-75ab-4788-a75e-cd2572a68523",
-    "templateType": "NHS_APP",
-    "testPatientNhsNumber": "9000000009"
+    }
   },
   "datacontenttype": "application/json",
   "dataschema": "https://notify.nhs.uk/events/schemas/ProofRequested/v1.json",
diff --git a/packages/event-schemas/examples/ProofRequested/v1/sms.json b/packages/event-schemas/examples/ProofRequested/v1/sms.json
index 68e63070c..a80d05afc 100644
--- a/packages/event-schemas/examples/ProofRequested/v1/sms.json
+++ b/packages/event-schemas/examples/ProofRequested/v1/sms.json
@@ -1,15 +1,15 @@
 {
   "data": {
+    "id": "b2c3d4e5-f6a7-8901-bcde-f12345678901",
+    "templateId": "7b69c481-86bc-5899-b86f-de3683b79634",
+    "templateType": "SMS",
+    "testPatientNhsNumber": "9000000009",
     "contactDetails": {
       "sms": "07700900000"
     },
-    "id": "b2c3d4e5-f6a7-8901-bcde-f12345678901",
     "personalisation": {
       "firstName": "Jane"
-    },
-    "templateId": "7b69c481-86bc-5899-b86f-de3683b79634",
-    "templateType": "SMS",
-    "testPatientNhsNumber": "9000000009"
+    }
   },
   "datacontenttype": "application/json",
   "dataschema": "https://notify.nhs.uk/events/schemas/ProofRequested/v1.json",
diff --git a/packages/event-schemas/package.json b/packages/event-schemas/package.json
index 463022a25..019942e26 100644
--- a/packages/event-schemas/package.json
+++ b/packages/event-schemas/package.json
@@ -56,5 +56,5 @@
   },
   "type": "commonjs",
   "types": "./dist/index.d.ts",
-  "version": "1.4.7"
+  "version": "1.4.6"
 }
diff --git a/scripts/config/pre-commit.yaml b/scripts/config/pre-commit.yaml
index 4e757008d..79d121c0b 100644
--- a/scripts/config/pre-commit.yaml
+++ b/scripts/config/pre-commit.yaml
@@ -19,8 +19,8 @@ repos:
       - id: pretty-format-json
         exclude: |
           (?x)^(
-            .*/?package-lock.json |
-            packages/event-schemas/schemas/[^/]+/[^/]+\.json
+            (^|/)package-lock\.json$ |
+            ^packages/event-schemas/schemas/[^/]+/[^/]+\.json$
           )$
         args: ['--autofix']
 

From 6b20f340cb23d569debbc7650637fbcd74a2ff07 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Wed, 8 Apr 2026 15:16:09 +0100
Subject: [PATCH 51/57] revert reformatting due to commit hook


From 26b4eb80082f4e59e9e09194869e95779e8c489c Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Wed, 8 Apr 2026 19:02:37 +0100
Subject: [PATCH 52/57] rm pdf letters support from routing code

---
 .../__snapshots__/page.test.tsx.snap          |  22 +--
 .../page.test.tsx                             |   7 +-
 .../__snapshots__/page.test.tsx.snap          |  14 +-
 .../preview-message-plan/page.test.tsx        |  63 +--------
 .../preview-template/page.test.tsx            |   8 +-
 .../__snapshots__/page.test.tsx.snap          |  16 +--
 .../page.test.tsx                             |  48 +------
 .../preview-template/page.test.tsx            |   8 +-
 .../ChooseChannelTemplate.test.tsx            |   4 +-
 .../ChooseChannelTemplate.test.tsx.snap       |  22 +--
 .../MessagePlanCascadePreview.test.tsx        | 113 +++-------------
 .../molecules/SummaryChooseLetter.test.tsx    |  26 +---
 .../MessagePlanCascadePreview.test.tsx.snap   |   4 +-
 .../SummaryChooseLetter.test.tsx.snap         | 126 +-----------------
 frontend/src/__tests__/helpers/helpers.ts     |   2 +-
 .../preview-template/[templateId]/page.tsx    |  12 +-
 .../preview-template/[templateId]/page.tsx    |  12 +-
 .../MessagePlanCascadePreview.tsx             |  16 +--
 .../SummaryChooseLetter.tsx                   |  20 +--
 .../SummaryLetterFromMessagePlan.tsx          |  24 +---
 .../routing.e2e.spec.ts                       |  17 ++-
 ...-letter-template.routing-component.spec.ts |  23 ++--
 ...-letter-template.routing-component.spec.ts |  81 +++--------
 ...-letter-template.routing-component.spec.ts |  88 +++---------
 ...-letter-template.routing-component.spec.ts |  61 +++------
 ...-letter-template.routing-component.spec.ts |  33 ++---
 ...iew-message-plan.routing-component.spec.ts |  85 ++++--------
 ...-letter-template.routing-component.spec.ts |  33 ++---
 ...ve-to-production.routing-component.spec.ts |  72 +++-------
 29 files changed, 250 insertions(+), 810 deletions(-)

diff --git a/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/__snapshots__/page.test.tsx.snap
index 149ec95f3..a2d4fb717 100644
--- a/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/__snapshots__/page.test.tsx.snap
@@ -66,7 +66,7 @@ exports[`ChooseStandardEnglishLetterTemplate page renders letter template select
                 <dd
                   class="nhsuk-summary-list__value"
                 >
-                  letter template name
+                  authoring letter template name
                 </dd>
               </div>
             </dl>
@@ -156,19 +156,19 @@ exports[`ChooseStandardEnglishLetterTemplate page renders letter template select
                               class="nhsuk-radios__item"
                             >
                               <input
-                                aria-labelledby="channelTemplate-letter-template-id-name"
+                                aria-labelledby="channelTemplate-authoring-letter-template-id-name"
                                 checked=""
                                 class="nhsuk-radios__input"
-                                data-testid="letter-template-id-radio"
-                                id="channelTemplate-letter-template-id"
+                                data-testid="authoring-letter-template-id-radio"
+                                id="channelTemplate-authoring-letter-template-id"
                                 name="channelTemplate"
                                 type="radio"
-                                value="letter-template-id"
+                                value="authoring-letter-template-id"
                               />
                               <label
                                 class="nhsuk-label nhsuk-radios__label"
-                                for="channelTemplate-letter-template-id"
-                                id="channelTemplate-letter-template-id--label"
+                                for="channelTemplate-authoring-letter-template-id"
+                                id="channelTemplate-authoring-letter-template-id--label"
                               >
                                  
                               </label>
@@ -176,7 +176,7 @@ exports[`ChooseStandardEnglishLetterTemplate page renders letter template select
                           </td>
                           <td
                             class="nhsuk-table__cell"
-                            id="channelTemplate-letter-template-id-name"
+                            id="channelTemplate-authoring-letter-template-id-name"
                             role="cell"
                           >
                             <span
@@ -185,7 +185,7 @@ exports[`ChooseStandardEnglishLetterTemplate page renders letter template select
                             >
                               Name 
                             </span>
-                            letter template name
+                            authoring letter template name
                           </td>
                           <td
                             class="nhsuk-table__cell"
@@ -226,8 +226,8 @@ exports[`ChooseStandardEnglishLetterTemplate page renders letter template select
                             <a
                               aria-label="Preview"
                               class="nhsuk-u-margin-bottom-2 nhsuk-link"
-                              data-testid="letter-template-id-preview-link"
-                              href="/message-plans/choose-standard-english-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34/preview-template/letter-template-id?lockNumber=42"
+                              data-testid="authoring-letter-template-id-preview-link"
+                              href="/message-plans/choose-standard-english-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34/preview-template/authoring-letter-template-id?lockNumber=42"
                               id="preview-template-link-0"
                             >
                               Preview
diff --git a/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/page.test.tsx
index 83ef9b8cf..72db01cce 100644
--- a/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/page.test.tsx
@@ -1,7 +1,10 @@
 import ChooseStandardEnglishLetterTemplate, {
   generateMetadata,
 } from '@app/message-plans/choose-standard-english-letter-template/[routingConfigId]/page';
-import { PDF_LETTER_TEMPLATE, ROUTING_CONFIG } from '@testhelpers/helpers';
+import {
+  AUTHORING_LETTER_TEMPLATE,
+  ROUTING_CONFIG,
+} from '@testhelpers/helpers';
 import { render } from '@testing-library/react';
 import { getTemplates } from '@utils/form-actions';
 import { getRoutingConfig } from '@utils/message-plans';
@@ -63,7 +66,7 @@ describe('ChooseStandardEnglishLetterTemplate page', () => {
 
   it('renders letter template selection', async () => {
     getRoutingConfigMock.mockResolvedValueOnce(ROUTING_CONFIG);
-    getTemplatesMock.mockResolvedValueOnce([PDF_LETTER_TEMPLATE]);
+    getTemplatesMock.mockResolvedValueOnce([AUTHORING_LETTER_TEMPLATE]);
 
     const page = await ChooseStandardEnglishLetterTemplate({
       params: Promise.resolve({
diff --git a/frontend/src/__tests__/app/message-plans/preview-message-plan/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/preview-message-plan/__snapshots__/page.test.tsx.snap
index 02b9160d2..6cf6ce8e7 100644
--- a/frontend/src/__tests__/app/message-plans/preview-message-plan/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/message-plans/preview-message-plan/__snapshots__/page.test.tsx.snap
@@ -606,10 +606,10 @@ exports[`full cascade plan matches snapshot 1`] = `
                   <p
                     data-testid="template-name"
                   >
-                    letter template name
+                    authoring letter template name
                   </p>
                   <a
-                    href="/preview-submitted-letter-template/278e1a92-353f-42a3-b08d-565ea1c9d763"
+                    href="/message-plans/preview-message-plan/39ee95ca-0500-4fe0-b1d6-c7f1b28bc267/preview-template/278e1a92-353f-42a3-b08d-565ea1c9d763"
                     rel="noopener noreferrer"
                     target="_blank"
                   >
@@ -725,7 +725,7 @@ exports[`full cascade plan matches snapshot 1`] = `
                         large print letter template name
                       </p>
                       <a
-                        href="/preview-submitted-letter-template/72ebc15c-d950-4e2e-99d4-3de7f174fba6"
+                        href="/message-plans/preview-message-plan/39ee95ca-0500-4fe0-b1d6-c7f1b28bc267/preview-template/72ebc15c-d950-4e2e-99d4-3de7f174fba6"
                         rel="noopener noreferrer"
                         target="_blank"
                       >
@@ -784,11 +784,11 @@ exports[`full cascade plan matches snapshot 1`] = `
                       <p
                         data-testid="template-name"
                       >
-                        letter template name
+                        authoring letter template name
                       </p>
                       <a
                         class="nhsuk-u-margin-bottom-0"
-                        href="/preview-submitted-letter-template/31399023-08a2-4dc7-81c7-e25b284b2aab"
+                        href="/message-plans/preview-message-plan/39ee95ca-0500-4fe0-b1d6-c7f1b28bc267/preview-template/31399023-08a2-4dc7-81c7-e25b284b2aab"
                         rel="noopener noreferrer"
                         target="_blank"
                       >
@@ -797,11 +797,11 @@ exports[`full cascade plan matches snapshot 1`] = `
                       <p
                         data-testid="template-name"
                       >
-                        letter template name
+                        authoring letter template name
                       </p>
                       <a
                         class="nhsuk-u-margin-bottom-0"
-                        href="/preview-submitted-letter-template/35746144-cac4-4e1f-b92b-4f58e9f1154f"
+                        href="/message-plans/preview-message-plan/39ee95ca-0500-4fe0-b1d6-c7f1b28bc267/preview-template/35746144-cac4-4e1f-b92b-4f58e9f1154f"
                         rel="noopener noreferrer"
                         target="_blank"
                       >
diff --git a/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx b/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx
index 9d90094c5..263c4b0eb 100644
--- a/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/preview-message-plan/page.test.tsx
@@ -15,7 +15,6 @@ import {
   EMAIL_TEMPLATE,
   LARGE_PRINT_LETTER_TEMPLATE,
   NHS_APP_TEMPLATE,
-  PDF_LETTER_TEMPLATE,
   SMS_TEMPLATE,
 } from '@testhelpers/helpers';
 import { RoutingConfigFactory } from '@testhelpers/routing-config-factory';
@@ -60,7 +59,6 @@ const kuTemplateId = '31399023-08a2-4dc7-81c7-e25b284b2aab';
 const sqTemplateId = '35746144-cac4-4e1f-b92b-4f58e9f1154f';
 const largePrintTemplateId = '72ebc15c-d950-4e2e-99d4-3de7f174fba6';
 const bslTemplateId = 'a4e82c0f-3b91-47d5-86e2-5c9f1a7d3b04';
-const authoringLetterTemplateId = '770ed5da-765d-431c-b4b4-4068d11ffed1';
 
 const templates: MessagePlanTemplates = {
   [appTemplateId]: {
@@ -79,17 +77,17 @@ const templates: MessagePlanTemplates = {
     templateStatus: 'SUBMITTED',
   },
   [letterTemplateId]: {
-    ...PDF_LETTER_TEMPLATE,
+    ...AUTHORING_LETTER_TEMPLATE,
     id: letterTemplateId,
     templateStatus: 'SUBMITTED',
   },
   [kuTemplateId]: {
-    ...PDF_LETTER_TEMPLATE,
+    ...AUTHORING_LETTER_TEMPLATE,
     id: kuTemplateId,
     templateStatus: 'SUBMITTED',
   },
   [sqTemplateId]: {
-    ...PDF_LETTER_TEMPLATE,
+    ...AUTHORING_LETTER_TEMPLATE,
     id: sqTemplateId,
     templateStatus: 'SUBMITTED',
   },
@@ -103,11 +101,6 @@ const templates: MessagePlanTemplates = {
     id: bslTemplateId,
     templateStatus: 'SUBMITTED',
   },
-  [authoringLetterTemplateId]: {
-    ...AUTHORING_LETTER_TEMPLATE,
-    id: authoringLetterTemplateId,
-    templateStatus: 'PROOF_APPROVED',
-  },
 };
 
 beforeEach(() => {
@@ -355,7 +348,7 @@ describe.each(digitalChannels)(
 );
 
 describe('letter only', () => {
-  it('shows only the card for the default template when no conditional templates are included (PDF letter)', async () => {
+  it('shows only the card for the default template when no conditional templates are included', async () => {
     const routingConfig = createRoutingConfig({
       cascade: [
         {
@@ -389,50 +382,6 @@ describe('letter only', () => {
 
     expect(link).toHaveTextContent('Preview template (opens in a new tab)');
 
-    expect(link).toHaveAttribute(
-      'href',
-      `/preview-submitted-letter-template/${template.id}`
-    );
-
-    expect(
-      within(block).queryByTestId('conditional-templates')
-    ).not.toBeInTheDocument();
-  });
-
-  it('shows only the card for the default template when no conditional templates are included (AUTHORING letter)', async () => {
-    const routingConfig = createRoutingConfig({
-      cascade: [
-        {
-          channel: 'LETTER',
-          channelType: 'primary',
-          defaultTemplateId: authoringLetterTemplateId,
-          cascadeGroups: ['standard'],
-        },
-      ],
-    });
-
-    const template = templates[authoringLetterTemplateId];
-
-    await renderPage(routingConfig);
-
-    expect(
-      screen.queryByRole('button', {
-        name: 'Open all digital template previews',
-      })
-    ).not.toBeInTheDocument();
-
-    const block = screen.getByTestId('message-plan-block-LETTER');
-
-    const card = within(block).getByTestId('channel-card');
-
-    const name = within(card).getByTestId('template-name');
-
-    expect(name).toHaveTextContent(template.name);
-
-    const link = within(card).getByRole('link');
-
-    expect(link).toHaveTextContent('Preview template (opens in a new tab)');
-
     expect(link).toHaveAttribute(
       'href',
       `/message-plans/preview-message-plan/${routingConfig.id}/preview-template/${template.id}`
@@ -490,7 +439,7 @@ describe('letter only', () => {
 
     expect(link).toHaveAttribute(
       'href',
-      `/preview-submitted-letter-template/${template.id}`
+      `/message-plans/preview-message-plan/${routingConfig.id}/preview-template/${template.id}`
     );
 
     expect(link).toHaveAttribute('target', '_blank');
@@ -602,7 +551,7 @@ describe('letter only', () => {
 
       expect(links[index]).toHaveAttribute(
         'href',
-        `/preview-submitted-letter-template/${template.id}`
+        `/message-plans/preview-message-plan/${routingConfig.id}/preview-template/${template.id}`
       );
 
       expect(links[index]).toHaveAttribute('target', '_blank');
diff --git a/frontend/src/__tests__/app/message-plans/preview-message-plan/preview-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/preview-message-plan/preview-template/page.test.tsx
index f6a86979d..c07309d1b 100644
--- a/frontend/src/__tests__/app/message-plans/preview-message-plan/preview-template/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/preview-message-plan/preview-template/page.test.tsx
@@ -5,7 +5,6 @@ import PreviewLetterTemplateFromPreviewMessagePlan, {
   generateMetadata,
 } from '@app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page';
 import { SummaryLetterFromMessagePlan } from '@molecules/SummaryLetterFromMessagePlan/SummaryLetterFromMessagePlan';
-import { validateAuthoringLetterTemplate } from 'nhs-notify-web-template-management-utils';
 
 jest.mock(
   '@molecules/SummaryLetterFromMessagePlan/SummaryLetterFromMessagePlan'
@@ -22,12 +21,7 @@ describe('PreviewLetterTemplateFromPreviewMessagePlan page', () => {
 
     const page = await PreviewLetterTemplateFromPreviewMessagePlan(props);
 
-    expect(page).toEqual(
-      <SummaryLetterFromMessagePlan
-        {...props}
-        validateTemplate={validateAuthoringLetterTemplate}
-      />
-    );
+    expect(page).toEqual(<SummaryLetterFromMessagePlan {...props} />);
   });
 
   it('should have the correct page title', async () => {
diff --git a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/__snapshots__/page.test.tsx.snap
index 9a14747a1..e9ea3c67c 100644
--- a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/__snapshots__/page.test.tsx.snap
@@ -557,10 +557,10 @@ exports[`Review and move to production page matches snapshot for full cascade 1`
                   <p
                     data-testid="template-name"
                   >
-                    letter template name
+                    authoring letter template name
                   </p>
                   <a
-                    href="/preview-letter-template/278e1a92-353f-42a3-b08d-565ea1c9d763"
+                    href="/message-plans/review-and-move-to-production/rc-123/preview-template/278e1a92-353f-42a3-b08d-565ea1c9d763"
                     rel="noopener noreferrer"
                     target="_blank"
                   >
@@ -673,10 +673,10 @@ exports[`Review and move to production page matches snapshot for full cascade 1`
                       <p
                         data-testid="template-name"
                       >
-                        authoring letter template name
+                        large print letter template name
                       </p>
                       <a
-                        href="/message-plans/review-and-move-to-production/rc-123/preview-template/770ed5da-765d-431c-b4b4-4068d11ffed1"
+                        href="/message-plans/review-and-move-to-production/rc-123/preview-template/72ebc15c-d950-4e2e-99d4-3de7f174fba6"
                         rel="noopener noreferrer"
                         target="_blank"
                       >
@@ -735,11 +735,11 @@ exports[`Review and move to production page matches snapshot for full cascade 1`
                       <p
                         data-testid="template-name"
                       >
-                        letter template name
+                        authoring letter template name
                       </p>
                       <a
                         class="nhsuk-u-margin-bottom-0"
-                        href="/preview-letter-template/31399023-08a2-4dc7-81c7-e25b284b2aab"
+                        href="/message-plans/review-and-move-to-production/rc-123/preview-template/31399023-08a2-4dc7-81c7-e25b284b2aab"
                         rel="noopener noreferrer"
                         target="_blank"
                       >
@@ -748,11 +748,11 @@ exports[`Review and move to production page matches snapshot for full cascade 1`
                       <p
                         data-testid="template-name"
                       >
-                        letter template name
+                        authoring letter template name
                       </p>
                       <a
                         class="nhsuk-u-margin-bottom-0"
-                        href="/preview-letter-template/35746144-cac4-4e1f-b92b-4f58e9f1154f"
+                        href="/message-plans/review-and-move-to-production/rc-123/preview-template/35746144-cac4-4e1f-b92b-4f58e9f1154f"
                         rel="noopener noreferrer"
                         target="_blank"
                       >
diff --git a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/page.test.tsx b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/page.test.tsx
index 1066bf210..1303193ab 100644
--- a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/page.test.tsx
@@ -9,7 +9,6 @@ import {
   EMAIL_TEMPLATE,
   LARGE_PRINT_LETTER_TEMPLATE,
   NHS_APP_TEMPLATE,
-  PDF_LETTER_TEMPLATE,
   SMS_TEMPLATE,
   AUTHORING_LETTER_TEMPLATE,
 } from '@testhelpers/helpers';
@@ -62,26 +61,20 @@ const letterTemplateId = '278e1a92-353f-42a3-b08d-565ea1c9d763';
 const kuTemplateId = '31399023-08a2-4dc7-81c7-e25b284b2aab';
 const sqTemplateId = '35746144-cac4-4e1f-b92b-4f58e9f1154f';
 const largePrintTemplateId = '72ebc15c-d950-4e2e-99d4-3de7f174fba6';
-const authoringLetterTemplateId = '770ed5da-765d-431c-b4b4-4068d11ffed1';
 const bslTemplateId = 'c7d93e1a-4b05-48f6-97a3-6d2e3b8c5f17';
 
 const templates: MessagePlanTemplates = {
   [appTemplateId]: { ...NHS_APP_TEMPLATE, id: appTemplateId },
   [emailTemplateId]: { ...EMAIL_TEMPLATE, id: emailTemplateId },
   [smsTemplateId]: { ...SMS_TEMPLATE, id: smsTemplateId },
-  [letterTemplateId]: { ...PDF_LETTER_TEMPLATE, id: letterTemplateId },
-  [kuTemplateId]: { ...PDF_LETTER_TEMPLATE, id: kuTemplateId },
-  [sqTemplateId]: { ...PDF_LETTER_TEMPLATE, id: sqTemplateId },
+  [letterTemplateId]: { ...AUTHORING_LETTER_TEMPLATE, id: letterTemplateId },
+  [kuTemplateId]: { ...AUTHORING_LETTER_TEMPLATE, id: kuTemplateId },
+  [sqTemplateId]: { ...AUTHORING_LETTER_TEMPLATE, id: sqTemplateId },
   [largePrintTemplateId]: {
     ...LARGE_PRINT_LETTER_TEMPLATE,
     id: largePrintTemplateId,
     templateStatus: 'SUBMITTED',
   },
-  [authoringLetterTemplateId]: {
-    ...AUTHORING_LETTER_TEMPLATE,
-    id: authoringLetterTemplateId,
-    templateStatus: 'PROOF_APPROVED',
-  },
   [bslTemplateId]: {
     ...BSL_LETTER_TEMPLATE,
     id: bslTemplateId,
@@ -320,7 +313,7 @@ describe('Review and move to production page', () => {
       ).toBeInTheDocument();
     });
 
-    it('renders PDF letter template as link', async () => {
+    it('renders letter templates with a link', async () => {
       const routingConfig = createRoutingConfig({
         cascade: [
           {
@@ -343,37 +336,7 @@ describe('Review and move to production page', () => {
       expect(link).toHaveTextContent('Preview template (opens in a new tab)');
       expect(link).toHaveAttribute(
         'href',
-        `/preview-letter-template/${letterTemplateId}`
-      );
-      expect(link).toHaveAttribute('target', '_blank');
-    });
-
-    it('renders AUTHORING letter template as link', async () => {
-      const routingConfig = createRoutingConfig({
-        cascade: [
-          {
-            channel: 'LETTER',
-            channelType: 'primary',
-            defaultTemplateId: authoringLetterTemplateId,
-            cascadeGroups: ['standard'],
-          },
-        ],
-      });
-
-      await renderPage(routingConfig);
-
-      const block = screen.getByTestId('message-plan-block-LETTER');
-      const templateName = within(block).getByTestId('template-name');
-
-      expect(templateName).toHaveTextContent(
-        templates[authoringLetterTemplateId].name
-      );
-
-      const link = within(block).getByRole('link');
-      expect(link).toHaveTextContent('Preview template (opens in a new tab)');
-      expect(link).toHaveAttribute(
-        'href',
-        `/message-plans/review-and-move-to-production/${routingConfig.id}/preview-template/${authoringLetterTemplateId}`
+        `/message-plans/review-and-move-to-production/${routingConfig.id}/preview-template/${letterTemplateId}`
       );
       expect(link).toHaveAttribute('target', '_blank');
     });
@@ -501,7 +464,6 @@ describe('Review and move to production page', () => {
           conditionalTemplates: [
             { templateId: kuTemplateId, language: 'ku' },
             { templateId: sqTemplateId, language: 'sq' },
-            { templateId: authoringLetterTemplateId, accessibleFormat: 'x1' },
             { templateId: largePrintTemplateId, accessibleFormat: 'x1' },
             { templateId: bslTemplateId, accessibleFormat: 'q4' },
           ],
diff --git a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/preview-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/preview-template/page.test.tsx
index ba10c5993..b2efe15e2 100644
--- a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/preview-template/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/preview-template/page.test.tsx
@@ -5,7 +5,6 @@ import PreviewLetterTemplateFromReviewAndMoveToProduction, {
   generateMetadata,
 } from '@app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page';
 import { SummaryLetterFromMessagePlan } from '@molecules/SummaryLetterFromMessagePlan/SummaryLetterFromMessagePlan';
-import { validateAuthoringLetterTemplate } from 'nhs-notify-web-template-management-utils';
 
 jest.mock(
   '@molecules/SummaryLetterFromMessagePlan/SummaryLetterFromMessagePlan'
@@ -23,12 +22,7 @@ describe('PreviewLetterTemplateFromReviewAndMoveToProduction page', () => {
     const page =
       await PreviewLetterTemplateFromReviewAndMoveToProduction(props);
 
-    expect(page).toEqual(
-      <SummaryLetterFromMessagePlan
-        {...props}
-        validateTemplate={validateAuthoringLetterTemplate}
-      />
-    );
+    expect(page).toEqual(<SummaryLetterFromMessagePlan {...props} />);
   });
 
   it('should have the correct page title', async () => {
diff --git a/frontend/src/__tests__/components/forms/ChooseChannelTemplate/ChooseChannelTemplate.test.tsx b/frontend/src/__tests__/components/forms/ChooseChannelTemplate/ChooseChannelTemplate.test.tsx
index c6ceaa8e6..d82a7bbb0 100644
--- a/frontend/src/__tests__/components/forms/ChooseChannelTemplate/ChooseChannelTemplate.test.tsx
+++ b/frontend/src/__tests__/components/forms/ChooseChannelTemplate/ChooseChannelTemplate.test.tsx
@@ -1,9 +1,9 @@
 import { ChooseChannelTemplate } from '@forms/ChooseChannelTemplate';
 import { fireEvent, render, screen, within } from '@testing-library/react';
 import {
+  AUTHORING_LETTER_TEMPLATE,
   EMAIL_TEMPLATE,
   LARGE_PRINT_LETTER_TEMPLATE,
-  PDF_LETTER_TEMPLATE,
   NHS_APP_TEMPLATE,
   ROUTING_CONFIG,
   SMS_TEMPLATE,
@@ -97,7 +97,7 @@ const propsByChannel = {
   LETTER: {
     pageHeading: 'Choose a letter template',
     cascadeIndex: 3,
-    templateList: [PDF_LETTER_TEMPLATE],
+    templateList: [AUTHORING_LETTER_TEMPLATE],
   },
   LARGE_PRINT_LETTER: {
     pageHeading: 'Choose a large print letter template',
diff --git a/frontend/src/__tests__/components/forms/ChooseChannelTemplate/__snapshots__/ChooseChannelTemplate.test.tsx.snap b/frontend/src/__tests__/components/forms/ChooseChannelTemplate/__snapshots__/ChooseChannelTemplate.test.tsx.snap
index c627c8974..bfeebca33 100644
--- a/frontend/src/__tests__/components/forms/ChooseChannelTemplate/__snapshots__/ChooseChannelTemplate.test.tsx.snap
+++ b/frontend/src/__tests__/components/forms/ChooseChannelTemplate/__snapshots__/ChooseChannelTemplate.test.tsx.snap
@@ -1808,7 +1808,7 @@ exports[`ChooseChannelTemplate renders letter form 1`] = `
               <dd
                 class="nhsuk-summary-list__value"
               >
-                letter template name
+                authoring letter template name
               </dd>
             </div>
           </dl>
@@ -1898,19 +1898,19 @@ exports[`ChooseChannelTemplate renders letter form 1`] = `
                             class="nhsuk-radios__item"
                           >
                             <input
-                              aria-labelledby="channelTemplate-letter-template-id-name"
+                              aria-labelledby="channelTemplate-authoring-letter-template-id-name"
                               checked=""
                               class="nhsuk-radios__input"
-                              data-testid="letter-template-id-radio"
-                              id="channelTemplate-letter-template-id"
+                              data-testid="authoring-letter-template-id-radio"
+                              id="channelTemplate-authoring-letter-template-id"
                               name="channelTemplate"
                               type="radio"
-                              value="letter-template-id"
+                              value="authoring-letter-template-id"
                             />
                             <label
                               class="nhsuk-label nhsuk-radios__label"
-                              for="channelTemplate-letter-template-id"
-                              id="channelTemplate-letter-template-id--label"
+                              for="channelTemplate-authoring-letter-template-id"
+                              id="channelTemplate-authoring-letter-template-id--label"
                             >
                                
                             </label>
@@ -1918,7 +1918,7 @@ exports[`ChooseChannelTemplate renders letter form 1`] = `
                         </td>
                         <td
                           class="nhsuk-table__cell"
-                          id="channelTemplate-letter-template-id-name"
+                          id="channelTemplate-authoring-letter-template-id-name"
                           role="cell"
                         >
                           <span
@@ -1927,7 +1927,7 @@ exports[`ChooseChannelTemplate renders letter form 1`] = `
                           >
                             Name 
                           </span>
-                          letter template name
+                          authoring letter template name
                         </td>
                         <td
                           class="nhsuk-table__cell"
@@ -1968,8 +1968,8 @@ exports[`ChooseChannelTemplate renders letter form 1`] = `
                           <a
                             aria-label="Preview"
                             class="nhsuk-u-margin-bottom-2 nhsuk-link"
-                            data-testid="letter-template-id-preview-link"
-                            href="/message-plans/choose-standard-english-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34/preview-template/letter-template-id?lockNumber=42"
+                            data-testid="authoring-letter-template-id-preview-link"
+                            href="/message-plans/choose-standard-english-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34/preview-template/authoring-letter-template-id?lockNumber=42"
                             id="preview-template-link-0"
                           >
                             Preview
diff --git a/frontend/src/__tests__/components/molecules/MessagePlanCascadePreview.test.tsx b/frontend/src/__tests__/components/molecules/MessagePlanCascadePreview.test.tsx
index 0c14fb810..70a43f288 100644
--- a/frontend/src/__tests__/components/molecules/MessagePlanCascadePreview.test.tsx
+++ b/frontend/src/__tests__/components/molecules/MessagePlanCascadePreview.test.tsx
@@ -4,17 +4,22 @@ import {
   AUTHORING_LETTER_TEMPLATE,
   EMAIL_TEMPLATE,
   NHS_APP_TEMPLATE,
-  PDF_LETTER_TEMPLATE,
   ROUTING_CONFIG,
   SMS_TEMPLATE,
 } from '@testhelpers/helpers';
+import { AuthoringLetterTemplate } from 'nhs-notify-web-template-management-utils';
+
+const APPROVED_LETTER: AuthoringLetterTemplate = {
+  ...AUTHORING_LETTER_TEMPLATE,
+  templateStatus: 'PROOF_APPROVED',
+};
 
 describe('MessagePlanCascadePreview', () => {
   const templates = {
     [NHS_APP_TEMPLATE.id]: NHS_APP_TEMPLATE,
     [EMAIL_TEMPLATE.id]: EMAIL_TEMPLATE,
     [SMS_TEMPLATE.id]: SMS_TEMPLATE,
-    [PDF_LETTER_TEMPLATE.id]: PDF_LETTER_TEMPLATE,
+    [APPROVED_LETTER.id]: APPROVED_LETTER,
   };
 
   it('renders cascade preview with all channels', () => {
@@ -22,6 +27,7 @@ describe('MessagePlanCascadePreview', () => {
       <MessagePlanCascadePreview
         messagePlan={ROUTING_CONFIG}
         templates={templates}
+        letterPreviewHrefBase={`/message-plans/review-and-move-to-production/${ROUTING_CONFIG.id}`}
       />
     );
 
@@ -37,6 +43,7 @@ describe('MessagePlanCascadePreview', () => {
       <MessagePlanCascadePreview
         messagePlan={ROUTING_CONFIG}
         templates={templates}
+        letterPreviewHrefBase={`/message-plans/review-and-move-to-production/${ROUTING_CONFIG.id}`}
       />
     );
 
@@ -45,7 +52,7 @@ describe('MessagePlanCascadePreview', () => {
     expect(templateNames[0]).toHaveTextContent(NHS_APP_TEMPLATE.name);
     expect(templateNames[1]).toHaveTextContent(EMAIL_TEMPLATE.name);
     expect(templateNames[2]).toHaveTextContent(SMS_TEMPLATE.name);
-    expect(templateNames[3]).toHaveTextContent(PDF_LETTER_TEMPLATE.name);
+    expect(templateNames[3]).toHaveTextContent(AUTHORING_LETTER_TEMPLATE.name);
   });
 
   it('renders open/close all previews button when non-letter channels present', () => {
@@ -53,6 +60,7 @@ describe('MessagePlanCascadePreview', () => {
       <MessagePlanCascadePreview
         messagePlan={ROUTING_CONFIG}
         templates={templates}
+        letterPreviewHrefBase={`/message-plans/review-and-move-to-production/${ROUTING_CONFIG.id}`}
       />
     );
 
@@ -71,7 +79,7 @@ describe('MessagePlanCascadePreview', () => {
           cascadeGroups: ['standard' as const],
           channel: 'LETTER' as const,
           channelType: 'primary' as const,
-          defaultTemplateId: PDF_LETTER_TEMPLATE.id,
+          defaultTemplateId: AUTHORING_LETTER_TEMPLATE.id,
         },
       ],
     };
@@ -80,6 +88,7 @@ describe('MessagePlanCascadePreview', () => {
       <MessagePlanCascadePreview
         messagePlan={letterOnlyRoutingConfig}
         templates={templates}
+        letterPreviewHrefBase={`/message-plans/review-and-move-to-production/${ROUTING_CONFIG.id}`}
       />
     );
 
@@ -93,6 +102,7 @@ describe('MessagePlanCascadePreview', () => {
       <MessagePlanCascadePreview
         messagePlan={ROUTING_CONFIG}
         templates={templates}
+        letterPreviewHrefBase={`/message-plans/review-and-move-to-production/${ROUTING_CONFIG.id}`}
       />
     );
 
@@ -124,6 +134,7 @@ describe('MessagePlanCascadePreview', () => {
       <MessagePlanCascadePreview
         messagePlan={singleChannelRoutingConfig}
         templates={templates}
+        letterPreviewHrefBase={`/message-plans/review-and-move-to-production/${ROUTING_CONFIG.id}`}
       />
     );
 
@@ -132,11 +143,12 @@ describe('MessagePlanCascadePreview', () => {
     ).not.toBeInTheDocument();
   });
 
-  it('renders letter template as link', () => {
+  it('renders letter template with link using letterPreviewHrefBase prop', () => {
     render(
       <MessagePlanCascadePreview
         messagePlan={ROUTING_CONFIG}
         templates={templates}
+        letterPreviewHrefBase={`/base-url`}
       />
     );
 
@@ -144,52 +156,18 @@ describe('MessagePlanCascadePreview', () => {
     const link = letterBlock.querySelector('a');
     expect(link).toHaveAttribute(
       'href',
-      `/preview-letter-template/${PDF_LETTER_TEMPLATE.id}`
+      `/base-url/preview-template/${AUTHORING_LETTER_TEMPLATE.id}`
     );
     expect(link).toHaveAttribute('target', '_blank');
     expect(link).toHaveTextContent('Preview template (opens in a new tab)');
   });
 
-  it('renders submitted letter template with submitted link', () => {
-    const submittedTemplate = {
-      ...PDF_LETTER_TEMPLATE,
-      id: 'submitted-letter-id',
-      templateStatus: 'SUBMITTED' as const,
-    };
-    const templatesWithSubmitted = {
-      ...templates,
-      [submittedTemplate.id]: submittedTemplate,
-    };
-    const routingConfigWithSubmitted = {
-      ...ROUTING_CONFIG,
-      cascade: ROUTING_CONFIG.cascade.map((item) =>
-        item.channel === 'LETTER'
-          ? { ...item, defaultTemplateId: submittedTemplate.id }
-          : item
-      ),
-    };
-
-    render(
-      <MessagePlanCascadePreview
-        messagePlan={routingConfigWithSubmitted}
-        templates={templatesWithSubmitted}
-      />
-    );
-
-    const letterBlock = screen.getByTestId('message-plan-block-LETTER');
-    const link = letterBlock.querySelector('a');
-    expect(link).toHaveAttribute(
-      'href',
-      `/preview-submitted-letter-template/${submittedTemplate.id}`
-    );
-    expect(link).toHaveAttribute('target', '_blank');
-  });
-
   it('renders non-letter templates with preview details', () => {
     render(
       <MessagePlanCascadePreview
         messagePlan={ROUTING_CONFIG}
         templates={templates}
+        letterPreviewHrefBase={`/message-plans/review-and-move-to-production/${ROUTING_CONFIG.id}`}
       />
     );
 
@@ -202,13 +180,14 @@ describe('MessagePlanCascadePreview', () => {
       [NHS_APP_TEMPLATE.id]: NHS_APP_TEMPLATE,
       // EMAIL_TEMPLATE is missing
       [SMS_TEMPLATE.id]: SMS_TEMPLATE,
-      [PDF_LETTER_TEMPLATE.id]: PDF_LETTER_TEMPLATE,
+      [AUTHORING_LETTER_TEMPLATE.id]: AUTHORING_LETTER_TEMPLATE,
     };
 
     render(
       <MessagePlanCascadePreview
         messagePlan={ROUTING_CONFIG}
         templates={templatesWithMissing}
+        letterPreviewHrefBase={`/message-plans/review-and-move-to-production/${ROUTING_CONFIG.id}`}
       />
     );
 
@@ -220,60 +199,12 @@ describe('MessagePlanCascadePreview', () => {
     expect(screen.getByTestId('message-plan-block-LETTER')).toBeInTheDocument();
   });
 
-  it('renders authoring letter template with letterPreviewHrefBase link', () => {
-    const authoringTemplates = {
-      ...templates,
-      [AUTHORING_LETTER_TEMPLATE.id]: AUTHORING_LETTER_TEMPLATE,
-    };
-    const routingConfigWithAuthoring = {
-      ...ROUTING_CONFIG,
-      cascade: ROUTING_CONFIG.cascade.map((item) =>
-        item.channel === 'LETTER'
-          ? { ...item, defaultTemplateId: AUTHORING_LETTER_TEMPLATE.id }
-          : item
-      ),
-    };
-
-    render(
-      <MessagePlanCascadePreview
-        messagePlan={routingConfigWithAuthoring}
-        templates={authoringTemplates}
-        letterPreviewHrefBase='/message-plans/review-and-move-to-production/routing-config-id'
-      />
-    );
-
-    const letterBlock = screen.getByTestId('message-plan-block-LETTER');
-    const link = letterBlock.querySelector('a');
-    expect(link).toHaveAttribute(
-      'href',
-      `/message-plans/review-and-move-to-production/routing-config-id/preview-template/${AUTHORING_LETTER_TEMPLATE.id}`
-    );
-    expect(link).toHaveAttribute('target', '_blank');
-  });
-
-  it('renders PDF letter template with standard link even when letterPreviewHrefBase is provided', () => {
-    render(
-      <MessagePlanCascadePreview
-        messagePlan={ROUTING_CONFIG}
-        templates={templates}
-        letterPreviewHrefBase='/message-plans/review-and-move-to-production/routing-config-id'
-      />
-    );
-
-    const letterBlock = screen.getByTestId('message-plan-block-LETTER');
-    const link = letterBlock.querySelector('a');
-    expect(link).toHaveAttribute(
-      'href',
-      `/preview-letter-template/${PDF_LETTER_TEMPLATE.id}`
-    );
-    expect(link).toHaveAttribute('target', '_blank');
-  });
-
   it('matches snapshot', () => {
     const { asFragment } = render(
       <MessagePlanCascadePreview
         messagePlan={ROUTING_CONFIG}
         templates={templates}
+        letterPreviewHrefBase={`/message-plans/preview-message-plan/${ROUTING_CONFIG.id}`}
       />
     );
 
diff --git a/frontend/src/__tests__/components/molecules/SummaryChooseLetter.test.tsx b/frontend/src/__tests__/components/molecules/SummaryChooseLetter.test.tsx
index 002b712a8..8bec9e9c0 100644
--- a/frontend/src/__tests__/components/molecules/SummaryChooseLetter.test.tsx
+++ b/frontend/src/__tests__/components/molecules/SummaryChooseLetter.test.tsx
@@ -1,7 +1,6 @@
 import { SummaryChooseLetter } from '@molecules/SummaryChooseLetter/SummaryChooseLetter';
 import {
   AUTHORING_LETTER_TEMPLATE,
-  PDF_LETTER_TEMPLATE,
   makeLetterVariant,
   ROUTING_CONFIG,
 } from '@testhelpers/helpers';
@@ -71,7 +70,7 @@ describe('SummaryChooseLetter', () => {
 
   it('should redirect to invalid-template when template fails validation', async () => {
     getTemplateMock.mockResolvedValueOnce({
-      ...PDF_LETTER_TEMPLATE,
+      ...AUTHORING_LETTER_TEMPLATE,
       templateType: 'EMAIL',
     } as unknown as TemplateDto);
 
@@ -80,28 +79,7 @@ describe('SummaryChooseLetter', () => {
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
   });
 
-  it('renders a PDF letter template preview', async () => {
-    getTemplateMock.mockResolvedValueOnce({
-      ...PDF_LETTER_TEMPLATE,
-      templateStatus: 'SUBMITTED',
-    });
-
-    const page = await SummaryChooseLetter({
-      ...defaultProps,
-      params: Promise.resolve({
-        routingConfigId: ROUTING_CONFIG.id,
-        templateId: PDF_LETTER_TEMPLATE.id,
-      }),
-    });
-
-    const container = render(page);
-
-    expect(getTemplateMock).toHaveBeenCalledWith(PDF_LETTER_TEMPLATE.id);
-    expect(getLetterVariantByIdMock).not.toHaveBeenCalled();
-    expect(container.asFragment()).toMatchSnapshot();
-  });
-
-  it('renders an authoring letter template preview', async () => {
+  it('renders a letter template preview', async () => {
     const letterVariant = makeLetterVariant();
 
     getTemplateMock.mockResolvedValueOnce({
diff --git a/frontend/src/__tests__/components/molecules/__snapshots__/MessagePlanCascadePreview.test.tsx.snap b/frontend/src/__tests__/components/molecules/__snapshots__/MessagePlanCascadePreview.test.tsx.snap
index e3d1d838a..546575a07 100644
--- a/frontend/src/__tests__/components/molecules/__snapshots__/MessagePlanCascadePreview.test.tsx.snap
+++ b/frontend/src/__tests__/components/molecules/__snapshots__/MessagePlanCascadePreview.test.tsx.snap
@@ -513,10 +513,10 @@ exports[`MessagePlanCascadePreview matches snapshot 1`] = `
           <p
             data-testid="template-name"
           >
-            letter template name
+            authoring letter template name
           </p>
           <a
-            href="/preview-letter-template/letter-template-id"
+            href="/message-plans/preview-message-plan/fbb81055-79b9-4759-ac07-d191ae57be34/preview-template/authoring-letter-template-id"
             rel="noopener noreferrer"
             target="_blank"
           >
diff --git a/frontend/src/__tests__/components/molecules/__snapshots__/SummaryChooseLetter.test.tsx.snap b/frontend/src/__tests__/components/molecules/__snapshots__/SummaryChooseLetter.test.tsx.snap
index 1df7f8661..bccd4f747 100644
--- a/frontend/src/__tests__/components/molecules/__snapshots__/SummaryChooseLetter.test.tsx.snap
+++ b/frontend/src/__tests__/components/molecules/__snapshots__/SummaryChooseLetter.test.tsx.snap
@@ -1,130 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`SummaryChooseLetter renders a PDF letter template preview 1`] = `
-<DocumentFragment>
-  <div
-    class="nhsuk-width-container"
-  >
-    <a
-      class="nhsuk-back-link"
-      data-testid="back-link-top"
-      href="/message-plans/choose-standard-english-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=5"
-    >
-      Go back
-    </a>
-    <main
-      class="nhsuk-main-wrapper"
-      id="maincontent"
-      role="main"
-    >
-      <div
-        class="nhsuk-grid-row"
-      >
-        <div
-          class="nhsuk-grid-column-full"
-        >
-          <div
-            class="nhsuk-u-reading-width"
-          >
-            <span
-              class="nhsuk-caption-l"
-            >
-              Template
-            </span>
-            <h1
-              data-testid="preview-message__heading"
-            >
-              letter template name
-            </h1>
-          </div>
-          <div
-            class="nhsuk-width-container nhsuk-u-margin-bottom-6 nhsuk-body-m"
-          >
-            <dl
-              class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview"
-            >
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Template ID
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value monospace-font"
-                  data-testid="preview-template-id"
-                >
-                  letter-template-id
-                </dd>
-              </div>
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Template type
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value"
-                >
-                  Standard letter
-                </dd>
-              </div>
-              <div
-                class="nhsuk-summary-list__row"
-              >
-                <dt
-                  class="nhsuk-summary-list__key"
-                >
-                  Template file
-                </dt>
-                <dd
-                  class="nhsuk-summary-list__value"
-                >
-                  <div
-                    class="container"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="icon"
-                      fill="none"
-                      height="26"
-                      viewBox="0 0 20 26"
-                      width="20"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M0 0V26H20V6.59375L19.7188 6.28125L13.7188 0.28125L13.4062 0H0ZM2 2H12V8H18V24H2V2ZM14 3.4375L16.5625 6H14V3.4375Z"
-                        fill="#4C6272"
-                      />
-                    </svg>
-                    <p
-                      class="text"
-                    >
-                      template.pdf
-                    </p>
-                  </div>
-                </dd>
-              </div>
-            </dl>
-          </div>
-          <a
-            class="nhsuk-link nhsuk-body-m nhsuk-u-display-inline-block"
-            data-testid="back-link-bottom"
-            href="/message-plans/choose-standard-english-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=5"
-          >
-            Go back
-          </a>
-        </div>
-      </div>
-    </main>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`SummaryChooseLetter renders an authoring letter template preview 1`] = `
+exports[`SummaryChooseLetter renders a letter template preview 1`] = `
 <DocumentFragment>
   <div
     class="nhsuk-width-container"
diff --git a/frontend/src/__tests__/helpers/helpers.ts b/frontend/src/__tests__/helpers/helpers.ts
index 68d336b3c..4cd8e7fb7 100644
--- a/frontend/src/__tests__/helpers/helpers.ts
+++ b/frontend/src/__tests__/helpers/helpers.ts
@@ -176,7 +176,7 @@ export const ROUTING_CONFIG: RoutingConfig = {
       cascadeGroups: ['standard'],
       channel: 'LETTER',
       channelType: 'primary',
-      defaultTemplateId: PDF_LETTER_TEMPLATE.id,
+      defaultTemplateId: AUTHORING_LETTER_TEMPLATE.id,
     },
   ],
   lockNumber: 0,
diff --git a/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx
index 81f4cea08..7c25b09f6 100644
--- a/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx
+++ b/frontend/src/app/message-plans/preview-message-plan/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -1,7 +1,4 @@
-import {
-  MessagePlanAndTemplatePageProps,
-  validateAuthoringLetterTemplate,
-} from 'nhs-notify-web-template-management-utils';
+import { MessagePlanAndTemplatePageProps } from 'nhs-notify-web-template-management-utils';
 import { Metadata } from 'next';
 import content from '@content/content';
 import { SummaryLetterFromMessagePlan } from '@molecules/SummaryLetterFromMessagePlan/SummaryLetterFromMessagePlan';
@@ -16,11 +13,6 @@ export async function generateMetadata(): Promise<Metadata> {
 
 const PreviewLetterTemplateFromPreviewMessagePlan = async (
   props: MessagePlanAndTemplatePageProps
-) => (
-  <SummaryLetterFromMessagePlan
-    {...props}
-    validateTemplate={validateAuthoringLetterTemplate}
-  />
-);
+) => <SummaryLetterFromMessagePlan {...props} />;
 
 export default PreviewLetterTemplateFromPreviewMessagePlan;
diff --git a/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx b/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx
index b3723ca56..934bdb8b0 100644
--- a/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx
+++ b/frontend/src/app/message-plans/review-and-move-to-production/[routingConfigId]/preview-template/[templateId]/page.tsx
@@ -1,7 +1,4 @@
-import {
-  MessagePlanAndTemplatePageProps,
-  validateAuthoringLetterTemplate,
-} from 'nhs-notify-web-template-management-utils';
+import { MessagePlanAndTemplatePageProps } from 'nhs-notify-web-template-management-utils';
 import { Metadata } from 'next';
 import content from '@content/content';
 import { SummaryLetterFromMessagePlan } from '@molecules/SummaryLetterFromMessagePlan/SummaryLetterFromMessagePlan';
@@ -16,11 +13,6 @@ export async function generateMetadata(): Promise<Metadata> {
 
 const PreviewLetterTemplateFromReviewAndMoveToProduction = async (
   props: MessagePlanAndTemplatePageProps
-) => (
-  <SummaryLetterFromMessagePlan
-    {...props}
-    validateTemplate={validateAuthoringLetterTemplate}
-  />
-);
+) => <SummaryLetterFromMessagePlan {...props} />;
 
 export default PreviewLetterTemplateFromReviewAndMoveToProduction;
diff --git a/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx b/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx
index ed29a6498..c620324f1 100644
--- a/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx
+++ b/frontend/src/components/molecules/MessagePlanCascadePreview/MessagePlanCascadePreview.tsx
@@ -43,25 +43,13 @@ function getLetterTemplatePreviewHref(
   template: TemplateDto,
   letterPreviewHrefBase?: string
 ): string {
-  if (
-    letterPreviewHrefBase &&
-    'letterVersion' in template &&
-    template.letterVersion === 'AUTHORING'
-  ) {
-    return `${letterPreviewHrefBase}/preview-template/${template.id}`;
-  }
-
-  const linkTemplate =
-    template.templateStatus === 'SUBMITTED'
-      ? pageContent.letterTemplateLinks.previewSubmitted
-      : pageContent.letterTemplateLinks.preview;
-  return interpolate(linkTemplate, { id: template.id });
+  return `${letterPreviewHrefBase}/preview-template/${template.id}`;
 }
 
 export type MessagePlanCascadePreviewProps = {
   messagePlan: RoutingConfig;
   templates: MessagePlanTemplates;
-  letterPreviewHrefBase?: string;
+  letterPreviewHrefBase: string;
 };
 
 export function MessagePlanCascadePreview({
diff --git a/frontend/src/components/molecules/SummaryChooseLetter/SummaryChooseLetter.tsx b/frontend/src/components/molecules/SummaryChooseLetter/SummaryChooseLetter.tsx
index f918c60f7..de07b0666 100644
--- a/frontend/src/components/molecules/SummaryChooseLetter/SummaryChooseLetter.tsx
+++ b/frontend/src/components/molecules/SummaryChooseLetter/SummaryChooseLetter.tsx
@@ -1,5 +1,4 @@
 import {
-  AuthoringLetterTemplate,
   LetterTemplate,
   MessagePlanAndTemplatePageProps,
 } from 'nhs-notify-web-template-management-utils';
@@ -18,7 +17,7 @@ type SummaryChooseLetterProps = MessagePlanAndTemplatePageProps & {
 
 export const SummaryChooseLetter = async (props: SummaryChooseLetterProps) => {
   const { templateId, routingConfigId } = await props.params;
-  const { validateTemplate, redirectUrlOnLockNumberFailure } = props;
+  const { redirectUrlOnLockNumberFailure } = props;
 
   const searchParams = await props.searchParams;
   const lockNumberResult = $LockNumber.safeParse(searchParams?.lockNumber);
@@ -31,18 +30,19 @@ export const SummaryChooseLetter = async (props: SummaryChooseLetterProps) => {
 
   const template = await getTemplate(templateId);
 
-  const validatedTemplate = validateTemplate(template);
+  const validatedTemplate = props.validateTemplate(template);
 
-  if (!validatedTemplate) {
+  if (
+    !validatedTemplate ||
+    !('letterVariantId' in validatedTemplate) ||
+    !validatedTemplate.letterVariantId
+  ) {
     return redirect('/invalid-template', RedirectType.replace);
   }
 
-  const letterVariantId = (validatedTemplate as AuthoringLetterTemplate)
-    .letterVariantId;
-
-  const letterVariant = letterVariantId
-    ? await getLetterVariantById(letterVariantId)
-    : undefined;
+  const letterVariant = await getLetterVariantById(
+    validatedTemplate.letterVariantId
+  );
 
   return (
     <NHSNotifyContainer>
diff --git a/frontend/src/components/molecules/SummaryLetterFromMessagePlan/SummaryLetterFromMessagePlan.tsx b/frontend/src/components/molecules/SummaryLetterFromMessagePlan/SummaryLetterFromMessagePlan.tsx
index c11646fbe..ddd0c8c97 100644
--- a/frontend/src/components/molecules/SummaryLetterFromMessagePlan/SummaryLetterFromMessagePlan.tsx
+++ b/frontend/src/components/molecules/SummaryLetterFromMessagePlan/SummaryLetterFromMessagePlan.tsx
@@ -1,39 +1,29 @@
 import {
-  AuthoringLetterTemplate,
-  LetterTemplate,
   MessagePlanAndTemplatePageProps,
+  validateAuthoringLetterTemplate,
 } from 'nhs-notify-web-template-management-utils';
-import type { TemplateDto } from 'nhs-notify-web-template-management-types';
 import { getLetterVariantById, getTemplate } from '@utils/form-actions';
 import { redirect, RedirectType } from 'next/navigation';
 import { PreviewTemplateFromMessagePlan } from '@molecules/PreviewTemplateFromMessagePlan/PreviewTemplateFromMessagePlan';
 import PreviewTemplateDetailsLetter from '@molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter';
 import { NHSNotifyContainer } from '@layouts/container/container';
 
-type SummaryLetterFromMessagePlanProps = MessagePlanAndTemplatePageProps & {
-  validateTemplate: (template?: TemplateDto) => LetterTemplate | undefined;
-};
-
 export const SummaryLetterFromMessagePlan = async (
-  props: SummaryLetterFromMessagePlanProps
+  props: MessagePlanAndTemplatePageProps
 ) => {
   const { templateId, routingConfigId } = await props.params;
-  const { validateTemplate } = props;
 
   const template = await getTemplate(templateId);
 
-  const validatedTemplate = validateTemplate(template);
+  const validatedTemplate = validateAuthoringLetterTemplate(template);
 
-  if (!validatedTemplate) {
+  if (!validatedTemplate || !validatedTemplate.letterVariantId) {
     return redirect('/invalid-template', RedirectType.replace);
   }
 
-  const letterVariantId = (validatedTemplate as AuthoringLetterTemplate)
-    .letterVariantId;
-
-  const letterVariant = letterVariantId
-    ? await getLetterVariantById(letterVariantId)
-    : undefined;
+  const letterVariant = await getLetterVariantById(
+    validatedTemplate.letterVariantId
+  );
 
   return (
     <NHSNotifyContainer>
diff --git a/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts b/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts
index f92681e12..ad94767fd 100644
--- a/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts
+++ b/tests/test-team/template-mgmt-e2e-tests/routing.e2e.spec.ts
@@ -27,11 +27,14 @@ import { TemplateMgmtMessageTemplatesPage } from '../pages/template-mgmt-message
 import { RoutingChooseTemplateForMessagePlanBasePage } from '../pages/routing/choose-template-base-page';
 import type { Template } from '../helpers/types';
 import { loginAsUser } from 'helpers/auth/login-as-user';
-import type { Channel } from 'nhs-notify-web-template-management-types';
+import type {
+  Channel,
+  LetterVariant,
+} from 'nhs-notify-web-template-management-types';
 
 const templateStorageHelper = new TemplateStorageHelper();
 
-function createTemplates(user: TestUser) {
+function createTemplates(user: TestUser, letterVariant: LetterVariant) {
   const templateIds = {
     NHSAPP: randomUUID(),
     EMAIL: randomUUID(),
@@ -70,6 +73,7 @@ function createTemplates(user: TestUser) {
       {
         shortFormRender: { status: 'RENDERED' },
         longFormRender: { status: 'RENDERED' },
+        letterVariantId: letterVariant.id,
       }
     ),
     LARGE_PRINT_LETTER: TemplateFactory.createAuthoringLetterTemplate(
@@ -81,6 +85,7 @@ function createTemplates(user: TestUser) {
         letterType: 'x1',
         shortFormRender: { status: 'RENDERED' },
         longFormRender: { status: 'RENDERED' },
+        letterVariantId: letterVariant.id,
       }
     ),
     BSL_LETTER: TemplateFactory.createAuthoringLetterTemplate(
@@ -92,6 +97,7 @@ function createTemplates(user: TestUser) {
         letterType: 'q4',
         shortFormRender: { status: 'RENDERED' },
         longFormRender: { status: 'RENDERED' },
+        letterVariantId: letterVariant.id,
       }
     ),
     ARABIC_LETTER: TemplateFactory.createAuthoringLetterTemplate(
@@ -103,6 +109,7 @@ function createTemplates(user: TestUser) {
         language: 'ar',
         shortFormRender: { status: 'RENDERED' },
         longFormRender: { status: 'RENDERED' },
+        letterVariantId: letterVariant.id,
       }
     ),
     POLISH_LETTER: TemplateFactory.createAuthoringLetterTemplate(
@@ -114,6 +121,7 @@ function createTemplates(user: TestUser) {
         language: 'pl',
         shortFormRender: { status: 'RENDERED' },
         longFormRender: { status: 'RENDERED' },
+        letterVariantId: letterVariant.id,
       }
     ),
   };
@@ -178,7 +186,10 @@ test.describe('Routing', () => {
     user = await context.auth.getTestUser(
       testUsers.UserLetterAuthoringEnabled.userId
     );
-    templates = createTemplates(user);
+    const [globalLetterVariant] =
+      await context.letterVariants.getGlobalLetterVariants();
+
+    templates = createTemplates(user, globalLetterVariant);
 
     await templateStorageHelper.seedTemplateData(Object.values(templates));
   });
diff --git a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-british-sign-language-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-british-sign-language-letter-template.routing-component.spec.ts
index 39ea4d9e9..5dfdc443d 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-british-sign-language-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-british-sign-language-letter-template.routing-component.spec.ts
@@ -15,6 +15,7 @@ import { RoutingPreviewBritishSignLanguageLetterTemplatePage } from 'pages/routi
 import { RoutingConfigFactory } from 'helpers/factories/routing-config-factory';
 import { RoutingConfigStorageHelper } from 'helpers/db/routing-config-storage-helper';
 import { getTestContext } from 'helpers/context/context';
+import { LetterVariant } from 'nhs-notify-web-template-management-types';
 
 const routingConfigStorageHelper = new RoutingConfigStorageHelper();
 const templateStorageHelper = new TemplateStorageHelper();
@@ -31,7 +32,7 @@ function createMessagePlans(user: TestUser) {
   };
 }
 
-function createTemplates(user: TestUser) {
+function createTemplates(user: TestUser, letterVariant: LetterVariant) {
   return {
     EMAIL: TemplateFactory.createEmailTemplate(
       randomUUID(),
@@ -41,7 +42,13 @@ function createTemplates(user: TestUser) {
     STANDARD_LETTER: TemplateFactory.createAuthoringLetterTemplate(
       randomUUID(),
       user,
-      'Standard letter template name'
+      'Standard letter template name',
+      'SUBMITTED',
+      {
+        shortFormRender: { status: 'RENDERED' },
+        longFormRender: { status: 'RENDERED' },
+        letterVariantId: letterVariant.id,
+      }
     ),
     BSL_LETTER: TemplateFactory.createAuthoringLetterTemplate(
       randomUUID(),
@@ -52,6 +59,7 @@ function createTemplates(user: TestUser) {
         letterType: 'q4',
         shortFormRender: { status: 'RENDERED' },
         longFormRender: { status: 'RENDERED' },
+        letterVariantId: letterVariant.id,
       }
     ),
   };
@@ -65,8 +73,11 @@ test.describe('Routing - Preview British Sign Language letter template page', ()
     const context = getTestContext();
     const user = await context.auth.getTestUser(testUsers.User1.userId);
 
+    const [globalLetterVariant] =
+      await context.letterVariants.getGlobalLetterVariants();
+
     messagePlans = createMessagePlans(user);
-    templates = createTemplates(user);
+    templates = createTemplates(user, globalLetterVariant);
 
     await routingConfigStorageHelper.seed(Object.values(messagePlans));
     await templateStorageHelper.seedTemplateData(Object.values(templates));
@@ -153,12 +164,6 @@ test.describe('Routing - Preview British Sign Language letter template page', ()
 
     await expect(previewBSLLetterTemplatePage.summaryList).toBeVisible();
 
-    expect(templates.BSL_LETTER.campaignId).toBeTruthy();
-
-    await expect(previewBSLLetterTemplatePage.campaignId).toContainText(
-      templates.BSL_LETTER.campaignId!
-    );
-
     await expect(
       previewBSLLetterTemplatePage.letterPreviewHeading
     ).toBeVisible();
diff --git a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-large-print-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-large-print-letter-template.routing-component.spec.ts
index c3ef137db..e927984e4 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-large-print-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-large-print-letter-template.routing-component.spec.ts
@@ -15,6 +15,7 @@ import { RoutingPreviewLargePrintLetterTemplatePage } from 'pages/routing/letter
 import { RoutingConfigFactory } from 'helpers/factories/routing-config-factory';
 import { RoutingConfigStorageHelper } from 'helpers/db/routing-config-storage-helper';
 import { getTestContext } from 'helpers/context/context';
+import { LetterVariant } from 'nhs-notify-web-template-management-types';
 
 const routingConfigStorageHelper = new RoutingConfigStorageHelper();
 const templateStorageHelper = new TemplateStorageHelper();
@@ -31,27 +32,25 @@ function createMessagePlans(user: TestUser) {
   };
 }
 
-function createTemplates(user: TestUser) {
+function createTemplates(user: TestUser, letterVariant: LetterVariant) {
   return {
     EMAIL: TemplateFactory.createEmailTemplate(
       randomUUID(),
       user,
       'Email template name'
     ),
-    STANDARD_LETTER: TemplateFactory.uploadPdfLetterTemplate(
+    STANDARD_LETTER: TemplateFactory.createAuthoringLetterTemplate(
       randomUUID(),
       user,
-      'Standard letter template name'
-    ),
-    LARGE_PRINT_LETTER: TemplateFactory.uploadPdfLetterTemplate(
-      randomUUID(),
-      user,
-      'Large print letter template name',
+      'Standard letter template name',
       'SUBMITTED',
-      'PASSED',
-      { letterType: 'x1' }
+      {
+        shortFormRender: { status: 'RENDERED' },
+        longFormRender: { status: 'RENDERED' },
+        letterVariantId: letterVariant.id,
+      }
     ),
-    AUTHORING_LARGE_PRINT_LETTER: TemplateFactory.createAuthoringLetterTemplate(
+    LARGE_PRINT_LETTER: TemplateFactory.createAuthoringLetterTemplate(
       randomUUID(),
       user,
       'Authoring large print letter template name',
@@ -60,6 +59,7 @@ function createTemplates(user: TestUser) {
         letterType: 'x1',
         shortFormRender: { status: 'RENDERED' },
         longFormRender: { status: 'RENDERED' },
+        letterVariantId: letterVariant.id,
       }
     ),
   };
@@ -73,8 +73,11 @@ test.describe('Routing - Preview large print letter template page', () => {
     const context = getTestContext();
     const user = await context.auth.getTestUser(testUsers.User1.userId);
 
+    const [globalLetterVariant] =
+      await context.letterVariants.getGlobalLetterVariants();
+
     messagePlans = createMessagePlans(user);
-    templates = createTemplates(user);
+    templates = createTemplates(user, globalLetterVariant);
 
     await routingConfigStorageHelper.seed(Object.values(messagePlans));
     await templateStorageHelper.seedTemplateData(Object.values(templates));
@@ -159,58 +162,6 @@ test.describe('Routing - Preview large print letter template page', () => {
 
     await expect(previewLargePrintLetterTemplatePage.summaryList).toBeVisible();
 
-    expect(templates.LARGE_PRINT_LETTER.campaignId).toBeTruthy();
-
-    await expect(previewLargePrintLetterTemplatePage.campaignId).toContainText(
-      templates.LARGE_PRINT_LETTER.campaignId!
-    );
-
-    await expect(
-      page.getByText(templates.LARGE_PRINT_LETTER.files!.pdfTemplate!.fileName)
-    ).toBeVisible();
-
-    await expect(
-      page.getByText(templates.LARGE_PRINT_LETTER.files!.testDataCsv!.fileName)
-    ).toBeVisible();
-  });
-
-  test('loads the AUTHORING large print letter template', async ({
-    page,
-    baseURL,
-  }) => {
-    const previewLargePrintLetterTemplatePage =
-      new RoutingPreviewLargePrintLetterTemplatePage(page);
-    await previewLargePrintLetterTemplatePage
-      .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-      .setPathParam('templateId', templates.AUTHORING_LARGE_PRINT_LETTER.id)
-      .setSearchParam('lockNumber', '0')
-      .loadPage();
-
-    await expect(page).toHaveURL(
-      `${baseURL}/templates/message-plans/choose-large-print-letter-template/${messagePlans.LETTER_ROUTING_CONFIG.id}/preview-template/${templates.AUTHORING_LARGE_PRINT_LETTER.id}?lockNumber=0`
-    );
-
-    await expect(
-      previewLargePrintLetterTemplatePage.templateCaption
-    ).toContainText('Template');
-
-    await expect(previewLargePrintLetterTemplatePage.pageHeading).toContainText(
-      templates.AUTHORING_LARGE_PRINT_LETTER.name
-    );
-
-    await expect(previewLargePrintLetterTemplatePage.templateId).toBeVisible();
-    await expect(previewLargePrintLetterTemplatePage.templateId).toContainText(
-      templates.AUTHORING_LARGE_PRINT_LETTER.id
-    );
-
-    await expect(previewLargePrintLetterTemplatePage.summaryList).toBeVisible();
-
-    expect(templates.AUTHORING_LARGE_PRINT_LETTER.campaignId).toBeTruthy();
-
-    await expect(previewLargePrintLetterTemplatePage.campaignId).toContainText(
-      templates.AUTHORING_LARGE_PRINT_LETTER.campaignId!
-    );
-
     await expect(
       previewLargePrintLetterTemplatePage.letterPreviewHeading
     ).toBeVisible();
@@ -222,7 +173,7 @@ test.describe('Routing - Preview large print letter template page', () => {
       previewLargePrintLetterTemplatePage.letterPreviewIframe
     ).toHaveAttribute(
       'src',
-      `/templates/files/${templates.AUTHORING_LARGE_PRINT_LETTER.clientId}/renders/${templates.AUTHORING_LARGE_PRINT_LETTER.id}/initial-render.pdf`
+      `/templates/files/${templates.LARGE_PRINT_LETTER.clientId}/renders/${templates.LARGE_PRINT_LETTER.id}/initial-render.pdf`
     );
   });
 
diff --git a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-other-language-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-other-language-letter-template.routing-component.spec.ts
index 89f58743c..67a6efba1 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-other-language-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-other-language-letter-template.routing-component.spec.ts
@@ -15,6 +15,7 @@ import { RoutingPreviewOtherLanguageLetterTemplatePage } from 'pages/routing/let
 import { RoutingConfigFactory } from 'helpers/factories/routing-config-factory';
 import { RoutingConfigStorageHelper } from 'helpers/db/routing-config-storage-helper';
 import { getTestContext } from 'helpers/context/context';
+import { LetterVariant } from 'nhs-notify-web-template-management-types';
 
 const routingConfigStorageHelper = new RoutingConfigStorageHelper();
 const templateStorageHelper = new TemplateStorageHelper();
@@ -38,27 +39,25 @@ function createMessagePlans(user: TestUser) {
   };
 }
 
-function createTemplates(user: TestUser) {
+function createTemplates(user: TestUser, letterVariant: LetterVariant) {
   return {
     EMAIL: TemplateFactory.createEmailTemplate(
       templateIds.EMAIL,
       user,
       'Email template name'
     ),
-    STANDARD_LETTER: TemplateFactory.uploadPdfLetterTemplate(
+    STANDARD_LETTER: TemplateFactory.createAuthoringLetterTemplate(
       templateIds.STANDARD_LETTER,
       user,
-      'Standard letter template name'
-    ),
-    FRENCH_LETTER: TemplateFactory.uploadPdfLetterTemplate(
-      templateIds.FRENCH_LETTER,
-      user,
-      'French letter template name',
-      'SUBMITTED',
-      'PASSED',
-      { language: 'fr' }
+      'Standard letter template name',
+      'PROOF_APPROVED',
+      {
+        shortFormRender: { status: 'RENDERED' },
+        longFormRender: { status: 'RENDERED' },
+        letterVariantId: letterVariant.id,
+      }
     ),
-    AUTHORING_FRENCH_LETTER: TemplateFactory.createAuthoringLetterTemplate(
+    FRENCH_LETTER: TemplateFactory.createAuthoringLetterTemplate(
       templateIds.AUTHORING_FRENCH_LETTER,
       user,
       'Authoring French letter template name',
@@ -67,6 +66,7 @@ function createTemplates(user: TestUser) {
         language: 'fr',
         shortFormRender: { status: 'RENDERED' },
         longFormRender: { status: 'RENDERED' },
+        letterVariantId: letterVariant.id,
       }
     ),
   };
@@ -80,8 +80,11 @@ test.describe('Routing - Preview foreign language letter template page', () => {
     const context = getTestContext();
     const user = await context.auth.getTestUser(testUsers.User1.userId);
 
+    const [globalLetterVariant] =
+      await context.letterVariants.getGlobalLetterVariants();
+
     messagePlans = createMessagePlans(user);
-    templates = createTemplates(user);
+    templates = createTemplates(user, globalLetterVariant);
 
     await routingConfigStorageHelper.seed(Object.values(messagePlans));
     await templateStorageHelper.seedTemplateData(Object.values(templates));
@@ -178,63 +181,6 @@ test.describe('Routing - Preview foreign language letter template page', () => {
       previewForeignLanguageLetterTemplatePage.summaryList
     ).toBeVisible();
 
-    expect(templates.FRENCH_LETTER.campaignId).toBeTruthy();
-
-    await expect(
-      previewForeignLanguageLetterTemplatePage.campaignId
-    ).toContainText(templates.FRENCH_LETTER.campaignId!);
-
-    await expect(
-      page.getByText(templates.FRENCH_LETTER.files!.pdfTemplate!.fileName)
-    ).toBeVisible();
-
-    await expect(
-      page.getByText(templates.FRENCH_LETTER.files!.testDataCsv!.fileName)
-    ).toBeVisible();
-  });
-
-  test('loads the AUTHORING foreign language letter template', async ({
-    page,
-    baseURL,
-  }) => {
-    const previewForeignLanguageLetterTemplatePage =
-      new RoutingPreviewOtherLanguageLetterTemplatePage(page)
-        .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-        .setPathParam('templateId', templates.AUTHORING_FRENCH_LETTER.id)
-        .setSearchParam('lockNumber', '0');
-    await previewForeignLanguageLetterTemplatePage.loadPage();
-    await expect(page).toHaveURL(
-      `${baseURL}/templates/message-plans/choose-other-language-letter-template/${messagePlans.LETTER_ROUTING_CONFIG.id}/preview-template/${templates.AUTHORING_FRENCH_LETTER.id}?lockNumber=0`
-    );
-
-    await expect(
-      previewForeignLanguageLetterTemplatePage.templateCaption
-    ).toBeVisible();
-    await expect(
-      previewForeignLanguageLetterTemplatePage.templateCaption
-    ).toContainText('Template');
-
-    await expect(
-      previewForeignLanguageLetterTemplatePage.pageHeading
-    ).toContainText(templates.AUTHORING_FRENCH_LETTER.name);
-
-    await expect(
-      previewForeignLanguageLetterTemplatePage.templateId
-    ).toBeVisible();
-    await expect(
-      previewForeignLanguageLetterTemplatePage.templateId
-    ).toContainText(templates.AUTHORING_FRENCH_LETTER.id);
-
-    await expect(
-      previewForeignLanguageLetterTemplatePage.summaryList
-    ).toBeVisible();
-
-    expect(templates.AUTHORING_FRENCH_LETTER.campaignId).toBeTruthy();
-
-    await expect(
-      previewForeignLanguageLetterTemplatePage.campaignId
-    ).toContainText(templates.AUTHORING_FRENCH_LETTER.campaignId!);
-
     await expect(
       previewForeignLanguageLetterTemplatePage.letterPreviewHeading
     ).toBeVisible();
@@ -246,7 +192,7 @@ test.describe('Routing - Preview foreign language letter template page', () => {
       previewForeignLanguageLetterTemplatePage.letterPreviewIframe
     ).toHaveAttribute(
       'src',
-      `/templates/files/${templates.AUTHORING_FRENCH_LETTER.clientId}/renders/${templates.AUTHORING_FRENCH_LETTER.id}/initial-render.pdf`
+      `/templates/files/${templates.FRENCH_LETTER.clientId}/renders/${templates.FRENCH_LETTER.id}/initial-render.pdf`
     );
   });
 
diff --git a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-standard-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-standard-letter-template.routing-component.spec.ts
index cad9b66d9..7be56755a 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-standard-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-standard-letter-template.routing-component.spec.ts
@@ -15,6 +15,7 @@ import { RoutingPreviewStandardLetterTemplatePage } from 'pages/routing/letter/p
 import { RoutingConfigFactory } from 'helpers/factories/routing-config-factory';
 import { RoutingConfigStorageHelper } from 'helpers/db/routing-config-storage-helper';
 import { getTestContext } from 'helpers/context/context';
+import { LetterVariant } from 'nhs-notify-web-template-management-types';
 
 const routingConfigStorageHelper = new RoutingConfigStorageHelper();
 const templateStorageHelper = new TemplateStorageHelper();
@@ -31,22 +32,23 @@ function createMessagePlans(user: TestUser) {
   };
 }
 
-function createTemplates(user: TestUser) {
+function createTemplates(user: TestUser, letterVariant: LetterVariant) {
   return {
     EMAIL: TemplateFactory.createEmailTemplate(
       randomUUID(),
       user,
       'Email template name'
     ),
-    LETTER: TemplateFactory.uploadPdfLetterTemplate(
+    LETTER: TemplateFactory.createAuthoringLetterTemplate(
       randomUUID(),
       user,
-      'Letter template name'
-    ),
-    AUTHORING_LETTER: TemplateFactory.createAuthoringLetterTemplate(
-      randomUUID(),
-      user,
-      'Authoring letter template name'
+      'Letter template name',
+      'PROOF_APPROVED',
+      {
+        shortFormRender: { status: 'RENDERED' },
+        longFormRender: { status: 'RENDERED' },
+        letterVariantId: letterVariant.id,
+      }
     ),
   };
 }
@@ -59,8 +61,11 @@ test.describe('Routing - Preview Letter template page', () => {
     const context = getTestContext();
     const user = await context.auth.getTestUser(testUsers.User1.userId);
 
+    const [globalLetterVariant] =
+      await context.letterVariants.getGlobalLetterVariants();
+
     messagePlans = createMessagePlans(user);
-    templates = createTemplates(user);
+    templates = createTemplates(user, globalLetterVariant);
 
     await routingConfigStorageHelper.seed(Object.values(messagePlans));
     await templateStorageHelper.seedTemplateData(Object.values(templates));
@@ -88,7 +93,7 @@ test.describe('Routing - Preview Letter template page', () => {
     await assertAndClickBackLinkTop(props);
   });
 
-  test('loads the Letter template', async ({ page, baseURL }) => {
+  test('loads the letter template', async ({ page, baseURL }) => {
     const previewLetterTemplatePage =
       new RoutingPreviewStandardLetterTemplatePage(page)
         .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
@@ -111,41 +116,9 @@ test.describe('Routing - Preview Letter template page', () => {
       templates.LETTER.campaignId!
     );
 
-    await expect(
-      page.getByText(templates.LETTER.files!.pdfTemplate!.fileName)
-    ).toBeVisible();
-
-    await expect(
-      page.getByText(templates.LETTER.files!.testDataCsv!.fileName)
-    ).toBeVisible();
-  });
-
-  test('loads the AUTHORING letter template', async ({ page, baseURL }) => {
-    const previewLetterTemplatePage =
-      new RoutingPreviewStandardLetterTemplatePage(page)
-        .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-        .setPathParam('templateId', templates.AUTHORING_LETTER.id)
-        .setSearchParam('lockNumber', '0');
-
-    await previewLetterTemplatePage.loadPage();
-
-    await expect(page).toHaveURL(
-      `${baseURL}/templates/message-plans/choose-standard-english-letter-template/${messagePlans.LETTER_ROUTING_CONFIG.id}/preview-template/${templates.AUTHORING_LETTER.id}?lockNumber=0`
-    );
-
-    await expect(previewLetterTemplatePage.pageHeading).toContainText(
-      templates.AUTHORING_LETTER.name
-    );
-
-    expect(templates.AUTHORING_LETTER.campaignId).toBeTruthy();
-
-    await expect(previewLetterTemplatePage.campaignId).toContainText(
-      templates.AUTHORING_LETTER.campaignId!
-    );
-
     await expect(previewLetterTemplatePage.templateId).toBeVisible();
     await expect(previewLetterTemplatePage.templateId).toContainText(
-      templates.AUTHORING_LETTER.id
+      templates.LETTER.id
     );
 
     await expect(previewLetterTemplatePage.summaryList).toBeVisible();
@@ -155,7 +128,7 @@ test.describe('Routing - Preview Letter template page', () => {
 
     await expect(previewLetterTemplatePage.letterPreviewIframe).toHaveAttribute(
       'src',
-      `/templates/files/${templates.AUTHORING_LETTER.clientId}/renders/${templates.AUTHORING_LETTER.id}/initial-render.pdf`
+      `/templates/files/${templates.LETTER.clientId}/renders/${templates.LETTER.id}/initial-render.pdf`
     );
   });
 
diff --git a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-preview-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-preview-letter-template.routing-component.spec.ts
index 10afb0e90..60bef3bb0 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-preview-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-preview-letter-template.routing-component.spec.ts
@@ -13,6 +13,7 @@ import { RoutingPreviewMessagePlanPreviewLetterTemplatePage } from 'pages/routin
 import { RoutingConfigFactory } from 'helpers/factories/routing-config-factory';
 import { RoutingConfigStorageHelper } from 'helpers/db/routing-config-storage-helper';
 import { getTestContext } from 'helpers/context/context';
+import { LetterVariant } from 'nhs-notify-web-template-management-types';
 
 const routingConfigStorageHelper = new RoutingConfigStorageHelper();
 const templateStorageHelper = new TemplateStorageHelper();
@@ -29,11 +30,10 @@ function createMessagePlans(user: TestUser) {
   };
 }
 
-function createTemplates(user: TestUser) {
+function createTemplates(user: TestUser, letterVariant: LetterVariant) {
   const templateIds = {
     EMAIL: randomUUID(),
     LETTER: randomUUID(),
-    PDF_LETTER: randomUUID(),
   };
 
   return {
@@ -45,12 +45,13 @@ function createTemplates(user: TestUser) {
     LETTER: TemplateFactory.createAuthoringLetterTemplate(
       templateIds.LETTER,
       user,
-      `Test Authoring Letter template - ${templateIds.LETTER}`
-    ),
-    PDF_LETTER: TemplateFactory.uploadPdfLetterTemplate(
-      templateIds.PDF_LETTER,
-      user,
-      `Test PDF Letter template - ${templateIds.PDF_LETTER}`
+      `Test Authoring Letter template - ${templateIds.LETTER}`,
+      'PROOF_APPROVED',
+      {
+        letterVariantId: letterVariant.id,
+        longFormRender: { status: 'RENDERED' },
+        shortFormRender: { status: 'RENDERED' },
+      }
     ),
   };
 }
@@ -63,8 +64,11 @@ test.describe('Routing - Preview Message Plan / Preview Letter template page', (
     const context = getTestContext();
     const user = await context.auth.getTestUser(testUsers.User1.userId);
 
+    const [globalLetterVariant] =
+      await context.letterVariants.getGlobalLetterVariants();
+
     messagePlans = createMessagePlans(user);
-    templates = createTemplates(user);
+    templates = createTemplates(user, globalLetterVariant);
 
     await routingConfigStorageHelper.seed(Object.values(messagePlans));
     await templateStorageHelper.seedTemplateData(Object.values(templates));
@@ -159,16 +163,5 @@ test.describe('Routing - Preview Message Plan / Preview Letter template page', (
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
-
-    test('when template is a PDF letter', async ({ page, baseURL }) => {
-      const previewLetterTemplatePage =
-        new RoutingPreviewMessagePlanPreviewLetterTemplatePage(page)
-          .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-          .setPathParam('templateId', templates.PDF_LETTER.id);
-
-      await previewLetterTemplatePage.loadPage();
-
-      await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
-    });
   });
 });
diff --git a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
index a9198450f..0606b8373 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan.routing-component.spec.ts
@@ -1,5 +1,8 @@
 import { randomUUID } from 'node:crypto';
-import type { Channel } from 'nhs-notify-web-template-management-types';
+import type {
+  Channel,
+  LetterVariant,
+} from 'nhs-notify-web-template-management-types';
 import { test, expect } from '@playwright/test';
 import { TestUser, testUsers } from 'helpers/auth/cognito-auth-helper';
 import { RoutingConfigStorageHelper } from 'helpers/db/routing-config-storage-helper';
@@ -21,7 +24,7 @@ import { getTestContext } from 'helpers/context/context';
 const routingConfigStorageHelper = new RoutingConfigStorageHelper();
 const templateStorageHelper = new TemplateStorageHelper();
 
-function createTemplates(user: TestUser) {
+function createTemplates(user: TestUser, letterVariant: LetterVariant) {
   const templateIds = {
     NHSAPP: randomUUID(),
     EMAIL: randomUUID(),
@@ -31,7 +34,6 @@ function createTemplates(user: TestUser) {
     BSL_LETTER: randomUUID(),
     FRENCH_LETTER: randomUUID(),
     SPANISH_LETTER: randomUUID(),
-    PDF_LETTER: randomUUID(),
   };
 
   return {
@@ -53,11 +55,16 @@ function createTemplates(user: TestUser) {
       `Test SMS template - ${templateIds.SMS}`,
       'SUBMITTED'
     ),
-    LETTER: TemplateFactory.uploadPdfLetterTemplate(
+    LETTER: TemplateFactory.createAuthoringLetterTemplate(
       templateIds.LETTER,
       user,
       `Test Letter template - ${templateIds.LETTER}`,
-      'SUBMITTED'
+      'SUBMITTED',
+      {
+        letterVariantId: letterVariant.id,
+        shortFormRender: { status: 'RENDERED' },
+        longFormRender: { status: 'RENDERED' },
+      }
     ),
     LARGE_PRINT_LETTER: TemplateFactory.createAuthoringLetterTemplate(
       templateIds.LARGE_PRINT_LETTER,
@@ -68,6 +75,7 @@ function createTemplates(user: TestUser) {
         letterType: 'x1',
         shortFormRender: { status: 'RENDERED' },
         longFormRender: { status: 'RENDERED' },
+        letterVariantId: letterVariant.id,
       }
     ),
     BSL_LETTER: TemplateFactory.createAuthoringLetterTemplate(
@@ -79,6 +87,7 @@ function createTemplates(user: TestUser) {
         letterType: 'q4',
         shortFormRender: { status: 'RENDERED' },
         longFormRender: { status: 'RENDERED' },
+        letterVariantId: letterVariant.id,
       }
     ),
     FRENCH_LETTER: TemplateFactory.createAuthoringLetterTemplate(
@@ -90,6 +99,7 @@ function createTemplates(user: TestUser) {
         language: 'fr',
         shortFormRender: { status: 'RENDERED' },
         longFormRender: { status: 'RENDERED' },
+        letterVariantId: letterVariant.id,
       }
     ),
     SPANISH_LETTER: TemplateFactory.createAuthoringLetterTemplate(
@@ -101,14 +111,9 @@ function createTemplates(user: TestUser) {
         language: 'es',
         shortFormRender: { status: 'RENDERED' },
         longFormRender: { status: 'RENDERED' },
+        letterVariantId: letterVariant.id,
       }
     ),
-    PDF_LETTER: TemplateFactory.uploadPdfLetterTemplate(
-      templateIds.PDF_LETTER,
-      user,
-      `Test PDF Letter template - ${templateIds.PDF_LETTER}`,
-      'SUBMITTED'
-    ),
   };
 }
 
@@ -120,7 +125,11 @@ test.describe('Routing - Preview Message Plan page', () => {
   test.beforeAll(async () => {
     const context = getTestContext();
     user = await context.auth.getTestUser(testUsers.User1.userId);
-    templates = createTemplates(user);
+
+    const [globalLetterVariant] =
+      await context.letterVariants.getGlobalLetterVariants();
+
+    templates = createTemplates(user, globalLetterVariant);
 
     await templateStorageHelper.seedTemplateData(Object.values(templates));
   });
@@ -309,7 +318,7 @@ test.describe('Routing - Preview Message Plan page', () => {
         templateBlock.defaultTemplateCard.templateLink
       ).toHaveAttribute(
         'href',
-        `/templates/preview-submitted-letter-template/${templates.LETTER.id}`
+        `/templates/message-plans/preview-message-plan/${dbEntry.id}/preview-template/${templates.LETTER.id}`
       );
 
       await expect(
@@ -361,61 +370,13 @@ test.describe('Routing - Preview Message Plan page', () => {
       ]);
 
       await expect(newTab).toHaveURL(
-        `/templates/preview-submitted-letter-template/${templates.LETTER.id}`
+        `/templates/message-plans/preview-message-plan/${dbEntry.id}/preview-template/${templates.LETTER.id}`
       );
 
       await newTab.close();
     });
   });
 
-  test('displays PDF letter template link pointing to submitted letter page', async ({
-    page,
-  }) => {
-    const { dbEntry } = RoutingConfigFactory.createWithChannels(
-      user,
-      ['LETTER'],
-      { status: 'COMPLETED' }
-    ).addTemplate('LETTER', templates.PDF_LETTER.id);
-
-    await routingConfigStorageHelper.seed([dbEntry]);
-
-    const previewMessagePlanPage = new RoutingPreviewMessagePlanPage(
-      page
-    ).setPathParam('messagePlanId', dbEntry.id);
-
-    await previewMessagePlanPage.loadPage();
-
-    const templateBlock =
-      await previewMessagePlanPage.getTemplateBlock('LETTER');
-
-    await expect(templateBlock.defaultTemplateCard.templateName).toHaveText(
-      templates.PDF_LETTER.name
-    );
-    await expect(templateBlock.defaultTemplateCard.templateLink).toHaveText(
-      'Preview template (opens in a new tab)'
-    );
-    await expect(
-      templateBlock.defaultTemplateCard.templateLink
-    ).toHaveAttribute(
-      'href',
-      `/templates/preview-submitted-letter-template/${templates.PDF_LETTER.id}`
-    );
-    await expect(
-      templateBlock.defaultTemplateCard.templateLink
-    ).toHaveAttribute('target', '_blank');
-
-    const [newTab] = await Promise.all([
-      page.context().waitForEvent('page'),
-      templateBlock.defaultTemplateCard.templateLink.click(),
-    ]);
-
-    await expect(newTab).toHaveURL(
-      `/templates/preview-submitted-letter-template/${templates.PDF_LETTER.id}`
-    );
-
-    await newTab.close();
-  });
-
   test('letter only with no conditional templates', async ({ page }) => {
     const { dbEntry } = RoutingConfigFactory.createWithChannels(
       user,
diff --git a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-preview-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-preview-letter-template.routing-component.spec.ts
index de340ff42..a9b42a671 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-preview-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-preview-letter-template.routing-component.spec.ts
@@ -13,6 +13,7 @@ import { RoutingReviewAndMoveToProductionPreviewLetterTemplatePage } from 'pages
 import { RoutingConfigFactory } from 'helpers/factories/routing-config-factory';
 import { RoutingConfigStorageHelper } from 'helpers/db/routing-config-storage-helper';
 import { getTestContext } from 'helpers/context/context';
+import { LetterVariant } from 'nhs-notify-web-template-management-types';
 
 const routingConfigStorageHelper = new RoutingConfigStorageHelper();
 const templateStorageHelper = new TemplateStorageHelper();
@@ -29,11 +30,10 @@ function createMessagePlans(user: TestUser) {
   };
 }
 
-function createTemplates(user: TestUser) {
+function createTemplates(user: TestUser, letterVariant: LetterVariant) {
   const templateIds = {
     EMAIL: randomUUID(),
     LETTER: randomUUID(),
-    PDF_LETTER: randomUUID(),
   };
 
   return {
@@ -45,12 +45,13 @@ function createTemplates(user: TestUser) {
     LETTER: TemplateFactory.createAuthoringLetterTemplate(
       templateIds.LETTER,
       user,
-      `Test Letter template - ${templateIds.LETTER}`
-    ),
-    PDF_LETTER: TemplateFactory.uploadPdfLetterTemplate(
-      templateIds.PDF_LETTER,
-      user,
-      `Test PDF Letter template - ${templateIds.PDF_LETTER}`
+      `Test Letter template - ${templateIds.LETTER}`,
+      'PROOF_APPROVED',
+      {
+        letterVariantId: letterVariant.id,
+        longFormRender: { status: 'RENDERED' },
+        shortFormRender: { status: 'RENDERED' },
+      }
     ),
   };
 }
@@ -63,8 +64,11 @@ test.describe('Routing - Review and Move to Production / Preview Letter template
     const context = getTestContext();
     const user = await context.auth.getTestUser(testUsers.User1.userId);
 
+    const [globalLetterVariant] =
+      await context.letterVariants.getGlobalLetterVariants();
+
     messagePlans = createMessagePlans(user);
-    templates = createTemplates(user);
+    templates = createTemplates(user, globalLetterVariant);
 
     await routingConfigStorageHelper.seed(Object.values(messagePlans));
     await templateStorageHelper.seedTemplateData(Object.values(templates));
@@ -159,16 +163,5 @@ test.describe('Routing - Review and Move to Production / Preview Letter template
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
-
-    test('when template is a PDF letter', async ({ page, baseURL }) => {
-      const previewLetterTemplatePage =
-        new RoutingReviewAndMoveToProductionPreviewLetterTemplatePage(page)
-          .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-          .setPathParam('templateId', templates.PDF_LETTER.id);
-
-      await previewLetterTemplatePage.loadPage();
-
-      await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
-    });
   });
 });
diff --git a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
index 98f7d8d76..6be7e7346 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production.routing-component.spec.ts
@@ -1,5 +1,8 @@
 import { randomUUID } from 'node:crypto';
-import type { Channel } from 'nhs-notify-web-template-management-types';
+import type {
+  Channel,
+  LetterVariant,
+} from 'nhs-notify-web-template-management-types';
 import { test, expect } from '@playwright/test';
 import { TestUser, testUsers } from 'helpers/auth/cognito-auth-helper';
 import { RoutingConfigStorageHelper } from 'helpers/db/routing-config-storage-helper';
@@ -20,7 +23,7 @@ import { getTestContext } from 'helpers/context/context';
 const routingConfigStorageHelper = new RoutingConfigStorageHelper();
 const templateStorageHelper = new TemplateStorageHelper();
 
-function createTemplates(user: TestUser) {
+function createTemplates(user: TestUser, letterVariant: LetterVariant) {
   const templateIds = {
     NHSAPP: randomUUID(),
     EMAIL: randomUUID(),
@@ -30,7 +33,6 @@ function createTemplates(user: TestUser) {
     BSL_LETTER: randomUUID(),
     FRENCH_LETTER: randomUUID(),
     SPANISH_LETTER: randomUUID(),
-    PDF_LETTER: randomUUID(),
   };
 
   return {
@@ -56,6 +58,7 @@ function createTemplates(user: TestUser) {
       `Test Letter template - ${templateIds.LETTER}`,
       'SUBMITTED',
       {
+        letterVariantId: letterVariant.id,
         shortFormRender: { status: 'RENDERED' },
         longFormRender: { status: 'RENDERED' },
       }
@@ -69,6 +72,7 @@ function createTemplates(user: TestUser) {
         letterType: 'x1',
         shortFormRender: { status: 'RENDERED' },
         longFormRender: { status: 'RENDERED' },
+        letterVariantId: letterVariant.id,
       }
     ),
     BSL_LETTER: TemplateFactory.createAuthoringLetterTemplate(
@@ -80,6 +84,7 @@ function createTemplates(user: TestUser) {
         letterType: 'q4',
         shortFormRender: { status: 'RENDERED' },
         longFormRender: { status: 'RENDERED' },
+        letterVariantId: letterVariant.id,
       }
     ),
     FRENCH_LETTER: TemplateFactory.createAuthoringLetterTemplate(
@@ -91,6 +96,7 @@ function createTemplates(user: TestUser) {
         language: 'fr',
         shortFormRender: { status: 'RENDERED' },
         longFormRender: { status: 'RENDERED' },
+        letterVariantId: letterVariant.id,
       }
     ),
     SPANISH_LETTER: TemplateFactory.createAuthoringLetterTemplate(
@@ -102,14 +108,9 @@ function createTemplates(user: TestUser) {
         language: 'es',
         shortFormRender: { status: 'RENDERED' },
         longFormRender: { status: 'RENDERED' },
+        letterVariantId: letterVariant.id,
       }
     ),
-    PDF_LETTER: TemplateFactory.uploadPdfLetterTemplate(
-      templateIds.PDF_LETTER,
-      user,
-      `Test PDF Letter template - ${templateIds.PDF_LETTER}`,
-      'SUBMITTED'
-    ),
   };
 }
 
@@ -121,7 +122,11 @@ test.describe('Routing - Review and Move to Production page', () => {
   test.beforeAll(async () => {
     const context = getTestContext();
     user = await context.auth.getTestUser(testUsers.User1.userId);
-    templates = createTemplates(user);
+
+    const [globalLetterVariant] =
+      await context.letterVariants.getGlobalLetterVariants();
+
+    templates = createTemplates(user, globalLetterVariant);
 
     await templateStorageHelper.seedTemplateData(Object.values(templates));
   });
@@ -372,53 +377,6 @@ test.describe('Routing - Review and Move to Production page', () => {
     });
   });
 
-  test('displays PDF letter template link pointing to submitted letter page', async ({
-    page,
-  }) => {
-    const { dbEntry } = RoutingConfigFactory.createWithChannels(
-      user,
-      ['LETTER'],
-      { status: 'DRAFT' }
-    ).addTemplate('LETTER', templates.PDF_LETTER.id);
-
-    await routingConfigStorageHelper.seed([dbEntry]);
-
-    const reviewPage = new RoutingReviewAndMoveToProductionPage(
-      page
-    ).setPathParam('messagePlanId', dbEntry.id);
-
-    await reviewPage.loadPage();
-
-    const templateBlock = await reviewPage.getTemplateBlock('LETTER');
-
-    await expect(templateBlock.defaultTemplateCard.templateName).toHaveText(
-      templates.PDF_LETTER.name
-    );
-    await expect(templateBlock.defaultTemplateCard.templateLink).toHaveText(
-      'Preview template (opens in a new tab)'
-    );
-    await expect(
-      templateBlock.defaultTemplateCard.templateLink
-    ).toHaveAttribute(
-      'href',
-      `/templates/preview-submitted-letter-template/${templates.PDF_LETTER.id}`
-    );
-    await expect(
-      templateBlock.defaultTemplateCard.templateLink
-    ).toHaveAttribute('target', '_blank');
-
-    const [newTab] = await Promise.all([
-      page.context().waitForEvent('page'),
-      templateBlock.defaultTemplateCard.templateLink.click(),
-    ]);
-
-    await expect(newTab).toHaveURL(
-      `/templates/preview-submitted-letter-template/${templates.PDF_LETTER.id}`
-    );
-
-    await newTab.close();
-  });
-
   test('keep in draft button navigates to the edit message plan page', async ({
     page,
     baseURL,

From e667993af50bc6ba1fdd14f2290b756ccdf6d57b Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Wed, 8 Apr 2026 19:08:19 +0100
Subject: [PATCH 53/57] make test fixture PROOF_APPROVED

---
 .../molecules/MessagePlanCascadePreview.test.tsx          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/__tests__/components/molecules/MessagePlanCascadePreview.test.tsx b/frontend/src/__tests__/components/molecules/MessagePlanCascadePreview.test.tsx
index 70a43f288..6ba782925 100644
--- a/frontend/src/__tests__/components/molecules/MessagePlanCascadePreview.test.tsx
+++ b/frontend/src/__tests__/components/molecules/MessagePlanCascadePreview.test.tsx
@@ -52,7 +52,7 @@ describe('MessagePlanCascadePreview', () => {
     expect(templateNames[0]).toHaveTextContent(NHS_APP_TEMPLATE.name);
     expect(templateNames[1]).toHaveTextContent(EMAIL_TEMPLATE.name);
     expect(templateNames[2]).toHaveTextContent(SMS_TEMPLATE.name);
-    expect(templateNames[3]).toHaveTextContent(AUTHORING_LETTER_TEMPLATE.name);
+    expect(templateNames[3]).toHaveTextContent(APPROVED_LETTER.name);
   });
 
   it('renders open/close all previews button when non-letter channels present', () => {
@@ -79,7 +79,7 @@ describe('MessagePlanCascadePreview', () => {
           cascadeGroups: ['standard' as const],
           channel: 'LETTER' as const,
           channelType: 'primary' as const,
-          defaultTemplateId: AUTHORING_LETTER_TEMPLATE.id,
+          defaultTemplateId: APPROVED_LETTER.id,
         },
       ],
     };
@@ -156,7 +156,7 @@ describe('MessagePlanCascadePreview', () => {
     const link = letterBlock.querySelector('a');
     expect(link).toHaveAttribute(
       'href',
-      `/base-url/preview-template/${AUTHORING_LETTER_TEMPLATE.id}`
+      `/base-url/preview-template/${APPROVED_LETTER.id}`
     );
     expect(link).toHaveAttribute('target', '_blank');
     expect(link).toHaveTextContent('Preview template (opens in a new tab)');
@@ -180,7 +180,7 @@ describe('MessagePlanCascadePreview', () => {
       [NHS_APP_TEMPLATE.id]: NHS_APP_TEMPLATE,
       // EMAIL_TEMPLATE is missing
       [SMS_TEMPLATE.id]: SMS_TEMPLATE,
-      [AUTHORING_LETTER_TEMPLATE.id]: AUTHORING_LETTER_TEMPLATE,
+      [APPROVED_LETTER.id]: APPROVED_LETTER,
     };
 
     render(

From 57b51f32532c255128ebd0da98b0c21e4ce2fb39 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Wed, 8 Apr 2026 19:44:33 +0100
Subject: [PATCH 54/57] accessibility test fix

---
 .../routing.accessibility.spec.ts                          | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts b/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts
index 593bd540f..6d2cc5c4d 100644
--- a/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts
+++ b/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts
@@ -64,6 +64,9 @@ test.describe('Routing', () => {
       testUsers.UserWithMultipleCampaigns.userId
     );
 
+    const [globalLetterVariant] =
+      await context.letterVariants.getGlobalLetterVariants();
+
     const createRoutingConfig = (id: string, status: RoutingConfigStatus) =>
       RoutingConfigFactory.createForMessageOrder(user, messageOrder, {
         id,
@@ -126,6 +129,7 @@ test.describe('Routing', () => {
         {
           shortFormRender: { status: 'RENDERED' },
           longFormRender: { status: 'RENDERED' },
+          letterVariantId: globalLetterVariant.id,
         }
       ),
       TemplateFactory.createAuthoringLetterTemplate(
@@ -137,6 +141,7 @@ test.describe('Routing', () => {
           letterType: 'x1',
           shortFormRender: { status: 'RENDERED' },
           longFormRender: { status: 'RENDERED' },
+          letterVariantId: globalLetterVariant.id,
         }
       ),
       TemplateFactory.createAuthoringLetterTemplate(
@@ -148,6 +153,7 @@ test.describe('Routing', () => {
           letterType: 'q4',
           shortFormRender: { status: 'RENDERED' },
           longFormRender: { status: 'RENDERED' },
+          letterVariantId: globalLetterVariant.id,
         }
       ),
       TemplateFactory.createAuthoringLetterTemplate(
@@ -159,6 +165,7 @@ test.describe('Routing', () => {
           language: 'fr',
           shortFormRender: { status: 'RENDERED' },
           longFormRender: { status: 'RENDERED' },
+          letterVariantId: globalLetterVariant.id,
         }
       ),
     ]);

From 5e570b085a0e7808e695870770f533d70000d0a6 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Thu, 9 Apr 2026 07:44:17 +0100
Subject: [PATCH 55/57] pw tests on missing variants

---
 .../page.test.tsx                             |  4 +-
 .../page.test.tsx                             | 18 +++++--
 .../ChooseChannelTemplate.test.tsx            |  8 +++-
 .../SummaryLetterFromMessagePlan.test.tsx     |  2 -
 ...-letter-template.routing-component.spec.ts | 48 ++++++++++++++++---
 ...-letter-template.routing-component.spec.ts | 48 ++++++++++++++++---
 ...-letter-template.routing-component.spec.ts | 34 +++++++++++--
 ...-letter-template.routing-component.spec.ts | 41 ++++++++++++++--
 ...-letter-template.routing-component.spec.ts | 39 ++++++++++++---
 ...-letter-template.routing-component.spec.ts | 37 +++++++++++---
 10 files changed, 235 insertions(+), 44 deletions(-)

diff --git a/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/page.test.tsx
index 72db01cce..cf5c4c03a 100644
--- a/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/page.test.tsx
@@ -66,7 +66,9 @@ describe('ChooseStandardEnglishLetterTemplate page', () => {
 
   it('renders letter template selection', async () => {
     getRoutingConfigMock.mockResolvedValueOnce(ROUTING_CONFIG);
-    getTemplatesMock.mockResolvedValueOnce([AUTHORING_LETTER_TEMPLATE]);
+    getTemplatesMock.mockResolvedValueOnce([
+      { ...AUTHORING_LETTER_TEMPLATE, templateStatus: 'PROOF_APPROVED' },
+    ]);
 
     const page = await ChooseStandardEnglishLetterTemplate({
       params: Promise.resolve({
diff --git a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/page.test.tsx b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/page.test.tsx
index 1303193ab..adf61dbb4 100644
--- a/frontend/src/__tests__/app/message-plans/review-and-move-to-production/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/review-and-move-to-production/page.test.tsx
@@ -67,9 +67,21 @@ const templates: MessagePlanTemplates = {
   [appTemplateId]: { ...NHS_APP_TEMPLATE, id: appTemplateId },
   [emailTemplateId]: { ...EMAIL_TEMPLATE, id: emailTemplateId },
   [smsTemplateId]: { ...SMS_TEMPLATE, id: smsTemplateId },
-  [letterTemplateId]: { ...AUTHORING_LETTER_TEMPLATE, id: letterTemplateId },
-  [kuTemplateId]: { ...AUTHORING_LETTER_TEMPLATE, id: kuTemplateId },
-  [sqTemplateId]: { ...AUTHORING_LETTER_TEMPLATE, id: sqTemplateId },
+  [letterTemplateId]: {
+    ...AUTHORING_LETTER_TEMPLATE,
+    id: letterTemplateId,
+    templateStatus: 'PROOF_APPROVED',
+  },
+  [kuTemplateId]: {
+    ...AUTHORING_LETTER_TEMPLATE,
+    id: kuTemplateId,
+    templateStatus: 'PROOF_APPROVED',
+  },
+  [sqTemplateId]: {
+    ...AUTHORING_LETTER_TEMPLATE,
+    id: sqTemplateId,
+    templateStatus: 'PROOF_APPROVED',
+  },
   [largePrintTemplateId]: {
     ...LARGE_PRINT_LETTER_TEMPLATE,
     id: largePrintTemplateId,
diff --git a/frontend/src/__tests__/components/forms/ChooseChannelTemplate/ChooseChannelTemplate.test.tsx b/frontend/src/__tests__/components/forms/ChooseChannelTemplate/ChooseChannelTemplate.test.tsx
index d82a7bbb0..118b4b814 100644
--- a/frontend/src/__tests__/components/forms/ChooseChannelTemplate/ChooseChannelTemplate.test.tsx
+++ b/frontend/src/__tests__/components/forms/ChooseChannelTemplate/ChooseChannelTemplate.test.tsx
@@ -97,12 +97,16 @@ const propsByChannel = {
   LETTER: {
     pageHeading: 'Choose a letter template',
     cascadeIndex: 3,
-    templateList: [AUTHORING_LETTER_TEMPLATE],
+    templateList: [
+      { ...AUTHORING_LETTER_TEMPLATE, templateStatus: 'PROOF_APPROVED' },
+    ],
   },
   LARGE_PRINT_LETTER: {
     pageHeading: 'Choose a large print letter template',
     cascadeIndex: 3,
-    templateList: [LARGE_PRINT_LETTER_TEMPLATE],
+    templateList: [
+      { ...LARGE_PRINT_LETTER_TEMPLATE, templateStatus: 'SUBMITTED' },
+    ],
     accessibleFormat: 'x1',
   },
 };
diff --git a/frontend/src/__tests__/components/molecules/SummaryLetterFromMessagePlan.test.tsx b/frontend/src/__tests__/components/molecules/SummaryLetterFromMessagePlan.test.tsx
index 864883577..d54ff53ca 100644
--- a/frontend/src/__tests__/components/molecules/SummaryLetterFromMessagePlan.test.tsx
+++ b/frontend/src/__tests__/components/molecules/SummaryLetterFromMessagePlan.test.tsx
@@ -7,7 +7,6 @@ import {
 import { render } from '@testing-library/react';
 import { getLetterVariantById, getTemplate } from '@utils/form-actions';
 import { redirect } from 'next/navigation';
-import { validateAuthoringLetterTemplate } from 'nhs-notify-web-template-management-utils';
 import type { TemplateDto } from 'nhs-notify-web-template-management-types';
 
 jest.mock('@utils/form-actions');
@@ -23,7 +22,6 @@ const defaultProps = {
     templateId: 'template-id',
   }),
   searchParams: Promise.resolve({}),
-  validateTemplate: validateAuthoringLetterTemplate,
 };
 
 describe('SummaryLetterFromMessagePlan', () => {
diff --git a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-british-sign-language-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-british-sign-language-letter-template.routing-component.spec.ts
index 5dfdc443d..ec8ea410d 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-british-sign-language-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-british-sign-language-letter-template.routing-component.spec.ts
@@ -21,7 +21,14 @@ const routingConfigStorageHelper = new RoutingConfigStorageHelper();
 const templateStorageHelper = new TemplateStorageHelper();
 
 const invalidTemplateId = 'invalid-id';
-const notFoundTemplateId = 'dc67b576-af7d-47b3-97d7-48fa204e7525';
+const notFoundTemplateId = randomUUID();
+
+const templateIds = {
+  EMAIL: randomUUID(),
+  STANDARD_LETTER: randomUUID(),
+  BSL_LETTER: randomUUID(),
+  BSL_LETTER_WITHOUT_VARIANT: randomUUID(),
+};
 
 function createMessagePlans(user: TestUser) {
   return {
@@ -35,14 +42,14 @@ function createMessagePlans(user: TestUser) {
 function createTemplates(user: TestUser, letterVariant: LetterVariant) {
   return {
     EMAIL: TemplateFactory.createEmailTemplate(
-      randomUUID(),
+      templateIds.EMAIL,
       user,
-      'Email template name'
+      `Email template name - ${templateIds.EMAIL}`
     ),
     STANDARD_LETTER: TemplateFactory.createAuthoringLetterTemplate(
-      randomUUID(),
+      templateIds.STANDARD_LETTER,
       user,
-      'Standard letter template name',
+      `Standard letter template name - ${templateIds.STANDARD_LETTER}`,
       'SUBMITTED',
       {
         shortFormRender: { status: 'RENDERED' },
@@ -51,9 +58,9 @@ function createTemplates(user: TestUser, letterVariant: LetterVariant) {
       }
     ),
     BSL_LETTER: TemplateFactory.createAuthoringLetterTemplate(
-      randomUUID(),
+      templateIds.BSL_LETTER,
       user,
-      'BSL letter template name',
+      `BSL letter template name - ${templateIds.BSL_LETTER}`,
       'SUBMITTED',
       {
         letterType: 'q4',
@@ -62,6 +69,17 @@ function createTemplates(user: TestUser, letterVariant: LetterVariant) {
         letterVariantId: letterVariant.id,
       }
     ),
+    BSL_LETTER_WITHOUT_VARIANT: TemplateFactory.createAuthoringLetterTemplate(
+      templateIds.BSL_LETTER_WITHOUT_VARIANT,
+      user,
+      `BSL letter template no variant - ${templateIds.BSL_LETTER_WITHOUT_VARIANT}`,
+      'PROOF_APPROVED',
+      {
+        letterType: 'q4',
+        shortFormRender: { status: 'RENDERED' },
+        longFormRender: { status: 'RENDERED' },
+      }
+    ),
   };
 }
 
@@ -234,6 +252,22 @@ test.describe('Routing - Preview British Sign Language letter template page', ()
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
+
+    test('when template does not have a letterVariantId', async ({
+      page,
+      baseURL,
+    }) => {
+      const previewBSLLetterTemplatePage =
+        new RoutingPreviewBritishSignLanguageLetterTemplatePage(page);
+
+      await previewBSLLetterTemplatePage
+        .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+        .setPathParam('templateId', templates.BSL_LETTER_WITHOUT_VARIANT.id)
+        .setSearchParam('lockNumber', '0')
+        .loadPage();
+
+      await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
+    });
   });
 
   test('redirects to the edit message plan page when lockNumber is missing', async ({
diff --git a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-large-print-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-large-print-letter-template.routing-component.spec.ts
index e927984e4..6a6079886 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-large-print-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-large-print-letter-template.routing-component.spec.ts
@@ -21,7 +21,14 @@ const routingConfigStorageHelper = new RoutingConfigStorageHelper();
 const templateStorageHelper = new TemplateStorageHelper();
 
 const invalidTemplateId = 'invalid-id';
-const notFoundTemplateId = 'dc67b576-af7d-47b3-97d7-48fa204e7525';
+const notFoundTemplateId = randomUUID();
+
+const templateIds = {
+  EMAIL: randomUUID(),
+  STANDARD_LETTER: randomUUID(),
+  LARGE_PRINT_LETTER: randomUUID(),
+  LARGE_PRINT_LETTER_WITHOUT_VARIANT: randomUUID(),
+};
 
 function createMessagePlans(user: TestUser) {
   return {
@@ -35,14 +42,14 @@ function createMessagePlans(user: TestUser) {
 function createTemplates(user: TestUser, letterVariant: LetterVariant) {
   return {
     EMAIL: TemplateFactory.createEmailTemplate(
-      randomUUID(),
+      templateIds.EMAIL,
       user,
-      'Email template name'
+      `Email template name - ${templateIds.EMAIL}`
     ),
     STANDARD_LETTER: TemplateFactory.createAuthoringLetterTemplate(
-      randomUUID(),
+      templateIds.STANDARD_LETTER,
       user,
-      'Standard letter template name',
+      `Standard letter template name - ${templateIds.STANDARD_LETTER}`,
       'SUBMITTED',
       {
         shortFormRender: { status: 'RENDERED' },
@@ -51,9 +58,9 @@ function createTemplates(user: TestUser, letterVariant: LetterVariant) {
       }
     ),
     LARGE_PRINT_LETTER: TemplateFactory.createAuthoringLetterTemplate(
-      randomUUID(),
+      templateIds.LARGE_PRINT_LETTER,
       user,
-      'Authoring large print letter template name',
+      `Large print letter template name - ${templateIds.LARGE_PRINT_LETTER}`,
       'SUBMITTED',
       {
         letterType: 'x1',
@@ -62,6 +69,17 @@ function createTemplates(user: TestUser, letterVariant: LetterVariant) {
         letterVariantId: letterVariant.id,
       }
     ),
+    LARGE_PRINT_LETTER_WITHOUT_VARIANT: TemplateFactory.createAuthoringLetterTemplate(
+      templateIds.LARGE_PRINT_LETTER_WITHOUT_VARIANT,
+      user,
+      `Large print letter template no variant - ${templateIds.LARGE_PRINT_LETTER_WITHOUT_VARIANT}`,
+      'PROOF_APPROVED',
+      {
+        letterType: 'x1',
+        shortFormRender: { status: 'RENDERED' },
+        longFormRender: { status: 'RENDERED' },
+      }
+    ),
   };
 }
 
@@ -232,6 +250,22 @@ test.describe('Routing - Preview large print letter template page', () => {
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
+
+    test('when template does not have a letterVariantId', async ({
+      page,
+      baseURL,
+    }) => {
+      const previewLargePrintLetterTemplatePage =
+        new RoutingPreviewLargePrintLetterTemplatePage(page);
+
+      await previewLargePrintLetterTemplatePage
+        .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+        .setPathParam('templateId', templates.LARGE_PRINT_LETTER_WITHOUT_VARIANT.id)
+        .setSearchParam('lockNumber', '0')
+        .loadPage();
+
+      await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
+    });
   });
 
   test('redirects to the edit message plan page when lockNumber is missing', async ({
diff --git a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-other-language-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-other-language-letter-template.routing-component.spec.ts
index 67a6efba1..ac7500576 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-other-language-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-other-language-letter-template.routing-component.spec.ts
@@ -26,8 +26,8 @@ const notFoundTemplateId = randomUUID();
 const templateIds = {
   EMAIL: randomUUID(),
   STANDARD_LETTER: randomUUID(),
-  FRENCH_LETTER: randomUUID(),
   AUTHORING_FRENCH_LETTER: randomUUID(),
+  FRENCH_LETTER_WITHOUT_VARIANT: randomUUID(),
 };
 
 function createMessagePlans(user: TestUser) {
@@ -44,12 +44,12 @@ function createTemplates(user: TestUser, letterVariant: LetterVariant) {
     EMAIL: TemplateFactory.createEmailTemplate(
       templateIds.EMAIL,
       user,
-      'Email template name'
+      `Email template name - ${templateIds.EMAIL}`
     ),
     STANDARD_LETTER: TemplateFactory.createAuthoringLetterTemplate(
       templateIds.STANDARD_LETTER,
       user,
-      'Standard letter template name',
+      `Standard letter template name - ${templateIds.STANDARD_LETTER}`,
       'PROOF_APPROVED',
       {
         shortFormRender: { status: 'RENDERED' },
@@ -60,7 +60,7 @@ function createTemplates(user: TestUser, letterVariant: LetterVariant) {
     FRENCH_LETTER: TemplateFactory.createAuthoringLetterTemplate(
       templateIds.AUTHORING_FRENCH_LETTER,
       user,
-      'Authoring French letter template name',
+      `French letter template name - ${templateIds.AUTHORING_FRENCH_LETTER}`,
       'SUBMITTED',
       {
         language: 'fr',
@@ -69,6 +69,17 @@ function createTemplates(user: TestUser, letterVariant: LetterVariant) {
         letterVariantId: letterVariant.id,
       }
     ),
+    FRENCH_LETTER_WITHOUT_VARIANT: TemplateFactory.createAuthoringLetterTemplate(
+      templateIds.FRENCH_LETTER_WITHOUT_VARIANT,
+      user,
+      `French letter template no variant - ${templateIds.FRENCH_LETTER_WITHOUT_VARIANT}`,
+      'PROOF_APPROVED',
+      {
+        language: 'fr',
+        shortFormRender: { status: 'RENDERED' },
+        longFormRender: { status: 'RENDERED' },
+      }
+    ),
   };
 }
 
@@ -247,6 +258,21 @@ test.describe('Routing - Preview foreign language letter template page', () => {
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
+
+    test('when template does not have a letterVariantId', async ({
+      page,
+      baseURL,
+    }) => {
+      const previewForeignLanguageLetterTemplatePage =
+        new RoutingPreviewOtherLanguageLetterTemplatePage(page)
+          .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+          .setPathParam('templateId', templates.FRENCH_LETTER_WITHOUT_VARIANT.id)
+          .setSearchParam('lockNumber', '0');
+
+      await previewForeignLanguageLetterTemplatePage.loadPage();
+
+      await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
+    });
   });
 
   test('redirects to the edit message plan page when lockNumber is missing', async ({
diff --git a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-standard-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-standard-letter-template.routing-component.spec.ts
index 7be56755a..34c5eb345 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-standard-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-standard-letter-template.routing-component.spec.ts
@@ -21,7 +21,13 @@ const routingConfigStorageHelper = new RoutingConfigStorageHelper();
 const templateStorageHelper = new TemplateStorageHelper();
 
 const invalidTemplateId = 'invalid-id';
-const notFoundTemplateId = 'dc67b576-af7d-47b3-97d7-48fa204e7525';
+const notFoundTemplateId = randomUUID();
+
+const templateIds = {
+  EMAIL: randomUUID(),
+  LETTER: randomUUID(),
+  LETTER_WITHOUT_VARIANT: randomUUID(),
+};
 
 function createMessagePlans(user: TestUser) {
   return {
@@ -35,14 +41,14 @@ function createMessagePlans(user: TestUser) {
 function createTemplates(user: TestUser, letterVariant: LetterVariant) {
   return {
     EMAIL: TemplateFactory.createEmailTemplate(
-      randomUUID(),
+      templateIds.EMAIL,
       user,
-      'Email template name'
+      `Email template name - ${templateIds.EMAIL}`
     ),
     LETTER: TemplateFactory.createAuthoringLetterTemplate(
-      randomUUID(),
+      templateIds.LETTER,
       user,
-      'Letter template name',
+      `Letter template name - ${templateIds.LETTER}`,
       'PROOF_APPROVED',
       {
         shortFormRender: { status: 'RENDERED' },
@@ -50,6 +56,16 @@ function createTemplates(user: TestUser, letterVariant: LetterVariant) {
         letterVariantId: letterVariant.id,
       }
     ),
+    LETTER_WITHOUT_VARIANT: TemplateFactory.createAuthoringLetterTemplate(
+      templateIds.LETTER_WITHOUT_VARIANT,
+      user,
+      `Letter template no variant - ${templateIds.LETTER_WITHOUT_VARIANT}`,
+      'PROOF_APPROVED',
+      {
+        shortFormRender: { status: 'RENDERED' },
+        longFormRender: { status: 'RENDERED' },
+      }
+    ),
   };
 }
 
@@ -168,6 +184,21 @@ test.describe('Routing - Preview Letter template page', () => {
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
+
+    test('when template does not have a letterVariantId', async ({
+      page,
+      baseURL,
+    }) => {
+      const previewLetterTemplatePage =
+        new RoutingPreviewStandardLetterTemplatePage(page)
+          .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+          .setPathParam('templateId', templates.LETTER_WITHOUT_VARIANT.id)
+          .setSearchParam('lockNumber', '0');
+
+      await previewLetterTemplatePage.loadPage();
+
+      await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
+    });
   });
 
   test('redirects to the edit message plan page when lockNumber is missing', async ({
diff --git a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-preview-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-preview-letter-template.routing-component.spec.ts
index 60bef3bb0..4f69ab45a 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-preview-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/preview-message-plan-preview-letter-template.routing-component.spec.ts
@@ -19,7 +19,13 @@ const routingConfigStorageHelper = new RoutingConfigStorageHelper();
 const templateStorageHelper = new TemplateStorageHelper();
 
 const invalidTemplateId = 'invalid-id';
-const notFoundTemplateId = 'dc67b576-af7d-47b3-97d7-48fa204e7525';
+const notFoundTemplateId = randomUUID();
+
+const templateIds = {
+  EMAIL: randomUUID(),
+  LETTER: randomUUID(),
+  LETTER_WITHOUT_VARIANT: randomUUID(),
+};
 
 function createMessagePlans(user: TestUser) {
   return {
@@ -31,11 +37,6 @@ function createMessagePlans(user: TestUser) {
 }
 
 function createTemplates(user: TestUser, letterVariant: LetterVariant) {
-  const templateIds = {
-    EMAIL: randomUUID(),
-    LETTER: randomUUID(),
-  };
-
   return {
     EMAIL: TemplateFactory.createEmailTemplate(
       templateIds.EMAIL,
@@ -45,7 +46,7 @@ function createTemplates(user: TestUser, letterVariant: LetterVariant) {
     LETTER: TemplateFactory.createAuthoringLetterTemplate(
       templateIds.LETTER,
       user,
-      `Test Authoring Letter template - ${templateIds.LETTER}`,
+      `Test Letter template - ${templateIds.LETTER}`,
       'PROOF_APPROVED',
       {
         letterVariantId: letterVariant.id,
@@ -53,6 +54,16 @@ function createTemplates(user: TestUser, letterVariant: LetterVariant) {
         shortFormRender: { status: 'RENDERED' },
       }
     ),
+    LETTER_WITHOUT_VARIANT: TemplateFactory.createAuthoringLetterTemplate(
+      templateIds.LETTER_WITHOUT_VARIANT,
+      user,
+      `Test Letter template no variant - ${templateIds.LETTER_WITHOUT_VARIANT}`,
+      'PROOF_APPROVED',
+      {
+        longFormRender: { status: 'RENDERED' },
+        shortFormRender: { status: 'RENDERED' },
+      }
+    ),
   };
 }
 
@@ -163,5 +174,19 @@ test.describe('Routing - Preview Message Plan / Preview Letter template page', (
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
+
+    test('when template does not have a letterVariantId', async ({
+      page,
+      baseURL,
+    }) => {
+      const previewLetterTemplatePage =
+        new RoutingPreviewMessagePlanPreviewLetterTemplatePage(page)
+          .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+          .setPathParam('templateId', templates.LETTER_WITHOUT_VARIANT.id);
+
+      await previewLetterTemplatePage.loadPage();
+
+      await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
+    });
   });
 });
diff --git a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-preview-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-preview-letter-template.routing-component.spec.ts
index a9b42a671..e3587f3a5 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-preview-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/review-and-move-to-production-preview-letter-template.routing-component.spec.ts
@@ -19,7 +19,13 @@ const routingConfigStorageHelper = new RoutingConfigStorageHelper();
 const templateStorageHelper = new TemplateStorageHelper();
 
 const invalidTemplateId = 'invalid-id';
-const notFoundTemplateId = 'dc67b576-af7d-47b3-97d7-48fa204e7525';
+const notFoundTemplateId = randomUUID();
+
+const templateIds = {
+  EMAIL: randomUUID(),
+  LETTER: randomUUID(),
+  LETTER_WITHOUT_VARIANT: randomUUID(),
+};
 
 function createMessagePlans(user: TestUser) {
   return {
@@ -31,11 +37,6 @@ function createMessagePlans(user: TestUser) {
 }
 
 function createTemplates(user: TestUser, letterVariant: LetterVariant) {
-  const templateIds = {
-    EMAIL: randomUUID(),
-    LETTER: randomUUID(),
-  };
-
   return {
     EMAIL: TemplateFactory.createEmailTemplate(
       templateIds.EMAIL,
@@ -53,6 +54,16 @@ function createTemplates(user: TestUser, letterVariant: LetterVariant) {
         shortFormRender: { status: 'RENDERED' },
       }
     ),
+    LETTER_WITHOUT_VARIANT: TemplateFactory.createAuthoringLetterTemplate(
+      templateIds.LETTER_WITHOUT_VARIANT,
+      user,
+      `Test Letter template no variant - ${templateIds.LETTER_WITHOUT_VARIANT}`,
+      'PROOF_APPROVED',
+      {
+        longFormRender: { status: 'RENDERED' },
+        shortFormRender: { status: 'RENDERED' },
+      }
+    ),
   };
 }
 
@@ -163,5 +174,19 @@ test.describe('Routing - Review and Move to Production / Preview Letter template
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
+
+    test('when template does not have a letterVariantId', async ({
+      page,
+      baseURL,
+    }) => {
+      const previewLetterTemplatePage =
+        new RoutingReviewAndMoveToProductionPreviewLetterTemplatePage(page)
+          .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+          .setPathParam('templateId', templates.LETTER_WITHOUT_VARIANT.id);
+
+      await previewLetterTemplatePage.loadPage();
+
+      await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
+    });
   });
 });

From 4a22f61bf632095c73847d43ff84728825261540 Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Thu, 9 Apr 2026 07:49:51 +0100
Subject: [PATCH 56/57] unit tests on missing variants

---
 .../molecules/SummaryChooseLetter.test.tsx          | 13 +++++++++++++
 .../molecules/SummaryLetterFromMessagePlan.test.tsx | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/frontend/src/__tests__/components/molecules/SummaryChooseLetter.test.tsx b/frontend/src/__tests__/components/molecules/SummaryChooseLetter.test.tsx
index 8bec9e9c0..2770f7e42 100644
--- a/frontend/src/__tests__/components/molecules/SummaryChooseLetter.test.tsx
+++ b/frontend/src/__tests__/components/molecules/SummaryChooseLetter.test.tsx
@@ -79,6 +79,19 @@ describe('SummaryChooseLetter', () => {
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
   });
 
+  it('should redirect to invalid-template when authoring letter template has no letterVariantId', async () => {
+    getTemplateMock.mockResolvedValueOnce({
+      ...AUTHORING_LETTER_TEMPLATE,
+      templateStatus: 'PROOF_APPROVED',
+      letterVariantId: undefined,
+    });
+
+    await SummaryChooseLetter(defaultProps);
+
+    expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
+    expect(getLetterVariantByIdMock).not.toHaveBeenCalled();
+  });
+
   it('renders a letter template preview', async () => {
     const letterVariant = makeLetterVariant();
 
diff --git a/frontend/src/__tests__/components/molecules/SummaryLetterFromMessagePlan.test.tsx b/frontend/src/__tests__/components/molecules/SummaryLetterFromMessagePlan.test.tsx
index d54ff53ca..0de7f5ce3 100644
--- a/frontend/src/__tests__/components/molecules/SummaryLetterFromMessagePlan.test.tsx
+++ b/frontend/src/__tests__/components/molecules/SummaryLetterFromMessagePlan.test.tsx
@@ -55,6 +55,19 @@ describe('SummaryLetterFromMessagePlan', () => {
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
   });
 
+  it('should redirect to invalid-template when authoring letter template has no letterVariantId', async () => {
+    getTemplateMock.mockResolvedValueOnce({
+      ...AUTHORING_LETTER_TEMPLATE,
+      templateStatus: 'SUBMITTED',
+      letterVariantId: undefined,
+    });
+
+    await SummaryLetterFromMessagePlan(defaultProps);
+
+    expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
+    expect(getLetterVariantByIdMock).not.toHaveBeenCalled();
+  });
+
   it('renders an authoring letter template preview', async () => {
     const letterVariant = makeLetterVariant();
 

From 8bfce13655fd5384f1e68d888deb282865a05b8c Mon Sep 17 00:00:00 2001
From: "alex.nuttall1" <alex.nuttall1@nhs.net>
Date: Thu, 9 Apr 2026 08:04:29 +0100
Subject: [PATCH 57/57] fmt

---
 ...-letter-template.routing-component.spec.ts | 28 +++++++++++--------
 ...-letter-template.routing-component.spec.ts | 28 +++++++++++--------
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-large-print-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-large-print-letter-template.routing-component.spec.ts
index 6a6079886..dc8dd60a6 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-large-print-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-large-print-letter-template.routing-component.spec.ts
@@ -69,17 +69,18 @@ function createTemplates(user: TestUser, letterVariant: LetterVariant) {
         letterVariantId: letterVariant.id,
       }
     ),
-    LARGE_PRINT_LETTER_WITHOUT_VARIANT: TemplateFactory.createAuthoringLetterTemplate(
-      templateIds.LARGE_PRINT_LETTER_WITHOUT_VARIANT,
-      user,
-      `Large print letter template no variant - ${templateIds.LARGE_PRINT_LETTER_WITHOUT_VARIANT}`,
-      'PROOF_APPROVED',
-      {
-        letterType: 'x1',
-        shortFormRender: { status: 'RENDERED' },
-        longFormRender: { status: 'RENDERED' },
-      }
-    ),
+    LARGE_PRINT_LETTER_WITHOUT_VARIANT:
+      TemplateFactory.createAuthoringLetterTemplate(
+        templateIds.LARGE_PRINT_LETTER_WITHOUT_VARIANT,
+        user,
+        `Large print letter template no variant - ${templateIds.LARGE_PRINT_LETTER_WITHOUT_VARIANT}`,
+        'PROOF_APPROVED',
+        {
+          letterType: 'x1',
+          shortFormRender: { status: 'RENDERED' },
+          longFormRender: { status: 'RENDERED' },
+        }
+      ),
   };
 }
 
@@ -260,7 +261,10 @@ test.describe('Routing - Preview large print letter template page', () => {
 
       await previewLargePrintLetterTemplatePage
         .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-        .setPathParam('templateId', templates.LARGE_PRINT_LETTER_WITHOUT_VARIANT.id)
+        .setPathParam(
+          'templateId',
+          templates.LARGE_PRINT_LETTER_WITHOUT_VARIANT.id
+        )
         .setSearchParam('lockNumber', '0')
         .loadPage();
 
diff --git a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-other-language-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-other-language-letter-template.routing-component.spec.ts
index ac7500576..e172c91ff 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-other-language-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-other-language-letter-template.routing-component.spec.ts
@@ -69,17 +69,18 @@ function createTemplates(user: TestUser, letterVariant: LetterVariant) {
         letterVariantId: letterVariant.id,
       }
     ),
-    FRENCH_LETTER_WITHOUT_VARIANT: TemplateFactory.createAuthoringLetterTemplate(
-      templateIds.FRENCH_LETTER_WITHOUT_VARIANT,
-      user,
-      `French letter template no variant - ${templateIds.FRENCH_LETTER_WITHOUT_VARIANT}`,
-      'PROOF_APPROVED',
-      {
-        language: 'fr',
-        shortFormRender: { status: 'RENDERED' },
-        longFormRender: { status: 'RENDERED' },
-      }
-    ),
+    FRENCH_LETTER_WITHOUT_VARIANT:
+      TemplateFactory.createAuthoringLetterTemplate(
+        templateIds.FRENCH_LETTER_WITHOUT_VARIANT,
+        user,
+        `French letter template no variant - ${templateIds.FRENCH_LETTER_WITHOUT_VARIANT}`,
+        'PROOF_APPROVED',
+        {
+          language: 'fr',
+          shortFormRender: { status: 'RENDERED' },
+          longFormRender: { status: 'RENDERED' },
+        }
+      ),
   };
 }
 
@@ -266,7 +267,10 @@ test.describe('Routing - Preview foreign language letter template page', () => {
       const previewForeignLanguageLetterTemplatePage =
         new RoutingPreviewOtherLanguageLetterTemplatePage(page)
           .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
-          .setPathParam('templateId', templates.FRENCH_LETTER_WITHOUT_VARIANT.id)
+          .setPathParam(
+            'templateId',
+            templates.FRENCH_LETTER_WITHOUT_VARIANT.id
+          )
           .setSearchParam('lockNumber', '0');
 
       await previewForeignLanguageLetterTemplatePage.loadPage();