Fix for - Reports - Report row shows fallback avatar when user has custom avatar by jmusial · Pull Request #84599 · Expensify/App

jmusial · 2026-03-09T14:19:24Z

Explanation of Change

Fixed Issues

$ #84472
PROPOSAL:

Tests

Precondition:

Use new account
User has custom avatar.

Log into the app
Create a workspace.
Go to workspace chat.
Create an empty report.
Go to Reports > Reports.
Report row will show user avatar.

Offline tests

N/A

QA Steps

Same as tests

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
- I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
  - If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
I verified that if a function's arguments changed that all usages have also been updated correctly
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
If new assets were added or existing ones were modified, I verified that:
- The assets are optimized and compressed (for SVG files, run npm run compress-svg)
- The assets load correctly across all supported platforms.
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

MacOS: Chrome / Safari

Screen.Recording.2026-03-09.at.15.20.12.mov

jmusial · 2026-03-09T14:19:35Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4955f23a85

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

luacmartins · 2026-03-09T15:41:44Z

@codex review

melvin-bot · 2026-03-09T15:41:45Z

@brunovjk Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

github-actions · 2026-03-09T15:45:27Z


    const [cardFeeds, cardFeedsResult] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER);
    const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
+    const [onyxPersonalDetailsList] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);


❌ PERF-11

useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST) subscribes to the entire personal details collection without a selector, and it is listed as a useMemo dependency (line 496). PERSONAL_DETAILS_LIST is a large, frequently-changing Onyx key — it updates whenever any user the current user has interacted with changes their profile. This means:

Every unrelated personal-detail change triggers a component re-render.

The expensive getSections() useMemo recomputes each time because onyxPersonalDetailsList is in its dependency array.

Consider one of these alternatives:

Use a ref to hold the Onyx value so it doesn't appear in the useMemo deps (the Onyx subscription still keeps it current, but the memo only recomputes when search data actually changes).

Use a selector to extract only the account IDs / avatar fields needed, reducing the deep-equal comparison surface.

Leverage Onyx.connect / getPersonalDetailsForAccountID() outside the render cycle (this pattern already exists in getReportSections).

Suggested change

const [onyxPersonalDetailsList] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);

// Option A: use a ref to avoid adding it to useMemo deps

const [onyxPersonalDetailsList] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);

const personalDetailsRef = useRef(onyxPersonalDetailsList);

personalDetailsRef.current = onyxPersonalDetailsList;

// Then use personalDetailsRef.current inside the useMemo callback

// and remove onyxPersonalDetailsList from the dependency array.

Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

@jmusial thoughts on the above?

I don't think we can escape calling it as is.

Before a subscription like this existed per every row src/components/ReportActionAvatars/index.tsx -> src/components/ReportActionAvatars/useReportActionAvatars.ts#59 so having it only once is an improvement.

I'll run some quick perf tests between this fix and old code using ReportActionAvatars and update here

Measurements (5x, compared to the Original ones from last week)

Not sure it isolates, the change well enough, will do one more run with manually reverting the changes

chatgpt-codex-connector · 2026-03-09T15:51:41Z

Codex Review: Didn't find any major issues. Delightful!

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

luacmartins

LGTM

abzokhattab

Nit: Inconsistent use of mergedPersonalDetails

The new mergedPersonalDetails is correctly used for getSearchReportAvatarProps, but fromDetails and toDetails still read from data.personalDetailsList directly:

App/src/libs/SearchUIUtils.ts

Lines 2319 to 2323 in 82f5a09

    
           const fromDetails = 
        
               data.personalDetailsList?.[reportItem.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID] ?? 
        
               getPersonalDetailsForAccountID(reportItem.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID) ?? 
        
               emptyPersonalDetails; 
        
           const toDetails = !shouldShowBlankTo && reportItem.managerID ? data.personalDetailsList?.[reportItem.managerID] : emptyPersonalDetails;

fromDetails happens to be safe because it already falls back to getPersonalDetailsForAccountID() (which reads Onyx). However, toDetails has no such fallback — if data.personalDetailsList is missing the managerID entry, the "to" field silently resolves to emptyPersonalDetails.

For consistency (and to prevent a similar bug on the "to" side), both lookups should use mergedPersonalDetails instead of data.personalDetailsList.

what do you think ?

jmusial · 2026-03-09T17:01:43Z

Nit: Inconsistent use of mergedPersonalDetails

The new mergedPersonalDetails is correctly used for getSearchReportAvatarProps, but fromDetails and toDetails still read from data.personalDetailsList directly:

App/src/libs/SearchUIUtils.ts

Lines 2319 to 2323 in 82f5a09

const fromDetails =

data.personalDetailsList?.[reportItem.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID] ??

getPersonalDetailsForAccountID(reportItem.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID) ??

emptyPersonalDetails;

const toDetails = !shouldShowBlankTo && reportItem.managerID ? data.personalDetailsList?.[reportItem.managerID] : emptyPersonalDetails;

fromDetails happens to be safe because it already falls back to getPersonalDetailsForAccountID() (which reads Onyx). However, toDetails has no such fallback — if data.personalDetailsList is missing the managerID entry, the "to" field silently resolves to emptyPersonalDetails.

For consistency (and to prevent a similar bug on the "to" side), both lookups should use mergedPersonalDetails instead of data.personalDetailsList.

what do you think ?

I think this is a great pick, would prefer to do this change in a separate PR as this is the DB fix, whould that be ok ?

abzokhattab · 2026-03-09T17:02:56Z

I think this is a great pick, would prefer to do this change in a separate PR as this is the DB fix, whould that be ok ?

Looks fine for me .. deferring that decision to @luacmartins

abzokhattab · 2026-03-09T17:03:03Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified there are no new alerts related to the canBeMissing param for useOnyx
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

Screen.Recording.2026-03-09.at.17.25.08.mov

Android: mWeb Chrome

Screen.Recording.2026-03-09.at.17.30.27.mov

iOS: HybridApp

Screen.Recording.2026-03-09.at.17.25.08.mov

iOS: mWeb Safari

Screen.Recording.2026-03-09.at.17.30.27.mov

MacOS: Chrome / Safari

Screen.Recording.2026-03-09.at.17.21.47.mov

abzokhattab

I have tested the current changes and it looks good to me

…r-resolves-to-fallback Fix for - Reports - Report row shows fallback avatar when user has custom avatar (cherry picked from commit 9def1e0) (cherry-picked to staging by luacmartins)

OSBotify · 2026-03-09T17:17:29Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2026-03-09T17:22:18Z

🚧 @luacmartins has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-03-09T17:28:55Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #84599.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-9def1e0-9fb5216-f428a5a5f59aa0b49417b7702ab39c96b74d84a2/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-9def1e0-9fb5216-33f6cfd34d6e59a182d1a2bd441e618059c2071c/index.html

Web 🕸️
https://84599.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

…r-resolves-to-fallback Fix for - Reports - Report row shows fallback avatar when user has custom avatar (cherry picked from commit 9def1e0)

OSBotify · 2026-03-09T20:39:20Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.3.33-5 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

OSBotify · 2026-03-09T21:28:34Z

🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 9.3.34-0 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

OSBotify · 2026-03-10T18:50:40Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.3.34-2 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

Fix for custom avatar resolves to fallback

4955f23

melvin-bot Bot assigned jmusial Mar 9, 2026

jmusial mentioned this pull request Mar 9, 2026

[Due for payment 2026-03-19] Reports - Report row shows fallback avatar when user has custom avatar #84472

Closed

7 tasks

chatgpt-codex-connector Bot reviewed Mar 9, 2026

View reviewed changes

Comment thread src/libs/SearchUIUtils.ts Outdated

