Skip to content

perf: stop WorkspacesListPage re-renders triggered by policy isLoading merges#91316

Open
WojtekBoman wants to merge 3 commits into
Expensify:mainfrom
software-mansion-labs:perf/fix-workspaces-list-rerenders
Open

perf: stop WorkspacesListPage re-renders triggered by policy isLoading merges#91316
WojtekBoman wants to merge 3 commits into
Expensify:mainfrom
software-mansion-labs:perf/fix-workspaces-list-rerenders

Conversation

@WojtekBoman
Copy link
Copy Markdown
Contributor

@WojtekBoman WojtekBoman commented May 21, 2026

Explanation of Change

Adds a policyCollectionWithoutLoadingFlagsSelector that strips transient isLoading* flags from the policy collection, and applies it to WorkspacesListPage and usePoliciesWithCardFeedErrors. Also replaces an unstable inline style array literal with a stable undefined so the shallow compare on the prop can hold.

Why this selector is safe?

The three flags this selector strips (isLoading, isLoadingReceiptPartners, isLoadingWorkspaceReimbursement) are only ever read off a single policy entry — every consumer subscribes via useOnyx(${ONYXKEYS.COLLECTION.POLICY}${policyID}) (directly or through usePolicy(policyID)), never off the policy collection. Since Onyx single-entry subscriptions are independent from collection subscriptions and the selector only filters what it returns (it doesn't mutate stored data), the two collection consumers using this selector (WorkspacesListPage and usePoliciesWithCardFeedErrors, neither of which reads these flags) stop re-rendering on loading-flag flips, while every spinner that depends on those flags keeps working unchanged.

Main:

Screen.Recording.2026-05-22.at.10.10.53.mov

The optimized version:

Important

Rows still re-render when the page re-renders, because menuItems and onPress are built inline per row and defeat React.memo; this is orthogonal to the loading-flag churn fixed here and should be addressed in a follow-up perf PR.

Screen.Recording.2026-05-22.at.10.08.33.mov

Fixed Issues

$ #91175
PROPOSAL:

Tests

  1. Sign in to an account with several workspaces (a High Traffic account gives the clearest signal).

  2. Open Settings → Workspaces and wait for the list to settle.

  3. Open the React DevTools Profiler (web) and start recording.

  4. Tap any workspace to navigate into it, then open a tab that calls openPolicyWorkflowsPage (e.g. Workflows).

  5. Stop recording without tapping back.

  6. Verify that WorkspacesListPage does not commit while the workspace screen is foregrounded, apart from the expected single isFocused blur transition. Before this PR, the page would re-render twice per optimistic isLoading flip on the policy entry (and the cascade re-rendered every row).

  7. Sign in to an account with several workspaces.

  8. Open Settings → Workspaces, scroll partway down, and tap one workspace to open it.

  9. Navigate through a few workspace tabs (Workflows, Members, etc.) and then tap back to the workspaces list.

  10. Verify that scroll position is preserved, the row that was tapped is not stuck in a hovered/pressed state, and the list renders normally.

  11. Sign in to an account that both owns at least one workspace and is a member of another workspace it doesn't own.

  12. Open Settings → Workspaces and tap the three-dots menu on each kind of workspace row.

  13. Verify the expected entries appear based on role (Go to workspace / Leave / Duplicate / Set as default / Delete / Transfer owner) and that selecting each performs its action without errors.

  • Verify that no errors appear in the JS console

Offline tests

N/A — this change only affects which fields on the policy collection trigger re-renders. It does not add API calls and does not change offline persistence behaviour.

QA Steps

Same as tests.

  • 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

@WojtekBoman
Copy link
Copy Markdown
Contributor Author

@codex

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

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

brickRoadIndicator={item.brickRoadIndicator}
shouldDisableThreeDotsMenu={item.disabled}
style={[item.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? styles.offlineFeedbackDeleted : {}]}
style={item.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? styles.offlineFeedbackDeleted : undefined}
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 Preserve deleted-row style array for strike-through detection

Passing styles.offlineFeedbackDeleted directly here changes style from an array to an object, but WorkspacesListRow derives isDeleted using Array.isArray(style) && style.includes(styles.offlineFeedbackDeleted). In the pending-delete case this now evaluates false, so the row’s text no longer gets the deleted strike-through treatment even though the workspace is pending deletion. This regresses the deleted-row visual state in Workspaces list flows.

Useful? React with 👍 / 👎.

@codecov
Copy link
Copy Markdown

codecov Bot commented May 21, 2026

Codecov Report

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

Files with missing lines Coverage Δ
src/hooks/usePoliciesWithCardFeedErrors.ts 100.00% <100.00%> (ø)
src/pages/workspace/WorkspacesListPage.tsx 72.69% <100.00%> (ø)
src/selectors/Policy.ts 76.06% <90.00%> (+1.30%) ⬆️
... and 21 files with indirect coverage changes

@WojtekBoman
Copy link
Copy Markdown
Contributor Author

@codex

@chatgpt-codex-connector
Copy link
Copy Markdown

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

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

@WojtekBoman WojtekBoman marked this pull request as ready for review May 22, 2026 14:20
@WojtekBoman WojtekBoman requested review from a team as code owners May 22, 2026 14:20
@melvin-bot melvin-bot Bot requested review from abzokhattab and joekaufmanexpensify and removed request for a team May 22, 2026 14:20
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented May 22, 2026

@abzokhattab 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 May 22, 2026 14:20
@abzokhattab
Copy link
Copy Markdown
Contributor

@codex review the PR

@abzokhattab
Copy link
Copy Markdown
Contributor

@MelvinBot review the PR

@MelvinBot
Copy link
Copy Markdown
Contributor

PR Review

Overall: Solid perf improvement. The selector approach is well-proven in this codebase (mirrors iouRequestPolicyCollectionSelector) and the claim that neither WorkspacesListPage nor usePoliciesWithCardFeedErrors reads these loading flags checks out.

Issues

  1. PR description mentions wrapping WorkspacesListRow in React.memo, but the diff doesn't include that change. The current export is withCurrentUserPersonalDetails(WorkspacesListRow) with no memo layer. Either the description is stale or the change is missing.

  2. deletedRowStyle is recreated every renderconst deletedRowStyle = [styles.offlineFeedbackDeleted] creates a new array each time WorkspacesListPage renders. Since WorkspacesListRow isn't memoized (see point 1), this doesn't matter today, but if memo is intended to be added, this would defeat it for rows in the delete state. Consider moving it to useMemo or a module-level constant.

Looks Good

  • The three stripped flags (isLoading, isLoadingReceiptPartners, isLoadingWorkspaceReimbursement) are all optional on the Policy type, so the as Policy cast is safe.
  • Both consumers (WorkspacesListPage, usePoliciesWithCardFeedErrors) handle undefined/null policies correctly.
  • Replacing {} with undefined for the non-delete style case is a nice touch — avoids a fresh object reference on every render.
  • The comment on the selector clearly explains the rationale and the safety argument.

@chatgpt-codex-connector
Copy link
Copy Markdown

Codex Review: Didn't find any major issues. 🚀

ℹ️ 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/selectors/Policy.ts
// (e.g. openPolicyWorkflowsPage's optimistic isLoading=true/false). Consumers that render the
// policy collection but don't care about those flags can pass this as a selector so useOnyx's
// deepEqual check elides re-renders while another screen flips the flags.
const policyCollectionWithoutLoadingFlagsSelector = (policies: OnyxCollection<Policy>): OnyxCollection<Policy> => {
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.

Can hou add a test for this?


function usePoliciesWithCardFeedErrors() {
const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: policyCollectionWithoutLoadingFlagsSelector});
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.

@TMisiukiewicz thoughts on this solution?

Copy link
Copy Markdown
Contributor

@TMisiukiewicz TMisiukiewicz May 25, 2026

Choose a reason for hiding this comment

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

uhh I think this will be a big perf regression for a customer with 5k policies, as the entire object will go through deepEqual inside useOnyx 😬. Can we verify it?

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.

I'll check it out 🕵️

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.

Image

@TMisiukiewicz

Hi, I checked how the performance behaves with 5k workspaces in the workspace list. To test this, I used the Aplause heavy account and multiplied their workspaces by 50x.

In the scenario with the selector enabled, the multiplication was done inside the selector itself. In the scenario without the selector, the multiplication was applied directly to the result returned from useOnyx, and then I measured rendering only.

I ran several profiler measurements, and the screenshot above shows the average results. From what I can see, we’re not really dealing with a performance issue here even with 5k workspaces, the difference is only a few milliseconds. In my opinion, with such a large dataset, this kind of variance is likely within the margin of measurement error.

It’s also worth noting that the selector helps reduce unnecessary re-renders caused by changes in loading fields, not only in the specific scenario related to this issue.

What do you think?

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.

I’ll also prepare tests using the file from you, but it’s possible the results will be similar.

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.

I did a measurement on iOS and for 5k policies I got ~650ms spent on deepEqual when I manually sent a merge to policies compared to ~1ms on main, here are the steps I followed

Screen.Recording.2026-05-26.at.09.52.56.mov

And the output:
Trace-20260526T095323.json

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.

So multiplying in the selector is probably not the best solution after all 😅 . In that case, I’ll try to come up with a better solution/workaround for this problem.

@mountiny
Copy link
Copy Markdown
Contributor

I believe the goal was also to undo the freezewrapper #90970

@abzokhattab
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 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: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari

@abzokhattab
Copy link
Copy Markdown
Contributor

Is it not ready for review? should i halt?

@joekaufmanexpensify
Copy link
Copy Markdown
Contributor

No product review needed

@joekaufmanexpensify joekaufmanexpensify removed their request for review May 22, 2026 21:14
@WojtekBoman WojtekBoman force-pushed the perf/fix-workspaces-list-rerenders branch from b509f56 to b5605f0 Compare May 25, 2026 09:13
@abzokhattab
Copy link
Copy Markdown
Contributor

Let me know when its ready for a review :D

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.

7 participants