From d8702b66dc571e5c5a61b83db4d7dcded0314db3 Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Fri, 28 Jun 2024 13:43:58 +0100 Subject: [PATCH 1/6] fix optimistic reportID for instant submit / no approvers --- src/libs/ReportUtils.ts | 26 ++++++++++++++++++++++++++ src/libs/TransactionUtils.ts | 9 +++++++++ 2 files changed, 35 insertions(+) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index cca52ac37c9d..8ea0a501b56c 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -1427,6 +1427,25 @@ function isMoneyRequestReport(reportOrID: OnyxInputOrEntry | string): bo return isIOUReport(report) || isExpenseReport(report); } + +/** + * Checks if a report contains only Non-Reimbursable transactions + */ +function hasOnlyNonReimbursableTransactions(iouReportID: string | undefined): boolean { + if (!iouReportID) { + return false; + } + + const transactions = TransactionUtils.getAllReportTransactions(iouReportID); + + // Early return false in case not having any transaction + if (!transactions || transactions.length === 0) { + return false; + } + + return transactions.every((transaction) => !TransactionUtils.getReimbursable(transaction)); +} + /** * Checks if a report has only one transaction associated with it */ @@ -1526,6 +1545,12 @@ function canAddOrDeleteTransactions(moneyRequestReport: OnyxEntry): bool return false; } + if(PolicyUtils.isInstantSubmitEnabled(getPolicy(moneyRequestReport?.policyID)) + && PolicyUtils.isSubmitAndClose(getPolicy(moneyRequestReport?.policyID)) + && hasOnlyNonReimbursableTransactions(moneyRequestReport?.reportID)) { + return false; + } + if (isReportApproved(moneyRequestReport) || isSettled(moneyRequestReport?.reportID)) { return false; } @@ -7309,6 +7334,7 @@ export { isChatUsedForOnboarding, getChatUsedForOnboarding, findPolicyExpenseChatByPolicyID, + hasOnlyNonReimbursableTransactions, }; export type { diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts index b28e5b782965..9303db04ed4e 100644 --- a/src/libs/TransactionUtils.ts +++ b/src/libs/TransactionUtils.ts @@ -387,6 +387,14 @@ function getDistance(transaction: OnyxInputOrEntry): number { return transaction?.comment?.customUnit?.quantity ?? 0; } + +/** + * Return the reimbursable value. Defaults to true to match BE logic. + */ +function getReimbursable(transaction: Transaction): boolean { + return transaction.reimbursable ?? true; +} + /** * Return the mccGroup field from the transaction, return the modifiedMCCGroup if present. */ @@ -878,6 +886,7 @@ export { isCustomUnitRateIDForP2P, getRateID, getTransaction, + getReimbursable, }; export type {TransactionChanges}; From a2f19e7aa4031efb24ddd71a2f3958ee8aaf040f Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Fri, 28 Jun 2024 14:01:58 +0100 Subject: [PATCH 2/6] run prettier --- src/libs/ReportUtils.ts | 11 ++++++----- src/libs/TransactionUtils.ts | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 8ea0a501b56c..ce6e72d2ed55 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -1427,7 +1427,6 @@ function isMoneyRequestReport(reportOrID: OnyxInputOrEntry | string): bo return isIOUReport(report) || isExpenseReport(report); } - /** * Checks if a report contains only Non-Reimbursable transactions */ @@ -1545,10 +1544,12 @@ function canAddOrDeleteTransactions(moneyRequestReport: OnyxEntry): bool return false; } - if(PolicyUtils.isInstantSubmitEnabled(getPolicy(moneyRequestReport?.policyID)) - && PolicyUtils.isSubmitAndClose(getPolicy(moneyRequestReport?.policyID)) - && hasOnlyNonReimbursableTransactions(moneyRequestReport?.reportID)) { - return false; + if ( + PolicyUtils.isInstantSubmitEnabled(getPolicy(moneyRequestReport?.policyID)) && + PolicyUtils.isSubmitAndClose(getPolicy(moneyRequestReport?.policyID)) && + hasOnlyNonReimbursableTransactions(moneyRequestReport?.reportID) + ) { + return false; } if (isReportApproved(moneyRequestReport) || isSettled(moneyRequestReport?.reportID)) { diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts index 9303db04ed4e..84d75d0574e3 100644 --- a/src/libs/TransactionUtils.ts +++ b/src/libs/TransactionUtils.ts @@ -387,7 +387,6 @@ function getDistance(transaction: OnyxInputOrEntry): number { return transaction?.comment?.customUnit?.quantity ?? 0; } - /** * Return the reimbursable value. Defaults to true to match BE logic. */ From ef658eca993b874f00baf947c7544d9947fac2c7 Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Fri, 28 Jun 2024 14:24:53 +0100 Subject: [PATCH 3/6] use policy var --- src/libs/ReportUtils.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index ce6e72d2ed55..c0ba77bb2463 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -1544,9 +1544,10 @@ function canAddOrDeleteTransactions(moneyRequestReport: OnyxEntry): bool return false; } + const policy = getPolicy(moneyRequestReport?.policyID); if ( - PolicyUtils.isInstantSubmitEnabled(getPolicy(moneyRequestReport?.policyID)) && - PolicyUtils.isSubmitAndClose(getPolicy(moneyRequestReport?.policyID)) && + PolicyUtils.isInstantSubmitEnabled(policy) && + PolicyUtils.isSubmitAndClose(policy) && hasOnlyNonReimbursableTransactions(moneyRequestReport?.reportID) ) { return false; From cccd4f6986e78803f8661cd6353a5bda46b8621e Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Fri, 28 Jun 2024 17:11:42 +0100 Subject: [PATCH 4/6] prettier --- src/libs/ReportUtils.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index c0ba77bb2463..12d5d255b8cc 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -1545,11 +1545,7 @@ function canAddOrDeleteTransactions(moneyRequestReport: OnyxEntry): bool } const policy = getPolicy(moneyRequestReport?.policyID); - if ( - PolicyUtils.isInstantSubmitEnabled(policy) && - PolicyUtils.isSubmitAndClose(policy) && - hasOnlyNonReimbursableTransactions(moneyRequestReport?.reportID) - ) { + if (PolicyUtils.isInstantSubmitEnabled(policy) && PolicyUtils.isSubmitAndClose(policy) && hasOnlyNonReimbursableTransactions(moneyRequestReport?.reportID)) { return false; } From 9ac74bd115f79e7fc37a7a1a5b4a0cdd773fbc53 Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Wed, 3 Jul 2024 10:18:31 +0100 Subject: [PATCH 5/6] remove unnecessary comment --- src/libs/ReportUtils.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 32b0ff8d459f..bc43fc1e871f 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -1453,8 +1453,6 @@ function hasOnlyNonReimbursableTransactions(iouReportID: string | undefined): bo } const transactions = TransactionUtils.getAllReportTransactions(iouReportID); - - // Early return false in case not having any transaction if (!transactions || transactions.length === 0) { return false; } From 83ef4d0a81a2e0e809155fa9864554c1ede53722 Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Thu, 4 Jul 2024 11:49:49 +0100 Subject: [PATCH 6/6] add null check --- src/libs/TransactionUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts index 84d75d0574e3..c8bfa316ca15 100644 --- a/src/libs/TransactionUtils.ts +++ b/src/libs/TransactionUtils.ts @@ -391,7 +391,7 @@ function getDistance(transaction: OnyxInputOrEntry): number { * Return the reimbursable value. Defaults to true to match BE logic. */ function getReimbursable(transaction: Transaction): boolean { - return transaction.reimbursable ?? true; + return transaction?.reimbursable ?? true; } /**