Skip to content

refactor: Remove deprecated report name functions in ReportUtils (Part 3) #83031

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

Merged
neil-marcellini merged 7 commits into from
Mar 9, 2026
+32 −37
Merged

refactor: Remove deprecated report name functions in ReportUtils (Part 3) #83031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dccd14f
refactor: remove deprecated report name functions in ReportUtils
mohammadjafarinejad Feb 20, 2026
a885d94
fix: remove duplicated code
mohammadjafarinejad Feb 20, 2026
a6ac404
Merge main and resolve conflicts
MelvinBot Mar 1, 2026
856c039
Fix: resolve Prettier and typecheck failures from merge
MelvinBot Mar 1, 2026
61d71c4
Merge branch 'main' into fix/76852-part3-1
mohammadjafarinejad Mar 7, 2026
b7028f7
Remove unused parentReport variable
mohammadjafarinejad Mar 7, 2026
5d7199e
Empty commit to retrigger actions
mohammadjafarinejad Mar 7, 2026
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
13 changes: 3 additions & 10 deletions src/components/AvatarWithDisplayName.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import Navigation from '@libs/Navigation/Navigation';
import {getPersonalDetailsForAccountIDs} from '@libs/OptionsListUtils';
import {getReportName} from '@libs/ReportNameUtils';
import type {DisplayNameWithTooltips} from '@libs/ReportUtils';
import {
canEditReportTitle,
getChatRoomSubtitle,
getDisplayNamesWithTooltips,
getParentNavigationSubtitle,
getReportName,
getReportStatusColorStyle,
getReportStatusTranslation,
isChatThread,
Expand Down Expand Up @@ -193,17 +193,10 @@ function AvatarWithDisplayName({
// We need to use isSmallScreenWidth instead of shouldUseNarrowLayout to display the edit button only on large screens
// eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
const {isSmallScreenWidth} = useResponsiveLayout();
const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`);
const [invoiceReceiverPolicy] = useOnyx(
`${ONYXKEYS.COLLECTION.POLICY}${parentReport?.invoiceReceiver && 'policyID' in parentReport.invoiceReceiver ? parentReport.invoiceReceiver.policyID : undefined}`,
{},
);

const reportAttributes = useReportAttributes();
const parentReportActionParam = report?.parentReportActionID ? parentReportActions?.[report.parentReportActionID] : undefined;
const isReportArchived = useReportIsArchived(report?.reportID);
// This will be fixed as part of https://github.com/Expensify/Expensify/issues/507850
// eslint-disable-next-line @typescript-eslint/no-deprecated
const title = getReportName({report, parentReportActionParam, personalDetails, invoiceReceiverPolicy, reportAttributes, isReportArchived});
const title = getReportName(report, reportAttributes);
const isParentReportArchived = useReportIsArchived(report?.parentReportID);
const subtitle = getChatRoomSubtitle(report, true, isReportArchived);
const parentNavigationSubtitleData = getParentNavigationSubtitle(report, isParentReportArchived, reportAttributes);
Expand Down
4 changes: 3 additions & 1 deletion src/components/ReportWelcomeText.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import useLocalize from '@hooks/useLocalize';
import useMappedPersonalDetails, {personalDetailMapper} from '@hooks/useMappedPersonalDetails';
import useOnyx from '@hooks/useOnyx';
import usePreferredPolicy from '@hooks/usePreferredPolicy';
import useReportAttributes from '@hooks/useReportAttributes';
import useReportIsArchived from '@hooks/useReportIsArchived';
import useThemeStyles from '@hooks/useThemeStyles';
import Navigation from '@libs/Navigation/Navigation';
Expand Down Expand Up @@ -43,6 +44,7 @@ function ReportWelcomeText({report, policy}: ReportWelcomeTextProps) {
const {translate, localeCompare} = useLocalize();
const styles = useThemeStyles();
const {environmentURL} = useEnvironment();
const reportAttributes = useReportAttributes();
const [personalDetails] = useMappedPersonalDetails(personalDetailMapper);
const {isRestrictedToPreferredPolicy} = usePreferredPolicy();
const isPolicyExpenseChat = isPolicyExpenseChatReportUtils(report);
Expand Down Expand Up @@ -79,7 +81,7 @@ function ReportWelcomeText({report, policy}: ReportWelcomeTextProps) {
)}`,
)
.join(', ');
const reportName = getReportName(report);
const reportName = getReportName(report, reportAttributes);
const shouldShowUsePlusButtonText =
moneyRequestOptions.includes(CONST.IOU.TYPE.PAY) ||
moneyRequestOptions.includes(CONST.IOU.TYPE.SUBMIT) ||
Expand Down
8 changes: 5 additions & 3 deletions src/pages/RoomInvitePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
import useDebouncedState from '@hooks/useDebouncedState';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useReportAttributes from '@hooks/useReportAttributes';
import useReportIsArchived from '@hooks/useReportIsArchived';
import useThemeStyles from '@hooks/useThemeStyles';
import {inviteToRoom, inviteToRoomAction, searchUserInServer} from '@libs/actions/Report';
Expand All @@ -37,8 +38,9 @@ import {addSMSDomainIfPhoneNumber, parsePhoneNumber} from '@libs/PhoneNumber';
import type {MemberEmailsToAccountIDs} from '@libs/PolicyUtils';
import {isPolicyEmployee as isPolicyEmployeeUtil} from '@libs/PolicyUtils';
import {getReportAction} from '@libs/ReportActionsUtils';
import {getReportName} from '@libs/ReportNameUtils';
import type {OptionData} from '@libs/ReportUtils';
import {getReportName, isHiddenForCurrentUser, isPolicyExpenseChat} from '@libs/ReportUtils';
import {isHiddenForCurrentUser, isPolicyExpenseChat} from '@libs/ReportUtils';
import CONST from '@src/CONST';
import type {TranslationPaths} from '@src/languages/types';
import ONYXKEYS from '@src/ONYXKEYS';
Expand All @@ -60,6 +62,7 @@ function RoomInvitePage({
},
}: RoomInvitePageProps) {
const styles = useThemeStyles();
const reportAttributes = useReportAttributes();
const {translate, formatPhoneNumber} = useLocalize();
const [userSearchPhrase] = useOnyx(ONYXKEYS.ROOM_MEMBERS_USER_SEARCH_PHRASE);
const [countryCode = CONST.DEFAULT_COUNTRY_CODE] = useOnyx(ONYXKEYS.COUNTRY_CODE);
Expand Down Expand Up @@ -199,8 +202,7 @@ function RoomInvitePage({
const shouldParserToHTML = reportAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT;
const backRoute = reportID && (!isPolicyEmployee || isReportArchived ? ROUTES.REPORT_WITH_ID_DETAILS.getRoute(reportID, backTo) : ROUTES.ROOM_MEMBERS.getRoute(reportID, backTo));

// eslint-disable-next-line @typescript-eslint/no-deprecated
const reportName = getReportName({report});
const reportName = getReportName(report, reportAttributes);

const ancestors = useAncestors(report);

Expand Down
9 changes: 6 additions & 3 deletions src/pages/RoomMembersPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import useLocalize from '@hooks/useLocalize';
import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
import useNetwork from '@hooks/useNetwork';
import useOnyx from '@hooks/useOnyx';
import useReportAttributes from '@hooks/useReportAttributes';
import useReportIsArchived from '@hooks/useReportIsArchived';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useSearchBackPress from '@hooks/useSearchBackPress';
Expand All @@ -37,9 +38,9 @@ import Parser from '@libs/Parser';
import {getDisplayNameOrDefault, getPersonalDetailsByIDs} from '@libs/PersonalDetailsUtils';
import {isPolicyAdmin, isPolicyEmployee as isPolicyEmployeeUtils} from '@libs/PolicyUtils';
import {getReportAction} from '@libs/ReportActionsUtils';
import {getReportName} from '@libs/ReportNameUtils';
import {
getReportForHeader,
getReportName,
getReportPersonalDetailsParticipants,
isChatThread,
isDefaultRoom,
Expand All @@ -66,6 +67,7 @@ function RoomMembersPage({report, policy}: RoomMembersPageProps) {
const reportAction = useMemo(() => getReportAction(report?.parentReportID, report?.parentReportActionID), [report?.parentReportID, report?.parentReportActionID]);
const shouldParserToHTML = reportAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT;
const styles = useThemeStyles();
const reportAttributes = useReportAttributes();
const [session] = useOnyx(ONYXKEYS.SESSION);
const [reportMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${report?.reportID}`);
const currentUserAccountID = Number(session?.accountID);
Expand Down Expand Up @@ -440,8 +442,9 @@ function RoomMembersPage({report, policy}: RoomMembersPageProps) {
>
<HeaderWithBackButton
title={selectionModeHeader ? translate('common.selectMultiple') : translate('workspace.common.members')}
// eslint-disable-next-line @typescript-eslint/no-deprecated
subtitle={StringUtils.lineBreaksToSpaces(shouldParserToHTML ? Parser.htmlToText(getReportName({report: reportForSubtitle})) : getReportName({report: reportForSubtitle}))}
subtitle={StringUtils.lineBreaksToSpaces(
shouldParserToHTML ? Parser.htmlToText(getReportName(reportForSubtitle, reportAttributes)) : getReportName(reportForSubtitle, reportAttributes),
)}
onBackButtonPress={() => {
if (isMobileSelectionModeEnabled) {
setSelectedMembers([]);
Expand Down
7 changes: 4 additions & 3 deletions src/pages/ShareCodePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
import useEnvironment from '@hooks/useEnvironment';
import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useReportAttributes from '@hooks/useReportAttributes';
import useReportIsArchived from '@hooks/useReportIsArchived';
import useStyleUtils from '@hooks/useStyleUtils';
import useThemeStyles from '@hooks/useThemeStyles';
import Clipboard from '@libs/Clipboard';
import Navigation from '@libs/Navigation/Navigation';
import type {BackToParams} from '@libs/Navigation/types';
import {getReportName} from '@libs/ReportNameUtils';
import {
getChatRoomSubtitle,
getDefaultWorkspaceAvatar,
Expand All @@ -29,7 +31,6 @@ import {
getParticipantsAccountIDsForDisplay,
getPolicyName,
getReportForHeader,
getReportName,
isExpenseReport,
isMoneyRequestReport,
} from '@libs/ReportUtils';
Expand Down Expand Up @@ -76,6 +77,7 @@ function ShareCodePage({report, policy, backTo}: ShareCodePageProps) {
const qrCodeRef = useRef<QRShareWithDownloadHandle>(null);

const currentUserPersonalDetails = useCurrentUserPersonalDetails();
const reportAttributes = useReportAttributes();
const isParentReportArchived = useReportIsArchived(report?.parentReportID);
const isReportArchived = useReportIsArchived(report?.reportID);
const isReport = !!report?.reportID;
Expand All @@ -100,8 +102,7 @@ function ShareCodePage({report, policy, backTo}: ShareCodePageProps) {

const reportForTitle = useMemo(() => getReportForHeader(report), [report]);

// eslint-disable-next-line @typescript-eslint/no-deprecated
const title = isReport ? getReportName({report: reportForTitle}) : (currentUserPersonalDetails.displayName ?? '');
const title = isReport ? getReportName(reportForTitle, reportAttributes) : (currentUserPersonalDetails.displayName ?? '');
const urlWithTrailingSlash = addTrailingForwardSlash(environmentURL);
const url = isReport
? `${urlWithTrailingSlash}${ROUTES.REPORT_WITH_ID.getRoute(report.reportID)}`
Expand Down
7 changes: 4 additions & 3 deletions src/pages/TripChatNameEditPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ import ScreenWrapper from '@components/ScreenWrapper';
import TextInput from '@components/TextInput';
import useAutoFocusInput from '@hooks/useAutoFocusInput';
import useLocalize from '@hooks/useLocalize';
import useReportAttributes from '@hooks/useReportAttributes';
import useThemeStyles from '@hooks/useThemeStyles';
import Navigation from '@libs/Navigation/Navigation';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import type {NewChatNavigatorParamList} from '@libs/Navigation/types';
import {getReportName} from '@libs/ReportUtils';
import {getReportName} from '@libs/ReportNameUtils';
import StringUtils from '@libs/StringUtils';
import {updateChatName} from '@userActions/Report';
import CONST from '@src/CONST';
Expand All @@ -28,12 +29,12 @@ type TripChatNameEditPageProps = Partial<PlatformStackScreenProps<NewChatNavigat

function TripChatNameEditPage({report}: TripChatNameEditPageProps) {
const styles = useThemeStyles();
const reportAttributes = useReportAttributes();
const {translate} = useLocalize();
const {inputCallbackRef} = useAutoFocusInput();

const reportID = report?.reportID;
// eslint-disable-next-line @typescript-eslint/no-deprecated
const currentChatName = getReportName({report});
const currentChatName = getReportName(report, reportAttributes);

const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.NEW_CHAT_NAME_FORM>): Errors => {
const errors: Errors = {};
Expand Down
21 changes: 7 additions & 14 deletions src/pages/media/AttachmentModalScreen/routes/report/ReportAvatarModalContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import React, {useMemo} from 'react';
import useDefaultAvatars from '@hooks/useDefaultAvatars';
import useOnyx from '@hooks/useOnyx';
import {getDefaultGroupAvatar, getPolicyName, getReportName, getWorkspaceIcon, isGroupChat, isThread, isUserCreatedPolicyRoom} from '@libs/ReportUtils';
import useReportAttributes from '@hooks/useReportAttributes';
import {getReportName} from '@libs/ReportNameUtils';
import {getDefaultGroupAvatar, getPolicyName, getWorkspaceIcon, isGroupChat, isThread, isUserCreatedPolicyRoom} from '@libs/ReportUtils';
import {getFullSizeAvatar} from '@libs/UserAvatarUtils';
import type {AttachmentModalBaseContentProps} from '@pages/media/AttachmentModalScreen/AttachmentModalBaseContent/types';
import AttachmentModalContainer from '@pages/media/AttachmentModalScreen/AttachmentModalContainer';
Expand All @@ -17,29 +19,20 @@ function ReportAvatarModalContent({navigation, route}: AttachmentModalScreenProp
const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
const [isLoadingApp = true] = useOnyx(ONYXKEYS.IS_LOADING_APP);
const reportAttributes = useReportAttributes();

const attachment: AttachmentModalBaseContentProps = useMemo(() => {
if (isGroupChat(report) && !isThread(report)) {
return {
source: report?.avatarUrl ? getFullSizeAvatar({avatarSource: report.avatarUrl, defaultAvatars}) : getDefaultGroupAvatar(report?.reportID),
// eslint-disable-next-line @typescript-eslint/no-deprecated
headerTitle: getReportName({report}),
headerTitle: getReportName(report, reportAttributes),
isWorkspaceAvatar: false,
};
}
if (isUserCreatedPolicyRoom(report) && report?.avatarUrl) {
return {
source: getFullSizeAvatar({avatarSource: report.avatarUrl, defaultAvatars}),
// eslint-disable-next-line @typescript-eslint/no-deprecated
headerTitle: getReportName({report}),
isWorkspaceAvatar: false,
};
}
if (isUserCreatedPolicyRoom(report) && report?.avatarUrl) {
return {
source: getFullSizeAvatar({avatarSource: report.avatarUrl, defaultAvatars}),
// eslint-disable-next-line @typescript-eslint/no-deprecated
headerTitle: getReportName({report}),
headerTitle: getReportName(report, reportAttributes),
isWorkspaceAvatar: false,
};
}
Expand All @@ -51,7 +44,7 @@ function ReportAvatarModalContent({navigation, route}: AttachmentModalScreenProp
originalFileName: policy?.originalFileName ?? policy?.id ?? report?.policyID,
isWorkspaceAvatar: true,
};
}, [policy, report, defaultAvatars]);
}, [policy, report, defaultAvatars, reportAttributes]);

const onDownloadAttachment = useDownloadAttachment();

Expand Down
Loading