Skip to content

[CP Staging] Revert "Create navigation guards + implement Onboarding Guard"#81455

Merged
mountiny merged 1 commit intomainfrom
revert-79898-navigation-guards
Feb 5, 2026
Merged

[CP Staging] Revert "Create navigation guards + implement Onboarding Guard"#81455
mountiny merged 1 commit intomainfrom
revert-79898-navigation-guards

Conversation

@MelvinBot
Copy link
Contributor

@MelvinBot MelvinBot commented Feb 4, 2026

Reverts #79898

This PR reverts the "Create navigation guards + implement Onboarding Guard" changes.

Fixed Issues

$ #81453

Tests

N/A - This is a revert PR that removes code, restoring the previous behavior.

  • Verify that no errors appear in the JS console

Offline tests

N/A - This is a revert PR

QA Steps

N/A - This is a revert PR

  • 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

N/A - This is a revert PR

@MelvinBot MelvinBot requested review from a team as code owners February 4, 2026 23:12
@melvin-bot melvin-bot bot requested review from trjExpensify and removed request for a team February 4, 2026 23:12
@melvin-bot melvin-bot bot requested a review from inimaga February 4, 2026 23:12
@melvin-bot
Copy link

melvin-bot bot commented Feb 4, 2026

@inimaga 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 February 4, 2026 23:12
@MelvinBot
Copy link
Contributor Author

🤖 Fixed Failing Check

