Skip to content

[No QA] perf: avoid mapping all personal details in ReportWelcomeText #88511

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
mountiny merged 4 commits into from
Apr 23, 2026
+7 −11
Merged

[No QA] perf: avoid mapping all personal details in ReportWelcomeText #88511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b6df843
perf(ReportWelcomeText): avoid mapping all personal details
TMisiukiewicz Apr 22, 2026
84df464
Merge remote-tracking branch 'origin/main' into perf/report-welcome-text
TMisiukiewicz Apr 22, 2026
db3dedd
address review: apply same perf fix to DebugReportActions and fix tes…
TMisiukiewicz Apr 22, 2026
f7587b5
Merge remote-tracking branch 'origin/main' into perf/report-welcome-text
TMisiukiewicz Apr 23, 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
9 changes: 3 additions & 6 deletions src/components/ReportWelcomeText.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import {View} from 'react-native';
import type {OnyxEntry} from 'react-native-onyx';
import useEnvironment from '@hooks/useEnvironment';
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';
Expand All @@ -28,7 +27,7 @@ import CONST from '@src/CONST';
import type {IOUType} from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type {OnyxInputOrEntry, PersonalDetailsList, Policy, Report} from '@src/types/onyx';
import type {Policy, Report} from '@src/types/onyx';
import RenderHTML from './RenderHTML';
import Text from './Text';

Expand All @@ -45,7 +44,7 @@ function ReportWelcomeText({report, policy}: ReportWelcomeTextProps) {
const styles = useThemeStyles();
const {environmentURL} = useEnvironment();
const reportAttributes = useReportAttributes();
const [personalDetails] = useMappedPersonalDetails(personalDetailMapper);
const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
const {isRestrictedToPreferredPolicy} = usePreferredPolicy();
const isPolicyExpenseChat = isPolicyExpenseChatReportUtils(report);
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
Expand Down Expand Up @@ -108,9 +107,7 @@ function ReportWelcomeText({report, policy}: ReportWelcomeTextProps) {
// If we are the only participant (e.g. solo group chat) then keep the current user personal details so the welcome message does not show up empty.
const shouldExcludeCurrentUser = participantAccountIDs.length > 0;
const participantAccountIDsExcludeCurrentUser = getParticipantsAccountIDsForDisplay(report, undefined, undefined, shouldExcludeCurrentUser);
const participantPersonalDetailListExcludeCurrentUser = Object.values(
getPersonalDetailsForAccountIDs(participantAccountIDsExcludeCurrentUser, personalDetails as OnyxInputOrEntry<PersonalDetailsList>),
);
const participantPersonalDetailListExcludeCurrentUser = Object.values(getPersonalDetailsForAccountIDs(participantAccountIDsExcludeCurrentUser, personalDetails));
const welcomeMessage = SidebarUtils.getWelcomeMessage({
report,
policy,
Expand Down
7 changes: 3 additions & 4 deletions src/pages/Debug/Report/DebugReportActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import SelectionList from '@components/SelectionList';
import RadioListItem from '@components/SelectionList/ListItem/RadioListItem';
import useDebouncedState from '@hooks/useDebouncedState';
import useLocalize from '@hooks/useLocalize';
import useMappedPersonalDetails, {personalDetailMapper} from '@hooks/useMappedPersonalDetails';
import useOnyx from '@hooks/useOnyx';
import useReportAttributes from '@hooks/useReportAttributes';
import useReportIsArchived from '@hooks/useReportIsArchived';
Expand All @@ -20,7 +19,7 @@ import SidebarUtils from '@libs/SidebarUtils';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type {OnyxInputOrEntry, PersonalDetailsList, ReportAction, ReportActions} from '@src/types/onyx';
import type {ReportAction, ReportActions} from '@src/types/onyx';

type DebugReportActionsProps = {
reportID: string;
Expand All @@ -36,7 +35,7 @@ function DebugReportActions({reportID}: DebugReportActionsProps) {
const [invoiceReceiverPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${invoiceReceiverPolicyID}`);
const isReportArchived = useReportIsArchived(reportID);
const ifUserCanPerformWriteAction = canUserPerformWriteAction(report, isReportArchived);
const [personalDetails] = useMappedPersonalDetails(personalDetailMapper);
const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
const reportAttributes = useReportAttributes();

Expand All @@ -56,7 +55,7 @@ function DebugReportActions({reportID}: DebugReportActionsProps) {
[getSortedAllReportActionsSelector],
);
const participantAccountIDs = getParticipantsAccountIDsForDisplay(report, undefined, undefined, true);
const participantPersonalDetailList = Object.values(getPersonalDetailsForAccountIDs(participantAccountIDs, personalDetails as OnyxInputOrEntry<PersonalDetailsList>));
const participantPersonalDetailList = Object.values(getPersonalDetailsForAccountIDs(participantAccountIDs, personalDetails));

const getReportActionDebugText = useCallback(
(reportAction: ReportAction) => {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/ReportWelcomeTextTest.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ describe('ReportWelcomeText', () => {
expect(screen.getByText('Expensify')).toBeTruthy();
});

it('uses personal details from Onyx via useMappedPersonalDetails', async () => {
it('uses personal details from Onyx', async () => {
const report: Report = {
reportID: '5',
type: CONST.REPORT.TYPE.CHAT,
Expand Down
Loading