Skip to content

Commit fcc2640

Browse files
committed
update logic
1 parent c2e6dc4 commit fcc2640

3 files changed

Lines changed: 6 additions & 11 deletions

File tree

src/libs/ReportPreviewActionUtils.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,7 @@ function canApprove(report: Report, violations: OnyxCollection<TransactionViolat
102102
return false;
103103
}
104104

105-
const hasOnlyPendingTransactions = !!transactions && transactions?.length > 0 && transactions.every((transaction) => isPending(transaction));
106-
107-
if (hasOnlyPendingTransactions) {
105+
if (!!transactions && transactions?.length > 0 && !transactions.some((transaction) => !isPending(transaction))) {
108106
return false;
109107
}
110108

src/libs/ReportPrimaryActionUtils.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,7 @@ function isApproveAction(report: Report, reportTransactions: Transaction[], poli
122122
return false;
123123
}
124124

125-
const hasOnlyPendingTransactions = reportTransactions.length > 0 && reportTransactions.every((transaction) => isPending(transaction));
126-
127-
if (hasOnlyPendingTransactions) {
125+
if (reportTransactions.length > 0 && !reportTransactions.some((transaction) => !isPending(transaction))) {
128126
return false;
129127
}
130128

src/libs/ReportSecondaryActionUtils.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,6 @@ function isSubmitAction(
152152
return true;
153153
}
154154

155-
const hasOnlyPendingTransactions = reportTransactions.length > 0 && reportTransactions.every((transaction) => isPending(transaction));
156-
if (hasOnlyPendingTransactions) {
157-
return false;
158-
}
159-
160155
const autoReportingFrequency = getCorrectedAutoReportingFrequency(policy);
161156

162157
const isScheduledSubmitEnabled = policy?.harvesting?.enabled && autoReportingFrequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL;
@@ -193,6 +188,10 @@ function isApproveAction(report: Report, reportTransactions: Transaction[], viol
193188
return true;
194189
}
195190

191+
if (reportTransactions.length > 0 && !reportTransactions.some((transaction) => !isPending(transaction))) {
192+
return false;
193+
}
194+
196195
const transactionIDs = reportTransactions.map((t) => t.transactionID);
197196

198197
const hasAllPendingRTERViolations = allHavePendingRTERViolation(transactionIDs, violations);

0 commit comments

Comments
 (0)