Skip to content

[CP Staging] Revert "Coalesce OnyxDerived recomputations via macrotask scheduling" - #95715

Merged
inimaga merged 1 commit into
Expensify:mainfrom
callstack-internal:revert-95287-onyxderived-coalescing
Jul 9, 2026
Merged

inimaga merged 1 commit into
Expensify:mainfrom
callstack-internal:revert-95287-onyxderived-coalescing

Conversation

@fabioh8010

@fabioh8010 fabioh8010 commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Reverts #95287 because of some deploy blockers:

Fixed Issues

$ #95301
$ #95721
$ #95700
$ #95698
$ #95696
PROPOSAL:

Tests

Verify the DBs are not reproducible anymore:

Offline tests

N/A

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 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 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)
  • 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.
  • 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
Screen.Recording.2026-07-09.at.16.17.24.mov
Screen.Recording.2026-07-09.at.16.22.48.mov
Screen.Recording.2026-07-09.at.16.25.48.mov

Reverts the coalescing engine that caused deploy blockers, scoped to just the
OnyxDerived changes on top of current main. Restores the synchronous, per-
dependency recompute engine (Onyx sourceValue based) and keeps
waitForCollectionCallback, matching main's current Onyx 3.0.86 (the onyx-store
work that removed it, Expensify#93436, was already reverted separately). Removes
getCollectionDelta, scheduleMacrotask, and the triggeredKeys/flush changes.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@codecov

codecov Bot commented Jul 9, 2026

Copy link
Copy Markdown

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
...bs/actions/OnyxDerived/configs/reportAttributes.ts 97.82% <100.00%> (+2.15%) ⬆️
...Derived/configs/reportTransactionsAndViolations.ts 100.00% <100.00%> (ø)
...actions/OnyxDerived/configs/sortedReportActions.ts 94.64% <100.00%> (-0.10%) ⬇️
src/libs/actions/OnyxDerived/index.ts 97.01% <100.00%> (-1.20%) ⬇️
src/libs/actions/OnyxDerived/utils.ts 100.00% <100.00%> (ø)
...ctions/OnyxDerived/configs/visibleReportActions.ts 94.82% <93.75%> (-1.61%) ⬇️
... and 18 files with indirect coverage changes

@fabioh8010
fabioh8010 marked this pull request as ready for review July 9, 2026 15:09
@fabioh8010
fabioh8010 requested review from a team as code owners July 9, 2026 15:09
@melvin-bot
melvin-bot Bot requested review from shubham1206agra and removed request for a team July 9, 2026 15:09
@melvin-bot

melvin-bot Bot commented Jul 9, 2026

Copy link
Copy Markdown

@shubham1206agra 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 requested review from heyjennahay and removed request for a team July 9, 2026 15:15

@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: 4c2803515f

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

context.currentValue = derivedValue;
context.sourceValues = sourceValues as typeof context.sourceValues;
context.triggeredKeys = triggeredKeys;
context.sourceValues = sourceKey && sourceValue !== undefined ? {[sourceKey]: sourceValue} : 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 cleared scalar dependency triggers

When a non-collection dependency is cleared to undefined, this drops both the new value and the identity of the triggering key from context.sourceValues. Several derived configs rely on seeing that key to force a full recompute (for example visibleReportActions on ONYXKEYS.SESSION for whisper targeting, and reportAttributes on locale/intro/concierge keys), so clearing one of those values now looks the same as an untriggered recompute and can leave the cached derived value computed for the previous scalar state until another dependency changes. Please keep the triggered key, or restore a separate trigger signal, even when the new value is undefined.

Useful? React with 👍 / 👎.

@fabioh8010 fabioh8010 Jul 9, 2026

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.

This PR is just a revert, and the issue mentioned was actually being solved in #95287

@inimaga

inimaga commented Jul 9, 2026

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 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
    • 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
    • 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 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

@inimaga
inimaga merged commit 262d84a into Expensify:main Jul 9, 2026
39 of 44 checks passed
@inimaga inimaga changed the title Revert "Coalesce OnyxDerived recomputations via macrotask scheduling" [CP Staging] Revert "Coalesce OnyxDerived recomputations via macrotask scheduling" Jul 9, 2026
@OSBotify

OSBotify commented Jul 9, 2026

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.

@github-actions

github-actions Bot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

🚧 inimaga has triggered a test Expensify/App build. You can view the workflow run here.

@chiragsalian

chiragsalian commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

Looks like this PR was CP'd. I don't see anyone testing it though so i asked QA to test all the linked issues in this PR and to clear them if the issue doesn't persist.

@mountiny

mountiny commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

@chiragsalian it was not cped yet

OSBotify pushed a commit that referenced this pull request Jul 9, 2026
…rived-coalescing

Revert "Coalesce OnyxDerived recomputations via macrotask scheduling"

(cherry picked from commit 262d84a)

(cherry-picked to staging by mountiny)
@OSBotify OSBotify added the CP Staging marks PRs that have been CP'd to staging label Jul 9, 2026
@OSBotify

OSBotify commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.4.32-2 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 I reviewed the changes in this PR against Expensify's help site files under docs/articles.

No help site changes are required.

This PR is a pure revert of an internal performance change ("Coalesce OnyxDerived recomputations via macrotask scheduling"), made to resolve deploy blockers. All modified files are internal engineering code with no user-facing behavior, feature, or copy changes:

  • src/libs/actions/OnyxDerived/* — internal Onyx derived-data computation logic
  • src/libs/getCollectionDelta.ts, src/libs/scheduleMacrotask.ts — internal utilities (removed)
  • cspell.json — spell-check dictionary config
  • tests/* — unit and UI tests

Since there are no changes to features, settings, workflows, or UI that a Help site article would document, no draft docs PR was created.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/grgia in version: 9.4.32-3 🚀

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

Bundle Size Analysis (Sentry):

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.4.33-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 I reviewed the changes in this PR and no help site changes are required under App/docs/articles, so I did not create a draft docs PR.

Why: This PR is a pure code revert of an internal architecture change — "Coalesce OnyxDerived recomputations via macrotask scheduling" (#95287) — done to resolve deploy blockers. Every changed file is internal implementation or test/config, with no impact on any documented, user-facing behavior:

  • src/libs/actions/OnyxDerived/* — internal Onyx derived-state computation
  • src/libs/getCollectionDelta.ts, src/libs/scheduleMacrotask.ts — internal utilities
  • tests/* — unit and UI tests
  • cspell.json — spell-check dictionary config

There are no changes to features, tab/settings labels, buttons, workspaces, billing, or integrations that the help site documents. Nothing to update.

@fabioh8010, since this is a code-only revert with no user-facing changes, no help site PR was created. Please confirm you agree that no docs update is needed here. If you believe an article should still be updated, let me know which behavior changed and I'll draft the PR.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/lakchote in version: 9.4.33-8 🚀

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

Bundle Size Analysis (Sentry):

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CP Staging marks PRs that have been CP'd to staging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants