Skip to content

Extract SelectionToolbar from MoneyRequestReportActionsList#87659

Merged
rlinoz merged 4 commits intoExpensify:mainfrom
callstack-internal:decompose/selection-toolbar
Apr 14, 2026
Merged

Extract SelectionToolbar from MoneyRequestReportActionsList#87659
rlinoz merged 4 commits intoExpensify:mainfrom
callstack-internal:decompose/selection-toolbar

Conversation

@adhorodyski
Copy link
Copy Markdown
Contributor

@adhorodyski adhorodyski commented Apr 10, 2026

@rlinoz

Explanation of Change

Extracted SelectionToolbar into a standalone self-subscribing component, removing it from MoneyRequestReportActionsList.

Previously, the toolbar's ~8 Onyx subscriptions (report, policy, chatReport, session, and related collections) lived inside the parent list component. Every Pusher event that updated any of those keys caused the entire parent + FlatList tree to re-render — including all visible report action rows. Moving the toolbar into its own component means those subscriptions are scoped to SelectionToolbar only. The parent now receives reportID, transactions, and reportActions as props and is otherwise unaffected by toolbar-related state updates.

Parent reduced from 985 → 746 lines. Fully React Compiler compliant — no manual memoization added.


Input

Before: 3 trial(s) — profiling-data.04-13-2026.15-39-01.json, profiling-data.04-13-2026.15-39-13.json, profiling-data.04-13-2026.15-39-27.json
After: 4 trial(s) — profiling-data.04-13-2026.15-31-10.json, profiling-data.04-13-2026.15-31-25.json, profiling-data.04-13-2026.15-31-37.json, profiling-data.04-13-2026.15-31-49.json

Summary

Metric Before After Delta Delta %
Total commits 65.3 65.0 -0.3 -0.5%
Total commit duration (ms) 602.7 497.6 -105.1 -17.4%
Components rendered 168 167 -1 -0.6%

Improved

Component Before renders After renders Before self (ms) After self (ms) Delta self (ms) Delta %
LinearGradientEmptyStateBackground 65.3 65.0 13.1 6.5 -6.6 -50.3%
ConfirmModal 6.0 6.0 1.9 0.1 -1.8 -94.7%
GenericPressable 16.7 15.3 6.6 5.7 -0.9 -13.6%
DropdownButton 1.7 1.0 1.4 0.6 -0.7 -52.4%
SearchFiltersBarWide 1.7 1.0 1.2 0.6 -0.6 -51.4%
SearchAutocompleteInput 11.7 9.0 2.5 1.9 -0.6 -23.0%
BaseTextInput 11.0 9.0 3.2 2.6 -0.5 -17.1%
RootStackNavigator 1.0 1.0 1.0 0.5 -0.4 -45.7%
RNMarkdownTextInputWithRef 11.0 9.0 1.0 0.5 -0.4 -45.7%
SearchPageHeaderInput 11.0 9.0 2.9 2.5 -0.4 -12.1%
HeaderWithBackButton (REMOVED) 1.0 0 0.0 0 REMOVED N/A

Regressed

Component Before renders After renders Before self (ms) After self (ms) Delta self (ms) Delta %
BaseListItem 6.0 6.0 4.4 7.3 2.9 66.5%
View 25.7 25.3 61.3 63.7 2.3 3.8%
OptionsListContextProvider 10.0 9.0 2.1 3.3 1.1 52.3%
ViewHolderInternal 8.0 9.0 5.3 6.3 1.1 20.1%
ReportActionItem 5.0 5.0 6.7 7.7 1.0 15.3%
OfflineWithFeedback 10.0 10.0 7.1 7.7 0.6 8.5%
ViewHolderCollection 17.0 17.0 4.8 5.4 0.5 11.2%
FlashList 9.0 9.0 2.3 2.8 0.5 22.1%
CustomStylesForChildrenProvider 10.0 10.0 2.0 2.4 0.4 20.8%
MenuItem 8.0 7.0 5.0 5.4 0.4 7.3%

Fixed Issues

$ #87760
PROPOSAL:

Tests

  1. Selection toolbar appears on mobile — Open report with expenses on narrow layout, long-press expense to enter selection mode. Toolbar shows with "Selected (1)" and dropdown.

  2. Select All / Deselect All — Enter selection mode, tap "Select all". All non-pending-delete transactions selected. Tap again, all deselected.

  3. Bulk delete with navigation — Select all expenses, delete. Confirm modal with correct count. If all deleted, navigates back to chat report.

  4. Cross-report selection cleanup — Select expenses in Report A, navigate to Report B. Selection clears automatically.

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

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

adhorodyski and others added 2 commits April 10, 2026 17:50
…lbar

# Conflicts:
#	src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx
@codecov
Copy link
Copy Markdown

codecov bot commented Apr 13, 2026

Codecov Report

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

Files with missing lines Coverage Δ
...equestReportView/MoneyRequestReportActionsList.tsx 65.01% <80.00%> (+5.56%) ⬆️
...onents/MoneyRequestReportView/SelectionToolbar.tsx 75.86% <75.86%> (ø)
... and 9 files with indirect coverage changes

@adhorodyski adhorodyski marked this pull request as ready for review April 13, 2026 14:26
@adhorodyski adhorodyski requested review from a team as code owners April 13, 2026 14:26
@melvin-bot melvin-bot bot requested review from joekaufmanexpensify and youssef-lr and removed request for a team April 13, 2026 14:26
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Apr 13, 2026

@youssef-lr 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 the request for review from a team April 13, 2026 14:27
@rlinoz rlinoz self-requested a review April 13, 2026 14:31
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: a547c1e78d

ℹ️ 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/components/MoneyRequestReportView/SelectionToolbar.tsx
@aimane-chnaif
Copy link
Copy Markdown
Contributor

@MelvinBot can you confirm all the removed logic in MoneyRequestReportActionsList.tsx‎ are correctly moved to SelectionToolbar.tsx and there are no inconsistencies?

@MelvinBot
Copy link
Copy Markdown
Contributor

All removed logic from MoneyRequestReportActionsList.tsx is correctly present in SelectionToolbar.tsx. Every import, Onyx subscription, state variable, callback, computed value, and JSX element has been faithfully moved. No missing pieces or behavioral inconsistencies.

Minor stylistic differences (all non-breaking)
  1. useFocusEffect — old code wrapped callback in useCallback; new code passes a bare arrow function. Re-registers each render but logic is identical and cheap.
  2. beginExportWithTemplate / onDeleteSelected — changed from useCallback to plain functions. Fine since they're consumed by a hook in the same render cycle.
  3. selectedTransactionsOptions — changed from useMemo to an IIFE. Recomputes every render; same logic.
  4. transactionsWithoutPendingDelete — changed from useMemo to plain .filter(). Same logic, no memoization.
  5. Confirm handler condition — flipped from if (=== CONFIRM) { do X } to if (!== CONFIRM) { return } do X. Semantically identical early-return pattern.
  6. Duplicate Onyx subscriptionsreport, policy, chatReport, reportNameValuePairs, reportMetadata are now subscribed in both components. Expected cost of decomposition and intentional per the PR description.

Items 1-4 relate to removing manual memoization, which is consistent with the PR description stating the code is "fully React Compiler compliant — no manual memoization added."

@aimane-chnaif
Copy link
Copy Markdown
Contributor

aimane-chnaif commented Apr 13, 2026

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

Android: HybridApp
android.mov
Android: mWeb Chrome
iOS: HybridApp
ios.mov
iOS: mWeb Safari
msafari.mov
MacOS: Chrome / Safari
web.mov

@MelvinBot
Copy link
Copy Markdown
Contributor

Code Review

The extraction is clean and correct — no bugs, no unused imports, no type mismatches. A few observations:

Medium: useFocusEffect without useCallback (SelectionToolbar.tsx:76)
React Navigation docs explicitly warn that the callback must be memoized. Without it, the effect tears down and re-runs every render. The PR relies on the React Compiler to auto-memoize this — valid while the compiler is active, but fragile if it's ever disabled for this file. Already discussed in the existing review thread, and the author confirmed this is intentional.

Low: Duplicate Onyx subscriptions
report, policy, chatReport, reportNameValuePairs, reportMetadata are now subscribed in both components (SelectionToolbar.tsx:62-68 and parent). Reasonable tradeoff for decomposition, but could be optimized later by passing as props.

Low: BulkDuplicateHandler moved inside wrapperViewRef
Previously rendered as a sibling before <View ref={wrapperViewRef}>, now rendered inside it via SelectionToolbar. Since BulkDuplicateHandler renders no visible UI, this shouldn't affect measureInWindow used for scroll-to-new-transaction — but worth being aware of.

Nits (all consistent with "no manual memoization" approach)
  • transactionsWithoutPendingDelete lost useMemo → plain .filter() every render (SelectionToolbar.tsx:93)
  • selectedTransactionsOptions changed from useMemo to IIFE (SelectionToolbar.tsx:200)
  • beginExportWithTemplate, onDeleteSelected, dismissRejectModalBasedOnAction lost useCallback wrappers

All rely on the React Compiler for memoization — consistent with the PR's stated approach.

Overall: well-scoped refactor with good perf wins. No blocking issues.

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: a547c1e78d

ℹ️ 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/components/MoneyRequestReportView/SelectionToolbar.tsx
@aimane-chnaif
Copy link
Copy Markdown
Contributor

aimane-chnaif commented Apr 13, 2026

Bug: Not able to select expenses after dismiss "Enjoying New Expensify" modal on iOS

Steps to reproduce:

  1. Create new account
  2. Create new workspace
  3. Create multiple expenses
  4. Go to expense detail
  5. Long press and select all expenses
  6. Press "x selected" > Submit
  7. Dismiss "Enjoying New Expensify" modal
  8. Try to long press and select expenses again
bug.mov

@aimane-chnaif
Copy link
Copy Markdown
Contributor

I think this bug was introduced by this PR. Not able to reproduce on main.

@adhorodyski
Copy link
Copy Markdown
Contributor Author

Screen.Recording.2026-04-14.at.12.41.58.mp4

I couldn't reproduce this (though I synced with main before that) so it's not reproducible for me on this branch @aimane-chnaif

@aimane-chnaif
Copy link
Copy Markdown
Contributor

I am not able to reproduce either. Blindly fixed elsewhere between yesterday and today?

Screen.Recording.2026-04-14.at.12.45.17.pm.mov

@rlinoz rlinoz merged commit c74212c into Expensify:main Apr 14, 2026
32 checks passed
@github-actions
Copy link
Copy Markdown
Contributor

🚧 @rlinoz 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/rlinoz in version: 9.3.60-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot
Copy link
Copy Markdown
Contributor

No help site changes needed — this PR is a purely internal refactoring (extracting SelectionToolbar into its own component for render performance). No user-facing features, labels, or workflows were changed.

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