Skip to content

fix: migrate NewChatPage to use useSearchSelector - #95778

Open
mkzie2 wants to merge 8 commits into
Expensify:mainfrom
mkzie2:mkzie2-issue/71061-2
Open

fix: migrate NewChatPage to use useSearchSelector#95778
mkzie2 wants to merge 8 commits into
Expensify:mainfrom
mkzie2:mkzie2-issue/71061-2

Conversation

@mkzie2

@mkzie2 mkzie2 commented Jul 10, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #71061
PROPOSAL:

Tests

  1. Tap the green + (FAB) → Start chat
  2. Verify that: options are displayed in the correct order (Recents, then alphabetical Contacts) and no duplicate item is shown
  3. Type something that will return no results
  4. Verify that: "No results found" message is displayed
  5. Clear the search and tap one of the user options
  6. Verify that: we are navigated to the correct 1:1 chat
  7. Go back to Start chat and tap Add to group on a user that is not first in the list
  8. Verify that: the user is selected in place (does not jump to the top) and a Next button appears
  9. Type a valid email of a non-existing user, tap Add to group on the invite row, then clear the search
  10. Verify that: the invited user stays visible in the top section
  11. Tap Next
  12. Verify that: NewChatConfirmPage opens with the correct selected participants
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  1. Tap the green + (FAB) → Start chat
  2. Verify that: options are displayed in the correct order (Recents, then alphabetical Contacts) and no duplicate item is shown
  3. Type something that will return no results
  4. Verify that: "No results found" message is displayed
  5. Clear the search and tap one of the user options
  6. Verify that: we are navigated to the correct 1:1 chat
  7. Go back to Start chat and tap Add to group on a user that is not first in the list
  8. Verify that: the user is selected in place (does not jump to the top) and a Next button appears
  9. Type a valid email of a non-existing user, tap Add to group on the invite row, then clear the search
  10. Verify that: the invited user stays visible in the top section
  11. Tap Next
  12. Verify that: NewChatConfirmPage opens with the correct selected participants
  • 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
Screen.Recording.2026-07-13.at.22.25.00.mp4
iOS: Native
iOS: mWeb Safari
Screen.Recording.2026-07-13.at.22.22.34.mp4
MacOS: Chrome / Safari
Screen.Recording.2026-07-13.at.22.11.05.mp4

@codecov

codecov Bot commented Jul 10, 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 Δ
src/hooks/useSearchSelector/base.ts 86.95% <100.00%> (+4.43%) ⬆️
...es/NewChatPage/useGroupChatDraftParticipantSync.ts 100.00% <100.00%> (ø)
src/pages/NewChatPage/index.tsx 77.06% <87.87%> (-1.41%) ⬇️
... and 21 files with indirect coverage changes

@mkzie2
mkzie2 marked this pull request as ready for review July 13, 2026 15:28
@mkzie2
mkzie2 requested review from a team as code owners July 13, 2026 15:28
@melvin-bot
melvin-bot Bot requested review from ZhenjaHorbach and heyjennahay and removed request for a team July 13, 2026 15:28
@melvin-bot

melvin-bot Bot commented Jul 13, 2026

Copy link
Copy Markdown

@ZhenjaHorbach 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 the request for review from a team July 13, 2026 15:28
@mkzie2

mkzie2 commented Jul 13, 2026

Copy link
Copy Markdown
Contributor Author

I can't log in to native app:

Screen.Recording.2026-07-13.at.22.26.01.mov
Screen.Recording.2026-07-13.at.22.26.17.mov

I'll try fix the issue and add missing screenshots later.

@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: f5a1a9cb1b

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

hasMore: hasMoreFilteredPersonalDetails,
} = usePaginatedData(options.personalDetails, PAGINATION_SIZE, {resetKey: cleanSearchTerm, skipPagination: !isSearching});
maxRecentReportsToShow: CONST.IOU.MAX_RECENT_REPORTS_TO_SHOW,
enablePhoneContacts: true,

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 contact de-duplication when enabling phone contacts

When native contact import is enabled here, the old NewChatPage path first ran mergeAndSortPersonalDetailsWithContacts, which de-duped imported contacts against Onyx personal details and preferred the real Onyx account on login collisions. The selector path now relies on useSearchSelector, whose native wrapper simply concatenates contact options before getValidOptions, so a device contact whose email/phone already exists in personal details can render as a second row with a generated accountID; selecting that duplicate writes the generated ID into NEW_GROUP_CHAT_DRAFT, and the confirm/create flow treats the existing member as an optimistic invite rather than the real account.

Useful? React with 👍 / 👎.

personalDetails.length + recentReports.length !== 0,
!!userToInvite,
debouncedSearchTerm.trim(),
countryCode,

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.

❌ CONSISTENCY-3 (docs)

