Skip to content

Fix onboarding loop for Track/Personal Spend path when Concierge report not in collection#87287

Merged
lakchote merged 1 commit intomainfrom
rory/fix-onboarding-track-loop
Apr 8, 2026
Merged

Fix onboarding loop for Track/Personal Spend path when Concierge report not in collection#87287
lakchote merged 1 commit intomainfrom
rory/fix-onboarding-track-loop

Conversation

@roryabraham
Copy link
Copy Markdown
Contributor

@roryabraham roryabraham commented Apr 7, 2026 •
edited
Loading

Explanation of Change

When a new user signs up with a gmail address and selects "Track and budget expenses" during onboarding, prepareOnboardingOnyxData tries to find the Concierge 1:1 chat via getChatByParticipants() in deprecatedAllReports. For brand-new accounts, the Concierge report may not yet be in the reports collection, causing the lookup to return undefined. This triggers an early return, preventing the COMPLETE_GUIDED_SETUP API call from being sent and leaving hasCompletedGuidedSetupFlow as false. However, navigateAfterOnboardingWithMicrotaskQueue still dismisses the modal, and then the OnboardingGuard sees incomplete onboarding and redirects back — creating an infinite loop.

The fix adds a fallback: when getChatByParticipants fails to find the Concierge chat, we use the module-level conciergeReportIDOnyxConnect (populated via Onyx.connect to CONCIERGE_REPORT_ID) to construct a minimal report object. This mirrors the existing fallback pattern already used for the admins room path.

Note: This is reproducible in the dev environment only, not staging.

Fixed Issues

$ #87286

Tests

  1. Sign up with a new gmail account on dev
  2. Click "Join"
  3. On the "What's your work email?" step, click Skip
  4. On the "What do you want to do today?" step, select Track and budget expenses
  5. On the "What's your name?" step, enter a first and last name and click Continue
  6. Verify the onboarding completes and you are taken to the Home screen without looping back
  • Verify that no errors appear in the JS console

Offline tests

N/A — This flow requires network for account creation and API calls.

QA Steps

This is reproducible in dev only, not staging. QA steps are the same as the Tests section above but should be run against dev.

  • 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
web.mov

Made with Cursor

@roryabraham
Fix onboarding loop for Track/Personal Spend path when Concierge repo…
57ff0e4 
…rt not in collection

When getChatByParticipants fails to find the Concierge 1:1 chat in
deprecatedAllReports (common for brand-new accounts during onboarding),
fall back to using the module-level conciergeReportIDOnyxConnect which
is populated via Onyx.connect to CONCIERGE_REPORT_ID.

Without this fallback, prepareOnboardingOnyxData returns undefined,
completeOnboarding bails out without sending COMPLETE_GUIDED_SETUP,
hasCompletedGuidedSetupFlow stays false, but navigateAfterOnboarding
still dismisses the modal. The OnboardingGuard then redirects back,
creating an infinite loop.

Made-with: Cursor
@codecov
Copy link
Copy Markdown

codecov bot commented Apr 7, 2026 •
edited by github-actions bot
Loading

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/libs/ReportUtils.ts 80.43% <100.00%> (-0.04%) ⬇️
... and 6 files with indirect coverage changes

@roryabraham roryabraham marked this pull request as ready for review April 7, 2026 22:54
@roryabraham roryabraham requested review from a team as code owners April 7, 2026 22:54
@melvin-bot melvin-bot bot requested review from dmkt9 and heyjennahay and removed request for a team April 7, 2026 22:54
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Apr 7, 2026

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

@roryabraham roryabraham removed the request for review from heyjennahay April 7, 2026 22:54
@dmkt9
Copy link
Copy Markdown
Contributor

dmkt9 commented Apr 8, 2026

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-hybrid.mp4
Android: mWeb Chrome
android.chrome.mp4
iOS: HybridApp
ios.hybrid.mp4
iOS: mWeb Safari
ios.safari.mp4
MacOS: Chrome / Safari
mac.safari.mp4
linux.chrome.mp4

@dmkt9
Copy link
Copy Markdown
Contributor

dmkt9 commented Apr 8, 2026

  • Verify that no errors appear in the JS console

@roryabraham, you forgot to tick this checkbox 😅

dmkt9
dmkt9 approved these changes Apr 8, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@dmkt9 dmkt9 left a comment

Choose a reason for hiding this comment

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

The changes look good to me.

I was initially unable to reproduce the bug because the OpenApp API always sends the Concierge report to me. However, once I delete that report, the issue can be reproduced consistently. And the solution works effectively.

@melvin-bot melvin-bot bot requested a review from lakchote April 8, 2026 09:19
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Apr 8, 2026

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

lakchote
lakchote approved these changes Apr 8, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@lakchote lakchote left a comment

Choose a reason for hiding this comment

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

LGTM

@lakchote lakchote merged commit ec93d81 into main Apr 8, 2026
45 of 46 checks passed
@lakchote lakchote deleted the rory/fix-onboarding-track-loop branch April 8, 2026 11:13
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 8, 2026

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

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 8, 2026

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

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-ec93d81-0782891-4f3f2977fa327ce6748d0ede9e9fcf934085ea5c/index.html https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-ec93d81-0782891-df9a602a47dbfe251c0f9ba77242b071265d5fe5/index.html
Android iOS
Web 🕸️
https://87287.pr-testing.expensify.com
Web

👀 View the workflow run that generated this build 👀

@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Apr 8, 2026

✋ 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 OSBotify mentioned this pull request Apr 9, 2026
Open
63 tasks
@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Apr 9, 2026

🚀 Deployed to staging by https://github.com/lakchote in version: 9.3.55-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot
Copy link
Copy Markdown
Contributor

MelvinBot commented Apr 9, 2026

No help site changes are required for this PR. The change is a purely internal bug fix in src/libs/ReportUtils.ts — adding a fallback for Concierge chat lookup during onboarding. No user-facing features, UI labels, settings, or documented workflows are affected.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lakchote lakchote lakchote approved these changes

+1 more reviewer

@dmkt9 dmkt9 dmkt9 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@roryabraham roryabraham

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@roryabraham @dmkt9 @OSBotify @MelvinBot @lakchote