move merging objects outside the loop

82f5a09

luacmartins marked this pull request as ready for review March 9, 2026 15:41

luacmartins requested review from a team as code owners March 9, 2026 15:41

melvin-bot Bot requested review from brunovjk and trjExpensify March 9, 2026 15:41

melvin-bot Bot removed the request for review from a team March 9, 2026 15:41

github-actions Bot reviewed Mar 9, 2026

View reviewed changes

luacmartins requested review from abzokhattab and removed request for brunovjk March 9, 2026 16:01

luacmartins approved these changes Mar 9, 2026

View reviewed changes

abzokhattab reviewed Mar 9, 2026

View reviewed changes

abzokhattab approved these changes Mar 9, 2026

View reviewed changes

melvin-bot Bot requested a review from luacmartins March 9, 2026 17:03

luacmartins approved these changes Mar 9, 2026

View reviewed changes

luacmartins merged commit 9def1e0 into Expensify:main Mar 9, 2026
29 of 35 checks passed

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Mar 9, 2026

OSBotify mentioned this pull request Mar 9, 2026

Deploy Checklist: New Expensify 2026-03-06 #84466

Closed

52 tasks

os-botify Bot mentioned this pull request Mar 9, 2026

🍒 Cherry pick PR #84599 to staging 🍒 #84621

Closed

50 tasks

jmusial mentioned this pull request Mar 11, 2026

[No QA] Followup: Use onyx personal details in get report sections #84858

Merged

50 tasks

api-claude-dev mentioned this pull request Mar 14, 2026

[Due for payment 2026-05-15] [$250] Invited member to expense report sees the chat with fallback avatar on LHN #85240

Closed

7 tasks

abzokhattab mentioned this pull request Mar 26, 2026

[PERF] - Use lighter avatar component in Report Item Row #84284

Merged

50 tasks

-    const [onyxPersonalDetailsList] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+// Option A: use a ref to avoid adding it to useMemo deps
+const [onyxPersonalDetailsList] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+const personalDetailsRef = useRef(onyxPersonalDetailsList);
+personalDetailsRef.current = onyxPersonalDetailsList;
+// Then use personalDetailsRef.current inside the useMemo callback
+// and remove onyxPersonalDetailsList from the dependency array.

	const fromDetails =
	data.personalDetailsList?.[reportItem.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID] ??
	getPersonalDetailsForAccountID(reportItem.ownerAccountID ?? CONST.DEFAULT_NUMBER_ID) ??
	emptyPersonalDetails;
	const toDetails = !shouldShowBlankTo && reportItem.managerID ? data.personalDetailsList?.[reportItem.managerID] : emptyPersonalDetails;

Conversation

jmusial commented Mar 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

jmusial commented Mar 9, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

luacmartins commented Mar 9, 2026

Uh oh!

melvin-bot Bot commented Mar 9, 2026

Uh oh!

github-actions Bot Mar 9, 2026

Choose a reason for hiding this comment

❌ PERF-11

Uh oh!

luacmartins Mar 9, 2026

Choose a reason for hiding this comment

Uh oh!

jmusial Mar 9, 2026

Choose a reason for hiding this comment

Uh oh!

jmusial Mar 9, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot commented Mar 9, 2026

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

abzokhattab left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jmusial commented Mar 9, 2026

Uh oh!

abzokhattab commented Mar 9, 2026

Uh oh!

abzokhattab commented Mar 9, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

abzokhattab left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Mar 9, 2026

Uh oh!

github-actions Bot commented Mar 9, 2026

Uh oh!

github-actions Bot commented Mar 9, 2026

Uh oh!

OSBotify commented Mar 9, 2026

Uh oh!

OSBotify commented Mar 9, 2026

Uh oh!

OSBotify commented Mar 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jmusial commented Mar 9, 2026 •

edited

Loading

abzokhattab left a comment •

edited

Loading