Skip to content

Commit ec8a94d

Browse files
committed
fix: remove unnessary code
1 parent 6d49bf5 commit ec8a94d

2 files changed

Lines changed: 4 additions & 11 deletions

File tree

src/libs/ReportPrimaryActionUtils.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,7 @@ function isSubmitAction(
130130
return false;
131131
}
132132

133-
if (reportTransactions.length > 0 && reportTransactions.every((transaction) => isPending(transaction))) {
134-
return false;
135-
}
136-
137-
const isAnyReceiptBeingScanned = reportTransactions?.some((transaction) => isScanning(transaction));
138-
139-
if (isAnyReceiptBeingScanned) {
133+
if (reportTransactions.length > 0 && reportTransactions.every((transaction) => isPending(transaction) || isScanning(transaction))) {
140134
return false;
141135
}
142136

src/libs/actions/OnyxDerived/configs/todos.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
2-
import {isApproveAction, isExportAction, isPrimaryPayAction} from '@libs/ReportPrimaryActionUtils';
3-
import {hasOnlyNonReimbursableTransactions, isArchivedReport, isCurrentUserSubmitter, isOpenExpenseReport} from '@libs/ReportUtils';
2+
import {isApproveAction, isExportAction, isPrimaryPayAction, isSubmitAction} from '@libs/ReportPrimaryActionUtils';
3+
import {hasOnlyNonReimbursableTransactions} from '@libs/ReportUtils';
44
import createOnyxDerivedValueConfig from '@userActions/OnyxDerived/createOnyxDerivedValueConfig';
55
import CONST from '@src/CONST';
66
import ONYXKEYS from '@src/ONYXKEYS';
@@ -58,8 +58,7 @@ const createTodosReportsAndTransactions = ({
5858
const reportActions = Object.values(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.reportID}`] ?? []);
5959
const reportTransactions = transactionsByReportID[report.reportID] ?? [];
6060
const reportMetadata = allReportMetadata?.[`${ONYXKEYS.COLLECTION.REPORT_METADATA}${report.reportID}`];
61-
const shouldShowInSubmitTodo = isOpenExpenseReport(report) && isCurrentUserSubmitter(report) && reportTransactions.length > 0 && !isArchivedReport(reportNameValuePair);
62-
if (shouldShowInSubmitTodo) {
61+
if (isSubmitAction(report, reportTransactions, reportMetadata, policy, reportNameValuePair, undefined, login, currentUserAccountID)) {
6362
reportsToSubmit.push(report);
6463
}
6564
if (isApproveAction(report, reportTransactions, currentUserAccountID, reportMetadata, policy)) {

0 commit comments

Comments
 (0)