Refactor send money flow function and improve help content logic

Author: blazejkustra

src/components/SidePanel/HelpComponents/HelpContent.tsx

@@ -50,12 +50,13 @@ function HelpContent({closeSidePanel}: HelpContentProps) {
         selector: (actions) =>
             Object.values(actions ?? {})
                 .filter((action) => action.reportActionID === report?.parentReportActionID)
+                .filter(isMoneyRequestAction)
                 .at(0),
     });
 
     const transactionID = useMemo(() => {
         const transactionThreadReportAction = getOneTransactionThreadReportAction(report, chatReport, reportActions ?? []);
-        return getOriginalMessage(isMoneyRequestAction(parentIOUReportAction) ? parentIOUReportAction : transactionThreadReportAction)?.IOUTransactionID;
+        return getOriginalMessage(parentIOUReportAction ?? transactionThreadReportAction)?.IOUTransactionID;
     }, [report, chatReport, reportActions, parentIOUReportAction]);
     const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {canBeMissing: true});
 

src/libs/ReportActionsUtils.ts

@@ -1198,7 +1198,7 @@ function isTagModificationAction(actionName: string): boolean {
  * Used for Send Money flow, which is a special case where we have no IOU create action and only one IOU pay action.
  * In other reports, pay actions do not count as a transactions, but this is an exception to this rule.
  */
-function getSendMoneyFlowOneTransactionReportAction(actions: OnyxEntry<ReportActions> | ReportAction[], chatReport: OnyxEntry<Report>): ReportAction<'IOU'> | undefined {
+function getSendMoneyFlowAction(actions: OnyxEntry<ReportActions> | ReportAction[], chatReport: OnyxEntry<Report>): ReportAction<'IOU'> | undefined {
     if (!chatReport) {
         return undefined;
     }
@@ -1273,7 +1273,7 @@ function getOneTransactionThreadReportAction(
         return;
     }
 
-    const sendMoneyFlow = getSendMoneyFlowOneTransactionReportAction(reportActions, chatReport);
+    const sendMoneyFlow = getSendMoneyFlowAction(reportActions, chatReport);
 
     if (sendMoneyFlow?.childReportID) {
         return sendMoneyFlow;
@@ -3099,7 +3099,7 @@ export {
     getWorkspaceDescriptionUpdatedMessage,
     getWorkspaceReportFieldAddMessage,
     getWorkspaceCustomUnitRateAddedMessage,
-    getSendMoneyFlowOneTransactionReportAction,
+    getSendMoneyFlowAction,
     getWorkspaceTagUpdateMessage,
     getWorkspaceReportFieldUpdateMessage,
     getWorkspaceReportFieldDeleteMessage,

tests/unit/ReportActionsUtilsTest.ts

@@ -6,7 +6,7 @@ import {actionR14932 as mockIOUAction, originalMessageR14932 as mockOriginalMess
 import {chatReportR14932 as mockChatReport, iouReportR14932 as mockIOUReport} from '../../__mocks__/reportData/reports';
 import CONST from '../../src/CONST';
 import * as ReportActionsUtils from '../../src/libs/ReportActionsUtils';
-import {getOneTransactionThreadReportID, getOriginalMessage, getSendMoneyFlowOneTransactionReportAction, isIOUActionMatchingTransactionList} from '../../src/libs/ReportActionsUtils';
+import {getOneTransactionThreadReportID, getOriginalMessage, getSendMoneyFlowAction, isIOUActionMatchingTransactionList} from '../../src/libs/ReportActionsUtils';
 import ONYXKEYS from '../../src/ONYXKEYS';
 import type {Report, ReportAction} from '../../src/types/onyx';
 import {createRandomReport} from '../utils/collections/reports';
@@ -856,7 +856,7 @@ describe('ReportActionsUtils', () => {
         });
     });
 
-    describe('getSendMoneyFlowOneTransactionReportAction', () => {
+    describe('getSendMoneyFlowAction', () => {
         const mockChatReportID = `${ONYXKEYS.COLLECTION.REPORT}REPORT` as const;
         const mockDMChatReportID = `${ONYXKEYS.COLLECTION.REPORT}REPORT_DM` as const;
         const childReportID = `${ONYXKEYS.COLLECTION.REPORT}childReport123` as const;
@@ -891,27 +891,27 @@ describe('ReportActionsUtils', () => {
         };
 
         it('should return undefined for a single non-IOU action', () => {
-            expect(getSendMoneyFlowOneTransactionReportAction([nonIOUAction], mockedReports[mockDMChatReportID])?.childReportID).toBeUndefined();
+            expect(getSendMoneyFlowAction([nonIOUAction], mockedReports[mockDMChatReportID])?.childReportID).toBeUndefined();
         });
 
         it('should return undefined for multiple IOU actions regardless of type', () => {
-            expect(getSendMoneyFlowOneTransactionReportAction([payAction, payAction], mockedReports[mockDMChatReportID])?.childReportID).toBeUndefined();
+            expect(getSendMoneyFlowAction([payAction, payAction], mockedReports[mockDMChatReportID])?.childReportID).toBeUndefined();
         });
 
         it('should return undefined for a single IOU action that is not `Pay`', () => {
-            expect(getSendMoneyFlowOneTransactionReportAction([createAction], mockedReports[mockDMChatReportID])?.childReportID).toBeUndefined();
+            expect(getSendMoneyFlowAction([createAction], mockedReports[mockDMChatReportID])?.childReportID).toBeUndefined();
         });
 
         it('should return the appropriate childReportID for a valid single `Pay` IOU action in DM chat', () => {
-            expect(getSendMoneyFlowOneTransactionReportAction([payAction], mockedReports[mockDMChatReportID])?.childReportID).toEqual(childReportID);
+            expect(getSendMoneyFlowAction([payAction], mockedReports[mockDMChatReportID])?.childReportID).toEqual(childReportID);
         });
 
         it('should return undefined for a valid single `Pay` IOU action in a chat that is not DM', () => {
-            expect(getSendMoneyFlowOneTransactionReportAction([payAction], mockedReports[mockChatReportID])?.childReportID).toBeUndefined();
+            expect(getSendMoneyFlowAction([payAction], mockedReports[mockChatReportID])?.childReportID).toBeUndefined();
         });
 
         it('should return undefined for a valid `Pay` IOU action in DM chat that has also a create IOU action', () => {
-            expect(getSendMoneyFlowOneTransactionReportAction([payAction, createAction], mockedReports[mockDMChatReportID])?.childReportID).toBeUndefined();
+            expect(getSendMoneyFlowAction([payAction, createAction], mockedReports[mockDMChatReportID])?.childReportID).toBeUndefined();
         });
     });