Skip to content

Commit 1a0aa79

Browse files
authored
Merge pull request Expensify#82968 from Expensify/claude-filterPendingDeleteTransactionsFromActions
Filter pending-delete transactions from action determination in MoneyReportHeader
2 parents 84bc68f + 508ff81 commit 1a0aa79

1 file changed

Lines changed: 16 additions & 6 deletions

File tree

src/components/MoneyReportHeader.tsx

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ import {
103103
isPending,
104104
isPerDiemRequest,
105105
isScanning,
106+
isTransactionPendingDelete,
106107
shouldShowBrokenConnectionViolationForMultipleTransactions,
107108
} from '@libs/TransactionUtils';
108109
import type {ExportType} from '@pages/inbox/report/ReportDetailsExportPage';
@@ -287,8 +288,16 @@ function MoneyReportHeader({
287288

288289
const {transactions: reportTransactions, violations} = useTransactionsAndViolationsForReport(moneyRequestReport?.reportID);
289290

290-
const transactions = useMemo(() => {
291-
return Object.values(reportTransactions);
291+
const {transactions, nonPendingDeleteTransactions} = useMemo(() => {
292+
const all: OnyxTypes.Transaction[] = [];
293+
const filtered: OnyxTypes.Transaction[] = [];
294+
for (const transaction of Object.values(reportTransactions)) {
295+
all.push(transaction);
296+
if (!isTransactionPendingDelete(transaction)) {
297+
filtered.push(transaction);
298+
}
299+
}
300+
return {transactions: all, nonPendingDeleteTransactions: filtered};
292301
}, [reportTransactions]);
293302

294303
// When prevent self-approval is enabled & the current user is submitter AND they're submitting to themselves, we need to show the optimistic next step
@@ -851,7 +860,7 @@ function MoneyReportHeader({
851860
currentUserAccountID: accountID,
852861
report: moneyRequestReport,
853862
chatReport,
854-
reportTransactions: transactions,
863+
reportTransactions: nonPendingDeleteTransactions,
855864
violations,
856865
bankAccountList,
857866
policy,
@@ -870,7 +879,7 @@ function MoneyReportHeader({
870879
isSubmittingAnimationRunning,
871880
moneyRequestReport,
872881
chatReport,
873-
transactions,
882+
nonPendingDeleteTransactions,
874883
violations,
875884
policy,
876885
reportNameValuePairs,
@@ -1182,7 +1191,7 @@ function MoneyReportHeader({
11821191
currentUserAccountID: accountID,
11831192
report: moneyRequestReport,
11841193
chatReport,
1185-
reportTransactions: transactions,
1194+
reportTransactions: nonPendingDeleteTransactions,
11861195
originalTransaction: originalIOUTransaction,
11871196
violations,
11881197
bankAccountList,
@@ -1198,7 +1207,7 @@ function MoneyReportHeader({
11981207
currentUserLogin,
11991208
accountID,
12001209
chatReport,
1201-
transactions,
1210+
nonPendingDeleteTransactions,
12021211
originalIOUTransaction,
12031212
violations,
12041213
policy,
@@ -1442,6 +1451,7 @@ function MoneyReportHeader({
14421451
icon: expensifyIcons.Buildings,
14431452
value: CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE,
14441453
sentryLabel: CONST.SENTRY_LABEL.MORE_MENU.CHANGE_WORKSPACE,
1454+
shouldShow: transactions.length === 0 || nonPendingDeleteTransactions.length > 0,
14451455
onSelected: () => {
14461456
if (!moneyRequestReport) {
14471457
return;

0 commit comments

Comments
 (0)