Revert "Remove macro/micro tasks during subscriber update"#758
Merged
rafecolton merged 1 commit intomainfrom Mar 20, 2026
Merged
Conversation
Contributor
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppAndroid: mWeb ChromeiOS: HybridAppiOS: mWeb SafariMacOS: Chrome / Safari |
luacmartins
approved these changes
Mar 20, 2026
|
@rafecolton looks like this was merged without a test passing. Please add a note explaining why this was done and remove the |
Member
Author
|
Not an emergency, straight revert. More context in linked thread |
Contributor
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 90f77d8c69
ℹ️ 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".
| }, 0); | ||
| }); | ||
| } | ||
| return Promise.all([nextMacrotaskPromise, Promise.resolve().then(callback)]).then(); |
There was a problem hiding this comment.
prepareSubscriberUpdate() is supposed to move subscriber work to the next macrotask, but Promise.resolve().then(callback) still runs keyChanged()/keysChanged() in the current turn before the setTimeout(0) barrier resolves. That means a connect() that is still hydrating a collection can still be overtaken by an immediate Onyx.set()/merge(), so waitForCollectionCallback subscribers may receive only the just-written member instead of the full collection during startup/reconnect. This is the same race the deleted tests/unit/collectionHydrationTest.ts was covering, so the revert brings back a user-visible initialization regression.
Useful? React with 👍 / 👎.
Comment on lines
810
to
812
| cachedCollection[key] = value; | ||
| lastConnectionCallbackData.set(subscriber.subscriptionID, cachedCollection); | ||
| subscriber.callback(cachedCollection, subscriber.key, {[key]: value}); | ||
| continue; |
There was a problem hiding this comment.
This branch used to update lastConnectionCallbackData with the assembled collection before invoking the callback. Without that bookkeeping, waitForCollectionCallback subscribers are no longer deduplicated, so a logically unchanged member can trigger an extra collection callback on the next update. useOnyx opts collection keys into waitForCollectionCallback by default (lib/useOnyx.ts:312), so this becomes a duplicate rerender/repeated side effect for collection hooks; the changed expectation in tests/unit/onyxTest.ts:1555-1558 is already showing the extra callback.
Useful? React with 👍 / 👎.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Details
Reverts #724 so that #754 can be safely merged into App.
More context here
cc @VickyStash @mountiny @fabioh8010 @kubabutkiewicz @Krishna2323
Related Issues
https://expensify.slack.com/archives/C08CZDJFJ77/p1774037642775419?thread_ts=1774036698.125079&cid=C08CZDJFJ77
Automated Tests
N/A, straight revert
Manual Tests
N/A, straight revert
Author Checklist
### Related Issuessection aboveTestssectiontoggleReportand notonIconClick)myBool && <MyComponent />.STYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)/** comment above it */thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor)thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick)Avataris modified, I verified thatAvataris working as expected in all cases)mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari