refactor: remove WithWritableReportOrNotFoundOnyxProps and add report…

… & reportDraft in WithWritableReportOrNotFoundProps

src/pages/iou/request/step/withWritableReportOrNotFound.tsx

@@ -14,14 +14,6 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
 import type {Report} from '@src/types/onyx';
 
-type WithWritableReportOrNotFoundOnyxProps = {
-    /** The report corresponding to the reportID in the route params */
-    report: OnyxEntry<Report>;
-
-    /** The draft report corresponding to the reportID in the route params */
-    reportDraft: OnyxEntry<Report>;
-};
-
 type MoneyRequestRouteName =
     | typeof SCREENS.MONEY_REQUEST.STEP_WAYPOINT
     | typeof SCREENS.MONEY_REQUEST.STEP_DESCRIPTION
@@ -44,7 +36,15 @@ type MoneyRequestRouteName =
 
 type Route<T extends MoneyRequestRouteName> = RouteProp<MoneyRequestNavigatorParamList, T>;
 
-type WithWritableReportOrNotFoundProps<T extends MoneyRequestRouteName> = WithWritableReportOrNotFoundOnyxProps & {route: Route<T>};
+type WithWritableReportOrNotFoundProps<T extends MoneyRequestRouteName> = {
+    /** The report corresponding to the reportID in the route params */
+    report: OnyxEntry<Report>;
+
+    /** The draft report corresponding to the reportID in the route params */
+    reportDraft: OnyxEntry<Report>;
+
+    route: Route<T>
+};
 
 export default function <TProps extends WithWritableReportOrNotFoundProps<MoneyRequestRouteName>, TRef>(
     WrappedComponent: ComponentType<TProps & RefAttributes<TRef>>,