Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix - Don't show RBR on the LHN for transaction threads with violations if the report has already been reimbursed/settled #37767

Merged
merged 12 commits into from
Mar 21, 2024
Merged

Fix - Don't show RBR on the LHN for transaction threads with violations if the report has already been reimbursed/settled #37767

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
20a754b
hide RBR for settled requests
FitseTLT Mar 4, 2024
ca74d99
updated based on comments
FitseTLT Mar 5, 2024
9a0386b
Merge branch 'main' into fix-showing-RBR-for-settled-transaction
FitseTLT Mar 11, 2024
3f7a361
took the condition into doesTransactionThreadHaveViolations
FitseTLT Mar 11, 2024
0e9bd7f
Merge branch 'main' into fix-showing-RBR-for-settled-transaction
FitseTLT Mar 15, 2024
dc222a1
Merge branch 'main' into fix-showing-RBR-for-settled-transaction
FitseTLT Mar 20, 2024
233883d
updated to shouldDisplayTransactionThreadViolations function
FitseTLT Mar 20, 2024
983b8f7
update to use shouldDisplayTransactionThreadViolations
FitseTLT Mar 20, 2024
adc09a2
reverted unnecessary change
FitseTLT Mar 20, 2024
0d112b6
reverted comment
FitseTLT Mar 20, 2024
384d183
fix based on comments
FitseTLT Mar 21, 2024
f9f8bb2
Merge branch 'main' into fix-showing-RBR-for-settled-transaction
FitseTLT Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/libs/SidebarUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,11 @@ function getOptionData({
const participantPersonalDetailList = Object.values(OptionsListUtils.getPersonalDetailsForAccountIDs(participantAccountIDs, personalDetails)) as PersonalDetails[];
const personalDetail = participantPersonalDetailList[0] ?? {};
const hasErrors = Object.keys(result.allReportErrors ?? {}).length !== 0;
let shouldHideViolation = false;
FitseTLT marked this conversation as resolved.
Show resolved Hide resolved
if (hasViolations && parentReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) {
const {IOUReportID} = parentReportAction?.originalMessage ?? {};
shouldHideViolation = ReportUtils.isSettled(IOUReportID);
}

result.isThread = ReportUtils.isChatThread(report);
result.isChatRoom = ReportUtils.isChatRoom(report);
Expand All @@ -241,7 +246,7 @@ function getOptionData({
result.isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);
result.shouldShowSubscript = ReportUtils.shouldReportShowSubscript(report);
result.pendingAction = report.pendingFields?.addWorkspaceRoom ?? report.pendingFields?.createChat;
result.brickRoadIndicator = hasErrors || hasViolations ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : '';
result.brickRoadIndicator = hasErrors || (hasViolations && !shouldHideViolation) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : '';
FitseTLT marked this conversation as resolved.
Show resolved Hide resolved
result.ownerAccountID = report.ownerAccountID;
result.managerID = report.managerID;
result.reportID = report.reportID;
Expand Down
Loading