Skip to content

Conversation

@TMisiukiewicz
Copy link
Contributor

@TMisiukiewicz TMisiukiewicz commented Dec 2, 2025

Details

Another attempt after reverting #693.

When setCollection/mergeCollection/partialSetCollection are called from OpenApp and ReconnectApp, it should preserve references for all the items that are unchanged to reduce the amount of the re-renders of the components connected to collection items that did not change.

$ Expensify/App#72679

=== 📁 Trace File Analysis ===

📄 File: profiling-data.02.12.2025.14-57-32.json
  • Commit count: 17
  • Total render duration: 609.893 ms
  • p50 / p95 / p99 (ms):
    • p50: 1.352 ms
    • p95: 321.086 ms
    • p99: 321.086 ms

📄 File: profiling-data.02.12.2025.14-58-32.json
  • Commit count: 9
  • Total render duration: 132.325 ms
  • p50 / p95 / p99 (ms):
    • p50: 1.263 ms
    • p95: 119.362 ms
    • p99: 119.362 ms

=== 📊 Trace Comparison ===

🔁 Comparing Baseline ↔️ profiling-data.02.12.2025.14-58-32.json
  🟢 Duration Diff: -477.568 ms (-78.3%)
  🟢 Commit Count Diff: -8

Related Issues

Expensify/App#74385
Expensify/App#74405
Expensify/App#74406

Automated Tests

Added required unit tests

Manual Tests

Test 1

  1. Open app
  2. Go to Settings -> Troubleshoot
  3. Clear cache and restart
  4. Go back to LHN
  5. Verify the LHN is displayed correctly

Test 2 - Expensify/App#74385

  1. Go to workspace chat.
  2. Create an expense.
  3. Open the report.
  4. Click More > Split
  5. Click Save.
  6. Open any split.
  7. Click More > Edit splits.
  8. Click on the other split (not highlighted).
  9. Click Remove split.
  10. Click Save.
  11. Click More.
  12. Verify split, hold and merge options are visible

Test 3 - Expensify/App#74406

  1. Open the Expensify app
  2. Open any workspace chat
  3. Create three manual expenses
  4. Navigate to "Reports" > "Reports"
  5. Expand the preview of the just created report
  6. Long tap and select two of the three expenses
  7. Tap on the dropdown menu and delete both expenses
  8. Navigate to workspace chat again
  9. Verify the report preview displays "1 expense" and the two deleted expenses are not displayed

Test 4 - Expensify/App#74405

  1. Go to workspace chat
  2. Create an expense
  3. Open the report
  4. Click More > Split
  5. Click Save
  6. Open any split
  7. Delete the split
    8.Create another expense in the same report
  8. Go offline
  9. Remove the split
  10. Verify the removed split does not reappear

Author Checklist

  • I linked the correct issue in the ### Related 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 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 / Chrome
    • iOS / native
    • iOS / Safari
    • MacOS / Chrome / Safari
    • MacOS / Desktop
  • 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • 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 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.js 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 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
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
    • 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 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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native
android.mov
Android: mWeb Chrome
iOS: Native
ios.mov
iOS: mWeb Safari
ios-web.mov
MacOS: Chrome / Safari
web.mov
MacOS: Desktop
desktop.mov

@TMisiukiewicz TMisiukiewicz requested a review from a team as a code owner December 2, 2025 13:48
@melvin-bot melvin-bot bot requested review from amyevans and removed request for a team December 2, 2025 13:49
@TMisiukiewicz
Copy link
Contributor Author

failing perf tests are expected

@JS00001 JS00001 self-requested a review December 2, 2025 14:09
@dukenv0307
Copy link

dukenv0307 commented Dec 2, 2025

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
Screen.Recording.2025-12-02.at.23.56.59.mov
Android: mWeb Chrome
Screen.Recording.2025-12-02.at.23.51.49.mov
iOS: HybridApp
Screen.Recording.2025-12-02.at.23.55.18.mov
iOS: mWeb Safari
Screen.Recording.2025-12-02.at.23.47.55.mov
MacOS: Chrome / Safari
Screen.Recording.2025-12-02.at.22.37.30.mov
Screen.Recording.2025-12-02.at.22.39.42.mov
Screen.Recording.2025-12-02.at.22.43.33.mov
Screen.Recording.2025-12-02.at.22.46.05.mov

@amyevans amyevans removed their request for review December 2, 2025 15:51
@dukenv0307
Copy link

dukenv0307 commented Dec 2, 2025

I found 2 issues, but they're not related to this PR, I still can reproduce on main

Test 1: Empty space after clear cache and reset

Screenshot 2025-12-03 at 00 01 19

Test 3: The report displays incorrectly after removing 2 expenses

Screenshot 2025-12-03 at 00 01 00

@JS00001
Copy link
Contributor

JS00001 commented Dec 2, 2025

@dukenv0307 could you please post those bugs in #expensify-bugs?

@JS00001
Copy link
Contributor

JS00001 commented Dec 2, 2025

@TMisiukiewicz

Merging is blocked
Commits must have verified signatures.

@TMisiukiewicz
Copy link
Contributor Author

@JS00001 oh damn, I switched to new Macbook last week and forgot 🤦 Let me fix this

@TMisiukiewicz TMisiukiewicz force-pushed the feat/preserve-references-of-unchanged-collection-items branch from 4c8a2b5 to 15fab94 Compare December 3, 2025 05:55
@TMisiukiewicz TMisiukiewicz force-pushed the feat/preserve-references-of-unchanged-collection-items branch from fa3b8b4 to a493500 Compare December 3, 2025 06:18
@TMisiukiewicz
Copy link
Contributor Author

Huh, modifying git history is insane, but I think it should be good now 😅

@dukenv0307
Copy link

dukenv0307 commented Dec 3, 2025

@dukenv0307 could you please post those bugs in #expensify-bugs?

I reported the first bug here, but for the second one I can't reproduce.

@JS00001 JS00001 merged commit 3877aae into Expensify:main Dec 3, 2025
7 of 8 checks passed
@os-botify
Copy link
Contributor

os-botify bot commented Dec 3, 2025

🚀 Published to npm in 3.0.19 🎉

TMisiukiewicz added a commit to callstack-internal/react-native-onyx that referenced this pull request Dec 9, 2025
…/preserve-references-of-unchanged-collection-items"

This reverts commit 3877aae, reversing
changes made to ae1ec3f.
mountiny added a commit that referenced this pull request Dec 9, 2025
TMisiukiewicz pushed a commit to callstack-internal/react-native-onyx that referenced this pull request Dec 15, 2025
…e-references-of-unchanged-collection-items

perf: preserve references of unchanged collection items v2
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.

3 participants