Skip to content

refactor: PureReportActionItem, add ModifiedExpenseContent and ReimbursementDeQueuedContent#87756

Merged
cristipaval merged 5 commits intoExpensify:mainfrom
callstack-internal:perf-send-message-phase-5
Apr 21, 2026
Merged

refactor: PureReportActionItem, add ModifiedExpenseContent and ReimbursementDeQueuedContent#87756
cristipaval merged 5 commits intoExpensify:mainfrom
callstack-internal:perf-send-message-phase-5

Conversation

@LukasMod
Copy link
Copy Markdown
Contributor

@LukasMod LukasMod commented Apr 13, 2026

Explanation of Change

Phase 5 of splitting the PureReportActionItem component.

Extracted ModifiedExpenseContent and ReimbursementDeQueuedContent as self-subscribing components, removing usePolicyForMovingExpenses (which scans the entire policy collection), 3 useOnyx calls, and 2 derived computations from ReportActionItem. These now only mount for matching action types instead of firing for every visible item.

This removes 2 props and 2 memo comparator entries from PureReportActionItem, reducing per-item subscription cost by ~6 useOnyx calls across the render path.

Fixed Issues

$ #87889
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console

Test 1: Modified Expense, Manual Field Edits

Steps:

  1. Submit an expense in a workspace chat
  2. Change amount, save
  3. Verify: system message shows the amount change
  4. Change the merchant, save
  5. Verify: system message shows the merchant change
  6. Change the description, save
  7. Verify: system message shows the description change

Test 2: Modified Expense, Tag Change

Preconditions:

  • Tags enabled with at least 2 tags

Steps:

  1. Submit an expense in that workspace with tag set to "Tag A"
  2. Open the expense, change the tag to "Tag B", save
  3. Verify: system message shows the tag change with readable names
  4. Remove the tag entirely, save
  5. Verify: system message shows the tag was removed

Test 3: Moved Expense, Between Workspace Reports

Steps:

  1. Open an expense that belongs to a workspace report (report A)
  2. Move it to a different report or workspace (report B)
  3. Go to the report B chat
  4. Verify: system message shows the expense was moved, with the correct origin report A name

Test 4: Reimbursement Dequeued, Cancel Payment

Preconditions:

  • A workspace with manual reimbursement

  • An expense submitted and paid elsewhere / outside Expensify (so the "Cancel payment" option is available on the report)

    Steps:

    1. Open the paid expense report
    2. Click the three-dot menu in the report header and select "Cancel payment"
    3. Confirm the cancellation in the modal
    4. Verify: a system message "canceled the payment" appears

Offline tests

QA Steps

  • 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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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
Screen.Recording.2026-04-14.at.14.34.29.mov
Android: mWeb Chrome

https://github.com/user-attachments/assets/ac3afe50-7c99-403f-be93-dc3cec4372f2
Screenshot 2026-04-14 at 14 46 05

iOS: Native

https://github.com/user-attachments/assets/e675ecac-2226-47a6-b2a1-1a49a0f35327
Screenshot 2026-04-14 at 14 45 41

iOS: mWeb Safari
Screen.Recording.2026-04-14.at.14.41.26.mov
MacOS: Chrome / Safari
Screen.Recording.2026-04-14.at.14.46.24.mov

Test 4
image

@LukasMod
Copy link
Copy Markdown
Contributor Author

@codex review

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: cfde41cb4e

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

Comment thread src/pages/inbox/report/PureReportActionItem.tsx
@LukasMod
Copy link
Copy Markdown
Contributor Author

@codex review

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4896437263

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

Comment on lines 2270 to 2273
prevProps.isChronosReport === nextProps.isChronosReport &&
prevProps.isClosedExpenseReportWithNoExpenses === nextProps.isClosedExpenseReportWithNoExpenses &&
deepEqual(prevProps.missingPaymentMethod, nextProps.missingPaymentMethod) &&
prevProps.reimbursementDeQueuedOrCanceledActionMessage === nextProps.reimbursementDeQueuedOrCanceledActionMessage &&
prevProps.modifiedExpenseMessage === nextProps.modifiedExpenseMessage &&
prevProps.userBillingFundID === nextProps.userBillingFundID &&
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Invalidate memo when extracted message inputs change

