failed conflict fix (I do not think I will use GitHub in the future to fix merge conflicts)

Author: Peter-Hudson-G

src/components/form-elements/date-input/DateInputContext.ts

@@ -5,7 +5,7 @@ import { createContext, type ChangeEvent } from 'react';
 export type IDateInputContext = {
   id: string;
   name: string;
-  error: string | undefined;
+  error: React.ReactNode | undefined;
   value?: { day?: string; month?: string; year?: string };
   defaultValue?: { day?: string; month?: string; year?: string };
   handleChange: (inputType: 'day' | 'month' | 'year', event: ChangeEvent<HTMLInputElement>) => void;

stories/Form Elements/Checkboxes.stories.tsx

@@ -101,18 +101,6 @@ export const WithHintHTML: Story = {
   ),
 };
 
-export const WithDisabledItem: Story = {
-  render: (args) => (
-    <form>
-      <Checkboxes id="colours" name="colours">
-        <Checkboxes.Item value="red">Red</Checkboxes.Item>
-        <Checkboxes.Item value="green">Green</Checkboxes.Item>
-        <Checkboxes.Item value="red" disabled>
-          Blue
-        </Checkboxes.Item>
-      </Checkboxes>
-    </form>
-  ),
 export const Small: Story = {
   args: {
     ...Standard.args,

stories/Form Elements/Radios.stories.tsx

@@ -132,8 +132,8 @@ export const RadiosWithHTMLHintsOnItems: Story = {
           <>
             You&#39;ll{' '}
             <span className="nhsuk-u-nowrap">
-              have a user ID if you've registered for self-assessment or filed a tax return online
-              before.
+              have a user ID if you&apos;ve registered for self-assessment or filed a tax return
+              online before.
             </span>
           </>
         }
@@ -158,7 +158,6 @@ export const RadiosWithHTMLHintsOnItems: Story = {
   ),
 };
 
-
 export const SmallRadios: Story = {
   args: {
     ...StandardRadios.args,

stories/Form Elements/Select.stories.tsx

@@ -94,7 +94,7 @@ export const SelectWithErrorAndHintText: Story = {
   args: {
     hint: 'Hint text goes here',
   },
-  render: function SelectWithErrorAndHintTextRender() {
+  render: function SelectWithErrorAndHintTextRender(args) {
     const [error, setError] = useState<string>('Error message goes here');
     return (
       <>