Skip to content

[No QA] Fix flaky ContactMethodsPage and UnreadIndicators tests - #92587

Merged
madmax330 merged 3 commits into
mainfrom
vit/fix-flaky-contact-methods-and-unread-indicators
Jun 4, 2026
Merged

[No QA] Fix flaky ContactMethodsPage and UnreadIndicators tests#92587
madmax330 merged 3 commits into
mainfrom
vit/fix-flaky-contact-methods-and-unread-indicators

Conversation

@mountiny

@mountiny mountiny commented Jun 3, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Explanation of Change

Two flaky tests in CI job 7/8 were investigated and fixed:

ContactMethodsPageTest — sets info indicator when login is unvalidated and not default

After await Onyx.merge(ONYXKEYS.LOGIN_LIST, {validatedDate: '2024-02-02'}) the Onyx subscriber notification is delivered on the next macrotask tick, after the merge promise resolves. waitFor immediately wraps its first retry in act(), which only flushes already-queued React state updates — it cannot see the Onyx notification that hasn't fired yet. Adding await waitForBatchedUpdates() before waitFor ensures the notification reaches the useOnyx hook and the component re-renders before the assertion runs.

The first test in the file (sets error indicator) passed because merging errorFields: null alongside validatedDate produces a structurally larger Onyx diff that happens to flush the notification synchronously in practice; the second test merging only validatedDate exposed a race that waitForBatchedUpdates() eliminates.

UnreadIndicatorsTest — Display bold in the LHN for unread chat and new line indicator above the chat message when we navigate to it

The test ended with return waitFor(() => expect(isNewMessagesBadgeVisible()).toBe(true)). Under heavy CI load (5 concurrent test shards on the same 8-vCPU runner) each waitFor retry wraps its callback in act(). act() stalls while draining the cascading scroll-triggered effects (setIsFloatingMessageCounterVisible, Reanimated shared-value updates, etc.), and on a CPU-starved runner each stall can be many seconds long. With the default 1000 ms waitFor timeout split into 50 ms intervals, only ~20 retries are attempted, but each retry's act() draining exceeds that window, letting the total balloon past the 120 000 ms Jest limit.

Replacing waitFor + act with await waitForBatchedUpdates() followed by a direct synchronous assertion matches the pattern used by every other test in the same describe block, avoids act() overhead entirely, and is sufficient because the badge's translateY is already at the expected value by the time the microtask queue is drained.

Fixed Issues

$ Internal — no GitHub issue; reproducer: https://github.com/Expensify/App/actions/runs/26909698301/job/79384087487

Tests

  1. Run npx jest tests/ui/ContactMethodsPageTest.tsx — both tests pass.
  2. Run npx jest tests/ui/UnreadIndicatorsTest.tsx --testNamePattern="Display bold in the LHN" — passes in ~9 s locally.
  3. Run the full UnreadIndicatorsTest suite and confirm no regressions.
  • Verify that no errors appear in the JS console

Offline tests

N/A — no offline behavior changed.

QA Steps

N/A — [No QA] test-only change; no production behavior changed.

  • 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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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

mountiny and others added 2 commits June 3, 2026 22:26
@mountiny @cursoragent
[No QA] Remove act() wrapper from signInAndGetApp to reduce CI flakiness
5fcea85 
Align the post-render Onyx merges in signInAndGetApp() with the
UnreadIndicatorsTest pattern: issue merges as a bare Promise.all and
let the final waitForBatchedUpdatesWithAct drain them, rather than
wrapping them in act() which forces a synchronous React flush that is
significantly slower under CI coverage instrumentation.

Co-authored-by: Cursor <cursoragent@cursor.com>
@mountiny @cursoragent
Fix flaky ContactMethodsPage and UnreadIndicators tests
2693fc6 
ContactMethodsPageTest: after merging only validatedDate the Onyx
subscriber notification is queued as a macrotask, so waitFor's act()
saw stale state on every retry. Adding waitForBatchedUpdates() before
waitFor ensures the notification is delivered to the useOnyx hook and
the component re-renders before the assertion runs.

UnreadIndicatorsTest: the 'Display bold in the LHN' test ended with
waitFor(() => expect(isNewMessagesBadgeVisible()).toBe(true)). Under
heavy CI load each waitFor retry wraps its callback in act(), which
can stall for many seconds draining scroll-triggered cascading effects,
eventually blowing the 120 s Jest timeout. Replacing waitFor+act with
waitForBatchedUpdates() + a direct assertion matches the pattern used
by every other test in the file and removes the act() overhead that
caused the hang.

Co-authored-by: Cursor <cursoragent@cursor.com>
@mountiny
mountiny requested a review from a team as a code owner June 3, 2026 20:48
@melvin-bot
melvin-bot Bot requested review from marcochavezf and removed request for a team June 3, 2026 20:49
@melvin-bot

melvin-bot Bot commented Jun 3, 2026

Copy link
Copy Markdown

@marcochavezf 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]

@madmax330

madmax330 commented Jun 4, 2026 •
edited
Loading

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

@madmax330
madmax330 merged commit 4a1868d into main Jun 4, 2026
32 of 33 checks passed
@madmax330
madmax330 deleted the vit/fix-flaky-contact-methods-and-unread-indicators branch June 4, 2026 18:42
@OSBotify OSBotify mentioned this pull request Jun 5, 2026
Closed
@OSBotify

OSBotify commented Jun 5, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/madmax330 in version: 9.4.0-0 🚀

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

Bundle Size Analysis (Sentry):

@OSBotify

OSBotify commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/Julesssss in version: 9.4.0-7 🚀

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

This was referenced Jun 17, 2026
Closed
Merged
brunovjk pushed a commit to brunovjk/Expensify-App that referenced this pull request Jun 17, 2026
@mountiny @cursoragent
Fix flaky UnreadIndicatorsTest CI timeout
26f4fb4 
Complete the PR Expensify#92587 waitFor pattern, avoid act() stalls during chat
navigation, and raise the Jest timeout to 240s for loaded CI runners.

Co-authored-by: Cursor <cursoragent@cursor.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@madmax330 madmax330 madmax330 approved these changes
@marcochavezf marcochavezf Awaiting requested review from marcochavezf

Assignees

@mountiny mountiny

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@mountiny @madmax330 @OSBotify