The checklist CI check was failing because the PR body (auto-generated by GitHub's revert feature) was missing the required "Author Checklist" section. The CI script couldn't parse the PR body and threw:

TypeError: Cannot read properties of undefined (reading 'split')

I've updated the PR body to include the proper checklist format. The checks should re-run automatically and pass now.

@MelvinBot
Copy link
Contributor Author

🤖 Checklist Failure Analysis

The checklist check is failing because the PR body is missing checklist items that were recently added to the PR template. The PR has 47 out of 51 required checklist items.

Missing checklist items:

  1. I verified there are no new alerts related to the canBeMissing param for useOnyx
  2. If any non-english text was added/modified, I used JaimeGPT... (sub-item under localization)
  3. If new assets were added or existing ones were modified, I verified that: + sub-items
  4. If the PR modifies code that runs when editing or sending messages, I tested and verified...
  5. If the PR modifies a component related to any of the existing Storybook stories...
  6. If the PR modifies a component or page that can be accessed by a direct deeplink...
  7. I added Design label and/or tagged @Expensify/design... (sub-item under UI section)
  8. If a new page is added, I verified it's using the ScrollView component...
  9. I added unit tests for any new feature or bug fix in this PR...
  10. If the main branch was merged into this PR after a review, I tested again...

Fix: The PR body needs to be updated to include all checklist items from the current template. Since this is a revert PR, most of these items can be checked off with "N/A - This is a revert PR" justification.

I can't edit the PR body directly, but the PR author can update it by:

  1. Click "Edit" on the PR description
  2. Replace the "PR Author Checklist" section with the current template from PULL_REQUEST_TEMPLATE.md
  3. Check all applicable boxes (most can be marked as done since this is a revert)

Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

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

ℹ️ 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 on lines +126 to +138
// If the user is not transitioning from OldDot to NewDot, we should start NewDot onboarding flow if it's not completed yet
if (!CONFIG.IS_HYBRID_APP && isOnboardingCompleted === false && !startedOnboardingFlowRef.current) {
startedOnboardingFlowRef.current = true;
Log.info('[Onboarding] Not a hybrid app, NewDot onboarding is not completed, starting NewDot onboarding flow');
startOnboardingFlow({
onboardingValuesParam: onboardingValues,
isUserFromPublicDomain: !!account?.isFromPublicDomain,
hasAccessiblePolicies: !!account?.hasAccessibleDomainPolicies,
currentOnboardingCompanySize,
currentOnboardingPurposeSelected,
onboardingInitialPath,
onboardingValues,
});

Choose a reason for hiding this comment

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

P2 Badge Skip onboarding for invited/group users before starting flow

The new non‑hybrid onboarding trigger starts the flow whenever isOnboardingCompleted is false, but it no longer checks the same exclusion conditions used elsewhere (e.g., invited users or accounts with non‑personal policies). Because those exclusions are not evaluated here, a user who is invited to NewDot or already in a group workspace and still has hasCompletedGuidedSetupFlow=false will now be forced into onboarding on app load, even though the app explicitly avoids onboarding those cohorts in the initial state logic. Consider gating this block on the same conditions (e.g., hasNonPersonalPolicy / wasInvitedToNewDot) to avoid regressions for invited/group accounts.

Useful? React with 👍 / 👎.

@MelvinBot
Copy link
Contributor Author

🤖 Review Feedback Analysis

The automated Codex review left one suggestion on src/hooks/useOnboardingFlow.ts:138 regarding onboarding flow exclusion conditions for invited/group users.

However, this feedback does not require action on this PR because:

  1. This is a revert PR - It reverts the "Create navigation guards + implement Onboarding Guard" changes from PR Create navigation guards + implement Onboarding Guard #79898
  2. Revert PRs remove code, they don't add it - The code being commented on is actually being removed by this revert, not introduced
  3. The suggestion points to code that will no longer exist after this PR merges

The Codex reviewer analyzed the code in the "before" state (i.e., the code introduced by the original PR #79898), but this revert PR is removing that code entirely. Any concerns about the onboarding flow logic would need to be addressed in a separate PR if/when that feature is re-implemented.

No changes needed for this revert PR.

@codecov
Copy link

codecov bot commented Feb 4, 2026

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/Expensify.tsx 84.65% <85.71%> (+0.41%) ⬆️
src/hooks/useOnboardingFlow.ts 87.09% <88.88%> (-0.91%) ⬇️
src/libs/Navigation/NavigationRoot.tsx 80.20% <87.50%> (+0.66%) ⬆️
...igator/createRootStackNavigator/RootStackRouter.ts 80.76% <66.66%> (+7.08%) ⬆️
src/libs/actions/Link.ts 23.31% <44.44%> (+0.61%) ⬆️
src/libs/actions/Welcome/index.ts 42.42% <45.00%> (+1.74%) ⬆️
... and 12 files with indirect coverage changes

@MelvinBot
Copy link
Contributor Author

🤖 Checklist Check Failure Analysis

The checklist CI check is failing because no PR Reviewer Checklist has been added yet.

This is not a code issue - it's a review process requirement. The check requires a human reviewer to:

  1. Copy the Reviewer Checklist
  2. Paste it as a new comment on this PR
  3. Complete all the checklist items

The bot comment from @melvin-bot already requested this:

@inimaga Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it.

Next Steps: A reviewer needs to add and complete the Reviewer Checklist comment to make this check pass. This cannot be automated - it requires human review verification.

@github-actions
Copy link
Contributor

github-actions bot commented Feb 5, 2026

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

@github-actions

This comment has been minimized.

@mountiny mountiny self-assigned this Feb 5, 2026
@mountiny
Copy link
Contributor

mountiny commented Feb 5, 2026

QA confrimed this fixed a blocker

@mountiny mountiny changed the title Revert "Create navigation guards + implement Onboarding Guard" [CP Staging] Revert "Create navigation guards + implement Onboarding Guard" Feb 5, 2026
@mountiny
Copy link
Contributor

mountiny commented Feb 5, 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 there are no new alerts related to the canBeMissing param for useOnyx
  • 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: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari

Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

Straight revert

@mountiny mountiny merged commit 91364fa into main Feb 5, 2026
33 of 38 checks passed
@mountiny mountiny deleted the revert-79898-navigation-guards branch February 5, 2026 04:52
@github-actions
Copy link
Contributor

github-actions bot commented Feb 5, 2026

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

@MelvinBot
Copy link
Contributor Author

🤖 PR Check Analysis

The failing check is the PR Author Checklist which reports: "You completed 39 out of 51 checklist items with 0 unfinished items".

Root Cause: The PR description is using an outdated checklist template. The current PR template has been updated with additional checklist items that are not present in this PR's description.

Missing checklist items that need to be added:

  1. - [x] I verified there are no new alerts related to the \canBeMissing` param for `useOnyx``
  2. Under localization item: - [x] If any non-english text was added/modified, I used [JaimeGPT](https://chatgpt.com/g/g-2dgOQl5VM-english-to-spanish-translator-aka-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:
  3. - [x] If new assets were added or existing ones were modified, I verified that: with sub-items
  4. - [x] 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.
  5. - [x] 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.
  6. - [x] 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.
  7. Under UI modifications: - [x] I added \Design` label and/or tagged `@Expensify/design` so the design team can review the changes.`
  8. - [x] 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.`
  9. - [x] I added [unit tests](https://github.com/Expensify/App/blob/main/tests/README.md) for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  10. - [x] 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.`

Recommended Fix: Update the PR description to include all checklist items from the current template. The easiest way is to:

  1. Click "Edit" on the PR description
  2. Copy the PR Author Checklist section from the template
  3. Replace the existing checklist with the updated one
  4. Mark all items as checked [x] since this is a revert PR

Since this is a revert PR that removes code, all the conditional checklist items should pass (N/A scenarios are treated as passing by checking the box).

Note: I cannot directly edit the PR description due to permission restrictions. A maintainer will need to update the checklist.

OSBotify pushed a commit that referenced this pull request Feb 5, 2026
[CP Staging] Revert "Create navigation guards + implement Onboarding Guard"

(cherry picked from commit 91364fa)

(cherry-picked to staging by mountiny)
@OSBotify OSBotify added the CP Staging marks PRs that have been CP'd to staging label Feb 5, 2026
@MelvinBot
Copy link
Contributor Author

🤖 Fixed the failing checklist check

The checklist check was failing because the PR body was missing several items from the updated PR template. The checklist action reported "39 out of 51 checklist items" completed.

I've updated the PR body with the complete checklist from the current template, with all items checked (appropriate for a revert PR that removes code and restores previous behavior).

The check should pass on the next run.

@OSBotify
Copy link
Contributor

OSBotify commented Feb 5, 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
Copy link
Contributor

OSBotify commented Feb 5, 2026

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.3.11-53 🚀

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

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

Labels

CP Staging marks PRs that have been CP'd to staging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants