Remove Onyx.connect() for the key: ONYXKEYS.COLLECTION.REPORT in src/libs/ReportUtils.ts (part 5) by truph01 · Pull Request #93267 · Expensify/App

truph01 · 2026-06-11T09:56:19Z

Explanation of Change

This PR is the 5th step to remove Onyx.connect() for the key: ONYXKEYS.COLLECTION.REPORT in src/libs/ReportUtils.ts.
This PR focus on refactoring the following flow:

getChatByParticipants -> prepareOnboardingOnyxData -> completeOnboarding (actions/Report/index.ts)

Fixed Issues

$ #66416
PROPOSAL:

Tests

Open ND
Login with new account
In onboarding steps, choose "Manage my team's expenses" > "1-4 employees" > "QuickBooks Online" > Click "Continue"
Verify the workspace is created and you are redirected to workspace admin report

Verify that no errors appear in the JS console

Offline tests

QA Steps

Open ND
Login with new account
In onboarding steps, choose "Manage my team's expenses" > "1-4 employees" > "QuickBooks Online" > Click "Continue"
Verify the workspace is created and you are redirected to workspace admin report

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-06-11.at.17.44.00.mov

melvin-bot · 2026-06-11T09:56:26Z

@DylanDylann 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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 8f8c69c8a5

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

chatgpt-codex-connector · 2026-06-11T10:00:48Z

+    const adminsChatReport = reports?.[`${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`];
    const conciergeChat =
-        getChatByParticipants([CONST.ACCOUNT_ID.CONCIERGE, deprecatedCurrentUserAccountID ?? CONST.DEFAULT_NUMBER_ID], deprecatedAllReports, false) ??
+        getChatByParticipants([CONST.ACCOUNT_ID.CONCIERGE, deprecatedCurrentUserAccountID ?? CONST.DEFAULT_NUMBER_ID], reports, false) ??


Keep onboarding report lookups on one snapshot

When a caller supplies reports, the target chat is now resolved from that passed snapshot, but later rollback/self-DM logic in this same function still reads deprecatedAllReports (for example when restoring the previous last visible action and when checking for an existing self-DM). If the React-provided collection is newer than the module-level cache during onboarding, an API failure can roll back stale preview state or miss an existing self-DM. Please use the same reports collection for the remaining report lookups in this flow before switching callers over to it.

Useful? React with 👍 / 👎.

Resolved via 6830d02

@truph01 Could we avoid passing the entire report collection into the prepareOnboardingOnyxData function? Instead, we can pass the concierge report (using conciergeReportID from Onyx to subscribe to just one report) rather than using getChatByParticipants. For the other instances of report params, I believe we can handle them similarly by passing only the specific reports we need.

@DylanDylann I applied your suggestion

codecov · 2026-06-11T10:01:16Z

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/useAutoCreateSubmitWorkspace.ts	`92.30% <100.00%> (+1.39%)`	⬆️
src/hooks/useAutoCreateTrackWorkspace.ts	`86.48% <100.00%> (+1.19%)`	⬆️
src/libs/ReportUtils.ts	`85.75% <100.00%> (-0.07%)`	⬇️
src/libs/actions/Report/index.ts	`70.77% <ø> (+0.10%)`	⬆️
...gPersonalDetails/BaseOnboardingPersonalDetails.tsx	`87.87% <100.00%> (+0.12%)`	⬆️
.../pages/OnboardingPurpose/BaseOnboardingPurpose.tsx	`91.78% <100.00%> (+0.35%)`	⬆️
.../OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx	`97.40% <100.00%> (+0.03%)`	⬆️
...estedFeatures/BaseOnboardingInterestedFeatures.tsx	`0.00% <0.00%> (ø)`
... and 11 files with indirect coverage changes

JmillsExpensify

No product review required.

DylanDylann · 2026-06-16T03:35:42Z

@truph01 the 4th PR is merged. Could you merge the latest main?

truph01 · 2026-06-16T09:22:24Z

@codex review

chatgpt-codex-connector · 2026-06-16T09:30:57Z

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

Reviewed commit: 69dd980969

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

DylanDylann · 2026-06-19T09:36:59Z

+    /** The concierge chat report, looked up by conciergeReportID. Falls back to getChatByParticipants using the deprecated module-level Onyx data while the refactor is in progress. */
+    conciergeChat?: OnyxEntry<Report>;
+    /** The admins chat report, looked up by adminsChatReportID. Falls back to the deprecated module-level Onyx data while the refactor is in progress. */
+    adminsChatReport?: OnyxEntry<Report>;


A boolean flag should be enough. I’d prefer to avoid passing a large object unnecessarily.

I believe we can use a selector here

A boolean flag should be enough. I’d prefer to avoid passing a large object unnecessarily.

@DylanDylann What do you mean by using "boolean flag" here?

My bad, let's ignore this

DylanDylann · 2026-06-22T12:41:07Z

@truph01 We don't always need to pass all three new params in every case. Please check the onboardingChoices value to determine exactly which parameter is necessary

truph01 · 2026-06-23T11:41:56Z

@codex review

@MelvinBot review

MelvinBot · 2026-06-23T11:47:40Z

Review

Looks solid — the refactor is correct and safe. Each call site now passes only the report(s) its engagement choice actually consumes, and every new param falls back to the deprecated module-level lookup (param ?? deprecatedAllReports?.[…]), so no path can regress. No blocking issues. A few things worth a sanity check below.

Call-site param mapping (all correct)

prepareOnboardingOnyxData consumes the params based on engagement choice:

conciergeChat → target chat when shouldPostTasksInAdminsRoom is false (ReportUtils.ts:11583).
adminsChatReport → target chat only when posting to #admins, which requires MANAGE_TEAM (isPostingTasksInAdminsRoom / followups).
selfDMReport → only the PERSONAL_SPEND / TRACK_PERSONAL / TRACK_WORKSPACE self-DM block.

Against that:

useAutoCreateSubmitWorkspace (EMPLOYER) → conciergeChat ✓
useAutoCreateTrackWorkspace (TRACK_*) → conciergeChat + selfDMReport ✓
BaseOnboardingWorkspaces (LOOKING_AROUND) → conciergeChat ✓
BaseOnboardingPurpose (LOOKING_AROUND/EMPLOYER/MANAGE_TEAM; track choices route to the hook first) → conciergeChat + adminsChatReport ✓

1. report = targetChatReport — one behavioral nuance to confirm. ReportUtils.ts:11978 now uses targetChatReport directly instead of re-reading by ID. In the fallback path where concierge resolves to the stub {reportID: conciergeReportIDOnyxConnect} (L11580-L11582), report is now a truthy stub with no chatType/participants, whereas before it was the (likely undefined) result of the ID lookup. That can flip canUserPerformWriteAction from falsy→true, changing the optimistic lastMessage computation. Real call sites pass the full conciergeChat, so this only affects the rare "ID known but report not in Onyx" case — and arguably the new result is more correct — but worth a conscious confirmation.

2. BaseOnboardingPersonalDetails comment vs. reachable choices. The local completeOnboarding is annotated "handles LOOKING_AROUND/EMPLOYER" (L92), but handleSubmit only diverts EMPLOYER (when canUseSubmit2026) and track choices (L153-L181). So MANAGE_TEAM (and EMPLOYER when the beta is off) can also reach it, and MANAGE_TEAM targets the #admins room — adminsChatReport isn't passed here, so it silently uses the deprecated fallback. Not a regression (fallback preserves behavior), but the comment is slightly inaccurate; either pass adminsChatReport too or reword the comment.

3. Minor: BaseOnboardingInterestedFeatures passes conciergeChat, but if that path is always MANAGE_TEAM (as its comment states) the target is the #admins room and conciergeChat is never read. Harmless, but droppable for consistency with the "pass only what's needed" approach you applied elsewhere.

Tests covering the new param paths look good. 👍

chatgpt-codex-connector · 2026-06-23T11:47:57Z

Codex Review: Didn't find any major issues. Another round soon, please!

Reviewed commit: f1825ac31c

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

DylanDylann · 2026-06-25T11:39:18Z

@truph01 I don't think we need comments here since it's already obvious.

DylanDylann · 2026-06-25T11:40:26Z

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

Screen.Recording.2026-06-25.at.18.39.40.mov

DylanDylann

Some NITs ☝️ The rest looks fine to me

Co-authored-by: DylanDylann <141406735+DylanDylann@users.noreply.github.com>

…dFeatures.tsx Co-authored-by: DylanDylann <141406735+DylanDylann@users.noreply.github.com>

Co-authored-by: DylanDylann <141406735+DylanDylann@users.noreply.github.com>

…ils.tsx Co-authored-by: DylanDylann <141406735+DylanDylann@users.noreply.github.com>

Co-authored-by: DylanDylann <141406735+DylanDylann@users.noreply.github.com>

github-actions · 2026-06-29T15:34:22Z

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

github-actions · 2026-06-29T15:40:17Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #93267.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-41de1fdfe92-0f1cc02-33452aa9981e722cc91afcaefeadb33f5bc5dcaa/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-41de1fd-0f1cc02-201ae6726a83e6a175740d7451beb673f003976a/index.html

Web 🕸️
❌ FAILED ❌
The QR code can't be generated, because the Web build failed

👀 View the workflow run that generated this build 👀

OSBotify · 2026-06-30T12:06:04Z

🚀 Deployed to staging by https://github.com/Gonals in version: 9.4.25-0 🚀

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

OSBotify · 2026-07-01T19:44:51Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.4.25-2 🚀

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

Bundle Size Analysis (Sentry):

Android

fix: refactor completeOnboarding

8f8c69c

truph01 requested review from a team as code owners June 11, 2026 09:56

melvin-bot Bot assigned truph01 Jun 11, 2026

melvin-bot Bot requested review from DylanDylann and JmillsExpensify and removed request for a team June 11, 2026 09:56