The new updateGroupDraft builds the group-chat draft participants array (mapping the selected options to {login, accountID} with the CONST.DEFAULT_NUMBER_ID fallback and appending the current user as creator) using logic that is nearly identical to the pre-existing createGroup function in this same file. Duplicating this participant-construction logic in two places means a future change (e.g. adding a field to SelectedParticipant) has to be made twice and can silently drift.

Extract the shared participant-array construction into a single helper and call it from both places, e.g.:

const buildDraftParticipants = (options: OptionData[]): SelectedParticipant[] => {
    if (!personalData?.login || !personalData?.accountID) {
        return [];
    }
    return [
        ...options.map((option) => ({
            login: option.login,
            accountID: option.accountID ?? CONST.DEFAULT_NUMBER_ID,
        })),
        {login: personalData.login, accountID: personalData.accountID},
    ];
};

const updateGroupDraft = (newSelectedOptions: OptionData[]) => {
    const participants = buildDraftParticipants(newSelectedOptions);
    if (!participants.length) {
        return;
    }
    setGroupDraft({participants});
};

Then reuse buildDraftParticipants(selectedOptions) inside createGroup as well.


Reviewed at: f5a1a9c | Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

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.

Sounds good

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.

@mkzie2
What about 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.

@ZhenjaHorbach I updated.

@mkzie2

mkzie2 commented Jul 17, 2026

Copy link
Copy Markdown
Contributor Author

@ZhenjaHorbach Friendly bump for review.

@mkzie2

mkzie2 commented Jul 27, 2026

Copy link
Copy Markdown
Contributor Author

@ZhenjaHorbach Friendly bump for review!

@ZhenjaHorbach

Copy link
Copy Markdown
Contributor

Will check today or tomorrow!

@ZhenjaHorbach

Copy link
Copy Markdown
Contributor

@codex
Review this PR

@ZhenjaHorbach

Copy link
Copy Markdown
Contributor

@MelvinBot
Review this PR

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 PR Review — overall this is a clean, well-scoped refactor. It removes the per-page option/pagination plumbing in NewChatPage and delegates to useSearchSelector, matching the InviteReportParticipantsPage reference pattern from the issue. All CI is green (typecheck, ESLint, React Compiler, unit tests, perf), no dangling references to the deleted mergeAndSortPersonalDetailsWithContacts/types files remain, and the moved de-dupe logic is now unit-tested. A few things to confirm before approving:

1. Native testing gap on the PR's headline behavior. The device-contact de-dupe is the substantive behavioral change here, and it is native-onlycontactOptions is only populated in useSearchSelector/index.native.ts:29, so the de-dupe block in base.ts:226-253 never runs on web. But Android: Native and iOS: Native screenshots/videos are missing from the PR body (the author noted a native login issue and said they'd add them later). Since imported-contact de-dupe + selection is exactly what changed, please make sure the import → dedupe → select-existing-contact flow is verified on a real device before this merges.

2. This changes shared-hook behavior for all consumers, not just NewChatPage. The de-dupe was moved into useSearchSelectorBase, so it now applies to every caller passing contactOptions (any enablePhoneContacts: true consumer), not only NewChatPage. That's arguably an improvement, but it expands the blast radius beyond this page — worth confirming it's intended and that no other consumer relied on the old raw-concat behavior.

Minor points (non-blocking)
  • Ordering: the deleted mergeAndSortPersonalDetailsWithContacts re-sorted the merged union alphabetically before pagination. The new code concatenates deduped contacts to the end of defaultOptions.personalDetails (base.ts:251) and relies on getValidOptions/orderOptions downstream for final ordering. This should be fine (test step 2 covers "alphabetical Contacts"), just confirm it holds on device.
  • Two new no-unsafe-type-assertion disablesoption as OptionData in toggleOption and the getParticipantsOption(...) as OptionData restore cast. Both are commented and reasonable given the option is fully built by the selector; flagging only for awareness.
  • Draft restore path looks correct: existing users (real accountID present in allPersonalDetails) restore via getParticipantsOption keeping isOptimisticAccount unset, while invited-by-email/phone users (optimistic accountID not in personal details) fall through to getUserToInviteOption and keep the optimistic flag (useGroupChatDraftParticipantSync.ts:61-71). No re-write loop since restore calls setSelectedOptions directly (bypassing onSelectionChange).

Nothing here is a hard blocker on the code itself — the main ask is native verification of the contact de-dupe before merge.

@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: e51455381c

ℹ️ 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/hooks/useSearchSelector/base.ts Outdated
Comment thread src/hooks/useSearchSelector/base.ts Outdated
Comment thread src/pages/NewChatPage/useGroupChatDraftParticipantSync.ts Outdated
@mkzie2

mkzie2 commented Jul 28, 2026

Copy link
Copy Markdown
Contributor Author

@ZhenjaHorbach I updated.

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.

3 participants