Skip to content

fix: show desktop notification when active chat is open but app is unfocused#93387

Merged
luacmartins merged 11 commits into
Expensify:mainfrom
nabi-ebrahimi:fix/desktop-notification-visible-unfocused-chat
Jun 18, 2026
Merged

fix: show desktop notification when active chat is open but app is unfocused#93387
luacmartins merged 11 commits into
Expensify:mainfrom
nabi-ebrahimi:fix/desktop-notification-visible-unfocused-chat

Conversation

@nabi-ebrahimi

@nabi-ebrahimi nabi-ebrahimi commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

This PR makes the unread/read logic depend on whether the user is actually focused on the app window, not only whether the app is visible.

The issue happens when NewDot is open to the active chat, the browser window remains visible, but focus is on another desktop app. In that state, the app was treating the incoming message as seen because Visibility.isVisible() was still true, so it marked the message read immediately. That advanced lastReadTime, which then caused the desktop notification to be suppressed as “already read.”

This change prevents that premature mark-as-read by requiring Visibility.hasFocus() before auto-reading messages in the open report. It also keeps the unread marker visible for new incoming messages while the window is unfocused, and re-runs the read logic when the app regains focus so normal focused behavior still works.

Fixed Issues

$ #92273
PROPOSAL: #92273 (comment)

Tests

  1. Sign in to NewDot on desktop web in Chrome.
  2. Enable desktop notifications for NewDot.
  3. Open a DM chat with User A and make sure the conversation is scrolled to the newest message.
  4. Switch focus to another desktop app, such as Slack or Finder, without minimizing NewDot and without switching browser tabs.
  5. Have User A send a new message.
  6. Verify a desktop notification is shown.
  7. Return focus to NewDot.
  8. Verify the message received while NewDot was unfocused was not silently consumed and the unread/new message indicator is shown.
  9. Read/clear the unread state for that message.
  10. Keep NewDot focused on the same chat.
  11. Have User A send another new message.
  12. Verify the message is marked read immediately and no unnecessary desktop notification is shown.
  • Verify that no errors appear in the JS console

Offline tests

Not applicable. This issue is about desktop window focus while the app is online and visible, not offline behavior.

QA Steps

Same as tests.

// TODO: These must be filled out, or the issue title must include "[No QA]."

  • 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 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 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
Screen.Recording.2026-06-12.at.10.32.26.AM.mov

@melvin-bot

melvin-bot Bot commented Jun 12, 2026

Copy link
Copy Markdown

@QichenZhu 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 removed request for a team June 12, 2026 06:05

@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: 949ab84072

ℹ️ 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 src/pages/inbox/report/useReportUnreadMessageScrollTracking.ts Outdated

@joekaufmanexpensify joekaufmanexpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Nice improvement!

@QichenZhu

QichenZhu commented Jun 15, 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
    https://expensify.slack.com/archives/C049HHMV9SM/p1778663561704459
  • 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
Screen.Recording.2026-06-15.at.3.36.34.PM.mov
Android: mWeb Chrome
Screen.Recording.2026-06-15.at.3.34.30.PM.mov
iOS: HybridApp
Screen.Recording.2026-06-15.at.3.33.18.PM.mov
iOS: mWeb Safari
Screen.Recording.2026-06-15.at.3.33.51.PM.mov
MacOS: Chrome / Safari
mac-desktop.mov

@QichenZhu QichenZhu left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

  1. Repeat while keeping NewDot focused on the same chat.
  2. Verify the message is marked read immediately and no unnecessary notification is shown.

These steps are incorrect. New messages won't be marked as read if the previous unread state is not cleared first.

Comment thread src/hooks/useMarkAsRead.ts Outdated
Comment on lines +119 to +121
useEffect(() => {
const markAsReadWhenVisibleAndFocused = useCallback(() => {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We shouldn't add useCallback to components that use react-compiler.

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.

Addressed.

Comment thread src/hooks/useMarkAsRead.ts Outdated
Comment on lines 168 to 171
useEffect(() => {
markAsReadWhenVisibleAndFocused();
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [isVisible, isFocused, reportLoadingState?.hasOnceLoadedReportActions]);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Here we should explain the suppression, even though we didn't add it, since we changed this effect.

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.

Addressed.

Comment on lines +398 to +399
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Please add an explanation or remove the suppression.

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.

Addressed.

Comment on lines 411 to 414
useEffect(() => {
markAsReadWhenVisibleAndFocused();
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [isFocused, isVisible, reportLoadingState?.hasOnceLoadedReportActions]);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Add a comment for the suppression as well.

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.

Addressed.

Comment on lines +416 to +417
useAppFocusEvent(markAsReadWhenVisibleAndFocused);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why do we need this?

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.

We need this for the desktop-app-switch case. The browser tab can stay visible while the NewDot window loses OS focus, so Visibility.onVisibilityChange may not fire when focus returns. useAppFocusEvent reruns the read catch-up when the user actually focuses NewDot again.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for explaining. I'm still trying to understand it. What bugs will happen without it?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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.

Good point. After re-checking the flow, I agree this is not required for the core issue.

The bug is fixed by preventing readNewestAction while the window is visible but unfocused, and by keeping unread/skipped-read handling guarded by Visibility.hasFocus(). Without this extra app-focus listener, the original notification/new-marker issue still stays fixed; the only difference is that a skipped read is not consumed immediately on window focus and instead follows the normal scroll/viewability path.

I removed it to keep the PR smaller and focused on the issue scope.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@nabi-ebrahimi thanks for checking! Since markAsReadWhenVisibleAndFocused() is now only used once, we don't need it. Same goes for src/hooks/useMarkAsRead.ts.

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.

Good point. Since useAppFocusEvent was removed, the helper was only used once. I inlined it in both places with no behavior change.

Comment thread src/hooks/useMarkAsRead.ts Outdated
Comment on lines +173 to +174
useAppFocusEvent(markAsReadWhenVisibleAndFocused);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same question.

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.

Same reason here: useIsFocused() only tells us the report route is focused inside navigation. In this bug, the route remains focused while the browser window itself is unfocused, so we need the app/window focus event to consume the skipped unread state when the user returns.

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.

Same as above.

@codecov

codecov Bot commented Jun 15, 2026

Copy link
Copy Markdown

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
...equestReportView/MoneyRequestReportActionsList.tsx 63.66% <100.00%> (+0.26%) ⬆️
src/hooks/useMarkAsRead.ts 94.02% <100.00%> (+0.09%) ⬆️
src/hooks/useUnreadMarker.ts 94.44% <ø> (ø)
...box/report/shouldDisplayNewMarkerOnReportAction.ts 97.82% <100.00%> (+0.09%) ⬆️
...box/report/useReportUnreadMessageScrollTracking.ts 95.00% <100.00%> (+1.66%) ⬆️
... and 118 files with indirect coverage changes

@nabi-ebrahimi

Copy link
Copy Markdown
Contributor Author

@QichenZhu Thanks for the review. I addressed the feedback and pushed the updates.

Summary:

  • Removed the added useCallback usage and moved the latest-callback handling into useAppFocusEvent with useEffectEvent.
  • Added comments explaining the existing dependency suppressions in the touched effects.
  • Added comments explaining why useAppFocusEvent is still needed for the visible-but-unfocused desktop window case.
  • Updated the test steps to clear the previous unread state before checking the focused-message case.

Could you please take another look when you have a chance?

@luacmartins luacmartins self-requested a review June 15, 2026 14:26

@luacmartins luacmartins left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@nabi-ebrahimi we also have conflicts now

@nabi-ebrahimi

Copy link
Copy Markdown
Contributor Author

@nabi-ebrahimi we also have conflicts now

Resolved, thanks

@nabi-ebrahimi

Copy link
Copy Markdown
Contributor Author

@QichenZhu kindly bump, thanks.

@QichenZhu

Copy link
Copy Markdown
Contributor

@nabi-ebrahimi please check this comment. Thanks!

@nabi-ebrahimi

Copy link
Copy Markdown
Contributor Author

@nabi-ebrahimi please check this comment. Thanks!

All done, thanks for the review!

@QichenZhu QichenZhu left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@nabi-ebrahimi thanks! the code is much cleaner now.

Comment on lines 398 to +402
// This effect logic to `mark as read` will only run when the report focused has new messages and the App visibility
// is changed to visible(meaning user switched to app/web, while user was previously using different tab or application).
// We will mark the report as read in the above case which marks the LHN report item as read while showing the new message
// marker for the chat messages received while the user wasn't focused on the report or on another browser tab for web.
// This effect should only run when app visibility/focus changes; the helper reads the latest report/action values without making every action update mark the report as read.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

NAB: since you reverted the previous changes and brought back the original comment, the new comment is not needed.

@melvin-bot melvin-bot Bot requested a review from luacmartins June 18, 2026 12:39

@luacmartins luacmartins left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@luacmartins luacmartins merged commit 88eddbe into Expensify:main Jun 18, 2026
33 of 36 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

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.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.4.15-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Help site review: no docs changes required.

I reviewed the changes in this PR against the help site files under App/docs/articles.

This is an internal behavior-correctness fix to the read/unread-marker and desktop-notification timing logic — auto-mark-as-read now requires window focus (Visibility.hasFocus()) rather than just app visibility, so a desktop notification is correctly shown (and the new-message marker is kept) when the active chat is open but the app window is unfocused.

I searched the help site for articles documenting this behavior. The notification-related articles describe:

  • Email notifications and the Account > Preferences notification toggles (feature updates, mute sounds)
  • Expensify Card notifications
  • Travel email notifications

None of them document when a message is marked as read or when an in-app desktop notification appears relative to window focus. No documented feature, setting, label, button, or workflow is changed or made stale by this PR, so no help site update is needed and I did not create a draft PR.

If you believe there is a specific article that should describe this behavior, reply with @MelvinBot and point me to it and I'll draft the update.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 9.4.15-3 🚀

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

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