melvin-bot Bot removed the request for review from a team June 11, 2026 09:56

truph01 changed the title ~~fix: refactor completeOnboarding~~ Remove Onyx.connect() for the key: ONYXKEYS.COLLECTION.REPORT in src/libs/ReportUtils.ts (part 5) Jun 11, 2026

chatgpt-codex-connector Bot reviewed Jun 11, 2026

View reviewed changes

JmillsExpensify reviewed Jun 11, 2026

View reviewed changes

truph01 added 4 commits June 11, 2026 17:20

fix: add test

3c92305

fix: use reports instead of deprecatedAllReports

6830d02

fix: add test

5816f8d

fix: add test

5e05fbe

truph01 added 2 commits June 16, 2026 10:36

Merge branch 'Expensify:main' into fix/66416-part-5

bf66b16

fix: don't pass entire reports data to prepareOnboardingOnyxData

69dd980

truph01 added 3 commits June 19, 2026 17:10

Merge branch 'Expensify:main' into fix/66416-part-5

3f60cdc

merge main

051acea

fix: conflicts

882f648

DylanDylann reviewed Jun 22, 2026

View reviewed changes

truph01 added 3 commits June 23, 2026 11:10

fix: conflicts

51a9f8e

fix: conflicts

e555959

fix: conflicts

8b0f233

truph01 added 2 commits June 23, 2026 18:39

fix: only pass necessary report params

018c0c6

fix: conflicts

f1825ac

truph01 added 3 commits June 23, 2026 20:09

Merge branch 'Expensify:main' into fix/66416-part-5

ddf10b3

Merge branch 'Expensify:main' into fix/66416-part-5

e427691

Merge branch 'main' into fix/66416-part-5

f5ca257

DylanDylann reviewed Jun 25, 2026

View reviewed changes

DylanDylann approved these changes Jun 25, 2026

View reviewed changes

melvin-bot Bot requested a review from Gonals June 25, 2026 11:41

truph01 and others added 7 commits June 29, 2026 16:00

Merge branch 'Expensify:main' into fix/66416-part-5

0bcceec

Update src/hooks/useAutoCreateSubmitWorkspace.ts

80fb674

Co-authored-by: DylanDylann <141406735+DylanDylann@users.noreply.github.com>

Update src/pages/OnboardingInterestedFeatures/BaseOnboardingIntereste…

c7ffa68

…dFeatures.tsx Co-authored-by: DylanDylann <141406735+DylanDylann@users.noreply.github.com>

Update src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx

12921ee

Co-authored-by: DylanDylann <141406735+DylanDylann@users.noreply.github.com>

Update src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx

2343286

Co-authored-by: DylanDylann <141406735+DylanDylann@users.noreply.github.com>

Update src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDeta…

f4e82f9

…ils.tsx Co-authored-by: DylanDylann <141406735+DylanDylann@users.noreply.github.com>

Update src/hooks/useAutoCreateTrackWorkspace.ts

de2754e

Co-authored-by: DylanDylann <141406735+DylanDylann@users.noreply.github.com>

Gonals approved these changes Jun 29, 2026

View reviewed changes

Gonals merged commit 41de1fd into Expensify:main Jun 29, 2026
33 checks passed

OSBotify mentioned this pull request Jun 30, 2026

Deploy Checklist: New Expensify 2026-06-30 #94951

Closed

60 tasks

This was referenced Jun 30, 2026

[$250] [Exploratory] Report details - Not found page opened when clicking admin report header #94977

Open

[$250] 93267 - Android - Onboarding - User is not directed to workspace admin report #94994

Open

melvin-bot Bot mentioned this pull request Jul 1, 2026

Remove Onyx.connect() for the key: ONYXKEYS.COLLECTION.REPORT in src/libs/ReportUtils.ts #66416

Open

Uh oh!

Conversation

truph01 commented Jun 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Jun 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jun 11, 2026

Choose a reason for hiding this comment

Uh oh!

truph01 Jun 11, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann Jun 16, 2026

Choose a reason for hiding this comment

Uh oh!

truph01 Jun 16, 2026

Choose a reason for hiding this comment

Uh oh!

codecov Bot commented Jun 11, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented Jun 16, 2026

Uh oh!

truph01 commented Jun 16, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jun 16, 2026

Uh oh!

DylanDylann Jun 19, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann Jun 22, 2026

Choose a reason for hiding this comment

Uh oh!

truph01 Jun 23, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann Jun 23, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented Jun 22, 2026

Uh oh!

truph01 commented Jun 23, 2026

Uh oh!

MelvinBot commented Jun 23, 2026

Review

Uh oh!

chatgpt-codex-connector Bot commented Jun 23, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DylanDylann commented Jun 25, 2026

Uh oh!

DylanDylann commented Jun 25, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

DylanDylann left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

truph01 commented Jun 11, 2026 •

edited

Loading

codecov Bot commented Jun 11, 2026 •

edited by github-actions Bot

Loading