From caa025bb01c10a9a0ef592ff018f4266f024de22 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Tue, 6 Feb 2024 11:49:24 +0700 Subject: [PATCH 1/8] fix error message disappear --- src/components/ReportActionItem/MoneyRequestView.tsx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx index 3a3aef6cabcd..1ca07db2eff5 100644 --- a/src/components/ReportActionItem/MoneyRequestView.tsx +++ b/src/components/ReportActionItem/MoneyRequestView.tsx @@ -189,10 +189,15 @@ function MoneyRequestView({ const hasReceipt = TransactionUtils.hasReceipt(transaction); let receiptURIs; - let hasErrors = false; + let hasErrors = Boolean( + canEdit && + transaction && + !TransactionUtils.isDistanceRequest(transaction) && + !TransactionUtils.isReceiptBeingScanned(transaction) && + TransactionUtils.areRequiredFieldsEmpty(transaction), + ); if (hasReceipt) { receiptURIs = ReceiptUtils.getThumbnailAndImageURIs(transaction); - hasErrors = canEdit && TransactionUtils.hasMissingSmartscanFields(transaction); } const pendingAction = transaction?.pendingAction; From 1ca73747a73be8446150e43d5c7eed9c5c6cea85 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Tue, 6 Feb 2024 13:32:58 +0700 Subject: [PATCH 2/8] fix lint --- src/components/ReportActionItem/MoneyRequestView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx index 1ca07db2eff5..ae7144e9c6a4 100644 --- a/src/components/ReportActionItem/MoneyRequestView.tsx +++ b/src/components/ReportActionItem/MoneyRequestView.tsx @@ -189,7 +189,7 @@ function MoneyRequestView({ const hasReceipt = TransactionUtils.hasReceipt(transaction); let receiptURIs; - let hasErrors = Boolean( + const hasErrors = Boolean( canEdit && transaction && !TransactionUtils.isDistanceRequest(transaction) && From bee6bd1c9b91f5bb2937de1f857f4b272988336c Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Thu, 15 Feb 2024 18:40:31 +0700 Subject: [PATCH 3/8] fix error message in LHN --- src/components/ReportActionItem/MoneyRequestView.tsx | 8 +------- src/libs/OptionsListUtils.ts | 2 +- src/libs/TransactionUtils.ts | 8 ++++++++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx index ae7144e9c6a4..6530279a54ab 100644 --- a/src/components/ReportActionItem/MoneyRequestView.tsx +++ b/src/components/ReportActionItem/MoneyRequestView.tsx @@ -189,13 +189,7 @@ function MoneyRequestView({ const hasReceipt = TransactionUtils.hasReceipt(transaction); let receiptURIs; - const hasErrors = Boolean( - canEdit && - transaction && - !TransactionUtils.isDistanceRequest(transaction) && - !TransactionUtils.isReceiptBeingScanned(transaction) && - TransactionUtils.areRequiredFieldsEmpty(transaction), - ); + const hasErrors = Boolean(canEdit && TransactionUtils.hasMissingRequiredFields(transaction)); if (hasReceipt) { receiptURIs = ReceiptUtils.getThumbnailAndImageURIs(transaction); } diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts index b6518b361381..33d97280a5ac 100644 --- a/src/libs/OptionsListUtils.ts +++ b/src/libs/OptionsListUtils.ts @@ -482,7 +482,7 @@ function getAllReportErrors(report: OnyxEntry, reportActions: OnyxEntry< if (parentReportAction?.actorAccountID === currentUserAccountID && ReportActionUtils.isTransactionThread(parentReportAction)) { const transactionID = parentReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? parentReportAction?.originalMessage?.IOUTransactionID : null; const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]; - if (TransactionUtils.hasMissingSmartscanFields(transaction ?? null) && !ReportUtils.isSettled(transaction?.reportID)) { + if (TransactionUtils.hasMissingRequiredFields(transaction ?? null) && !ReportUtils.isSettled(transaction?.reportID)) { reportActionErrors.smartscan = ErrorUtils.getMicroSecondOnyxError('report.genericSmartscanFailureMessage'); } } else if ((ReportUtils.isIOUReport(report) || ReportUtils.isExpenseReport(report)) && report?.ownerAccountID === currentUserAccountID) { diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts index 8a814f311481..9bd4b19df3be 100644 --- a/src/libs/TransactionUtils.ts +++ b/src/libs/TransactionUtils.ts @@ -435,6 +435,13 @@ function hasMissingSmartscanFields(transaction: OnyxEntry): boolean return Boolean(transaction && hasReceipt(transaction) && !isDistanceRequest(transaction) && !isReceiptBeingScanned(transaction) && areRequiredFieldsEmpty(transaction)); } +/** + * Check if the transaction has missing required fields + */ +function hasMissingRequiredFields(transaction: OnyxEntry): boolean { + return Boolean(transaction && !isDistanceRequest(transaction) && !isReceiptBeingScanned(transaction) && areRequiredFieldsEmpty(transaction)); +} + /** * Check if the transaction has a defined route */ @@ -592,4 +599,5 @@ export { waypointHasValidAddress, getRecentTransactions, hasViolation, + hasMissingRequiredFields, }; From 6215e7678218f33a7e3fbb1009d53753f0617e2a Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Thu, 15 Feb 2024 18:49:36 +0700 Subject: [PATCH 4/8] fix remove redundant boolean --- src/components/ReportActionItem/MoneyRequestView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx index d5b836fb5318..e8ac5162c7e9 100644 --- a/src/components/ReportActionItem/MoneyRequestView.tsx +++ b/src/components/ReportActionItem/MoneyRequestView.tsx @@ -189,7 +189,7 @@ function MoneyRequestView({ const hasReceipt = TransactionUtils.hasReceipt(transaction); let receiptURIs; - const hasErrors = Boolean(canEdit && TransactionUtils.hasMissingRequiredFields(transaction)); + const hasErrors = canEdit && TransactionUtils.hasMissingRequiredFields(transaction); if (hasReceipt) { receiptURIs = ReceiptUtils.getThumbnailAndImageURIs(transaction); } From 7c21c94603c6b6c441f50ffa102c88ac66d69e26 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Thu, 22 Feb 2024 14:31:09 +0700 Subject: [PATCH 5/8] update hasMissingSmartscanFields function --- src/libs/ReportUtils.ts | 3 +-- src/libs/TransactionUtils.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index ae6e02e70d29..2d0d91897d3b 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -2252,8 +2252,7 @@ function areAllRequestsBeingSmartScanned(iouReportID: string, reportPreviewActio * */ function hasMissingSmartscanFields(iouReportID: string): boolean { - const transactionsWithReceipts = getTransactionsWithReceipts(iouReportID); - return transactionsWithReceipts.some((transaction) => TransactionUtils.hasMissingSmartscanFields(transaction)); + return TransactionUtils.getAllReportTransactions(iouReportID).some((transaction) => TransactionUtils.hasMissingSmartscanFields(transaction)); } /** diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts index 799a86141877..6a0a4aeb0424 100644 --- a/src/libs/TransactionUtils.ts +++ b/src/libs/TransactionUtils.ts @@ -447,7 +447,7 @@ function isReceiptBeingScanned(transaction: OnyxEntry): boolean { * Check if the transaction has a non-smartscanning receipt and is missing required fields */ function hasMissingSmartscanFields(transaction: OnyxEntry): boolean { - return Boolean(transaction && hasReceipt(transaction) && !isDistanceRequest(transaction) && !isReceiptBeingScanned(transaction) && areRequiredFieldsEmpty(transaction)); + return Boolean(transaction && !isDistanceRequest(transaction) && !isReceiptBeingScanned(transaction) && areRequiredFieldsEmpty(transaction)); } /** From 631d206773ca38ccf01e5e3d75297025dc4f2e9f Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Fri, 23 Feb 2024 13:38:18 +0700 Subject: [PATCH 6/8] fix replace hasMissingRequiredFields by hasMissingSmartscanFields --- src/components/ReportActionItem/MoneyRequestView.tsx | 2 +- src/libs/OptionsListUtils.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx index 06f1843fffb0..bc31ae8b8f44 100644 --- a/src/components/ReportActionItem/MoneyRequestView.tsx +++ b/src/components/ReportActionItem/MoneyRequestView.tsx @@ -192,7 +192,7 @@ function MoneyRequestView({ const hasReceipt = TransactionUtils.hasReceipt(transaction); let receiptURIs; - const hasErrors = canEdit && TransactionUtils.hasMissingRequiredFields(transaction); + const hasErrors = canEdit && TransactionUtils.hasMissingSmartscanFields(transaction); if (hasReceipt) { receiptURIs = ReceiptUtils.getThumbnailAndImageURIs(transaction); } diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts index c62adbe54fda..97b4fc0144c8 100644 --- a/src/libs/OptionsListUtils.ts +++ b/src/libs/OptionsListUtils.ts @@ -482,7 +482,7 @@ function getAllReportErrors(report: OnyxEntry, reportActions: OnyxEntry< if (parentReportAction?.actorAccountID === currentUserAccountID && ReportActionUtils.isTransactionThread(parentReportAction)) { const transactionID = parentReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? parentReportAction?.originalMessage?.IOUTransactionID : null; const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]; - if (TransactionUtils.hasMissingRequiredFields(transaction ?? null) && !ReportUtils.isSettled(transaction?.reportID)) { + if (TransactionUtils.hasMissingSmartscanFields(transaction ?? null) && !ReportUtils.isSettled(transaction?.reportID)) { reportActionErrors.smartscan = ErrorUtils.getMicroSecondOnyxError('report.genericSmartscanFailureMessage'); } } else if ((ReportUtils.isIOUReport(report) || ReportUtils.isExpenseReport(report)) && report?.ownerAccountID === currentUserAccountID) { From 9dcca6a38b2f54d32c4bcd8807efc04243ab9d7e Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Fri, 23 Feb 2024 13:39:35 +0700 Subject: [PATCH 7/8] fix remove hasMissingRequiredFields --- src/libs/TransactionUtils.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts index 6a0a4aeb0424..0f3870c90628 100644 --- a/src/libs/TransactionUtils.ts +++ b/src/libs/TransactionUtils.ts @@ -450,13 +450,6 @@ function hasMissingSmartscanFields(transaction: OnyxEntry): boolean return Boolean(transaction && !isDistanceRequest(transaction) && !isReceiptBeingScanned(transaction) && areRequiredFieldsEmpty(transaction)); } -/** - * Check if the transaction has missing required fields - */ -function hasMissingRequiredFields(transaction: OnyxEntry): boolean { - return Boolean(transaction && !isDistanceRequest(transaction) && !isReceiptBeingScanned(transaction) && areRequiredFieldsEmpty(transaction)); -} - /** * Check if the transaction has a defined route */ @@ -641,7 +634,6 @@ export { waypointHasValidAddress, getRecentTransactions, hasViolation, - hasMissingRequiredFields, }; export type {TransactionChanges}; From dfaeb66ba45e866fee6484f59798b2f412038957 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Mon, 26 Feb 2024 08:29:55 +0700 Subject: [PATCH 8/8] fix missing RBR in report preview --- src/components/ReportActionItem/ReportPreview.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx index 591767234b8b..cbc728ffd1ce 100644 --- a/src/components/ReportActionItem/ReportPreview.tsx +++ b/src/components/ReportActionItem/ReportPreview.tsx @@ -138,7 +138,7 @@ function ReportPreview({ const hasReceipts = transactionsWithReceipts.length > 0; const isScanning = hasReceipts && areAllRequestsBeingSmartScanned; - const hasErrors = (hasReceipts && hasMissingSmartscanFields) || (canUseViolations && ReportUtils.hasViolations(iouReportID, transactionViolations)); + const hasErrors = hasMissingSmartscanFields || (canUseViolations && ReportUtils.hasViolations(iouReportID, transactionViolations)); const lastThreeTransactionsWithReceipts = transactionsWithReceipts.slice(-3); const lastThreeReceipts = lastThreeTransactionsWithReceipts.map((transaction) => ReceiptUtils.getThumbnailAndImageURIs(transaction));