[No QA] refactor: decompose OptionRowLHN alternate text and action badge by BartekObudzinski · Pull Request #89274 · Expensify/App

BartekObudzinski · 2026-04-30T13:58:34Z

Explanation of Change

Extracts two self-contained subtrees out of OptionRowLHN into dedicated child components, mirroring the pattern from #89087 (OptionRowAvatar):

OptionRowAlternateText owns the alternate-text <Text> plus the custom-emoji branch (containsCustomEmoji + containsOnlyCustomEmoji + TextWithEmojiFragment). Removes the useMemo for alternateTextContainsCustomEmojiWithText from the parent.
OptionRowActionBadge owns the RBR/GBR badge JSX (the Badge + DotIndicator Icon variants). Owns its own useTheme/useThemeStyles and reads DotIndicator via useMemoizedLazyExpensifyIcons so the parent's lazy-icon set shrinks from ['Pencil', 'DotIndicator', 'Pin'] to ['Pencil', 'Pin'].

The parent OptionRowLHN keeps its React.memo wrapper and load-bearing manual memoization per the React Compiler RC-6 exception. Both new components compile cleanly with React Compiler.

Measured impact

Perf-neutral. ManualNavigateToInboxTab measurements on Android are within noise of main; this is a readability/composition refactor, not a perf win. Shipping it as prep so future extractions in this file (e.g. status badge) start from a smaller parent.

Fixed Issues

$ #89275
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

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

… child components

BartekObudzinski · 2026-04-30T14:00:31Z

in case we want to ship it there is a holiday tomorrow (01.05) and i will be back on monday

JS00001 · 2026-04-30T14:32:11Z

No c+ is needed here

…option-row-lhn # Conflicts: # src/components/LHNOptionsList/OptionRowLHN.tsx

melvin-bot · 2026-05-04T06:46:20Z

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

DylanDylann · 2026-05-04T12:18:57Z

@BartekObudzinski Please revert Mobile-Expensify folder

DylanDylann · 2026-05-04T12:20:23Z

All good. But I suggest creating an OptionRowLHN folder, then put all child components in this folder.

DylanDylann · 2026-05-04T12:22:10Z

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.

Screenshots/Videos

Verified the RBR/GBR and the alternative text display correctly

JS00001

Please remove mobile-expensify changes

…ltipLayer

codecov · 2026-05-04T13:30:30Z

Codecov Report

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

Files with missing lines	Coverage Δ
...ptionsList/OptionRowLHN/OptionRowAlternateText.tsx	`100.00% <100.00%> (ø)`
...HNOptionsList/OptionRowLHN/OptionRowErrorBadge.tsx	`100.00% <100.00%> (ø)`
...LHNOptionsList/OptionRowLHN/OptionRowPressable.tsx	`85.00% <ø> (ø)`
...OptionsList/OptionRowLHN/OptionRowTooltipLayer.tsx	`100.00% <100.00%> (ø)`
...c/components/LHNOptionsList/OptionRowLHN/index.tsx	`94.73% <100.00%> (ø)`
...ts/LHNOptionsList/OptionRowLHN/OptionRowAvatar.tsx	`66.66% <85.71%> (ø)`
...LHNOptionsList/OptionRowLHN/OptionRowInfoBadge.tsx	`84.61% <84.61%> (ø)`
... and 31 files with indirect coverage changes

stitesExpensify · 2026-05-04T14:11:03Z

LGTM, lint is failing though.

@codex review please

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 052f36a906

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

DylanDylann · 2026-05-04T14:58:09Z


+OptionRowTooltipLayerInner.displayName = 'OptionRowTooltipLayerInner';
+
+function OptionRowTooltipLayer({shouldShowRBRorGBRTooltip, shouldShowGetStartedTooltip, onOptionPress, renderChildren}: OptionRowTooltipLayerProps) {


@BartekObudzinski Is there a reason we need to pass these props? Could this component define them?

DylanDylann · 2026-05-04T14:59:16Z

@@ -331,16 +289,12 @@ function OptionRowLHN({
            shouldShowErrorMessages={false}
            needsOffscreenAlphaCompositing
        >


Please move this wrapper into OptionRowTooltipLayer

DylanDylann · 2026-05-04T15:02:15Z

@BartekObudzinski Should we move OptionRowLHNData to the new folder (may change the folder name if needed for importing)

…ayer

DylanDylann · 2026-05-04T15:07:17Z

+    actionBadgeText: string;
+};
+
+function OptionRowActionBadge({severity, actionBadgeText}: OptionRowActionBadgeProps) {


Please refactor to avoid duplicated code. I’m fine with creating two separate components instead of combining them like this.

DylanDylann · 2026-05-04T15:07:49Z

@@ -254,41 +226,20 @@
                                    </View>
                                ) : null}
                                {brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR && (


Please move this check into the child component

DylanDylann · 2026-05-04T15:14:07Z

@@ -227,22 +210,11 @@
                                        )}
                                    </View>
                                    {!!optionItem.alternateText && (


Please move this check into child component

DylanDylann · 2026-05-04T15:18:18Z

    if (!optionItem) {
        // This is the case when the component is focused and the optionItem is null.
        // For example, when you submit an expense in offline mode and click on the
        // generated expense report, we would only see the Report Details but no item in LHN.
        return null;
    }


Please move this null check to the parent component

joekaufmanexpensify · 2026-05-04T20:49:22Z

No product review needed

refactor: decompose OptionRowLHN alternate text and action badge into…

40420c1

… child components

melvin-bot Bot assigned BartekObudzinski Apr 30, 2026

BartekObudzinski mentioned this pull request Apr 30, 2026

[Metrics] Improve ManualNavigateToInboxTab #77175

Open

JS00001 mentioned this pull request Apr 30, 2026

Decompose OptionRowLHN alternate text and action badge #89275

Open

JS00001 previously approved these changes Apr 30, 2026

View reviewed changes

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

a0b6707

…option-row-lhn # Conflicts: # src/components/LHNOptionsList/OptionRowLHN.tsx

BartekObudzinski dismissed JS00001’s stale review via a0b6707 May 4, 2026 06:36

BartekObudzinski changed the title ~~refactor: decompose OptionRowLHN alternate text and action badge~~ [No QA] refactor: decompose OptionRowLHN alternate text and action badge May 4, 2026

BartekObudzinski marked this pull request as ready for review May 4, 2026 06:45

BartekObudzinski requested review from a team as code owners May 4, 2026 06:45

melvin-bot Bot requested review from joekaufmanexpensify and stitesExpensify and removed request for a team May 4, 2026 06:45

mountiny requested a review from DylanDylann May 4, 2026 12:01

JS00001 requested changes May 4, 2026

View reviewed changes

BartekObudzinski added 2 commits May 4, 2026 15:15

refactor: address review feedback on OptionRowAvatar and OptionRowToo…

57a1d0c

…ltipLayer

merge: pull latest upstream main

f4a8624

refactor: move OptionRowLHN children into dedicated subfolder

0f0768c

JS00001 previously approved these changes May 4, 2026

View reviewed changes

Comment thread src/components/LHNOptionsList/OptionRowLHN/OptionRowTooltipLayer.tsx Outdated

fix: drop unnecessary fragment in OptionRowTooltipLayer early return

052f36a

BartekObudzinski dismissed JS00001’s stale review via 052f36a May 4, 2026 13:57

JS00001 previously approved these changes May 4, 2026

View reviewed changes

stitesExpensify previously approved these changes May 4, 2026

View reviewed changes

chatgpt-codex-connector Bot reviewed May 4, 2026

View reviewed changes

Comment thread src/components/LHNOptionsList/OptionRowLHN/OptionRowTooltipLayer.tsx

fix: address ESLint failures (alias imports, no prop spread)

37a4c1e

BartekObudzinski dismissed stale reviews from stitesExpensify and JS00001 via 37a4c1e May 4, 2026 14:38

BartekObudzinski added 2 commits May 4, 2026 16:39

perf: skip tooltip hooks for rows that cannot show a tooltip

dd5428d

fix: prettier formatting

6c378f1

JS00001 previously approved these changes May 4, 2026

View reviewed changes

DylanDylann reviewed May 4, 2026

View reviewed changes

refactor: move tooltip eligibility computation into OptionRowTooltipL…

51c347d

…ayer

BartekObudzinski dismissed JS00001’s stale review via 51c347d May 4, 2026 15:05

DylanDylann reviewed May 4, 2026

View reviewed changes

refactor: split action badge, move offline wrapper into tooltip layer

b9a923b

DylanDylann reviewed May 4, 2026

View reviewed changes

joekaufmanexpensify removed their request for review May 4, 2026 20:49


		OptionRowTooltipLayerInner.displayName = 'OptionRowTooltipLayerInner';

		function OptionRowTooltipLayer({shouldShowRBRorGBRTooltip, shouldShowGetStartedTooltip, onOptionPress, renderChildren}: OptionRowTooltipLayerProps) {

Conversation

BartekObudzinski commented Apr 30, 2026 • edited by mountiny Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Measured impact

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

BartekObudzinski commented Apr 30, 2026

Uh oh!

JS00001 commented Apr 30, 2026

Uh oh!

melvin-bot Bot commented May 4, 2026

Uh oh!

DylanDylann commented May 4, 2026

Uh oh!

DylanDylann commented May 4, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

JS00001 left a comment

Choose a reason for hiding this comment

Uh oh!

codecov Bot commented May 4, 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!

Uh oh!

stitesExpensify commented May 4, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

DylanDylann May 4, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann May 4, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented May 4, 2026

Uh oh!

DylanDylann May 4, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann May 4, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann May 4, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann May 4, 2026

Choose a reason for hiding this comment

Uh oh!

joekaufmanexpensify commented May 4, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

BartekObudzinski commented Apr 30, 2026 •

edited by mountiny

Loading

DylanDylann commented May 4, 2026 •

edited

Loading

codecov Bot commented May 4, 2026 •

edited by github-actions Bot

Loading