Skip to content

Fix cross-tab sync for collection-root subscribers - #815

Draft
elirangoshen wants to merge 6 commits into
Expensify:mainfrom
callstack-internal:eliran/94839-tab-sync-for-collections
Draft

Fix cross-tab sync for collection-root subscribers#815
elirangoshen wants to merge 6 commits into
Expensify:mainfrom
callstack-internal:eliran/94839-tab-sync-for-collections

Conversation

@elirangoshen

@elirangoshen elirangoshen commented Jul 28, 2026

Copy link
Copy Markdown
Contributor

Details

Supersedes #803 (same changes with latest main merged in — re-opened from a branch I can maintain). Originally coming from here, authored by @fabioh8010.

Cross-tab (multi-instance) storage sync events were not delivered to collection-root subscribers — e.g. the LHN subscribing to the whole report_ collection — so actions like pin/unpin, drafting a message, or marking a report read/unread performed in one tab did not sync to other open tabs.

This PR:

  • Batches storage sync events and notifies collection-root subscribers (not just individual member-key subscribers) when collection members sync from another instance.
  • Handles legacy pre-batching sync events for backward compatibility.
  • Splits large sync events into chunks to stay under storage event size limits.

Note: this fix depends on the OnyxDerived recompute coalescing that landed in E/App via Expensify/App#96785 (now on staging). Without coalescing, the extra collection-root notifications caused a derived-value recompute storm. Re-verified against latest E/App main (which includes #96785) — see Manual Tests.

Related Issues

Expensify/App#94839

Linked E/App PR

Expensify/App#97218

Automated Tests

Added tests in tests/unit/onyxTest.ts verifying that both collection-root subscribers (waitForCollectionCallback: true) and collection member subscribers are notified when a collection member syncs from another instance. Existing multi-instance sync tests were updated to the new batched event shape.

Manual Tests

Tested on web against latest E/App main (includes the OnyxDerived microtask coalescing from Expensify/App#96785), with Onyx pinned to this PR's head (latest main merged in, v3.0.94):

  1. Opened two NewDot tabs signed in to the same account.
  2. In Tab A: pinned/unpinned a report, drafted a message in a mid-list report, marked a report read/unread, and sent a message — verified each action synced to Tab B (pin icon, LHN re-ordering, draft icon, unread bold, new message) without refreshing.
  3. Verified no derived recompute storm: instrumented OnyxDerived compute counts in the idle tab — only ~3–6 recomputes per action (previous failure mode without coalescing was thousands of recomputes and a frozen tab).
  4. Verified no console errors and no tab freeze in either tab.

Author Checklist

  • I linked the correct issue in the ### Related Issues section above
  • I linked the corresponding Expensify/App PR in the ### Linked E/App PR section above, and verified this change against it (E/App CI passed and manual testing completed)
  • 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
  • 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: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2026-07-28.at.11.30.11.mov
Screen.Recording.2026-07-28.at.11.31.40.mov
Screen.Recording.2026-07-28.at.11.39.21.mov

Collection-root callbacks are now automatic for collection keys, so the
option no longer exists on ConnectOptions.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@elirangoshen
elirangoshen marked this pull request as ready for review July 28, 2026 10:57
@elirangoshen
elirangoshen requested a review from a team as a code owner July 28, 2026 10:57
@elirangoshen

Copy link
Copy Markdown
Contributor Author

@codex review

@melvin-bot
melvin-bot Bot requested review from Beamanator and removed request for a team July 28, 2026 10:57

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

Copy link
Copy Markdown

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

ℹ️ 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 lib/storage/InstanceSync/index.web.ts
@Beamanator

Copy link
Copy Markdown
Contributor

Eyyy i'm traveling a bit today so won't be able to get to this review till tomorrow, @mountiny looks like you're assigned to the issue Expensify/App#94839, do you want to review today?

@mountiny
mountiny self-requested a review July 28, 2026 18:27
@truph01

truph01 commented Jul 29, 2026

Copy link
Copy Markdown

@mountiny Could you assign me as a reviewer since I was assigned to Expensify/App#94839?

@elirangoshen
elirangoshen marked this pull request as draft July 29, 2026 14:23
@elirangoshen
elirangoshen force-pushed the eliran/94839-tab-sync-for-collections branch from 4f91425 to f4587d6 Compare July 29, 2026 14:31
@mountiny
mountiny requested a review from situchan July 29, 2026 17:34
@mountiny

Copy link
Copy Markdown
Contributor

Happy to review, @situchan can you work on the checklist?

@situchan

Copy link
Copy Markdown

@situchan can you work on the checklist?

yes

Comment on lines 22 to +77
function raiseStorageSyncManyKeysEvent(onyxKeys: StorageKeyList) {
if (onyxKeys.length === 0) {
return;
}

let chunk: StorageKeyList = [];
let chunkLength = 2; // accounts for the surrounding `[]`
for (const onyxKey of onyxKeys) {
raiseStorageSyncEvent(onyxKey);
const keyLength = onyxKey.length + 3; // quotes + comma separator
if (chunk.length > 0 && chunkLength + keyLength > MAX_SYNC_PAYLOAD_LENGTH) {
emitSyncEvent(JSON.stringify(chunk));
chunk = [];
chunkLength = 2;
}
chunk.push(onyxKey);
chunkLength += keyLength;
}
if (chunk.length > 0) {
emitSyncEvent(JSON.stringify(chunk));

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Chunking can split a collection across two events.

Chunks are cut purely by payload size, so if one collection's members land in two different chunks, the receiver sees two storage events → two keysChanged calls → two collection notifications instead of one.
This partially undoes the O(N²)→O(1) win exactly in the large-batch case chunking exists for.
Grouping by collection before chunking would avoid it.

Not blocker though

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 think its an edge case , maybe not worth to fix for now.
what do you think @fabioh8010 ?

Comment thread tests/unit/onyxTest.ts
Onyx.disconnect(connection2);
});

it('should notify collection-root and collection member subscribers when a collection member syncs from another instance', async () => {

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

A couple of test gaps worth filling.

The two new tests are good, but I'd add:

  • A deletion test (member removed in another tab → subscribers get undefined). Not only verifying this manually.
  • A chunking test around the size limit — that logic is currently untested.
  • Optionally, a test for the legacy raw-key path in parseSyncOnyxStorageEventValue.

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 added few tests now.

@situchan

situchan commented Jul 29, 2026

Copy link
Copy Markdown

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 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)
  • 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)
  • 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.
  • 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
test.mov

…y parsing

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
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.

6 participants