From ee262104c6e681e2173d7c810f180dce161cd3a2 Mon Sep 17 00:00:00 2001
From: Michael Harrison <michael.harrison31@nhs.net>
Date: Fri, 28 Nov 2025 15:25:54 +0000
Subject: [PATCH 1/6] CCM-11496: get ready to move

---
 .../__snapshots__/page.test.tsx.snap          |  16 +-
 .../create-message-plan/server-action.test.ts |   4 +-
 .../__snapshots__/page.test.tsx.snap          | 140 +++++++++++++++
 .../get-ready-to-move/page.test.tsx           |  50 ++++++
 .../molecules/ContentRenderer.test.tsx        |  97 ++++++++--
 .../molecules/MarkdownContent.test.tsx        |  21 +++
 .../ContentRenderer.test.tsx.snap             | 136 ++++++++++++++
 .../CreateEditMessagePlan.test.tsx.snap       |   4 +-
 .../src/__tests__/utils/form-actions.test.ts  | 166 +-----------------
 .../src/__tests__/utils/markdown-list.test.ts |  13 ++
 .../create-message-plan/server-action.ts      |   2 +-
 .../[routingConfigId]/page.module.scss        |  22 +++
 .../[routingConfigId]/page.tsx                |  74 ++++++++
 .../forms/MessagePlan/MessagePlan.tsx         |  12 +-
 .../ContentRenderer/ContentRenderer.tsx       |  36 ++--
 .../MarkdownContent/MarkdownContent.tsx       |   8 +-
 frontend/src/content/content.ts               | 123 ++++++++++---
 frontend/src/middleware.ts                    |   1 +
 frontend/src/utils/form-actions.ts            |  27 ---
 frontend/src/utils/markdown-list.ts           |  15 ++
 .../pages/routing/get-ready-to-move-page.ts   |  17 ++
 .../template-mgmt-message-templates-page.ts   |  12 ++
 ...emplate-protected-routes.component.spec.ts |   2 +
 ...choose-templates.routing-component.spec.ts |   2 +-
 ...ady-to-move-page.routing-component.spec.ts | 106 +++++++++++
 25 files changed, 840 insertions(+), 266 deletions(-)
 create mode 100644 frontend/src/__tests__/app/message-plans/get-ready-to-move/__snapshots__/page.test.tsx.snap
 create mode 100644 frontend/src/__tests__/app/message-plans/get-ready-to-move/page.test.tsx
 create mode 100644 frontend/src/__tests__/components/molecules/__snapshots__/ContentRenderer.test.tsx.snap
 create mode 100644 frontend/src/__tests__/utils/markdown-list.test.ts
 create mode 100644 frontend/src/app/message-plans/get-ready-to-move/[routingConfigId]/page.module.scss
 create mode 100644 frontend/src/app/message-plans/get-ready-to-move/[routingConfigId]/page.tsx
 create mode 100644 frontend/src/utils/markdown-list.ts
 create mode 100644 tests/test-team/pages/routing/get-ready-to-move-page.ts
 create mode 100644 tests/test-team/template-mgmt-routing-component-tests/get-ready-to-move-page.routing-component.spec.ts

diff --git a/frontend/src/__tests__/app/choose-templates/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/choose-templates/__snapshots__/page.test.tsx.snap
index d240745d1..494ecaf1f 100644
--- a/frontend/src/__tests__/app/choose-templates/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/choose-templates/__snapshots__/page.test.tsx.snap
@@ -119,7 +119,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
                       >
                         NHS App
                       </span>
-                       
+
                       template
                     </a>
                   </li>
@@ -147,7 +147,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
                         >
                           NHS App
                         </span>
-                         
+
                         template
                       </button>
                     </form>
@@ -292,7 +292,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
                       >
                         Text message (SMS)
                       </span>
-                       
+
                       template
                     </a>
                   </li>
@@ -320,7 +320,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
                         >
                           Text message (SMS)
                         </span>
-                         
+
                         template
                       </button>
                     </form>
@@ -459,7 +459,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
                       >
                         Email
                       </span>
-                       
+
                       template
                     </a>
                   </li>
@@ -603,7 +603,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
                       >
                         Letter
                       </span>
-                       
+
                       template
                     </a>
                   </li>
@@ -631,7 +631,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
                         >
                           Letter
                         </span>
-                         
+
                         template
                       </button>
                     </form>
@@ -650,7 +650,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
             class="nhsuk-button"
             data-testid="move-to-production-cta"
             draggable="false"
-            href="/message-plans/move-to-production/fbb81055-79b9-4759-ac07-d191ae57be34"
+            href="/message-plans/get-ready-to-move/fbb81055-79b9-4759-ac07-d191ae57be34"
             role="button"
           >
             Move to production
diff --git a/frontend/src/__tests__/app/message-plans/create-message-plan/server-action.test.ts b/frontend/src/__tests__/app/message-plans/create-message-plan/server-action.test.ts
index 6ab71a15f..f2df3a318 100644
--- a/frontend/src/__tests__/app/message-plans/create-message-plan/server-action.test.ts
+++ b/frontend/src/__tests__/app/message-plans/create-message-plan/server-action.test.ts
@@ -4,14 +4,14 @@ import type { CascadeItem, RoutingConfig } from 'nhs-notify-backend-client';
 import type { MessageOrder } from 'nhs-notify-web-template-management-utils';
 import { createMessagePlanServerAction } from '@app/message-plans/create-message-plan/server-action';
 import { NextRedirectError } from '@testhelpers/next-redirect';
-import { createRoutingConfig } from '@utils/form-actions';
+import { createRoutingConfig } from '@utils/message-plans';
 
 jest.mock('next/navigation');
 jest.mocked(redirect).mockImplementation((url, type) => {
   throw new NextRedirectError(url, type);
 });
 
