[No QA] refactor: rename OptionRowAvatar to OptionRow/Avatar by BartekObudzinski · Pull Request #90332 · Expensify/App

BartekObudzinski · 2026-05-12T11:58:22Z

Explanation of Change

Renames OptionRowAvatar.tsx -> OptionRow/Avatar.tsx and updates displayName to OptionRow.Avatar, matching the leaf-naming convention agreed in #89946. Scope is the rename only -- the context-wiring portion of #89950 is deferred pending a team decision on the Provider approach (commented in the #89946 thread).

Fixed Issues

$ #89950
PROPOSAL:

Tests

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Verify that no errors appear in the JS console

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

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

melvin-bot · 2026-05-12T12:56:26Z

@DylanDylann 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]

BartekObudzinski · 2026-05-12T13:28:13Z

@codex review

chatgpt-codex-connector · 2026-05-12T13:31:47Z

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

ℹ️ 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".

trjExpensify · 2026-05-12T21:39:42Z

PR doesn’t need product input as a refactor PR. Unassigning and unsubscribing myself.

DylanDylann · 2026-05-13T05:08:20Z

Could you move these props into the child component?

Reverted the encapsulation in 09aa9af — the new useTheme + useThemeStyles calls inside Avatar tripped the Reassure render-count gate (+3 renders, allowed deviation is 0). Restored the original prop-based wiring to keep this PR a pure rename.

The encapsulation will land in #89958 (final wiring) alongside the render-prop removal — hoisting hover state out of the Pressable callback makes the extra hook calls a non-issue.

I had to revert it it had some additional render counts and jobs fails, since it additional I will look closer in the cleanup PR.

DylanDylann · 2026-05-13T05:09:16Z

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
- MacOS: Desktop
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.

DylanDylann · 2026-05-13T05:09:47Z

@BartekObudzinski One comment: #90332 (comment)

codecov · 2026-05-13T07:17:09Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
...s/LHNOptionsList/OptionRowLHN/OptionRow/Avatar.tsx	`70.00% <100.00%> (ø)`
...s/LHNOptionsList/OptionRowLHN/OptionRowLHNCore.tsx	`95.65% <ø> (ø)`
... and 193 files with indirect coverage changes

…atar" This reverts commit d9d1467.

…-avatar # Conflicts: # src/components/LHNOptionsList/OptionRowLHN/OptionRowLHNCore.tsx

mountiny · 2026-05-13T08:16:33Z

    optionItem: OptionData;
    isInFocusMode: boolean;
    subscriptAvatarBorderColor: ColorValue;
    secondaryAvatarBackgroundColor: ColorValue;
    singleAvatarContainerStyle: ViewStyle[];


docs can you add them in next pr please

github-actions · 2026-05-13T08:20:06Z

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

github-actions · 2026-05-13T08:28:44Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-b091c01-4be7f16-69b627a5d0a6e09d9d800645d7b3e5f365c64f2e/index.html	❌ FAILED ❌
	The QR code can't be generated, because the iOS build failed

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-05-13T08:29:16Z

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

OSBotify · 2026-05-13T21:30:34Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.3.74-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-13T21:32:11Z

No help site changes needed — this PR is a purely internal refactor (file rename from OptionRowAvatar.tsx to OptionRow/Avatar.tsx with display name updates). No user-facing behavior, features, or UI text changed.

OSBotify · 2026-05-15T18:11:07Z

🚀 Deployed to production by https://github.com/Beamanator in version: 9.3.74-7 🚀

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

refactor: rename OptionRowAvatar to OptionRow/Avatar

dda71fe

melvin-bot Bot assigned BartekObudzinski May 12, 2026

BartekObudzinski marked this pull request as ready for review May 12, 2026 12:56

BartekObudzinski requested review from a team as code owners May 12, 2026 12:56

melvin-bot Bot requested review from DylanDylann and trjExpensify and removed request for a team May 12, 2026 12:56

BartekObudzinski mentioned this pull request May 12, 2026

[Due for payment 2026-05-20] [Improvement] Decompose OptionRowLHN into compound component family #89946

Open

12 tasks

trjExpensify removed their request for review May 12, 2026 21:39

DylanDylann reviewed May 13, 2026

View reviewed changes

DylanDylann approved these changes May 13, 2026

View reviewed changes

melvin-bot Bot requested a review from srikarparsi May 13, 2026 05:09

refactor: move hover/focus color derivation into OptionRow.Avatar

d9d1467

Revert "refactor: move hover/focus color derivation into OptionRow.Av…

09aa9af

…atar" This reverts commit d9d1467.

mountiny self-requested a review May 13, 2026 07:51

Merge remote-tracking branch 'upstream/main' into refactor/option-row…

dec3296

…-avatar # Conflicts: # src/components/LHNOptionsList/OptionRowLHN/OptionRowLHNCore.tsx

mountiny approved these changes May 13, 2026

View reviewed changes

mountiny merged commit b091c01 into Expensify:main May 13, 2026
34 checks passed

BartekObudzinski mentioned this pull request May 13, 2026

[No QA] refactor: OptionRowLHN — final wiring + ArchivedOptionRowLHN variant #90459

Merged

52 tasks

OSBotify mentioned this pull request May 13, 2026

Deploy Checklist: New Expensify 2026-05-13 #90562

Closed

64 tasks

OSBotify mentioned this pull request May 14, 2026

Expense - IOU receiver has green dot in LHN turns pay badge on revisit #90627

Open

7 tasks

melvin-bot Bot mentioned this pull request May 15, 2026

[Due for payment 2026-05-22] [No QA] refactor: OptionRowLHN — Avatar rename + context wiring #89950

Closed

Conversation

BartekObudzinski commented May 12, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented May 12, 2026

Uh oh!

BartekObudzinski commented May 12, 2026

Uh oh!

chatgpt-codex-connector Bot commented May 12, 2026

Uh oh!

trjExpensify commented May 12, 2026

Uh oh!

DylanDylann May 13, 2026

Choose a reason for hiding this comment

Uh oh!

BartekObudzinski May 13, 2026 • 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!

BartekObudzinski May 13, 2026

Choose a reason for hiding this comment

Uh oh!

BartekObudzinski May 13, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented May 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Uh oh!

DylanDylann commented May 13, 2026

Uh oh!

codecov Bot commented May 13, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

mountiny May 13, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented May 13, 2026

Uh oh!

github-actions Bot commented May 13, 2026

Uh oh!

OSBotify commented May 13, 2026

Uh oh!

OSBotify commented May 13, 2026

Uh oh!

MelvinBot commented May 13, 2026

Uh oh!

OSBotify commented May 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

BartekObudzinski May 13, 2026 •

edited

Loading

DylanDylann commented May 13, 2026 •

edited

Loading

codecov Bot commented May 13, 2026 •

edited by github-actions Bot

Loading