Fix: IOU-Error message remains on IOU report even same error message is dismissed from 1:1 #37875
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,14 @@ | ||
| import Onyx from 'react-native-onyx'; | ||
| import * as ReportActionUtils from '@libs/ReportActionsUtils'; | ||
| import * as ReportUtils from '@libs/ReportUtils'; | ||
| import CONST from '@src/CONST'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
| import type ReportAction from '@src/types/onyx/ReportAction'; | ||
| import * as Report from './Report'; | ||
|
|
||
| type IgnoreDirection = 'parent' | 'child'; | ||
|
|
||
| function clearReportActionErrors(reportID: string, reportAction: ReportAction, keys?: string[]) { | ||
| const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction); | ||
|
|
||
| if (!reportAction?.reportActionID) { | ||
|
|
@@ -34,14 +35,58 @@ function clearReportActionErrors(reportID: string, reportAction: OnyxEntry<Repor | |
| return; | ||
| } | ||
|
|
||
| if (keys) { | ||
| const errors: Record<string, null> = {}; | ||
|
|
||
| keys.forEach((key) => { | ||
| errors[key] = null; | ||
| }); | ||
|
|
||
| Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${originalReportID}`, { | ||
| [reportAction.reportActionID]: { | ||
| errors, | ||
| }, | ||
| }); | ||
| return; | ||
| } | ||
| Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${originalReportID}`, { | ||
| [reportAction.reportActionID]: { | ||
| errors: null, | ||
| }, | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * | ||
| ignore: `undefined` means we want to check both parent and children report actions | ||
| ignore: `parent` or `child` means we want to ignore checking parent or child report actions because they've been previously checked | ||
| */ | ||
| function clearAllRelatedReportActionErrors(reportID: string, reportAction: ReportAction | null, ignore?: IgnoreDirection, keys?: string[]) { | ||
| const errorKeys = keys ?? Object.keys(reportAction?.errors ?? {}); | ||
| if (!reportAction || errorKeys.length === 0) { | ||
| return; | ||
| } | ||
|
|
||
| clearReportActionErrors(reportID, reportAction, keys); | ||
|
|
||
| const report = ReportUtils.getReport(reportID); | ||
| if (report?.parentReportID && report?.parentReportActionID && ignore !== 'parent') { | ||
| const parentReportAction = ReportActionUtils.getReportAction(report.parentReportID, report.parentReportActionID); | ||
| const parentErrorKeys = Object.keys(parentReportAction?.errors ?? {}).filter((err) => errorKeys.includes(err)); | ||
|
|
||
| clearAllRelatedReportActionErrors(report.parentReportID, parentReportAction, 'child', parentErrorKeys); | ||
|
There was a problem hiding this comment. Please point out 1 case where we need to call There was a problem hiding this comment. I already used it in Pls correct me if I misunderstand sth |
||
| } | ||
|
|
||
| if (reportAction.childReportID && ignore !== 'child') { | ||
| const childActions = ReportActionUtils.getAllReportActions(reportAction.childReportID); | ||
| Object.values(childActions).forEach((action) => { | ||
| const childErrorKeys = Object.keys(action.errors ?? {}).filter((err) => errorKeys.includes(err)); | ||
| clearAllRelatedReportActionErrors(reportAction.childReportID ?? '', action, 'parent', childErrorKeys); | ||
|
There was a problem hiding this comment.
@tienifr For this point, I mean that in here There was a problem hiding this comment. Well, we need to use |
||
| }); | ||
| } | ||
| } | ||
|
|
||
| export { | ||
| // eslint-disable-next-line import/prefer-default-export | ||
| clearAllRelatedReportActionErrors, | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is to handle cases with multiple errors in the same report action, right?
It may be a good improvement but It is not mentioned in the issue. Why do you think It is our expectation? Do you confirm with the design team or any internal engineer about that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes
When users click x button, we'll clear all errors of that action, so the related action can share some same errors and we need to clear all of them. I believe it's the expectation in the OP
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree that's the expectation