-jest.mock('@utils/form-actions');
+jest.mock('@utils/message-plans');
 jest.mocked(createRoutingConfig).mockResolvedValue(
   mock<RoutingConfig>({
     id: 'mock-routing-config-id',
diff --git a/frontend/src/__tests__/app/message-plans/get-ready-to-move/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/get-ready-to-move/__snapshots__/page.test.tsx.snap
new file mode 100644
index 000000000..080376e4d
--- /dev/null
+++ b/frontend/src/__tests__/app/message-plans/get-ready-to-move/__snapshots__/page.test.tsx.snap
@@ -0,0 +1,140 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`matches snapshot 1`] = `
+<DocumentFragment>
+  <main
+    class="nhsuk-main-wrapper"
+    id="maincontent"
+    role="main"
+  >
+    <div
+      class="nhsuk-grid-row"
+    >
+      <div
+        class="nhsuk-grid-column-two-thirds"
+      >
+        <span
+          class="nhsuk-caption-xl"
+        >
+          Step 1 of 2
+        </span>
+        <h1
+          class="nhsuk-heading-xl"
+        >
+          Get ready to move message plan to production
+        </h1>
+        <table
+          class="nhsuk-u-margin-bottom-6 table"
+        >
+          <tbody
+            class="nhsuk-table__body"
+          >
+            <tr
+              class="nhsuk-table__row"
+            >
+              <th
+                class="nhsuk-table__cell"
+              >
+                Name
+              </th>
+              <td
+                class="nhsuk-table__cell"
+              >
+                My Routing Config
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        <p>
+          Moving message plans from draft to production means they are ready to send.
+        </p>
+        <p>
+          Any templates used in these message plans will be locked.
+        </p>
+        <p>
+          Messages will only be sent to recipients when you make a request with 
+          <a
+            href="https://digital.nhs.uk/developer/api-catalogue/nhs-notify"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            NHS Notify API
+          </a>
+           or 
+          <a
+            href="https://digital.nhs.uk/developer/api-catalogue/nhs-notify-mesh"
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            NHS Notify MESH
+          </a>
+          .
+        </p>
+        <h2
+          class="nhsuk-heading-m"
+          id="before-you-continue"
+        >
+          Before you continue
+        </h2>
+        <p>
+          Make sure:
+        </p>
+        <ul
+          class="nhsuk-list nhsuk-list--bullet"
+        >
+          <li>
+            the relevant stakeholders in your team have approved your templates and message plan
+          </li>
+          <li>
+            your templates have no errors
+          </li>
+        </ul>
+        <div
+          class="nhsuk-warning-callout"
+        >
+          <h3
+            class="nhsuk-warning-callout__label"
+          >
+            Important
+            <span
+              class="nhsuk-u-visually-hidden"
+            >
+              :
+            </span>
+          </h3>
+          <p>
+            You cannot edit anything that is in production.
+          </p>
+          <p>
+            If you need to edit your templates or message plans, you can copy and replace them.
+          </p>
+        </div>
+        <div
+          class="nhsuk-form-group"
+        >
+          <a
+            aria-disabled="false"
+            class="nhsuk-button"
+            data-testid="continue-link"
+            draggable="false"
+            href="/templates/message-plans/review-and-move-to-production/routing-config-id"
+            role="button"
+          >
+            Continue
+          </a>
+          <a
+            aria-disabled="false"
+            class="nhsuk-button nhsuk-button--secondary nhsuk-u-margin-left-3"
+            data-testid="cancel-link"
+            draggable="false"
+            href="/templates/message-plans"
+            role="button"
+          >
+            Keep in draft
+          </a>
+        </div>
+      </div>
+    </div>
+  </main>
+</DocumentFragment>
+`;
diff --git a/frontend/src/__tests__/app/message-plans/get-ready-to-move/page.test.tsx b/frontend/src/__tests__/app/message-plans/get-ready-to-move/page.test.tsx
new file mode 100644
index 000000000..4f5b4eff0
--- /dev/null
+++ b/frontend/src/__tests__/app/message-plans/get-ready-to-move/page.test.tsx
@@ -0,0 +1,50 @@
+import { render } from '@testing-library/react';
+import { mock } from 'jest-mock-extended';
+import { redirect, RedirectType } from 'next/navigation';
+import { RoutingConfig } from 'nhs-notify-backend-client';
+import { getRoutingConfig } from '@utils/message-plans';
+import Page, {
+  metadata,
+} from '../../../../app/message-plans/get-ready-to-move/[routingConfigId]/page';
+
+jest.mock('next/navigation');
+jest.mock('@utils/message-plans');
+
+const routingConfig = mock<RoutingConfig>({
+  name: 'My Routing Config',
+});
+
+beforeEach(() => {
+  jest.clearAllMocks();
+});
+
+test('metadata', () => {
+  expect(metadata).toEqual({
+    title: 'Get ready to move message plan to production - NHS Notify',
+  });
+});
+
+test('matches snapshot', async () => {
+  jest.mocked(getRoutingConfig).mockResolvedValueOnce(routingConfig);
+
+  const page = await Page({
+    params: Promise.resolve({ routingConfigId: 'routing-config-id' }),
+  });
+
+  const container = render(page);
+
+  expect(container.asFragment()).toMatchSnapshot();
+});
+
+test('redirects if routing config is not found from path parameter', async () => {
+  await Page({
+    params: Promise.resolve({ routingConfigId: 'routing-config-id' }),
+  });
+
+  expect(getRoutingConfig).toHaveBeenCalledWith('routing-config-id');
+
+  expect(redirect).toHaveBeenCalledWith(
+    '/message-plans/invalid',
+    RedirectType.replace
+  );
+});
diff --git a/frontend/src/__tests__/components/molecules/ContentRenderer.test.tsx b/frontend/src/__tests__/components/molecules/ContentRenderer.test.tsx
index 8276fd62e..0cf1fa333 100644
--- a/frontend/src/__tests__/components/molecules/ContentRenderer.test.tsx
+++ b/frontend/src/__tests__/components/molecules/ContentRenderer.test.tsx
@@ -4,6 +4,7 @@ import {
   ContentBlock,
   ContentItem,
 } from '@molecules/ContentRenderer/ContentRenderer';
+import { markdownList } from '@utils/markdown-list';
 
 describe('ContentRenderer', () => {
   it('renders nothing for empty content array', () => {
@@ -14,7 +15,8 @@ describe('ContentRenderer', () => {
   });
 
   it('renders a plain string as MarkdownContent in inline mode', () => {
-    render(<ContentRenderer content='Just a string block' />);
+    const container = render(<ContentRenderer content='Just a string block' />);
+    expect(container.asFragment()).toMatchSnapshot();
     expect(screen.getByText('Just a string block')).toBeInTheDocument();
   });
 
@@ -45,7 +47,9 @@ describe('ContentRenderer', () => {
       { type: 'text', text: 'Another paragraph.' },
     ];
 
-    render(<ContentRenderer content={content} />);
+    const container = render(<ContentRenderer content={content} />);
+
+    expect(container.asFragment()).toMatchSnapshot();
 
     const listItems = screen.getAllByRole('paragraph');
     expect(listItems).toHaveLength(2);
@@ -58,7 +62,7 @@ describe('ContentRenderer', () => {
       { type: 'inline-text', text: 'Inline content' },
     ];
 
-    render(
+    const container = render(
       <ul>
         <li data-testid='list-item'>
           <ContentRenderer content={content} />
@@ -66,6 +70,8 @@ describe('ContentRenderer', () => {
       </ul>
     );
 
+    expect(container.asFragment()).toMatchSnapshot();
+
     const listItem = screen.getByTestId('list-item');
     expect(listItem).toHaveTextContent('Inline content');
     expect(listItem.querySelector('p')).toBeNull();
@@ -74,7 +80,7 @@ describe('ContentRenderer', () => {
   it('treats a string as inline text (no paragraph wrapper)', () => {
     const content: string = 'Inline via string';
 
-    render(
+    const container = render(
       <ul>
         <li data-testid='list-item'>
           <ContentRenderer content={content} />
@@ -82,6 +88,8 @@ describe('ContentRenderer', () => {
       </ul>
     );
 
+    expect(container.asFragment()).toMatchSnapshot();
+
     const listItem = screen.getByTestId('list-item');
     expect(listItem).toHaveTextContent('Inline via string');
     expect(listItem.querySelector('p')).toBeNull();
@@ -90,7 +98,7 @@ describe('ContentRenderer', () => {
   it('treats a string array as inline text (no paragraph wrapper)', () => {
     const content: ContentItem[] = ['Inline via string'];
 
-    render(
+    const container = render(
       <ul>
         <li data-testid='list-item'>
           <ContentRenderer content={content} />
@@ -98,6 +106,8 @@ describe('ContentRenderer', () => {
       </ul>
     );
 
+    expect(container.asFragment()).toMatchSnapshot();
+
     const listItem = screen.getByTestId('list-item');
     expect(listItem).toHaveTextContent('Inline via string');
     expect(listItem.querySelector('p')).toBeNull();
@@ -115,7 +125,9 @@ describe('ContentRenderer', () => {
       },
     ];
 
-    render(<ContentRenderer content={content} />);
+    const container = render(<ContentRenderer content={content} />);
+
+    expect(container.asFragment()).toMatchSnapshot();
 
     const hiddenText = screen.getByText('An example of heading markdown');
     expect(hiddenText).toHaveAttribute('id', 'heading-markdown-description');
@@ -127,19 +139,84 @@ describe('ContentRenderer', () => {
     );
   });
 
-  it('renders list blocks', () => {
+  it('renders unordered list blocks', () => {
     const content: ContentBlock[] = [
       {
-        type: 'list',
-        items: ['Item 1', 'Item 2', 'Item 3'],
+        type: 'text',
+        text: markdownList('ul', ['Item 1', 'Item 2', 'Item 3']),
       },
     ];
 
-    render(<ContentRenderer content={content} />);
+    const container = render(<ContentRenderer content={content} />);
+
+    expect(container.asFragment()).toMatchSnapshot();
+
+    const listItems = screen.getAllByRole('listitem');
+    expect(listItems).toHaveLength(3);
+    expect(listItems[0]?.parentElement?.tagName).toBe('UL');
+    expect(listItems[0]).toHaveTextContent('Item 1');
+    expect(listItems[1]).toHaveTextContent('Item 2');
+    expect(listItems[2]).toHaveTextContent('Item 3');
+  });
+
+  it('renders ordered list blocks', () => {
+    const content: ContentBlock[] = [
+      {
+        type: 'text',
+        text: markdownList('ol', ['Item 1', 'Item 2', 'Item 3']),
+      },
+    ];
+
+    const container = render(<ContentRenderer content={content} />);
+
+    expect(container.asFragment()).toMatchSnapshot();
+
     const listItems = screen.getAllByRole('listitem');
     expect(listItems).toHaveLength(3);
+    expect(listItems[0]?.parentElement?.tagName).toBe('OL');
     expect(listItems[0]).toHaveTextContent('Item 1');
     expect(listItems[1]).toHaveTextContent('Item 2');
     expect(listItems[2]).toHaveTextContent('Item 3');
   });
+
+  it('renders with overrides on text blocks', () => {
+    const content: ContentBlock[] = [
+      {
+        type: 'text',
+        text: 'This is a paragraph.',
+        overrides: { p: { props: { className: 'foo' } } },
+      },
+      {
+        type: 'text',
+        text: 'Another paragraph.',
+        overrides: { p: { props: { className: 'bar' } } },
+      },
+    ];
+
+    const container = render(<ContentRenderer content={content} />);
+
+    expect(container.asFragment()).toMatchSnapshot();
+
+    const paragraphs = screen.getAllByRole('paragraph');
+    expect(paragraphs).toHaveLength(2);
+    expect(paragraphs[0]).toHaveClass('foo');
+    expect(paragraphs[1]).toHaveClass('bar');
+  });
+
+  it('renders with overrides on inline-text blocks', () => {
+    const content: ContentBlock[] = [
+      {
+        type: 'inline-text',
+        text: 'This is a [link](https://example.com).',
+        overrides: { a: { props: { className: 'foo' } } },
+      },
+    ];
+
+    const container = render(<ContentRenderer content={content} />);
+
+    expect(container.asFragment()).toMatchSnapshot();
+
+    const link = screen.getByRole('link');
+    expect(link).toHaveClass('foo');
+  });
 });
diff --git a/frontend/src/__tests__/components/molecules/MarkdownContent.test.tsx b/frontend/src/__tests__/components/molecules/MarkdownContent.test.tsx
index 55137379f..96bc2d5f3 100644
--- a/frontend/src/__tests__/components/molecules/MarkdownContent.test.tsx
+++ b/frontend/src/__tests__/components/molecules/MarkdownContent.test.tsx
@@ -100,6 +100,27 @@ describe('MarkdownContent', () => {
     expect(container.querySelector('p')).toHaveTextContent('Block content');
   });
 
+  it('renders block content with overrides', () => {
+    const { container } = render(
+      <MarkdownContent
+        content='Block content'
+        overrides={{ p: { props: { className: 'foobar' } } }}
+      />
+    );
+    expect(container.querySelector('p')).toHaveClass('foobar');
+  });
+
+  it('renders inline mode with overrides', () => {
+    const { container } = render(
+      <MarkdownContent
+        content='Here is a [link](https://example.com)'
+        mode='inline'
+        overrides={{ a: { props: { className: 'foobar' } } }}
+      />
+    );
+    expect(container.querySelector('a')).toHaveClass('foobar');
+  });
+
   it('renders interpolated variables correctly', () => {
     render(
       <MarkdownContent
diff --git a/frontend/src/__tests__/components/molecules/__snapshots__/ContentRenderer.test.tsx.snap b/frontend/src/__tests__/components/molecules/__snapshots__/ContentRenderer.test.tsx.snap
new file mode 100644
index 000000000..8c7c3d353
--- /dev/null
+++ b/frontend/src/__tests__/components/molecules/__snapshots__/ContentRenderer.test.tsx.snap
@@ -0,0 +1,136 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ContentRenderer renders a plain string as MarkdownContent in inline mode 1`] = `
+<DocumentFragment>
+  Just a string block
+</DocumentFragment>
+`;
+
+exports[`ContentRenderer renders an inline-text block without a paragraph wrapper 1`] = `
+<DocumentFragment>
+  <ul>
+    <li
+      data-testid="list-item"
+    >
+      Inline content
+    </li>
+  </ul>
+</DocumentFragment>
+`;
+
+exports[`ContentRenderer renders code blocks with accessible description 1`] = `
+<DocumentFragment>
+  <span
+    class="nhsuk-u-visually-hidden"
+    id="heading-markdown-description"
+  >
+    An example of heading markdown
+  </span>
+  <pre
+    class="nhsuk-code-block"
+  >
+    <code
+      aria-describedby="heading-markdown-description"
+    >
+      # This is a heading
+    </code>
+  </pre>
+</DocumentFragment>
+`;
+
+exports[`ContentRenderer renders ordered list blocks 1`] = `
+<DocumentFragment>
+  <ol
+    start="1"
+  >
+    <li>
+      Item 1
+    </li>
+    <li>
+      Item 2
+    </li>
+    <li>
+      Item 3
+    </li>
+  </ol>
+</DocumentFragment>
+`;
+
+exports[`ContentRenderer renders text blocks using MarkdownContent 1`] = `
+<DocumentFragment>
+  <p>
+    This is a paragraph.
+  </p>
+  <p>
+    Another paragraph.
+  </p>
+</DocumentFragment>
+`;
+
+exports[`ContentRenderer renders unordered list blocks 1`] = `
+<DocumentFragment>
+  <ul>
+    <li>
+      Item 1
+    </li>
+    <li>
+      Item 2
+    </li>
+    <li>
+      Item 3
+    </li>
+  </ul>
+</DocumentFragment>
+`;
+
+exports[`ContentRenderer renders with overrides on inline-text blocks 1`] = `
+<DocumentFragment>
+  This is a 
+  <a
+    class="foo"
+    href="https://example.com"
+  >
+    link
+  </a>
+  .
+</DocumentFragment>
+`;
+
+exports[`ContentRenderer renders with overrides on text blocks 1`] = `
+<DocumentFragment>
+  <p
+    class="foo"
+  >
+    This is a paragraph.
+  </p>
+  <p
+    class="bar"
+  >
+    Another paragraph.
+  </p>
+</DocumentFragment>
+`;
+
+exports[`ContentRenderer treats a string array as inline text (no paragraph wrapper) 1`] = `
+<DocumentFragment>
+  <ul>
+    <li
+      data-testid="list-item"
+    >
+      Inline via string
+    </li>
+  </ul>
+</DocumentFragment>
+`;
+
+exports[`ContentRenderer treats a string as inline text (no paragraph wrapper) 1`] = `
+<DocumentFragment>
+  <ul>
+    <li
+      data-testid="list-item"
+    >
+      Inline via string
+    </li>
+  </ul>
+</DocumentFragment>
+`;
diff --git a/frontend/src/__tests__/components/organisms/__snapshots__/CreateEditMessagePlan.test.tsx.snap b/frontend/src/__tests__/components/organisms/__snapshots__/CreateEditMessagePlan.test.tsx.snap
index 23e89617a..cc790fd6d 100644
--- a/frontend/src/__tests__/components/organisms/__snapshots__/CreateEditMessagePlan.test.tsx.snap
+++ b/frontend/src/__tests__/components/organisms/__snapshots__/CreateEditMessagePlan.test.tsx.snap
@@ -541,7 +541,7 @@ exports[`CreateEditMessagePlan should match snapshot for a typical message plan
             class="nhsuk-button"
             data-testid="move-to-production-cta"
             draggable="false"
-            href="/message-plans/move-to-production/30fd1e1c-a608-47cf-9cc2-eabaeeeebeca"
+            href="/message-plans/get-ready-to-move/30fd1e1c-a608-47cf-9cc2-eabaeeeebeca"
             role="button"
           >
             Move to production
@@ -1069,7 +1069,7 @@ exports[`CreateEditMessagePlan should match snapshot for a typical message plan
             class="nhsuk-button"
             data-testid="move-to-production-cta"
             draggable="false"
-            href="/message-plans/move-to-production/30fd1e1c-a608-47cf-9cc2-eabaeeeebeca"
+            href="/message-plans/get-ready-to-move/30fd1e1c-a608-47cf-9cc2-eabaeeeebeca"
             role="button"
           >
             Move to production
diff --git a/frontend/src/__tests__/utils/form-actions.test.ts b/frontend/src/__tests__/utils/form-actions.test.ts
index f37d87bf8..1249b19ae 100644
--- a/frontend/src/__tests__/utils/form-actions.test.ts
+++ b/frontend/src/__tests__/utils/form-actions.test.ts
@@ -15,16 +15,12 @@ import {
   setTemplateToDeleted,
   setTemplateToSubmitted,
   requestTemplateProof,
-  createRoutingConfig,
 } from '@utils/form-actions';
 import { getSessionServer } from '@utils/amplify-utils';
 import { TemplateDto, TemplateStatus } from 'nhs-notify-backend-client';
 import { templateApiClient } from 'nhs-notify-backend-client/src/template-api-client';
-import { routingConfigurationApiClient } from 'nhs-notify-backend-client/src/routing-config-api-client';
-import { randomUUID } from 'node:crypto';
 
 const mockedTemplateClient = jest.mocked(templateApiClient);
-const mockedRoutingConfigClient = jest.mocked(routingConfigurationApiClient);
 const authIdTokenServerMock = jest.mocked(getSessionServer);
 
 jest.mock('@utils/amplify-utils');
@@ -34,7 +30,7 @@ jest.mock('nhs-notify-backend-client/src/routing-config-api-client');
 describe('form-actions', () => {
   beforeEach(() => {
     jest.resetAllMocks();
-    authIdTokenServerMock.mockResolvedValueOnce({
+    authIdTokenServerMock.mockResolvedValue({
       accessToken: 'token',
       clientId: 'client1',
     });
@@ -99,11 +95,7 @@ describe('form-actions', () => {
   });
 
   test('createTemplate - should throw error when no token', async () => {
-    authIdTokenServerMock.mockReset();
-    authIdTokenServerMock.mockResolvedValueOnce({
-      accessToken: undefined,
-      clientId: undefined,
-    });
+    authIdTokenServerMock.mockResolvedValueOnce({});
 
     const createTemplateInput: CreateUpdateNHSAppTemplate = {
       templateType: 'NHS_APP',
@@ -269,11 +261,7 @@ describe('form-actions', () => {
   });
 
   test('uploadLetterTemplate - should throw error when no token', async () => {
-    authIdTokenServerMock.mockReset();
-    authIdTokenServerMock.mockResolvedValueOnce({
-      accessToken: undefined,
-      clientId: undefined,
-    });
+    authIdTokenServerMock.mockResolvedValueOnce({});
 
     const uploadLetterTemplateInput: UploadLetterTemplate = {
       templateType: 'LETTER',
@@ -371,11 +359,7 @@ describe('form-actions', () => {
   });
 
   test('saveTemplate - should throw error when no token', async () => {
-    authIdTokenServerMock.mockReset();
-    authIdTokenServerMock.mockResolvedValueOnce({
-      accessToken: undefined,
-      clientId: undefined,
-    });
+    authIdTokenServerMock.mockResolvedValueOnce({});
 
     const updateTemplateInput: NHSAppTemplate = {
       id: 'bde7301a-e8c0-404a-8d19-c0b8ef7817f9',
@@ -441,11 +425,7 @@ describe('form-actions', () => {
   });
 
   test('getTemplate - should throw error when no token', async () => {
-    authIdTokenServerMock.mockReset();
-    authIdTokenServerMock.mockResolvedValueOnce({
-      accessToken: undefined,
-      clientId: undefined,
-    });
+    authIdTokenServerMock.mockResolvedValueOnce({});
 
     await expect(getTemplate('id')).rejects.toThrow(
       'Failed to get access token'
@@ -495,11 +475,7 @@ describe('form-actions', () => {
   });
 
   test('getTemplates - should throw error when no token', async () => {
-    authIdTokenServerMock.mockReset();
-    authIdTokenServerMock.mockResolvedValueOnce({
-      accessToken: undefined,
-      clientId: undefined,
-    });
+    authIdTokenServerMock.mockResolvedValueOnce({});
 
     await expect(getTemplates()).rejects.toThrow('Failed to get access token');
   });
@@ -625,7 +601,6 @@ describe('form-actions', () => {
     });
 
     test('submitTemplate - should throw error when no token', async () => {
-      authIdTokenServerMock.mockReset();
       authIdTokenServerMock.mockResolvedValueOnce({
         accessToken: undefined,
         clientId: undefined,
@@ -676,7 +651,6 @@ describe('form-actions', () => {
     });
 
     test('deleteTemplate - should throw error when no token', async () => {
-      authIdTokenServerMock.mockReset();
       authIdTokenServerMock.mockResolvedValueOnce({
         accessToken: undefined,
         clientId: undefined,
@@ -746,7 +720,6 @@ describe('form-actions', () => {
     });
 
     test('requestTemplateProof - should throw error when no token', async () => {
-      authIdTokenServerMock.mockReset();
       authIdTokenServerMock.mockResolvedValueOnce({
         accessToken: undefined,
         clientId: undefined,
@@ -757,131 +730,4 @@ describe('form-actions', () => {
       );
     });
   });
-
-  describe('createRoutingConfig', () => {
-    test('creates a routing config', async () => {
-      const now = new Date();
-      const id = randomUUID();
-
-      mockedRoutingConfigClient.create.mockImplementationOnce(
-        async (input) => ({
-          data: {
-            ...input,
-            id,
-            clientId: 'client1',
-            createdAt: now.toISOString(),
-            status: 'DRAFT',
-            updatedAt: now.toISOString(),
-            lockNumber: 1,
-            defaultCascadeGroup: 'standard',
-          },
-        })
-      );
-
-      const result = await createRoutingConfig({
-        name: 'My Routing Config',
-        campaignId: 'my-campaign-id',
-        cascade: [
-          {
-            channelType: 'primary',
-            channel: 'NHSAPP',
-            cascadeGroups: ['standard'],
-            defaultTemplateId: null,
-          },
-        ],
-        cascadeGroupOverrides: [],
-      });
-
-      expect(mockedRoutingConfigClient.create).toHaveBeenCalledWith(
-        {
-          name: 'My Routing Config',
-          campaignId: 'my-campaign-id',
-          cascade: [
-            {
-              channelType: 'primary',
-              channel: 'NHSAPP',
-              cascadeGroups: ['standard'],
-              defaultTemplateId: null,
-            },
-          ],
-          cascadeGroupOverrides: [],
-        },
-        'token'
-      );
-
-      expect(result).toEqual({
-        id,
-        clientId: 'client1',
-        createdAt: now.toISOString(),
-        status: 'DRAFT',
-        updatedAt: now.toISOString(),
-        lockNumber: 1,
-        name: 'My Routing Config',
-        campaignId: 'my-campaign-id',
-        cascade: [
-          {
-            channelType: 'primary',
-            channel: 'NHSAPP',
-            cascadeGroups: ['standard'],
-            defaultTemplateId: null,
-          },
-        ],
-        cascadeGroupOverrides: [],
-        defaultCascadeGroup: 'standard',
-      });
-    });
-
-    test('errors when no token', async () => {
-      authIdTokenServerMock.mockReset();
-      authIdTokenServerMock.mockResolvedValueOnce({
-        accessToken: undefined,
-        clientId: undefined,
-      });
-
-      await expect(
-        createRoutingConfig({
-          name: 'My Routing Config',
-          campaignId: 'my-campaign-id',
-          cascade: [
-            {
-              channelType: 'primary',
-              channel: 'NHSAPP',
-              cascadeGroups: ['standard'],
-              defaultTemplateId: null,
-            },
-          ],
-          cascadeGroupOverrides: [],
-        })
-      ).rejects.toThrow('Failed to get access token');
-
-      expect(mockedRoutingConfigClient.create).not.toHaveBeenCalled();
-    });
-
-    test('errors when request fails', async () => {
-      mockedRoutingConfigClient.create.mockResolvedValueOnce({
-        error: {
-          errorMeta: {
-            code: 400,
-            description: 'Bad request',
-          },
-        },
-      });
-
-      await expect(
-        createRoutingConfig({
-          name: 'My Routing Config',
-          campaignId: 'my-campaign-id',
-          cascade: [
-            {
-              channelType: 'primary',
-              channel: 'NHSAPP',
-              cascadeGroups: ['standard'],
-              defaultTemplateId: null,
-            },
-          ],
-          cascadeGroupOverrides: [],
-        })
-      ).rejects.toThrow('Failed to create message plan');
-    });
-  });
 });
diff --git a/frontend/src/__tests__/utils/markdown-list.test.ts b/frontend/src/__tests__/utils/markdown-list.test.ts
new file mode 100644
index 000000000..bb92fb785
--- /dev/null
+++ b/frontend/src/__tests__/utils/markdown-list.test.ts
@@ -0,0 +1,13 @@
+import { markdownList } from '@utils/markdown-list';
+
+test('returns a markdown string for an ordered list', () => {
+  expect(markdownList('ol', ['foo', 'bar', 'baz'])).toEqual(
+    '1. foo\n2. bar\n3. baz'
+  );
+});
+
+test('returns a markdown string for an unordered list', () => {
+  expect(markdownList('ul', ['foo', 'bar', 'baz'])).toEqual(
+    '- foo\n- bar\n- baz'
+  );
+});
diff --git a/frontend/src/app/message-plans/create-message-plan/server-action.ts b/frontend/src/app/message-plans/create-message-plan/server-action.ts
index 79dd3751b..b9fca3034 100644
--- a/frontend/src/app/message-plans/create-message-plan/server-action.ts
+++ b/frontend/src/app/message-plans/create-message-plan/server-action.ts
@@ -8,7 +8,7 @@ import {
   type FormState,
   type MessageOrder,
 } from 'nhs-notify-web-template-management-utils';
-import { createRoutingConfig } from '@utils/form-actions';
+import { createRoutingConfig } from '@utils/message-plans';
 import { $MessagePlanFormData } from '@forms/MessagePlan/schema';
 
 const $CreateMessagePlanFormData = $MessagePlanFormData.extend({
diff --git a/frontend/src/app/message-plans/get-ready-to-move/[routingConfigId]/page.module.scss b/frontend/src/app/message-plans/get-ready-to-move/[routingConfigId]/page.module.scss
new file mode 100644
index 000000000..b29957406
--- /dev/null
+++ b/frontend/src/app/message-plans/get-ready-to-move/[routingConfigId]/page.module.scss
@@ -0,0 +1,22 @@
+.table {
+  background-color: var(--nhsuk-card-background-colour);
+  border: 1px solid var(--nhsuk-border-colour);
+
+  tr {
+    border-bottom: 1px solid var(--nhsuk-border-colour);
+  }
+
+  th {
+    width: 20%;
+    color: var(--nhsuk-grey-1-colour);
+  }
+
+  th,
+  td {
+    padding: 1rem;
+  }
+
+  tr:hover {
+    background-color: inherit;
+  }
+}
diff --git a/frontend/src/app/message-plans/get-ready-to-move/[routingConfigId]/page.tsx b/frontend/src/app/message-plans/get-ready-to-move/[routingConfigId]/page.tsx
new file mode 100644
index 000000000..f6611586e
--- /dev/null
+++ b/frontend/src/app/message-plans/get-ready-to-move/[routingConfigId]/page.tsx
@@ -0,0 +1,74 @@
+import classNames from 'classnames';
+import type { Metadata } from 'next';
+import { redirect, RedirectType } from 'next/navigation';
+import type { MessagePlanPageProps } from 'nhs-notify-web-template-management-utils';
+import { NHSNotifyButton } from '@atoms/NHSNotifyButton/NHSNotifyButton';
+import { NHSNotifyMain } from '@atoms/NHSNotifyMain/NHSNotifyMain';
+import content from '@content/content';
+import { ContentRenderer } from '@molecules/ContentRenderer/ContentRenderer';
+import { getRoutingConfig } from '@utils/message-plans';
+import styles from './page.module.scss';
+
+const pageContent = content.pages.messagePlanGetReadyToMoveToProduction();
+
+export const metadata: Metadata = {
+  title: pageContent.title,
+};
+
+export default async function MessagePlanGetReadyToMoveToProductionPage({
+  params,
+}: MessagePlanPageProps) {
+  const { routingConfigId } = await params;
+
+  const routingConfig = await getRoutingConfig(routingConfigId);
+
+  if (!routingConfig) {
+    return redirect('/message-plans/invalid', RedirectType.replace);
+  }
+
+  return (
+    <NHSNotifyMain>
+      <div className='nhsuk-grid-row'>
+        <div className='nhsuk-grid-column-two-thirds'>
+          <span className='nhsuk-caption-xl'>{pageContent.stepCounter}</span>
+          <h1 className='nhsuk-heading-xl'>{pageContent.heading}</h1>
+          <table
+            className={classNames('nhsuk-u-margin-bottom-6', styles.table)}
+          >
+            <tbody className='nhsuk-table__body'>
+              <tr className='nhsuk-table__row'>
+                <th className='nhsuk-table__cell'>Name</th>
+                <td className='nhsuk-table__cell'>{routingConfig.name}</td>
+              </tr>
+            </tbody>
+          </table>
+          <ContentRenderer content={pageContent.content} />
+          <div className='nhsuk-warning-callout'>
+            <h3 className='nhsuk-warning-callout__label'>
+              {pageContent.callout.label}
+              <span className='nhsuk-u-visually-hidden'>:</span>
+            </h3>
+            <ContentRenderer content={pageContent.callout.content} />
+          </div>
+          <div className='nhsuk-form-group'>
+            <NHSNotifyButton
+              href={pageContent.continue.href(routingConfigId)}
+              data-testid='continue-link'
+            >
+              {pageContent.continue.text}
+            </NHSNotifyButton>
+
+            <NHSNotifyButton
+              secondary
+              href={pageContent.cancel.href}
+              className='nhsuk-u-margin-left-3'
+              data-testid='cancel-link'
+            >
+              {pageContent.cancel.text}
+            </NHSNotifyButton>
+          </div>
+        </div>
+      </div>
+    </NHSNotifyMain>
+  );
+}
diff --git a/frontend/src/components/forms/MessagePlan/MessagePlan.tsx b/frontend/src/components/forms/MessagePlan/MessagePlan.tsx
index 13c36ec29..a59f298be 100644
--- a/frontend/src/components/forms/MessagePlan/MessagePlan.tsx
+++ b/frontend/src/components/forms/MessagePlan/MessagePlan.tsx
@@ -16,6 +16,7 @@ import content from '@content/content';
 import { useTextInput } from '@hooks/use-text-input.hook';
 import { NHSNotifyFormWrapper } from '@molecules/NHSNotifyFormWrapper/NHSNotifyFormWrapper';
 import { useNHSNotifyForm } from '@providers/form-provider';
+import { ContentRenderer } from '@molecules/ContentRenderer/ContentRenderer';
 
 const formContent = content.components.messagePlanForm;
 
@@ -59,16 +60,7 @@ export function MessagePlanForm({
             {formContent.fields.name.details.summary}
           </Details.Summary>
           <Details.Text>
-            <p>{formContent.fields.name.details.text.main}</p>
-            <p>{formContent.fields.name.details.text.commonNames.main}</p>
-            <ul className='nhsuk-list nhsuk-list--bullet'>
-              {formContent.fields.name.details.text.commonNames.list.map(
-                (item) => (
-                  <li key={item}>{item}</li>
-                )
-              )}
-            </ul>
-            <p>{formContent.fields.name.details.text.commonNames.example}</p>
+            <ContentRenderer content={formContent.fields.name.details.text} />
           </Details.Text>
         </Details>
         <TextInput
diff --git a/frontend/src/components/molecules/ContentRenderer/ContentRenderer.tsx b/frontend/src/components/molecules/ContentRenderer/ContentRenderer.tsx
index 41b950a2d..de2f66cf0 100644
--- a/frontend/src/components/molecules/ContentRenderer/ContentRenderer.tsx
+++ b/frontend/src/components/molecules/ContentRenderer/ContentRenderer.tsx
@@ -1,24 +1,29 @@
+import type { MarkdownToJSX } from 'markdown-to-jsx';
 import CodeExample from '@atoms/CodeExample/CodeExample';
 import { MarkdownContent } from '@molecules/MarkdownContent/MarkdownContent';
 
 type StandardBlock = { testId?: string };
-export type MarkdownTextBlock = StandardBlock & { type: 'text'; text: string };
+
+export type MarkdownTextBlock = StandardBlock & {
+  type: 'text';
+  text: string;
+  overrides?: MarkdownToJSX.Overrides;
+};
+
 export type MarkdownInlineBlock = StandardBlock & {
   type: 'inline-text';
   text: string;
+  overrides?: MarkdownToJSX.Overrides;
 };
+
 export type CodeBlock = StandardBlock & {
   type: 'code';
   code: string;
   aria: { text: string; id: string };
 };
-export type ListBlock = StandardBlock & { type: 'list'; items: string[] };
 
-export type ContentBlock =
-  | MarkdownTextBlock
-  | MarkdownInlineBlock
-  | CodeBlock
-  | ListBlock;
+export type ContentBlock = MarkdownTextBlock | MarkdownInlineBlock | CodeBlock;
+
 export type ContentItem = ContentBlock | string;
 
 interface ContentRendererProps {
@@ -55,6 +60,7 @@ export function ContentRenderer({ content, variables }: ContentRendererProps) {
                 testId={block.testId}
                 content={block.text}
                 variables={variables}
+                overrides={block.overrides}
                 mode='block'
               />
             );
@@ -66,6 +72,7 @@ export function ContentRenderer({ content, variables }: ContentRendererProps) {
                 testId={block.testId}
                 content={block.text}
                 variables={variables}
+                overrides={block.overrides}
                 mode='inline'
               />
             );
@@ -82,21 +89,6 @@ export function ContentRenderer({ content, variables }: ContentRendererProps) {
               </CodeExample>
             );
           }
-          case 'list': {
-            return (
-              <ul data-testid={block.testId} key={key}>
-                {block.items.map((item, itemId) => (
-                  <li key={itemId}>
-                    <MarkdownContent
-                      content={item}
-                      variables={variables}
-                      mode='inline'
-                    />
-                  </li>
-                ))}
-              </ul>
-            );
-          }
           default: {
             console.error('Unsupported content block:', block);
 
diff --git a/frontend/src/components/molecules/MarkdownContent/MarkdownContent.tsx b/frontend/src/components/molecules/MarkdownContent/MarkdownContent.tsx
index c525d39cf..5b40846e7 100644
--- a/frontend/src/components/molecules/MarkdownContent/MarkdownContent.tsx
+++ b/frontend/src/components/molecules/MarkdownContent/MarkdownContent.tsx
@@ -1,12 +1,13 @@
-import { interpolate } from '@utils/interpolate';
-import Markdown, { MarkdownToJSX } from 'markdown-to-jsx';
 import React from 'react';
+import { interpolate } from '@utils/interpolate';
+import Markdown, { type MarkdownToJSX } from 'markdown-to-jsx';
 
 type MarkdownContentProps = {
   content: string | string[];
   variables?: Record<string, string | number>;
   testId?: string;
   mode?: 'block' | 'inline';
+  overrides?: MarkdownToJSX.Overrides;
 };
 
 export function MarkdownContent({
@@ -14,6 +15,7 @@ export function MarkdownContent({
   variables,
   testId,
   mode = 'block',
+  overrides,
 }: MarkdownContentProps) {
   const items = Array.isArray(content) ? content : [content];
 
@@ -35,6 +37,7 @@ export function MarkdownContent({
         props: { target: '_blank', rel: 'noopener noreferrer' },
       },
       span: { component: NoWrap },
+      ...overrides,
     },
   };
 
@@ -47,6 +50,7 @@ export function MarkdownContent({
         component: 'a',
         props: { target: '_blank', rel: 'noopener noreferrer' },
       },
+      ...overrides,
     },
   };
 
diff --git a/frontend/src/content/content.ts b/frontend/src/content/content.ts
index 0127ad848..6c4619d8c 100644
--- a/frontend/src/content/content.ts
+++ b/frontend/src/content/content.ts
@@ -1,6 +1,7 @@
+import type { TemplateStatus, TemplateType } from 'nhs-notify-backend-client';
 import type { ContentBlock } from '@molecules/ContentRenderer/ContentRenderer';
 import { getBasePath } from '@utils/get-base-path';
-import { TemplateStatus, TemplateType } from 'nhs-notify-backend-client';
+import { markdownList } from '@utils/markdown-list';
 
 const generatePageTitle = (title: string): string => {
   return `${title} - NHS Notify`;
@@ -116,14 +117,14 @@ const personalisation: {
           text: 'You can use the following PDS personalisation fields:',
         },
         {
-          type: 'list',
-          items: [
+          type: 'text',
+          text: markdownList('ul', [
             '((fullName))',
             '((firstName))',
             '((lastName))',
             '((nhsNumber))',
             '((date))',
-          ],
+          ]),
         },
         {
           type: 'text',
@@ -1103,11 +1104,11 @@ const messagePlanFallbackConditions: Record<
           text: 'The relevant accessible or language letter will be sent instead of the standard English letter if, both: ',
         },
         {
-          type: 'list',
-          items: [
+          type: 'text',
+          text: markdownList('ul', [
             'the recipient has requested an accessible or language letter in PDS',
             `you've included the relevant template in this message plan`,
-          ],
+          ]),
         },
       ],
     },
@@ -1130,7 +1131,7 @@ const createEditMessagePlan = {
   },
   ctas: {
     primary: {
-      href: '/message-plans/move-to-production/{{routingConfigId}}',
+      href: '/message-plans/get-ready-to-move/{{routingConfigId}}',
       text: 'Move to production',
     },
     secondary: {
@@ -1206,11 +1207,11 @@ const messagePlanDraftAndProdInfo: {
         text: "Message plans that you're working on and are not ready to be sent. You can test these, using our:",
       },
       {
-        type: 'list',
-        items: [
+        type: 'text',
+        text: markdownList('ul', [
           '[API integration environment (opens in a new tab)](https://digital.nhs.uk/developer/api-catalogue/nhs-notify#overview--environments-and-testing)',
           '[Integration MESH mailbox (opens in a new tab)](https://digital.nhs.uk/developer/api-catalogue/nhs-notify-mesh/sending-a-message#sending-your-request)',
-        ],
+        ]),
       },
     ],
   },
@@ -1236,6 +1237,73 @@ const messagePlansPage = {
   },
 };
 
+const messagePlanGetReadyToMoveToProduction = () => {
+  const content: ContentBlock[] = [
+    {
+      type: 'text',
+      text: 'Moving message plans from draft to production means they are ready to send.',
+    },
+    {
+      type: 'text',
+      text: 'Any templates used in these message plans will be locked.',
+    },
+    {
+      type: 'text',
+      text: 'Messages will only be sent to recipients when you make a request with [NHS Notify API](https://digital.nhs.uk/developer/api-catalogue/nhs-notify) or [NHS Notify MESH](https://digital.nhs.uk/developer/api-catalogue/nhs-notify-mesh).',
+    },
+    {
+      type: 'text',
+      text: '## Before you continue',
+      overrides: { h2: { props: { className: 'nhsuk-heading-m' } } },
+    },
+    {
+      type: 'text',
+      text: 'Make sure:',
+    },
+    {
+      type: 'text',
+      text: markdownList('ul', [
+        'the relevant stakeholders in your team have approved your templates and message plan',
+        'your templates have no errors',
+      ]),
+      overrides: {
+        ul: { props: { className: 'nhsuk-list nhsuk-list--bullet' } },
+      },
+    },
+  ];
+
+  const calloutContent: ContentBlock[] = [
+    {
+      type: 'text',
+      text: 'You cannot edit anything that is in production.',
+    },
+    {
+      type: 'text',
+      text: 'If you need to edit your templates or message plans, you can copy and replace them.',
+    },
+  ];
+
+  return {
+    title: generatePageTitle('Get ready to move message plan to production'),
+    stepCounter: 'Step 1 of 2',
+    heading: 'Get ready to move message plan to production',
+    content,
+    callout: {
+      label: 'Important',
+      content: calloutContent,
+    },
+    continue: {
+      text: 'Continue',
+      href: (id: string) =>
+        `${getBasePath()}/message-plans/review-and-move-to-production/${id}`,
+    },
+    cancel: {
+      text: 'Keep in draft',
+      href: `${getBasePath()}/message-plans`,
+    },
+  };
+};
+
 const messagePlansListComponent = {
   tableHeadings: ['Name', 'Routing Plan ID', 'Last edited'],
   noMessagePlansMessage: 'You do not have any message plans in {{status}} yet.',
@@ -1275,20 +1343,32 @@ const messagePlanForm = {
       hint: 'This will not be visible to recipients.',
       details: {
         summary: 'Naming your message plans',
-        text: {
-          main: 'You should name your message plans in a way that works best for your service or organisation.',
-          commonNames: {
-            main: 'Common message plan names include the:',
-            list: [
+        text: [
+          {
+            type: 'text',
+            text: 'You should name your message plans in a way that works best for your service or organisation.',
+          },
+          {
+            type: 'text',
+            text: 'Common message plan names include the:',
+          },
+          {
+            type: 'text',
+            text: markdownList('ul', [
               'channels it uses',
               'subject or reason for the message',
               'intended audience for the message',
               'version number',
-            ],
-            example:
-              "For example, 'Email, SMS, letter - covid19 2023 - over 65s - version 3'",
+            ]),
+            overrides: {
+              ul: { props: { className: 'nhsuk-list nhsuk-list--bullet' } },
+            },
           },
-        },
+          {
+            type: 'text',
+            text: "For example, 'Email, SMS, letter - covid19 2023 - over 65s - version 3'",
+          },
+        ] satisfies ContentBlock[],
       },
     },
     campaignId: {
@@ -1347,6 +1427,7 @@ const content = {
     previewTemplateFromMessagePlan,
   },
   pages: {
+    chooseTemplatesForMessagePlan,
     createMessagePlan,
     editMessagePlanSettings,
     error404,
@@ -1354,8 +1435,8 @@ const content = {
     letterTemplateInvalidConfiguration,
     messagePlanInvalidConfiguration,
     messageTemplates,
-    chooseTemplatesForMessagePlan,
     messagePlansPage,
+    messagePlanGetReadyToMoveToProduction,
     chooseNhsAppTemplate,
     chooseEmailTemplate,
     chooseTextMessageTemplate,
diff --git a/frontend/src/middleware.ts b/frontend/src/middleware.ts
index d9ab7aa89..53d8bd893 100644
--- a/frontend/src/middleware.ts
+++ b/frontend/src/middleware.ts
@@ -30,6 +30,7 @@ const protectedPaths = [
   /^\/message-plans\/choose-text-message-template\/[^/]+\/preview-template\/[^/]+$/,
   /^\/message-plans\/create-message-plan$/,
   /^\/message-plans\/edit-message-plan-settings\/[^/]+$/,
+  /^\/message-plans\/get-ready-to-move\/[^/]+$/,
   /^\/message-plans\/invalid$/,
   /^\/message-plans$/,
   /^\/message-templates$/,
diff --git a/frontend/src/utils/form-actions.ts b/frontend/src/utils/form-actions.ts
index 243e07032..80d7c4779 100644
--- a/frontend/src/utils/form-actions.ts
+++ b/frontend/src/utils/form-actions.ts
@@ -4,12 +4,10 @@ import { getSessionServer } from '@utils/amplify-utils';
 import {
   $TemplateDto,
   CreateUpdateTemplate,
-  RoutingConfig,
   TemplateDto,
 } from 'nhs-notify-backend-client';
 import { logger } from 'nhs-notify-web-template-management-utils/logger';
 import { templateApiClient } from 'nhs-notify-backend-client/src/template-api-client';
-import { routingConfigurationApiClient } from 'nhs-notify-backend-client/src/routing-config-api-client';
 import { sortAscByUpdatedAt } from './sort';
 import { TemplateFilter } from 'nhs-notify-backend-client/src/types/filters';
 
@@ -208,28 +206,3 @@ export async function getTemplates(
 
   return sortAscByUpdatedAt(valid);
 }
-
-export async function createRoutingConfig(
-  routingConfig: Pick<
-    RoutingConfig,
-    'name' | 'campaignId' | 'cascade' | 'cascadeGroupOverrides'
-  >
-): Promise<RoutingConfig> {
-  const { accessToken } = await getSessionServer();
-
-  if (!accessToken) {
-    throw new Error('Failed to get access token');
-  }
-
-  const { data, error } = await routingConfigurationApiClient.create(
-    routingConfig,
-    accessToken
-  );
-
-  if (error) {
-    logger.error('Failed to create message plan', { error });
-    throw new Error('Failed to create message plan');
-  }
-
-  return data;
-}
diff --git a/frontend/src/utils/markdown-list.ts b/frontend/src/utils/markdown-list.ts
new file mode 100644
index 000000000..e08bbc827
--- /dev/null
+++ b/frontend/src/utils/markdown-list.ts
@@ -0,0 +1,15 @@
+type ListType = 'ol' | 'ul';
+
+export function markdownList(listType: ListType, list: string[]) {
+  return list
+    .map((item, index) => {
+      let prefix = '-';
+
+      if (listType === 'ol') {
+        prefix = `${index + 1}.`;
+      }
+
+      return `${prefix} ${item}`;
+    })
+    .join('\n');
+}
diff --git a/tests/test-team/pages/routing/get-ready-to-move-page.ts b/tests/test-team/pages/routing/get-ready-to-move-page.ts
new file mode 100644
index 000000000..524c00ad6
--- /dev/null
+++ b/tests/test-team/pages/routing/get-ready-to-move-page.ts
@@ -0,0 +1,17 @@
+import type { Locator, Page } from '@playwright/test';
+import { TemplateMgmtBasePageDynamic } from 'pages/template-mgmt-base-page-dynamic';
+
+export class RoutingGetReadyToMovePage extends TemplateMgmtBasePageDynamic {
+  static readonly pageUrlSegments = ['message-plans/get-ready-to-move'];
+
+  public readonly continueLink: Locator;
+
+  public readonly cancelLink: Locator;
+
+  constructor(page: Page) {
+    super(page);
+
+    this.continueLink = page.getByTestId('continue-link');
+    this.cancelLink = page.getByTestId('cancel-link');
+  }
+}
diff --git a/tests/test-team/pages/template-mgmt-message-templates-page.ts b/tests/test-team/pages/template-mgmt-message-templates-page.ts
index 922bd4594..ee0304f72 100644
--- a/tests/test-team/pages/template-mgmt-message-templates-page.ts
+++ b/tests/test-team/pages/template-mgmt-message-templates-page.ts
@@ -18,4 +18,16 @@ export class TemplateMgmtMessageTemplatesPage extends TemplateMgmtBasePageNonDyn
   async clickCreateTemplateButton() {
     await this.createTemplateButton.click();
   }
+
+  async getRowByTemplateId(id: string) {
+    return this.page.locator(`tbody tr:has(td:nth-child(2):has-text("${id}"))`);
+  }
+
+  async getTemplateStatus(templateId: string) {
+    const row = await this.getRowByTemplateId(templateId);
+
+    const statusCell = row.locator('td:nth-child(4) .nhsuk-tag');
+
+    return statusCell.textContent();
+  }
 }
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 cde560b86..196ddaa2a 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
@@ -48,6 +48,7 @@ import { RoutingPreviewNhsAppTemplatePage } from 'pages/routing/nhs-app/preview-
 import { RoutingPreviewEmailTemplatePage } from 'pages/routing/email/preview-email-page';
 import { RoutingPreviewStandardLetterTemplatePage } from 'pages/routing/letter/preview-standard-letter-page';
 import { RoutingPreviewSmsTemplatePage } from 'pages/routing/sms/preview-sms-template-page';
+import { RoutingGetReadyToMovePage } from 'pages/routing/get-ready-to-move-page';
 
 // Reset storage state for this file to avoid being authenticated
 test.use({ storageState: { cookies: [], origins: [] } });
@@ -57,6 +58,7 @@ const protectedPages = [
   RoutingChooseTemplatesPage,
   RoutingCreateMessagePlanPage,
   RoutingEditMessagePlanSettingsPage,
+  RoutingGetReadyToMovePage,
   RoutingInvalidMessagePlanPage,
   RoutingMessagePlanCampaignIdRequiredPage,
   RoutingMessagePlansPage,
diff --git a/tests/test-team/template-mgmt-routing-component-tests/choose-templates.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/choose-templates.routing-component.spec.ts
index 3cb590664..17820253c 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/choose-templates.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/choose-templates.routing-component.spec.ts
@@ -234,7 +234,7 @@ test.describe('Routing - Choose Templates page', () => {
     );
     await expect(chooseTemplatesPage.moveToProductionButton).toHaveAttribute(
       'href',
-      `/templates/message-plans/move-to-production/${validRoutingConfigId}`
+      `/templates/message-plans/get-ready-to-move/${validRoutingConfigId}`
     );
     await expect(chooseTemplatesPage.saveAndCloseButton).toHaveText(
       'Save and close'
diff --git a/tests/test-team/template-mgmt-routing-component-tests/get-ready-to-move-page.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/get-ready-to-move-page.routing-component.spec.ts
new file mode 100644
index 000000000..29da2e0d9
--- /dev/null
+++ b/tests/test-team/template-mgmt-routing-component-tests/get-ready-to-move-page.routing-component.spec.ts
@@ -0,0 +1,106 @@
+import { test, expect } from '@playwright/test';
+import {
+  createAuthHelper,
+  TestUser,
+  testUsers,
+} from 'helpers/auth/cognito-auth-helper';
+import { RoutingConfigStorageHelper } from 'helpers/db/routing-config-storage-helper';
+import { RoutingConfigFactory } from 'helpers/factories/routing-config-factory';
+import {
+  assertFooterLinks,
+  assertHeaderLogoLink,
+  assertSignOutLink,
+  assertSkipToMainContent,
+} from 'helpers/template-mgmt-common.steps';
+import { RoutingMessagePlansPage } from 'pages/routing/message-plans-page';
+import { RoutingGetReadyToMovePage } from 'pages/routing/get-ready-to-move-page';
+
+const routingConfigStorage = new RoutingConfigStorageHelper();
+
+let user: TestUser;
+
+test.beforeAll(async () => {
+  const authHelper = createAuthHelper();
+  user = await authHelper.getTestUser(testUsers.User1.userId);
+});
+
+test.afterAll(async () => {
+  await routingConfigStorage.deleteSeeded();
+});
+
+test.describe('Get Ready To Move Page', () => {
+  test('common page tests', async ({ page, baseURL }) => {
+    const routingConfig = RoutingConfigFactory.create(user);
+
+    await routingConfigStorage.seed([routingConfig.dbEntry]);
+
+    const props = {
+      page: new RoutingGetReadyToMovePage(page),
+      id: routingConfig.dbEntry.id,
+      baseURL,
+    };
+
+    await assertSkipToMainContent(props);
+    await assertHeaderLogoLink(props);
+    await assertFooterLinks(props);
+    await assertSignOutLink(props);
+  });
+
+  test('continue button navigates to the review and move to production page', async ({
+    baseURL,
+    page,
+  }) => {
+    const routingConfig = RoutingConfigFactory.create(user);
+
+    await routingConfigStorage.seed([routingConfig.dbEntry]);
+
+    const getReadyToMovePage = new RoutingGetReadyToMovePage(page);
+
+    await getReadyToMovePage.loadPage(routingConfig.dbEntry.id);
+
+    await expect(page).toHaveURL(
+      `${baseURL}/templates/message-plans/get-ready-to-move/${routingConfig.dbEntry.id}`
+    );
+
+    await getReadyToMovePage.continueLink.click();
+
+    await expect(page).toHaveURL(
+      `${baseURL}/templates/message-plans/review-and-move-to-production/${routingConfig.dbEntry.id}`
+    );
+  });
+
+  test('cancel button links to the message plan list page, does not move the plan to production', async ({
+    baseURL,
+    page,
+  }) => {
+    const routingConfig = RoutingConfigFactory.create(user);
+
+    await routingConfigStorage.seed([routingConfig.dbEntry]);
+
+    const getReadyToMovePage = new RoutingGetReadyToMovePage(page);
+
+    await getReadyToMovePage.loadPage(routingConfig.dbEntry.id);
+
+    await expect(page).toHaveURL(
+      `${baseURL}/templates/message-plans/get-ready-to-move/${routingConfig.dbEntry.id}`
+    );
+
+    await getReadyToMovePage.cancelLink.click();
+
+    await expect(page).toHaveURL(`${baseURL}/templates/message-plans`);
+
+    const messagePlansPage = new RoutingMessagePlansPage(page);
+
+    await messagePlansPage.draftMessagePlansTable.click();
+
+    const draftIdCells = messagePlansPage.draftMessagePlansTable.getByTestId(
+      'message-plan-id-cell'
+    );
+
+    const draftCellsText = await draftIdCells.allTextContents();
+
+    expect(draftCellsText).toContainEqual(
+      expect.stringContaining(routingConfig.dbEntry.id)
+    );
+  });
+});

From 8b7ee69f70f6445107c5986800d16afe6db16d41 Mon Sep 17 00:00:00 2001
From: Michael Harrison <michael.harrison31@nhs.net>
Date: Fri, 28 Nov 2025 15:56:13 +0000
Subject: [PATCH 2/6] CCM-11496: snapshot whitespace

---
 .../__snapshots__/page.test.tsx.snap               | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/src/__tests__/app/choose-templates/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/choose-templates/__snapshots__/page.test.tsx.snap
index 494ecaf1f..457ddc81c 100644
--- a/frontend/src/__tests__/app/choose-templates/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/choose-templates/__snapshots__/page.test.tsx.snap
@@ -119,7 +119,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
                       >
                         NHS App
                       </span>
-
+                       
                       template
                     </a>
                   </li>
@@ -147,7 +147,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
                         >
                           NHS App
                         </span>
-
+                         
                         template
                       </button>
                     </form>
@@ -292,7 +292,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
                       >
                         Text message (SMS)
                       </span>
-
+                       
                       template
                     </a>
                   </li>
@@ -320,7 +320,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
                         >
                           Text message (SMS)
                         </span>
-
+                         
                         template
                       </button>
                     </form>
@@ -459,7 +459,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
                       >
                         Email
                       </span>
-
+                       
                       template
                     </a>
                   </li>
@@ -603,7 +603,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
                       >
                         Letter
                       </span>
-
+                       
                       template
                     </a>
                   </li>
@@ -631,7 +631,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
                         >
                           Letter
                         </span>
-
+                         
                         template
                       </button>
                     </form>

From b98ecda980bd148cdad0fb5accedaac8c2f05bb6 Mon Sep 17 00:00:00 2001
From: Michael Harrison <michael.harrison31@nhs.net>
Date: Mon, 1 Dec 2025 12:26:34 +0000
Subject: [PATCH 3/6] CCM-11496: fix merge

---
 .../pages/routing/get-ready-to-move-page.ts   |  7 ++++---
 ...ady-to-move-page.routing-component.spec.ts | 20 +++++++++++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/tests/test-team/pages/routing/get-ready-to-move-page.ts b/tests/test-team/pages/routing/get-ready-to-move-page.ts
index 524c00ad6..f19fa6480 100644
--- a/tests/test-team/pages/routing/get-ready-to-move-page.ts
+++ b/tests/test-team/pages/routing/get-ready-to-move-page.ts
@@ -1,8 +1,9 @@
 import type { Locator, Page } from '@playwright/test';
-import { TemplateMgmtBasePageDynamic } from 'pages/template-mgmt-base-page-dynamic';
+import { TemplateMgmtBasePage } from 'pages/template-mgmt-base-page';
 
-export class RoutingGetReadyToMovePage extends TemplateMgmtBasePageDynamic {
-  static readonly pageUrlSegments = ['message-plans/get-ready-to-move'];
+export class RoutingGetReadyToMovePage extends TemplateMgmtBasePage {
+  static readonly pathTemplate =
+    '/message-plans/get-ready-to-move/:messagePlanId';
 
   public readonly continueLink: Locator;
 
diff --git a/tests/test-team/template-mgmt-routing-component-tests/get-ready-to-move-page.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/get-ready-to-move-page.routing-component.spec.ts
index 29da2e0d9..b21630e6f 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/get-ready-to-move-page.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/get-ready-to-move-page.routing-component.spec.ts
@@ -35,8 +35,10 @@ test.describe('Get Ready To Move Page', () => {
     await routingConfigStorage.seed([routingConfig.dbEntry]);
 
     const props = {
-      page: new RoutingGetReadyToMovePage(page),
-      id: routingConfig.dbEntry.id,
+      page: new RoutingGetReadyToMovePage(page).setPathParam(
+        'messagePlanId',
+        routingConfig.dbEntry.id
+      ),
       baseURL,
     };
 
@@ -54,9 +56,12 @@ test.describe('Get Ready To Move Page', () => {
 
     await routingConfigStorage.seed([routingConfig.dbEntry]);
 
-    const getReadyToMovePage = new RoutingGetReadyToMovePage(page);
+    const getReadyToMovePage = new RoutingGetReadyToMovePage(page).setPathParam(
+      'messagePlanId',
+      routingConfig.dbEntry.id
+    );
 
-    await getReadyToMovePage.loadPage(routingConfig.dbEntry.id);
+    await getReadyToMovePage.loadPage();
 
     await expect(page).toHaveURL(
       `${baseURL}/templates/message-plans/get-ready-to-move/${routingConfig.dbEntry.id}`
@@ -77,9 +82,12 @@ test.describe('Get Ready To Move Page', () => {
 
     await routingConfigStorage.seed([routingConfig.dbEntry]);
 
-    const getReadyToMovePage = new RoutingGetReadyToMovePage(page);
+    const getReadyToMovePage = new RoutingGetReadyToMovePage(page).setPathParam(
+      'messagePlanId',
+      routingConfig.dbEntry.id
+    );
 
-    await getReadyToMovePage.loadPage(routingConfig.dbEntry.id);
+    await getReadyToMovePage.loadPage();
 
     await expect(page).toHaveURL(
       `${baseURL}/templates/message-plans/get-ready-to-move/${routingConfig.dbEntry.id}`

From 4cba1507c357d6eb6d6d02c2124ccf7966ac61a6 Mon Sep 17 00:00:00 2001
From: Michael Harrison <michael.harrison31@nhs.net>
Date: Tue, 2 Dec 2025 11:16:26 +0000
Subject: [PATCH 4/6] CCM-11496: update test page model method name

---
 tests/test-team/pages/template-mgmt-message-templates-page.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test-team/pages/template-mgmt-message-templates-page.ts b/tests/test-team/pages/template-mgmt-message-templates-page.ts
index d944547c5..c85bfa19d 100644
--- a/tests/test-team/pages/template-mgmt-message-templates-page.ts
+++ b/tests/test-team/pages/template-mgmt-message-templates-page.ts
@@ -19,12 +19,12 @@ export class TemplateMgmtMessageTemplatesPage extends TemplateMgmtBasePage {
     await this.createTemplateButton.click();
   }
 
-  async getRowByTemplateId(id: string) {
+  async getTemplatesTableRowByTemplateId(id: string) {
     return this.page.locator(`tbody tr:has(td:nth-child(2):has-text("${id}"))`);
   }
 
   async getTemplateStatus(templateId: string) {
-    const row = await this.getRowByTemplateId(templateId);
+    const row = await this.getTemplatesTableRowByTemplateId(templateId);
 
     const statusCell = row.locator('td:nth-child(4) .nhsuk-tag');
 

From 6ded996f3dd2ec1212e695ee552f118102549b03 Mon Sep 17 00:00:00 2001
From: Michael Harrison <michael.harrison31@nhs.net>
Date: Tue, 2 Dec 2025 12:49:03 +0000
Subject: [PATCH 5/6] CCM-11496: use summary list

---
 .../__snapshots__/page.test.tsx.snap          | 34 ++++++++-----------
 .../[routingConfigId]/page.module.scss        | 22 ------------
 .../[routingConfigId]/page.tsx                | 23 ++++++-------
 3 files changed, 26 insertions(+), 53 deletions(-)
 delete mode 100644 frontend/src/app/message-plans/get-ready-to-move/[routingConfigId]/page.module.scss

diff --git a/frontend/src/__tests__/app/message-plans/get-ready-to-move/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/get-ready-to-move/__snapshots__/page.test.tsx.snap
index 080376e4d..d30aeb20a 100644
--- a/frontend/src/__tests__/app/message-plans/get-ready-to-move/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/message-plans/get-ready-to-move/__snapshots__/page.test.tsx.snap
@@ -23,28 +23,24 @@ exports[`matches snapshot 1`] = `
         >
           Get ready to move message plan to production
         </h1>
-        <table
-          class="nhsuk-u-margin-bottom-6 table"
+        <dl
+          class="nhsuk-summary-list"
         >
-          <tbody
-            class="nhsuk-table__body"
+          <div
+            class="nhsuk-summary-list__row"
           >
-            <tr
-              class="nhsuk-table__row"
+            <dt
+              class="nhsuk-summary-list__key"
             >
-              <th
-                class="nhsuk-table__cell"
-              >
-                Name
-              </th>
-              <td
-                class="nhsuk-table__cell"
-              >
-                My Routing Config
-              </td>
-            </tr>
-          </tbody>
-        </table>
+              Name
+            </dt>
+            <dd
+              class="nhsuk-summary-list__value"
+            >
+              My Routing Config
+            </dd>
+          </div>
+        </dl>
         <p>
           Moving message plans from draft to production means they are ready to send.
         </p>
diff --git a/frontend/src/app/message-plans/get-ready-to-move/[routingConfigId]/page.module.scss b/frontend/src/app/message-plans/get-ready-to-move/[routingConfigId]/page.module.scss
deleted file mode 100644
index b29957406..000000000
--- a/frontend/src/app/message-plans/get-ready-to-move/[routingConfigId]/page.module.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-.table {
-  background-color: var(--nhsuk-card-background-colour);
-  border: 1px solid var(--nhsuk-border-colour);
-
-  tr {
-    border-bottom: 1px solid var(--nhsuk-border-colour);
-  }
-
-  th {
-    width: 20%;
-    color: var(--nhsuk-grey-1-colour);
-  }
-
-  th,
-  td {
-    padding: 1rem;
-  }
-
-  tr:hover {
-    background-color: inherit;
-  }
-}
diff --git a/frontend/src/app/message-plans/get-ready-to-move/[routingConfigId]/page.tsx b/frontend/src/app/message-plans/get-ready-to-move/[routingConfigId]/page.tsx
index f6611586e..bea27ce1c 100644
--- a/frontend/src/app/message-plans/get-ready-to-move/[routingConfigId]/page.tsx
+++ b/frontend/src/app/message-plans/get-ready-to-move/[routingConfigId]/page.tsx
@@ -1,4 +1,3 @@
-import classNames from 'classnames';
 import type { Metadata } from 'next';
 import { redirect, RedirectType } from 'next/navigation';
 import type { MessagePlanPageProps } from 'nhs-notify-web-template-management-utils';
@@ -7,7 +6,6 @@ import { NHSNotifyMain } from '@atoms/NHSNotifyMain/NHSNotifyMain';
 import content from '@content/content';
 import { ContentRenderer } from '@molecules/ContentRenderer/ContentRenderer';
 import { getRoutingConfig } from '@utils/message-plans';
-import styles from './page.module.scss';
 
 const pageContent = content.pages.messagePlanGetReadyToMoveToProduction();
 
@@ -32,17 +30,18 @@ export default async function MessagePlanGetReadyToMoveToProductionPage({
         <div className='nhsuk-grid-column-two-thirds'>
           <span className='nhsuk-caption-xl'>{pageContent.stepCounter}</span>
           <h1 className='nhsuk-heading-xl'>{pageContent.heading}</h1>
-          <table
-            className={classNames('nhsuk-u-margin-bottom-6', styles.table)}
-          >
-            <tbody className='nhsuk-table__body'>
-              <tr className='nhsuk-table__row'>
-                <th className='nhsuk-table__cell'>Name</th>
-                <td className='nhsuk-table__cell'>{routingConfig.name}</td>
-              </tr>
-            </tbody>
-          </table>
+
+          <dl className='nhsuk-summary-list'>
+            <div className='nhsuk-summary-list__row'>
+              <dt className='nhsuk-summary-list__key'>Name</dt>
+              <dd className='nhsuk-summary-list__value'>
+                {routingConfig.name}
+              </dd>
+            </div>
+          </dl>
+
           <ContentRenderer content={pageContent.content} />
+
           <div className='nhsuk-warning-callout'>
             <h3 className='nhsuk-warning-callout__label'>
               {pageContent.callout.label}

From 212b911261df2a0d281f205b4a1866ecb8c76081 Mon Sep 17 00:00:00 2001
From: Michael Harrison <michael.harrison31@nhs.net>
Date: Wed, 10 Dec 2025 10:36:53 +0000
Subject: [PATCH 6/6] CCM-11496: link text

---
 .../get-ready-to-move/__snapshots__/page.test.tsx.snap        | 4 ++--
 frontend/src/content/content.ts                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/__tests__/app/message-plans/get-ready-to-move/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/get-ready-to-move/__snapshots__/page.test.tsx.snap
index d30aeb20a..df9f80d71 100644
--- a/frontend/src/__tests__/app/message-plans/get-ready-to-move/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/message-plans/get-ready-to-move/__snapshots__/page.test.tsx.snap
@@ -54,7 +54,7 @@ exports[`matches snapshot 1`] = `
             rel="noopener noreferrer"
             target="_blank"
           >
-            NHS Notify API
+            NHS Notify API (opens in a new tab)
           </a>
            or 
           <a
@@ -62,7 +62,7 @@ exports[`matches snapshot 1`] = `
             rel="noopener noreferrer"
             target="_blank"
           >
-            NHS Notify MESH
+            NHS Notify MESH (opens in a new tab)
           </a>
           .
         </p>
diff --git a/frontend/src/content/content.ts b/frontend/src/content/content.ts
index 6c4619d8c..ce4c39818 100644
--- a/frontend/src/content/content.ts
+++ b/frontend/src/content/content.ts
@@ -1249,7 +1249,7 @@ const messagePlanGetReadyToMoveToProduction = () => {
     },
     {
       type: 'text',
-      text: 'Messages will only be sent to recipients when you make a request with [NHS Notify API](https://digital.nhs.uk/developer/api-catalogue/nhs-notify) or [NHS Notify MESH](https://digital.nhs.uk/developer/api-catalogue/nhs-notify-mesh).',
+      text: 'Messages will only be sent to recipients when you make a request with [NHS Notify API (opens in a new tab)](https://digital.nhs.uk/developer/api-catalogue/nhs-notify) or [NHS Notify MESH (opens in a new tab)](https://digital.nhs.uk/developer/api-catalogue/nhs-notify-mesh).',
     },
     {
       type: 'text',