Skip to content

Fix onboarding modal not shown for invited users who haven't completed it#86380

Closed
MelvinBot wants to merge 2 commits intomainfrom
claude-fixOnboardingModalForInvitedUsers
Closed

Fix onboarding modal not shown for invited users who haven't completed it#86380
MelvinBot wants to merge 2 commits intomainfrom
claude-fixOnboardingModalForInvitedUsers

Conversation

@MelvinBot
Copy link
Copy Markdown
Contributor

Explanation of Change

When a user signs up via OldDot and lands on NewDot but exits the browser before completing the onboarding modal, then gets invited to a Collect workspace via OldDot, the onboarding modal is not shown on the next login.

The root cause is that the isInvitedOrGroupMember flag in OnboardingGuard evaluates to true when hasNonPersonalPolicy is true (because the user was added to a workspace), which causes onboarding to be skipped — even though hasCompletedGuidedSetupFlow is explicitly false.

This PR adds && onboarding?.hasCompletedGuidedSetupFlow !== false to the isInvitedOrGroupMember condition, so that users who explicitly started but didn't complete onboarding still see the modal regardless of workspace membership. This preserves the existing behavior for:

  • Users who completed onboarding (hasCompletedGuidedSetupFlow: true)
  • Old/migrated accounts with empty onboarding data (hasCompletedGuidedSetupFlow: undefined)
  • Users invited via invite link (wasInvitedToNewDot)

Fixed Issues

$ #84436
PROPOSAL: #84436 (comment)

Tests

  1. Sign up via OldDot (staging.expensify.com) with a new account, choosing "Manage expenses for 1-9 employees"
  2. Once on NewDot, do NOT complete the onboarding modal — close the browser
  3. From another account, invite the new account to a Collect workspace via OldDot
  4. Log back in to staging.new.expensify.com as the invited member
  5. Verify the onboarding modal is shown
  • Verify that no errors appear in the JS console

Offline tests

N/A — this is a guard evaluation that runs on navigation, not an API call.

QA Steps

  1. Sign up via OldDot (staging.expensify.com) with a new account, choosing "Manage expenses for 1-9 employees"
  2. Once on NewDot, do NOT complete the onboarding modal — close the browser
  3. From another account, invite the new account to a Collect workspace via OldDot
  4. Log back in to staging.new.expensify.com as the invited member
  5. Verify the onboarding modal is shown
  6. Also verify that users who were invited via an invite link (without ever signing up first) still skip onboarding as expected
  • 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
      • 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

N/A — logic-only change in navigation guard

Android: mWeb Chrome

N/A — logic-only change in navigation guard

iOS: Native

N/A — logic-only change in navigation guard

iOS: mWeb Safari

N/A — logic-only change in navigation guard

MacOS: Chrome / Safari

N/A — logic-only change in navigation guard

MelvinBot and others added 2 commits March 25, 2026 23:13
…ted it

When a user signs up but exits before completing onboarding, then gets
invited to a workspace, the isInvitedOrGroupMember flag incorrectly
skips onboarding because hasNonPersonalPolicy becomes true. Adding a
check for hasCompletedGuidedSetupFlow !== false ensures users who
explicitly started but didn't complete onboarding still see the modal.

Co-authored-by: Aimane Chnaif <aimane-chnaif@users.noreply.github.com>
Adds a test case verifying that users who started but didn't complete
onboarding are still shown the onboarding modal even after being
invited to a workspace (hasNonPersonalPolicy is true).

Co-authored-by: Aimane Chnaif <aimane-chnaif@users.noreply.github.com>
@aimane-chnaif
Copy link
Copy Markdown
Contributor

@MelvinBot close this PR

@MelvinBot MelvinBot closed this Apr 21, 2026
@MelvinBot
Copy link
Copy Markdown
Contributor Author

Closed this PR as requested by aimane-chnaif.

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.

2 participants