Skip to content

fix(onboarding): prevent browser back from reopening onboarding steps - #94709

Merged
luacmartins merged 11 commits into
Expensify:mainfrom
software-mansion-labs:fix/go-back-history-after-onboarding
Jul 21, 2026
Merged

luacmartins merged 11 commits into
Expensify:mainfrom
software-mansion-labs:fix/go-back-history-after-onboarding

Conversation

@WojtekBoman

@WojtekBoman WojtekBoman commented Jun 26, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixes onboarding browser-back behavior on web by collapsing the nested onboarding stack before completeOnboarding, using forceReplace exit navigation options, and wiring post-completion navigation from the Purpose step. Platform-specific behavior lives in .ts/.native.ts helpers (collapseOnboardingNestedStack, getOnboardingExitNavigationOptions, dismissOnboardingModalBeforeExit).

Screen.Recording.2026-07-06.at.16.00.38.mov

Fixed Issues

$ #86816
PROPOSAL:

Tests

  1. Sign up for a new account on web (desktop browser)

  2. Complete onboarding through Purpose → Personal Details → Interested Features (or Workspaces), advancing through multiple steps

  3. Finish onboarding and land on the expected destination (home, admins room, or Concierge)

  4. Press the browser Back button

  5. Verify that onboarding steps do not reopen and navigation stays on the post-onboarding destination

  6. On web, start onboarding and advance at least two steps deep in the onboarding modal

  7. Select "I'm just looking around" on the Purpose step and complete onboarding from there

  8. Verify that you are navigated to the correct post-onboarding destination without getting stuck on the Purpose screen

  9. On iOS or Android native, complete onboarding through any flow that dismisses the onboarding modal

  10. Verify that the modal dismisses cleanly and you land on the expected destination without navigation errors in the console

  • Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

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

@WojtekBoman

Copy link
Copy Markdown
Contributor Author

@codex

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

ℹ️ 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/libs/actions/Report/index.ts Resolved
@WojtekBoman
WojtekBoman force-pushed the fix/go-back-history-after-onboarding branch from 969d51d to 2fbb494 Compare June 30, 2026 09:18
@codecov

codecov Bot commented Jun 30, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
.../helpers/OnboardingNavigationUtils/index.native.ts 100.00% <100.00%> (ø)
src/libs/navigateAfterOnboarding.ts 87.50% <100.00%> (ø)
.../pages/OnboardingPurpose/BaseOnboardingPurpose.tsx 91.89% <100.00%> (+0.11%) ⬆️
...igation/helpers/OnboardingNavigationUtils/index.ts 90.90% <90.90%> (ø)
src/libs/actions/Report/index.ts 71.54% <50.00%> (+0.07%) ⬆️
... and 13 files with indirect coverage changes

@WojtekBoman

Copy link
Copy Markdown
Contributor Author

@codex

@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: 75ae3b9fef

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

@WojtekBoman

Copy link
Copy Markdown
Contributor Author

@codex

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.

Since we are using these three new functions only for onboarding, it might be better to group them into a single file for mobile and a single file with no-ops for web. I feel that creating a new folder for every small function might overcomplicate the structure. Maybe we could combine them into one file, similar to Navigation.ts, but for onboarding. What do you think?

// Skip when forceReplace is set so the caller's explicit REPLACE intent is preserved.
const currentTopRoute = currentState.routes[currentState.index];
if (currentTopRoute?.name !== NAVIGATORS.TAB_NAVIGATOR && typedPayload.name === NAVIGATORS.TAB_NAVIGATOR) {
if (!forceReplace && currentTopRoute?.name !== NAVIGATORS.TAB_NAVIGATOR && typedPayload.name === NAVIGATORS.TAB_NAVIGATOR) {

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.

I have a slight concern regarding the use of forceReplace in linkTo. I feel it might be a bit risky to use 'navigate' action for all navigations with forceReplace, as it could cause a few unexpected bugs. Because we use forceReplace pretty regularly, if we try to navigate to a screen that’s already in the stack, 'navigate' action will pull us back to the old screen instead of pushing a new one. This might also be problematic for our dynamic routes.

Do you think we could tweak this approach? Or maybe we could just add an extra flag so this behavior only applies to the onboarding screens?

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.

I’m also wondering whether making a change this high up in the navigation architecture is a good idea specifically for fixing onboarding. Were there more bugs similar to the one we’re trying to fix with this change?

@WojtekBoman
WojtekBoman force-pushed the fix/go-back-history-after-onboarding branch from 918a6ab to a419896 Compare July 6, 2026 09:14
@WojtekBoman
WojtekBoman marked this pull request as ready for review July 6, 2026 12:07
@WojtekBoman
WojtekBoman requested review from a team as code owners July 6, 2026 12:07
@melvin-bot

melvin-bot Bot commented Jul 6, 2026

Copy link
Copy Markdown

@ChavdaSachin 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 request for a team July 6, 2026 12:08
JmillsExpensify
JmillsExpensify previously approved these changes Jul 6, 2026

@JmillsExpensify JmillsExpensify left a comment

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.

LGTM

@ChavdaSachin

ChavdaSachin commented Jul 8, 2026 •

Copy link
Copy Markdown
Contributor

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

Android: HybridApp
Android: mWeb Chrome
iOS: HybridApp
Screen.Recording.2026-07-20.at.7.18.00.PM.mov
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2026-07-20.at.7.04.28.PM.mov

@WojtekBoman

Copy link
Copy Markdown
Contributor Author

@ChavdaSachin friendly bump :)

@ChavdaSachin

Copy link
Copy Markdown
Contributor

Thanks for the ping, I had some issues with my private domain.
It's fixed now, I should complete the review tomorrow.

@ChavdaSachin ChavdaSachin left a comment

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.

LGTM ✅

@melvin-bot
melvin-bot Bot requested a review from luacmartins July 20, 2026 23:08
@ChavdaSachin

Copy link
Copy Markdown
Contributor

@WojtekBoman, the code looks good. Please merge the main.

And ping me if you make changes to the core logic and this needs another review after the merge.

@WojtekBoman

Copy link
Copy Markdown
Contributor Author

@ChavdaSachin Conflicts solved!

@ChavdaSachin ChavdaSachin left a comment

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.

Ready for the merge ✅

@luacmartins
luacmartins merged commit 869722f into Expensify:main Jul 21, 2026
36 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

Copy link
Copy Markdown
Contributor

✋ 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 Jul 22, 2026
49 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.4.42-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 I reviewed the changes in this PR against the help site content under App/docs/articles.

No help site changes are required.

This PR is a purely technical navigation fix — it collapses the nested onboarding navigation stack before completeOnboarding (resetOnboardingStackToRoot) and wires post-completion navigation from the Purpose step so that pressing the browser Back button after finishing onboarding no longer reopens onboarding steps. The changes are limited to navigation internals, helpers, and a unit test:

  • src/libs/Navigation/helpers/OnboardingNavigationUtils/* (new platform-specific helpers)
  • src/libs/actions/Report/index.ts
  • src/libs/navigateAfterOnboarding.ts
  • src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
  • tests/unit/resetOnboardingStackToRootTest.ts

There is no new or changed user-facing feature, setting, label, tab, or workflow — the onboarding flow itself and its steps are unchanged. Help articles describe how to use features and complete flows, and none of that documented behavior is affected by this fix, so there's nothing to add or update.

No draft PR was created since no documentation updates are needed.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.4.42-1 🚀

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

Bundle Size Analysis (Sentry):

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.

8 participants