After extracting ModifiedExpenseContent and ReimbursementDeQueuedContent, the memo comparator no longer tracks the derived message props that previously forced updates for these action types. As a result, PureReportActionItem can now skip rerenders when values like currentUserEmail or report fields used by those messages change, leaving stale text/link state (for example, a modified-expense message can keep the help URL instead of switching to workspace rules once user/session data hydrates). Please include the underlying dependencies in the comparator (or keep passing derived message props) so these branches re-render when their inputs change.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The props that bypass the memo (report?.ownerAccountID, report?.policyID, currentUserEmail) are immutable during the component's lifetime, they're set at report creation / login and don't change. The mutable data (policy, policyTags, movedFrom/ToReport) is handled by self-subscription inside the extracted components, which bypasses the memo entirely. The old string comparisons were only catching changes to these self-subscribing values, not to the immutable ones.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically there is also another case of change which is the first loading of the data. There can be other cases that could cause a re-render in those circumstances but it might be a good idea to still add the necessary dependencies. WDYT @cristipaval

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than re-add the prop/comparator entry, I pushed the fix to ModifiedExpenseContent itself to read it via useCurrentUserPersonalDetails() , the same pattern we use in other decomposed files. Context updates re-render the child directly when session.email hydrates. It will work well with other PRs too

@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 14, 2026

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
src/pages/inbox/report/PureReportActionItem.tsx 77.77% <100.00%> (-0.20%) ⬇️
src/pages/inbox/report/ReportActionItem.tsx 100.00% <ø> (ø)
src/pages/inbox/report/ReportActionItemThread.tsx 0.00% <ø> (ø)
...ox/report/actionContents/MentionWhisperContent.tsx 86.66% <ø> (ø)
...x/report/actionContents/ModifiedExpenseContent.tsx 100.00% <100.00%> (ø)
.../inbox/report/actionContents/ReimbursedContent.tsx 100.00% <100.00%> (ø)
...rt/actionContents/ReimbursementDeQueuedContent.tsx 100.00% <100.00%> (ø)
... and 34 files with indirect coverage changes

@LukasMod LukasMod force-pushed the perf-send-message-phase-5 branch from 0e0a44b to 95e063e Compare April 14, 2026 13:39
@LukasMod LukasMod marked this pull request as ready for review April 14, 2026 13:41
@LukasMod LukasMod requested review from a team as code owners April 14, 2026 13:41
@melvin-bot melvin-bot Bot requested review from FitseTLT and heyjennahay April 14, 2026 13:41
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented Apr 14, 2026

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

@melvin-bot melvin-bot Bot removed request for a team April 14, 2026 13:41
@FitseTLT
Copy link
Copy Markdown
Contributor

@cristipaval I am auto assigned here shall I review it?

@cristipaval
Copy link
Copy Markdown
Contributor

yes please, @FitseTLT . Thanks

@LukasMod
Copy link
Copy Markdown
Contributor Author

@FitseTLT Could you please take a look at this PR?

@cristipaval
Copy link
Copy Markdown
Contributor

I pinged him internally

@FitseTLT
Copy link
Copy Markdown
Contributor

On it

@FitseTLT
Copy link
Copy Markdown
Contributor

@LukasMod We are missing test steps for ReimbursementDeQueuedContent

@LukasMod LukasMod force-pushed the perf-send-message-phase-5 branch from f5863c1 to 3f50c60 Compare April 20, 2026 07:58
@LukasMod
Copy link
Copy Markdown
Contributor Author

@FitseTLT Right, I added steps for Test 4 for ReimbursementDeQueuedContent, thanks! Unit tests inside PureReportActionItemTest, same as for other branches

@LukasMod
Copy link
Copy Markdown
Contributor Author

I pushed some useCurrentUserPersonalDetails subscriptions deep down to children to avoid stale values case and prepare it for next PRs a bit

@FitseTLT
Copy link
Copy Markdown
Contributor

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.
  • [ x 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 image
Android: mWeb Chrome image
iOS: HybridApp image
iOS: mWeb Safari image
MacOS: Chrome / Safari image

Copy link
Copy Markdown
Contributor

@FitseTLT FitseTLT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@melvin-bot melvin-bot Bot requested a review from cristipaval April 20, 2026 19:20
Copy link
Copy Markdown
Contributor

@cristipaval cristipaval left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you both!

@cristipaval cristipaval merged commit 3c70896 into Expensify:main Apr 21, 2026
33 checks passed
@github-actions
Copy link
Copy Markdown
Contributor

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

@OSBotify
Copy link
Copy Markdown
Contributor

✋ 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
Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.3.61-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot
Copy link
Copy Markdown
Contributor

This PR is a purely internal refactoring — it extracts ModifiedExpenseContent, ReimbursementDeQueuedContent, and ReimbursedContent into self-subscribing components to reduce per-item Onyx subscription cost in PureReportActionItem. There are no user-facing changes to features, UI labels, workflows, or behavior.

No help site changes are required.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants