CCM-8580: fixes post 15 rebase

Author: alexnuttall

frontend/src/__tests__/app/copy-template/page.test.tsx

@@ -35,41 +35,13 @@ describe('CopyTemplatePage', () => {
   it('should load page', async () => {
     getTemplateMock.mockResolvedValueOnce(template);
 
-    const page = await CopyTemplatePage({
-      params: {
-        templateId: 'template-id',
-      },
-    });
-
-    expect(page).toEqual(
-      <CopyTemplate
-        template={template}
-        templateTypes={Object.values(TemplateType)}
-      />
-    );
-  });
-
-  it('Letter option is hidden when the feature flag is not enabled', async () => {
-    process.env.NEXT_PUBLIC_ENABLE_LETTERS = 'false';
-
-    getTemplateMock.mockResolvedValueOnce(template);
-
     const page = await CopyTemplatePage({
       params: Promise.resolve({
         templateId: 'template-id',
       }),
     });
 
-    expect(page).toEqual(
-      <CopyTemplate
-        template={template}
-        templateTypes={[
-          TemplateType.NHS_APP,
-          TemplateType.EMAIL,
-          TemplateType.SMS,
-        ]}
-      />
-    );
+    expect(page).toEqual(<CopyTemplate template={template} />);
   });
 
   it('should redirect to invalid-template when no templateId is found', async () => {

frontend/src/__tests__/app/create-letter-template/page.test.tsx

@@ -15,6 +15,8 @@ describe('CreateLetterTemplatePage', () => {
   it('returns 404 when letters feature flag is not enabled', async () => {
     process.env.NEXT_PUBLIC_ENABLE_LETTERS = 'false';
 
-    await expect(CreateLetterTemplatePage()).rejects.toThrow('NEXT_NOT_FOUND');
+    await expect(CreateLetterTemplatePage()).rejects.toThrow(
+      'NEXT_HTTP_ERROR_FALLBACK;404'
+    );
   });
 });

frontend/src/components/forms/ChooseTemplate/ChooseTemplate.tsx

@@ -13,7 +13,11 @@ import {
 import { NHSNotifyMain } from '@atoms/NHSNotifyMain/NHSNotifyMain';
 import { chooseTemplateAction } from './server-action';
 
-export const ChooseTemplate = () => {
+export const ChooseTemplate = ({
+  templateTypes,
+}: {
+  templateTypes: TemplateType[];
+}) => {
   const [state, action] = useActionState(chooseTemplateAction, {});
 
   const options = templateTypes.map((templateType) => ({