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

fix scan expense report and transaction are not hidden #39389

Merged
merged 14 commits into from
Apr 12, 2024
Merged

fix scan expense report and transaction are not hidden #39389

Changes from 4 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e86e35e
fix scan expense report and transaction are not hidden
tienifr Apr 2, 2024
c8a42c7
fix merge main
tienifr Apr 3, 2024
cc63fee
fix update hasNonFailedReceiptError variable
tienifr Apr 3, 2024
20acf25
fix remove redundant line break
tienifr Apr 3, 2024
5784171
fix rename variable
tienifr Apr 4, 2024
890efed
fix lint
tienifr Apr 4, 2024
1492725
fix merge main
tienifr Apr 8, 2024
852f950
fix merge main
tienifr Apr 9, 2024
54f5c1f
fix merge main
tienifr Apr 10, 2024
1a13943
fix expense report is not hidden
tienifr Apr 10, 2024
1c17d75
fix update hasErrorsOtherThanFailedReceipt
tienifr Apr 10, 2024
7d02b90
fix remove hasBrickError
tienifr Apr 11, 2024
f987438
fix lint
tienifr Apr 11, 2024
276fd22
fix merge main
tienifr Apr 12, 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: 5 additions & 2 deletions src/libs/SidebarUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import type Report from '@src/types/onyx/Report';
import type {ReportActions} from '@src/types/onyx/ReportAction';
import type ReportAction from '@src/types/onyx/ReportAction';
import type DeepValueOf from '@src/types/utils/DeepValueOf';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
import * as CollectionUtils from './CollectionUtils';
import localeCompare from './LocaleCompare';
import * as LocalePhoneNumber from './LocalePhoneNumber';
Expand Down Expand Up @@ -89,9 +90,11 @@ function getOrderedReportIDs(
betas.includes(CONST.BETAS.VIOLATIONS) && !!parentReportAction && ReportUtils.doesTransactionThreadHaveViolations(report, transactionViolations, parentReportAction);
const isHidden = report.notificationPreference === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN;
const isFocused = report.reportID === currentReportId;
const hasErrors = Object.keys(OptionsListUtils.getAllReportErrors(report, reportActions) ?? {}).length !== 0;
const allReportErrors = OptionsListUtils.getAllReportErrors(report, reportActions) ?? {};
const hasErrors = Object.keys(allReportErrors).length !== 0;
const hasBrickError = hasErrors || doesReportHaveViolations ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : '';
const shouldOverrideHidden = hasBrickError || isFocused || report.isPinned;
const hasNonFailedReceiptError = isEmptyObject(allReportErrors) || Object.values(allReportErrors).some((error) => error?.[0] !== 'report.genericSmartscanFailureMessage');
tienifr marked this conversation as resolved.
Show resolved Hide resolved
const shouldOverrideHidden = (hasBrickError && hasNonFailedReceiptError) || isFocused || report.isPinned;
if (isHidden && !shouldOverrideHidden) {
return false;
}
Expand Down
Loading