Skip to content

[No QA] Keep unread markers on visible support replies - #105979

Merged
roryabraham merged 4 commits into
mainfrom
rory/fix-support-survey-unread
Nov 5, 2026
Merged

roryabraham merged 4 commits into
mainfrom
rory/fix-support-survey-unread

Conversation

@roryabraham

@roryabraham roryabraham commented Nov 4, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

An old support-ticket survey can take the unread marker even though the survey itself is hidden, leaving an unread reply without a “New” divider. Filter hidden surveys before unread selection, keeping both content-level action arrays aligned without changing pagination or loading decisions.

Fixed Issues

For #105473

Tests

  1. Sign in with a test account, and click Home.

  2. Open Chrome’s developer tools with Option+Command+J on macOS (Ctrl+Shift+J on Windows/Linux), select Console, and run the fixture below. It creates a local test conversation and puts the app in offline mode; it does not create a server-side support ticket.

    async function seedSurveyUnreadTicket(state = 'unresolved') {
        await Onyx.merge('network', {isOffline: true});
        const {accountID} = await Onyx.get('session');
        const reportID = '991105473';
        const makeAction = (id, actionName, minute, text) => ({
            reportActionID: String(id), actionName, created: `2026-11-04 10:${minute}:00.000`,
            actorAccountID: 8392101, message: [{type: 'COMMENT', text, html: text}],
            originalMessage: {html: text}, shouldShow: true,
        });
        const actions = [
            makeAction(991105470, 'CREATED', '00', 'Support ticket opened'),
            makeAction(991105471, 'ADDCOMMENT', '01', 'Previously read message'),
            makeAction(991105472, 'SUPPORT_SURVEY', '03', 'Obsolete survey'),
            makeAction(991105473, 'ADDCOMMENT', '04', 'Your support reply after reopening'),
        ];
        if (state !== 'unresolved') {
            if (state !== 'missing-closure') actions.push(makeAction(991105474, 'CLOSED', '05', 'Resolved support ticket'));
            actions.push(makeAction(991105475, 'SUPPORT_SURVEY', '06', 'Latest support survey'));
        }
        await Onyx.multiSet({
            [`report_${reportID}`]: {
                reportID, type: 'supportTicket', reportName: 'Survey unread regression', ownerAccountID: accountID, managerID: 8392101,
                stateNum: state === 'unresolved' ? 0 : 2, statusNum: state === 'unresolved' ? 0 : 2,
                participants: {[accountID]: {notificationPreference: 'always'}, 8392101: {notificationPreference: 'always'}},
                lastReadTime: '2026-11-04 10:02:00.000', lastVisibleActionCreated: actions.at(-1).created,
                lastMessageText: actions.at(-1).message[0].text,
            },
            [`reportActions_${reportID}`]: Object.fromEntries(actions.map(action => [action.reportActionID, action])),
            [`reportActionsPages_${reportID}`]: [actions.map(action => action.reportActionID).reverse()],
            [`reportNameValuePairs_${reportID}`]: state === 'replaced' ? {reopenedAsReportID: '991105480'} : {},
            [`reportLoadingState_${reportID}`]: {hasOnceLoadedReportActions: true, isLoadingInitialReportActions: false},
        });
        history.pushState({}, '', `/r/${reportID}`);
        window.dispatchEvent(new PopStateEvent('popstate'));
    }
    await seedSurveyUnreadTicket();
  3. Confirm “Your support reply after reopening” has exactly one “New” divider above it, and no “How was your support experience?” survey is displayed.

  4. Click Home, then run await seedSurveyUnreadTicket('resolved') in Console.

  5. Confirm the reply still has its “New” divider and exactly one “How was your support experience?” survey appears below “Resolved support ticket”.

  6. Click Home, then run await seedSurveyUnreadTicket('replaced') in Console.

  7. Confirm the survey disappears and the reply retains its “New” divider.

  8. Click Home, then run await seedSurveyUnreadTicket('missing-closure') in Console.

  9. Confirm no survey appears when the resolution message is not cached, and the reply retains its “New” divider.

  • Verify that no errors appear in the JS console

Offline tests

The local fixture above exercises the list with the app in offline mode. Server persistence and native platforms are not covered by these steps.

QA Steps

None.

  • 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
Screen.Recording.2026-11-04.at.4.20.44.PM.mov

@roryabraham
roryabraham requested a review from a team November 4, 2026 20:38
@roryabraham

This comment has been minimized.

@roryabraham

This comment has been minimized.

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 4, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-05T00:26:52.600736Z 7f79652 Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

chatgpt-codex-connector[bot]

This comment was marked as resolved.

@MelvinBot

This comment was marked as low quality.

@roryabraham

This comment has been minimized.

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Delightful!

Reviewed commit: 0d6b5ed4db

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

@roryabraham roryabraham changed the title Keep unread markers on visible support replies [No QA] Keep unread markers on visible support replies Nov 5, 2026
@roryabraham
roryabraham marked this pull request as ready for review November 5, 2026 00:22
@roryabraham
roryabraham requested a review from a team as a code owner November 5, 2026 00:22
@melvin-bot
melvin-bot Bot requested review from justinpersaud and trjExpensify and removed request for a team November 5, 2026 00:22
@melvin-bot

melvin-bot Bot commented Nov 5, 2026

Copy link
Copy Markdown

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

@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


P2 Badge Keep hidden surveys in mark-as-read catch-up

When an unresolved or replaced support ticket remains mounted while the window is unfocused and its only new action is a hidden survey, passing this filtered array to useMarkAsRead prevents the focus-recovery scan from finding any unread action. The report-change pass records a skipped read, but there is no rendered unread row to trigger completeSkippedMarkAsRead(), so lastReadTime is not advanced and the report can remain unread in the LHN after focus returns. Preserve the unfiltered page for useMarkAsRead while using the filtered arrays for unread-marker selection and rendering.

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

@roryabraham
roryabraham merged commit ca844d4 into main Nov 5, 2026
53 of 56 checks passed
@roryabraham
roryabraham deleted the rory/fix-support-survey-unread branch November 5, 2026 23:31
@github-actions

github-actions Bot commented Nov 5, 2026

Copy link
Copy Markdown
Contributor

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

@OSBotify

OSBotify commented Nov 5, 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 Nov 5, 2026

Copy link
Copy Markdown
Contributor

@OSBotify OSBotify mentioned this pull request Nov 6, 2026
93 tasks done
@OSBotify

OSBotify commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.5.33-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

No FullStory changes needed — this PR only fixes unread-divider placement by excluding already-hidden support surveys before unread selection; it adds no new user-facing functionality.

@OSBotify

OSBotify commented Nov 7, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/roryabraham in version: 9.5.33-1 🚀

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

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants