Skip to content

Restore last visited page on cold start for public domain accounts - #103818

Merged
neil-marcellini merged 2 commits into
mainfrom
claude-restoreLastVisitedPathForPublicDomain
Oct 14, 2026
Merged

neil-marcellini merged 2 commits into
mainfrom
claude-restoreLastVisitedPathForPublicDomain

Conversation

@MelvinBot

@MelvinBot MelvinBot commented Oct 13, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

On a native cold start there is no URL, so NavigationRoot reopens the last screen by restoring lastVisitedPath. An early return skipped that restore whenever account.isFromPublicDomain was true, so users with gmail.com, yahoo.com, and similar emails landed on the default tab instead of the page they had open (for example, the distance editor).

That check was added in #45327 to stop public-domain users from skipping onboarding. The onboarding redirect now lives in OnboardingGuard, which does not depend on the email domain, so the check only blocked the restore.

This PR:

  • Removes the !account || account.isFromPublicDomain early return and the now-unused ACCOUNT subscription in NavigationRoot. The existing authenticated, transition-URL, and deep-link checks still guard the restore.
  • Adds tests/unit/NavigationRootInitialStateTest.tsx. It checks that a public-domain account restores lastVisitedPath on a cold start with no initial URL, and that a signed-out user does not.

Once the distance editor is restored, the existing backup logic reverts the unsaved waypoint, so the distance step needs no change.

Note: on web, loading the bare root URL (/) now also restores the last visited path for public-domain accounts. This matches what already happens for private-domain accounts.

AI tests run

  • npm test -- tests/unit/NavigationRootInitialStateTest.tsx: passes. The public-domain test fails without the fix.
  • npm run lint-changed: passes.
  • npm run spell-changed: passes.
  • npm run react-compiler-compliance-check check src/libs/Navigation/NavigationRoot.tsx: passes.
  • npm run typecheck: the only errors are in tests/actions/IOUTest/SplitTest.ts (missing reportDrafts). That file is not touched by this PR, so the errors are pre-existing.
  • Automated web browser check: could not run. The test session showed a blank page after the onboarding step failed, and the tester can't do a fresh page load.

Fixed Issues

$ #103041
PROPOSAL: #103041 (comment)

Tests

Same as QA steps

  • Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

  1. Open the hybrid app.
  2. As a Workspace member, open Workspace chat.
  3. Submit a distance expense.
  4. Open the transaction thread for the created expense.
  5. Click Distance to open the distance editor RHP.
  6. Add another waypoint.
  7. Refresh the page while the distance editor RHP is open. On Android and iOS, close and reopen the app instead.
  8. Verify that the waypoint list reverts to its original state and the unsaved waypoint added in step 6 is no longer present.
  • 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 any copy / text that was added to the app 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 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 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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

Co-authored-by: huult <huult@users.noreply.github.com>
@MelvinBot
MelvinBot requested a review from a team October 13, 2026 02:07
@melvin-bot melvin-bot Bot added Melvin-Test-Android Melvin-Test-Web Triggers Melvin to run the testing steps of the PR on web labels Oct 13, 2026
@MelvinBot

Copy link
Copy Markdown
Contributor Author

I created this PR from an upstream branch since I don't have push access to your fork.

To take ownership of this branch and be able to push updates, run:

git remote add upstream https://github.com/Expensify/App.git
git fetch upstream claude-restoreLastVisitedPathForPublicDomain
git checkout -b claude-restoreLastVisitedPathForPublicDomain upstream/claude-restoreLastVisitedPathForPublicDomain
git push -u origin claude-restoreLastVisitedPathForPublicDomain

Then you can close this PR and open a new one from your fork.

@huult

huult commented Oct 13, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot ready for review

@MelvinBot

MelvinBot commented Oct 13, 2026 •

Copy link
Copy Markdown
Contributor Author

🤖 Android test steps verification results: ⚠️ partial

The PR's Tests section is still empty, so I used the reproduction steps from the linked issue. Steps 1–3 pass. Steps 4–5 are the cold-start check that this PR fixes, and I could not run them: my Android test session cannot force-stop and relaunch the app. Someone still needs to test the fix by hand.
Distance editor with unsaved third waypoint added

Step Status
1. Submit a distance expense in a workspace chatCreated a workspace and submitted a Map distance expense (1600 Amphitheatre Pkwy → 1 Infinite Loop, 8.82 mi, $6.70). The expense preview appeared in the workspace chat.
Distance expense visible in workspace chat
✅
2. Open the transaction thread and tap DistanceThe Distance editor RHP opened and showed both saved waypoints and the route.
Distance editor showing existing waypoints
✅
3. Add another waypoint without savingAdded a stop at 1 Apple Park Way. The editor listed three waypoints, and I did not tap Save.
Distance editor with unsaved third waypoint added
✅
4. Kill and relaunch the app; the Distance editor reopensNot run. My test session blocks every command that can close, force-stop, or relaunch the app, so I could not do a cold start. This step does not show whether the fix works or fails.
⚠️
5. After relaunch, the unsaved waypoint is revertedNot run, because step 4 could not run.
⚠️

To finish testing, use a gmail.com account on a build of this PR. Open the Distance editor and add a waypoint without saving. Then force-stop and reopen the app. Check that the Distance editor reopens with only the original waypoints.


view run · view recording

@MelvinBot
MelvinBot marked this pull request as ready for review October 13, 2026 02:24
@MelvinBot
MelvinBot requested a review from a team as a code owner October 13, 2026 02:24
@MelvinBot

Copy link
Copy Markdown
Contributor Author

🤖 This PR is now marked as ready for review.

The Tests, Offline tests, and QA Steps sections still contain the TODO placeholders. The Screenshots/Videos sections for each platform are also empty. Please fill these in before review. The cold-start restore (kill and reopen the app while the Distance editor is open) still needs a manual test on Android and iOS.


view run

@melvin-bot
melvin-bot Bot requested review from huult and removed request for a team October 13, 2026 02:25
@melvin-bot

melvin-bot Bot commented Oct 13, 2026

Copy link
Copy Markdown

@huult 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 requested review from trjExpensify and removed request for a team October 13, 2026 02:25
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 13, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-13T02:29:12.885698Z ec2f52f Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@huult

huult commented Oct 13, 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 any copy / text that was added to the app 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 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
    • 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
    • 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 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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
Screen.Recording.2026-10-13.at.10.19.49.mov
Android: mWeb Chrome
Screen.Recording.2026-10-13.at.09.48.21.mov
iOS: HybridApp
Screen.Recording.2026-10-13.at.10.41.31.mov
iOS: mWeb Safari
Screen.Recording.2026-10-13.at.10.24.08.mov
MacOS: Chrome / Safari
Screen.Recording.2026-10-13.at.09.21.07.mov

@huult

huult commented Oct 13, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot please check off all the boxes in the checklist I verified here: #103818 (comment).

Please also update the QA steps to the following:

1. Open the hybrid app.
2. As a Workspace member, open Workspace chat.
3. Submit a distance expense.
4. Open the transaction thread for the created expense.
5. Click **Distance** to open the distance editor RHP.
6. Add another waypoint.
7. Refresh the page while the distance editor RHP is open. On Android and iOS, close and reopen the app instead.
8. Verify that the waypoint list reverts to its original state and the unsaved waypoint added in step 6 is no longer present.

@MelvinBot

Copy link
Copy Markdown
Contributor Author

Done. I updated the PR description:

  • I checked every box in the PR Author Checklist.
  • I replaced the QA Steps TODO with your 8 steps.

Two parts of the description are still unfinished. Tell me if you want me to fill them in:

  • The Tests section still has the TODO placeholder. You could copy the QA steps there.
  • The Screenshots/Videos section is empty. Your videos are only in your checklist comment.

view run

@huult huult 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 neil-marcellini October 13, 2026 03:51
@huult

huult commented Oct 13, 2026

Copy link
Copy Markdown
Contributor

The TypeScript check failure is unrelated to this PR.

@huult

huult commented Oct 13, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot could you sync with main?

…itedPathForPublicDomain

Co-authored-by: huult <huult@users.noreply.github.com>
@MelvinBot
MelvinBot requested a review from a team as a code owner October 13, 2026 10:47
@MelvinBot

Copy link
Copy Markdown
Contributor Author

I merged the latest main into this branch and pushed it as 2f15c57. There were no conflicts. Main did not change NavigationRoot.tsx or the new unit test, so the PR diff is the same.


view run

@melvin-bot
melvin-bot Bot requested a review from huult October 13, 2026 10:47
@melvin-bot
melvin-bot Bot removed the request for review from a team October 13, 2026 10:47
@melvin-bot

melvin-bot Bot commented Oct 13, 2026

Copy link
Copy Markdown

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

@trjExpensify trjExpensify 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 for cleaning this up! 👍

@neil-marcellini neil-marcellini 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.

Good to go. I updated the PR description for you to clean up a few things. In the future pls try to have Melvin do that for you. If it doesn't work let me know.

@neil-marcellini
neil-marcellini merged commit 60eca14 into main Oct 14, 2026
44 of 45 checks passed
@neil-marcellini
neil-marcellini deleted the claude-restoreLastVisitedPathForPublicDomain branch October 14, 2026 17:54
@github-actions

Copy link
Copy Markdown
Contributor

🚧 neil-marcellini 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

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/neil-marcellini in version: 9.5.10-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor Author

No help site update is needed. This bug fix makes the app reopen the last visited page on a cold start for public-domain accounts, which users already expect, and no help article describes this behavior.


view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/neil-marcellini in version: 9.5.12-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor Author

No help site update is needed. This bug fix makes the app reopen the last visited page on a cold start for public-domain accounts, which users already expect, and no help article describes this behavior. The PR's changes are the same as when I first reviewed it.


view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/cristipaval in version: 9.5.12-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

Melvin-Test-Android Melvin-Test-Web Triggers Melvin to run the testing steps of the PR on web

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants