Skip to content

Logged-out sign-in page URL shows /Home instead of root #94433

Merged
mountiny merged 6 commits into
Expensify:mainfrom
software-mansion-labs:fix/signin-page-root-url
Jun 30, 2026
Merged

Logged-out sign-in page URL shows /Home instead of root #94433
mountiny merged 6 commits into
Expensify:mainfrom
software-mansion-labs:fix/signin-page-root-url

Conversation

@sumo-slonik

@sumo-slonik sumo-slonik commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

The logged-out sign-in page showed /Home on web because PublicScreens registered SignInPage as SCREENS.HOME. Registering it under NAVIGATORS.TAB_NAVIGATOR (which has no path of its own) keeps the URL at the root /, and the related logout / 2FA reset paths are updated to match (with a /Home/ redirect kept for legacy cached paths).

Fixed Issues

$ #94450
PROPOSAL:

Tests

  1. Open the app on web while logged out.
  2. Verify the sign-in page is shown and the address bar URL is / (NOT /Home).
  3. Navigate directly to /Home while logged out and verify it redirects to /.
  4. Log in, then log out, and verify you land on the sign-in page with the URL /.
  5. While logged in on the Home tab, log out and verify the URL is / (NOT /home).
  6. Open a deep-link when logged out and check if redirect works correct after loging in.
  • Verify that no errors appear in the JS console

Offline tests

N/A — this change only affects unauthenticated navigation/URL resolution and has no offline-specific behavior.

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

PublicScreens registered the SignInPage under the top-level SCREENS.HOME, which has no root-level path mapping (it's only mapped as "home" nested in TAB_NAVIGATOR), so React Navigation derived "/Home" from the screen name. Logging out from the Home tab also surfaced "/home" because the post-logout reset carried over the nested tab focus.

Register the SignInPage under NAVIGATORS.TAB_NAVIGATOR instead, mirroring the authenticated top-level navigator (as it used to be registered under REPORTS_SPLIT_NAVIGATOR). TAB_NAVIGATOR has no path of its own, so the unauthenticated URL stays at "/". Update the post-logout and validate-login resets to target TAB_NAVIGATOR and drop any carried-over nested tab state so logout always lands on "/".
- Add PublicSignInPageRootUrlTest: mounts the real PublicScreens navigator
  and asserts the root route renders SignInPage under TAB_NAVIGATOR and
  resolves to "/" (verified to fail if reverted to SCREENS.HOME).
- Rename getPathFromStatePublicHomeTest -> publicSignInPageUrlResolutionTest;
  drive the real linking config round-trip (getAdaptedStateFromPath ->
  getPathFromState), cover the legacy /Home -> / redirect, and fix the
  mislabeled authenticated-root case.
- Trim comments to behavior-only (drop change/history narration) across
  PublicScreens, getAdaptedStateFromPath, getStateToResetAfterLogout, types,
  and the ValidateLoginPage 2FA reset.
- Consolidate navigation tests into one PublicScreens render guard
  (renders SignInPage under TAB_NAVIGATOR at '/', plus the legacy /Home -> /
  redirect); remove the redundant getPathFromState resolution file.
- Make the test's jest.mock factory robust (mock-prefixed hoisted function
  declaration) instead of relying on module-load ordering.
@sumo-slonik sumo-slonik changed the title Fix/signin page root url Logged-out sign-in page URL shows /Home instead of root Jun 24, 2026
# Conflicts:
#	src/libs/Navigation/NavigationRoot.tsx
restoreTabNavigatorRoutes reattaches the prior session's TAB_NAVIGATOR
subtree to the public sign-in route (which now shares that name), so the
logged-out reset failed to drop a previous deep-linked report. Evict the
in-memory preserved navigator states on logout so the next session starts
clean.
@codecov

codecov Bot commented Jun 24, 2026

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/libs/Navigation/AppNavigator/PublicScreens.tsx 100.00% <ø> (ø)
.../createSplitNavigator/usePreserveNavigatorState.ts 84.61% <100.00%> (+2.00%) ⬆️
...libs/Navigation/helpers/getAdaptedStateFromPath.ts 44.72% <ø> (+0.62%) ⬆️
...s/Navigation/helpers/getStateToResetAfterLogout.ts 100.00% <100.00%> (ø)
src/pages/ValidateLoginPage/index.web.tsx 100.00% <ø> (ø)
src/libs/Navigation/NavigationRoot.tsx 76.23% <50.00%> (+0.23%) ⬆️
... and 587 files with indirect coverage changes

@WojtekBoman WojtekBoman 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 🐘

@sumo-slonik sumo-slonik marked this pull request as ready for review June 25, 2026 07:03
@sumo-slonik sumo-slonik requested review from a team as code owners June 25, 2026 07:03
@melvin-bot melvin-bot Bot requested review from flaviadefaria and nyomanjyotisa and removed request for a team June 25, 2026 07:03
@melvin-bot

melvin-bot Bot commented Jun 25, 2026

Copy link
Copy Markdown

@nyomanjyotisa 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 June 25, 2026 07:03

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

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

...rootState,
index: 0,
routes: [{...lastRoute, params: shouldClearParams ? undefined : lastRoute.params}],
routes: [{...lastRoute, params: shouldClearParams ? undefined : lastRoute.params, state: shouldClearNestedState ? undefined : lastRoute.state}],

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Clear TAB_NAVIGATOR params during logout reset

Please also clear params when lastRoute.name === NAVIGATORS.TAB_NAVIGATOR. Some TAB_NAVIGATOR routes carry their child tab in params rather than only in state (for example, getRehydratedTabNavigatorStateAfterPush() stores the full tab subtree in params.state), but this reset now drops state while preserving those params. Since PublicScreens and AuthScreens share the TAB_NAVIGATOR route name, logging out from such a route can leave the previous session's tab subtree attached to the public sign-in route and let the next login hydrate back to a stale tab/path instead of starting cleanly at /.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think this comment is valid. We can get a dirty URL from leftover params after logout

Steps to reproduce:

  1. Log in to the Expensify App
  2. Navigate around in-app a few times (jump across tabs into a nested page)
  3. Log out and observe the URL
MacOS-Chrome.mov

What do you think? @sumo-slonik

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Good catch @nyomanjyotisa, thanks for digging into this and sharing the clear repro 🙏 Taking a closer look now and will follow up shortly.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Confirmed and already fixed: the carried-over tab subtree also lives in params.state (not just state), so the post-logout reset now clears params for TAB_NAVIGATOR as well — the public sign-in route lands cleanly on /.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Screen.Recording.2026-06-30.at.15.30.40.mov

The tab subtree carried over from an authenticated session lives in both
route.state and params.state (getRehydratedTabNavigatorStateAfterPush writes
it under params). Clearing only state left the params behind, which surfaced
as a dirty post-logout URL and could rehydrate a stale tab on the next login.
Clear params too so the public sign-in route resets to a clean "/".
@nyomanjyotisa

Copy link
Copy Markdown
Member

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
Android-mWeb.Chrome.mp4
iOS: HybridApp
iOS: mWeb Safari
iOS-mWeb.Safari.mp4
MacOS: Chrome / Safari
MacOS-Chrome.mov

@nyomanjyotisa nyomanjyotisa left a comment

Copy link
Copy Markdown
Member

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 mountiny June 30, 2026 16:44

@mountiny mountiny 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.

Thanks

@mountiny mountiny merged commit b3c1376 into Expensify:main Jun 30, 2026
34 of 36 checks passed
@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.

@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

OSBotify commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/mountiny in version: 9.4.26-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 files under docs/articles, and one update is required.

This PR moves the logged-out sign-in page URL on web from /Home to the root /. One help article still referenced the login page at the old URL:

I opened a draft PR updating that link to https://new.expensify.com/ so it reflects the new canonical URL:

Draft PR: #95086

No other help site changes are needed — this was a navigation/URL-resolution fix with no other user-facing documented behavior.

@sumo-slonik, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review.

@m-natarajan

Copy link
Copy Markdown

@sumo-slonik @nyomanjyotisa Are we expecting / at the end of the URL like staging.new.expensify.com/
For Step 3 also / not displayed, Is this expected or potential issue? Please check the attached video

Recording.993.mp4

@sumo-slonik

Copy link
Copy Markdown
Contributor Author

@sumo-slonik @nyomanjyotisa Are we expecting / at the end of the URL like staging.new.expensify.com/ For Step 3 also / not displayed, Is this expected or potential issue? Please check the attached video

Recording.993.mp4

Yes, that's working as designed.

@OSBotify

OSBotify commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/grgia in version: 9.4.27-2 🚀

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.

7 participants