Skip to content

fix: "On Hold" status is not removed after expense is moved to Self DM #70593

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
AndrewGable merged 3 commits into from
Oct 16, 2025
+34 −0
Merged

fix: "On Hold" status is not removed after expense is moved to Self DM #70593

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
747e560
fix: "On Hold" status is not removed after expense is moved to Self DM
daledah Sep 15, 2025
aec22e7
Merge branch 'main' into fix/69109
daledah Oct 10, 2025
7ae48f3
fix: add missing param to API call
daledah Oct 10, 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
34 changes: 34 additions & 0 deletions src/libs/actions/Transaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
buildOptimisticDismissedViolationReportAction,
buildOptimisticMovedTransactionAction,
buildOptimisticSelfDMReport,
buildOptimisticUnHoldReportAction,
buildOptimisticUnreportedTransactionAction,
buildTransactionThread,
findSelfDMReportID,
Expand Down Expand Up @@ -50,13 +51,13 @@
import {getPolicyTagsData} from './Policy/Tag';

let recentWaypoints: RecentWaypoint[] = [];
Onyx.connect({

Check warning on line 54 in src/libs/actions/Transaction.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.NVP_RECENT_WAYPOINTS,
callback: (val) => (recentWaypoints = val ?? []),
});

const allTransactions: Record<string, Transaction> = {};
Onyx.connect({

Check warning on line 60 in src/libs/actions/Transaction.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.TRANSACTION,
callback: (transaction, key) => {
if (!key || !transaction) {
Expand All @@ -68,7 +69,7 @@
});

let allTransactionDrafts: OnyxCollection<Transaction> = {};
Onyx.connect({

Check warning on line 72 in src/libs/actions/Transaction.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.TRANSACTION_DRAFT,
waitForCollectionCallback: true,
callback: (value) => {
Expand All @@ -77,7 +78,7 @@
});

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

Check warning on line 81 in src/libs/actions/Transaction.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 @@ -89,7 +90,7 @@
});

const allTransactionViolation: OnyxCollection<TransactionViolation[]> = {};
Onyx.connect({

Check warning on line 93 in src/libs/actions/Transaction.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.TRANSACTION_VIOLATIONS,
callback: (transactionViolation, key) => {
if (!key || !transactionViolation) {
Expand All @@ -101,7 +102,7 @@
});

let allTransactionViolations: TransactionViolations = [];
Onyx.connect({

Check warning on line 105 in src/libs/actions/Transaction.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.TRANSACTION_VIOLATIONS,
callback: (val) => (allTransactionViolations = val ?? []),
});
Expand Down Expand Up @@ -776,6 +777,9 @@
key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`,
value: {
reportID,
comment: {
hold: null,
},
},
});

Expand All @@ -792,6 +796,9 @@
key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`,
value: {
reportID: transaction.reportID,
comment: {
hold: transaction.comment?.hold,
},
},
});

Expand Down Expand Up @@ -1111,6 +1118,33 @@
} else {
transactionIDToReportActionAndThreadData[transaction.transactionID] = baseTransactionData;
}

// Build unhold report action
if (isOnHold(transaction)) {
Copy link
Contributor

@eh2077 eh2077 Feb 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this caused

we should only add remove unhold message for unimported report

const unHoldAction = buildOptimisticUnHoldReportAction();
optimisticData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`,
value: {[unHoldAction.reportActionID]: unHoldAction},
});

successData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`,
value: {[unHoldAction.reportActionID]: {pendingAction: null}},
});

failureData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`,
value: {[unHoldAction.reportActionID]: null},
});

transactionIDToReportActionAndThreadData[transaction.transactionID] = {
...transactionIDToReportActionAndThreadData[transaction.transactionID],
unholdReportActionID: unHoldAction.reportActionID,
};
}
Copy link
Contributor

@allgandalf allgandalf Oct 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
}
}
transactionIDToReportActionAndThreadData[transaction.transactionID] = {
...transactionIDToReportActionAndThreadData[transaction.transactionID],
unholdReportActionID: unHoldAction.reportActionID,
};
}

Copy link
Contributor

@allgandalf allgandalf Oct 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@daledah if you implement the above changes, you should be all set to open this PR for review

Copy link
Contributor

@allgandalf allgandalf Oct 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

c.c. @ahmedGaber93 for viz

});

if (!transactionsMoved) {
Expand Down
Loading