Skip to content

Fix delete option is missing from report details page after split and delete one of the splits #75953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dangrous merged 5 commits into from
Dec 1, 2025
Merged

Fix delete option is missing from report details page after split and delete one of the splits #75953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
437a690
fix report is not a one-transaction report if it has deleted IOU action
bernhardoj Nov 25, 2025
b0018a2
Merge branch 'main' into fix/74741-missing-delete-option-from-details…
bernhardoj Nov 27, 2025
4d6c64f
update comment
bernhardoj Nov 27, 2025
1c114d1
add unit test
bernhardoj Nov 27, 2025
787dab7
prettier
bernhardoj Nov 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/libs/ReportActionsUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
type MemberChangeMessageElement = MessageTextElement | MemberChangeMessageUserMentionElement | MemberChangeMessageRoomReferenceElement;

let allReportActions: OnyxCollection<ReportActions>;
Onyx.connect({

Check warning on line 60 in src/libs/ReportActionsUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
waitForCollectionCallback: true,
callback: (actions) => {
Expand All @@ -69,7 +69,7 @@
});

let allReports: OnyxCollection<Report>;
Onyx.connect({

Check warning on line 72 in src/libs/ReportActionsUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.REPORT,
waitForCollectionCallback: true,
callback: (value) => {
Expand All @@ -78,14 +78,14 @@
});

let isNetworkOffline = false;
Onyx.connect({

Check warning on line 81 in src/libs/ReportActionsUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.NETWORK,
callback: (val) => (isNetworkOffline = val?.isOffline ?? false),
});

let currentUserAccountID: number | undefined;
let currentEmail = '';
Onyx.connect({

Check warning on line 88 in src/libs/ReportActionsUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.SESSION,
callback: (value) => {
// When signed out, value is undefined
Expand All @@ -99,7 +99,7 @@
});

let privatePersonalDetails: PrivatePersonalDetails | undefined;
Onyx.connect({

Check warning on line 102 in src/libs/ReportActionsUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.PRIVATE_PERSONAL_DETAILS,
callback: (personalDetails) => {
privatePersonalDetails = personalDetails;
Expand Down Expand Up @@ -1372,10 +1372,9 @@
if (
actionType &&
iouRequestTypesSet.has(actionType) &&
// Include deleted IOU reportActions if:
// - they have an associated IOU transaction ID or
// - the action is pending deletion and the user is offline
(!!originalMessage?.IOUTransactionID || (action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && (isOffline ?? isNetworkOffline)))
!!originalMessage?.IOUTransactionID &&
// Include deleted IOU reportActions if the action is pending deletion and the user is offline
(!isDeletedAction(action) || (action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && (isOffline ?? isNetworkOffline)))
) {
if (iouRequestAction !== null) {
// We found a second action so this is for sure not a one-transaction report
Expand Down
17 changes: 17 additions & 0 deletions tests/unit/ReportActionsUtilsTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,13 @@ describe('ReportActionsUtils', () => {
childReportID: 'existingChildReportID',
};

const deletedLinkedActionWithChildReportID: ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> = {
...mockIOUAction,
message: [{deleted: '2025-11-27 09:06:16.568', type: 'COMMENT', text: ''}],
originalMessage: {...originalMessage, IOUTransactionID: '123'},
childReportID: 'existingChildReportID',
};

const linkedActionWithoutChildReportID = {
...mockIOUAction,
originalMessage: {...originalMessage, IOUTransactionID},
Expand Down Expand Up @@ -436,6 +443,16 @@ describe('ReportActionsUtils', () => {
const result = ReportActionsUtils.getOneTransactionThreadReportAction(mockedReports[IOUReportID], mockedReports[mockChatReportID], [payAction], false, [IOUTransactionID]);
expect(result).toBeUndefined();
});

it('should return action when single IOU action and deleted IOU action exist', () => {
const result = ReportActionsUtils.getOneTransactionThreadReportAction(
mockedReports[IOUReportID],
mockedReports[mockChatReportID],
[linkedActionWithChildReportID, deletedLinkedActionWithChildReportID],
false,
);
expect(result).toEqual(linkedActionWithChildReportID);
});
});

describe('getOneTransactionThreadReportID', () => {
Expand Down
Loading