fix wrong HOC order

Expensify · Mar 27, 2024 · fffd56b · fffd56b
1 parent ff173b4
commit fffd56b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/src/pages/iou/request/step/IOURequestStepDate.tsx b/src/pages/iou/request/step/IOURequestStepDate.tsx
@@ -121,12 +121,7 @@ function IOURequestStepDate({
 
 IOURequestStepDate.displayName = 'IOURequestStepDate';
 
-// eslint-disable-next-line rulesdir/no-negated-variables
-const IOURequestStepDateWithWritableReportOrNotFound = withWritableReportOrNotFound(IOURequestStepDate);
-// eslint-disable-next-line rulesdir/no-negated-variables
-const IOURequestStepDateWithFullTransactionOrNotFound = withFullTransactionOrNotFound(IOURequestStepDateWithWritableReportOrNotFound);
-
-export default withOnyx<IOURequestStepDateProps, IOURequestStepDateOnyxProps>({
+const IOURequestStepDateWithOnyx = withOnyx<IOURequestStepDateProps, IOURequestStepDateOnyxProps>({
     splitDraftTransaction: {
         key: ({route}) => {
             const transactionID = route?.params.transactionID ?? 0;
@@ -142,5 +137,11 @@ export default withOnyx<IOURequestStepDateProps, IOURequestStepDateOnyxProps>({
     policyTags: {
         key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '0'}`,
     },
-    // @ts-expect-error TODO: Remove this once withFullTransactionOrNotFound (https://github.com/Expensify/App/issues/36123) is migrated to TypeScript.
-})(IOURequestStepDateWithFullTransactionOrNotFound);
+})(IOURequestStepDate);
+
+// eslint-disable-next-line rulesdir/no-negated-variables
+const IOURequestStepDateWithWritableReportOrNotFound = withWritableReportOrNotFound(IOURequestStepDateWithOnyx);
+// eslint-disable-next-line rulesdir/no-negated-variables
+const IOURequestStepDateWithFullTransactionOrNotFound = withFullTransactionOrNotFound(IOURequestStepDateWithWritableReportOrNotFound);
+
+export default IOURequestStepDateWithFullTransactionOrNotFound;
diff --git a/src/pages/iou/request/step/IOURequestStepDescription.tsx b/src/pages/iou/request/step/IOURequestStepDescription.tsx
@@ -189,12 +189,7 @@ function IOURequestStepDescription({
 
 IOURequestStepDescription.displayName = 'IOURequestStepDescription';
 
-// eslint-disable-next-line rulesdir/no-negated-variables
-const IOURequestStepDescriptionWithWritableReportOrNotFound = withWritableReportOrNotFound(IOURequestStepDescription);
-// eslint-disable-next-line rulesdir/no-negated-variables
-const IOURequestStepDescriptionWithFullTransactionOrNotFound = withFullTransactionOrNotFound(IOURequestStepDescriptionWithWritableReportOrNotFound);
-
-export default withOnyx<IOURequestStepDescriptionProps, IOURequestStepDescriptionOnyxProps>({
+const IOURequestStepDescriptionWithOnyx = withOnyx<IOURequestStepDescriptionProps, IOURequestStepDescriptionOnyxProps>({
     splitDraftTransaction: {
         key: ({route}) => {
             const transactionID = route?.params.transactionID ?? 0;
@@ -228,5 +223,11 @@ export default withOnyx<IOURequestStepDescriptionProps, IOURequestStepDescriptio
     session: {
         key: ONYXKEYS.SESSION,
     },
-    // @ts-expect-error TODO: Remove this once withFullTransactionOrNotFound (https://github.com/Expensify/App/issues/36123) is migrated to TypeScript.
-})(IOURequestStepDescriptionWithFullTransactionOrNotFound);
+})(IOURequestStepDescription);
+
+// eslint-disable-next-line rulesdir/no-negated-variables
+const IOURequestStepDescriptionWithWritableReportOrNotFound = withWritableReportOrNotFound(IOURequestStepDescriptionWithOnyx);
+// eslint-disable-next-line rulesdir/no-negated-variables
+const IOURequestStepDescriptionWithFullTransactionOrNotFound = withFullTransactionOrNotFound(IOURequestStepDescriptionWithWritableReportOrNotFound);
+
+export default IOURequestStepDescriptionWithFullTransactionOrNotFound;