Skip to content

Commit 1d81ce2

Browse files
committed
show GBR in recent chats
1 parent 62c4588 commit 1d81ce2

2 files changed

Lines changed: 5 additions & 8 deletions

File tree

src/components/Search/SearchAutocompleteList.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import {combineOrderingOfReportsAndPersonalDetails, getSearchOptions} from '@lib
2222
import Performance from '@libs/Performance';
2323
import {getAllTaxRates, getCleanedTagName, shouldShowPolicy} from '@libs/PolicyUtils';
2424
import type {OptionData} from '@libs/ReportUtils';
25-
import {getReportOrDraftReport, isChatReport} from '@libs/ReportUtils';
2625
import {
2726
getAutocompleteCategories,
2827
getAutocompleteRecentCategories,
@@ -126,16 +125,13 @@ function getItemHeight(item: OptionData | SearchQueryItem) {
126125

127126
function SearchRouterItem(props: UserListItemProps<OptionData> | SearchQueryListItemProps) {
128127
const styles = useThemeStyles();
129-
const item = props.item;
130-
const report = getReportOrDraftReport(item.reportID);
131-
const shouldDisplayRBR = report && isChatReport(report) && !report.chatReportID;
132128

133129
if (isSearchQueryListItem(props)) {
134130
return (
135131
<SearchQueryListItem
136132
// eslint-disable-next-line react/jsx-props-no-spreading
137133
{...props}
138-
shouldDisplayRBR={shouldDisplayRBR}
134+
shouldDisplayRBR
139135
/>
140136
);
141137
}
@@ -144,7 +140,7 @@ function SearchRouterItem(props: UserListItemProps<OptionData> | SearchQueryList
144140
pressableStyle={[styles.br2, styles.ph3]}
145141
// eslint-disable-next-line react/jsx-props-no-spreading
146142
{...props}
147-
shouldDisplayRBR={shouldDisplayRBR}
143+
shouldDisplayRBR
148144
/>
149145
);
150146
}

src/libs/OptionsListUtils.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -942,8 +942,9 @@ function createOption(
942942
result.shouldShowSubscript = shouldReportShowSubscript(report, !!result.private_isArchived);
943943
result.isPolicyExpenseChat = reportUtilsIsPolicyExpenseChat(report);
944944
result.isOwnPolicyExpenseChat = report.isOwnPolicyExpenseChat ?? false;
945-
result.allReportErrors = reportAttributesDerived?.[report.reportID]?.reportErrors ?? {};
946-
result.brickRoadIndicator = !isEmptyObject(result.allReportErrors) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : '';
945+
const reportAttribute = reportAttributesDerived?.[report.reportID];
946+
result.allReportErrors = reportAttribute?.reportErrors ?? {};
947+
result.brickRoadIndicator = !isEmptyObject(result.allReportErrors) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : (reportAttribute?.brickRoadStatus ?? '');
947948
result.pendingAction = report.pendingFields ? (report.pendingFields.addWorkspaceRoom ?? report.pendingFields.createChat) : undefined;
948949
result.ownerAccountID = report.ownerAccountID;
949950
result.reportID = report.reportID;

0 commit comments

Comments
 (0)