Skip to content

[CP Staging & Prod] Add Settings_Profile to exit survey entryScreens#88990

Merged
youssef-lr merged 9 commits intomainfrom
claude-exitSurveyMissingEntryScreen
Apr 27, 2026
Merged

[CP Staging & Prod] Add Settings_Profile to exit survey entryScreens#88990
youssef-lr merged 9 commits intomainfrom
claude-exitSurveyMissingEntryScreen

Conversation

@MelvinBot
Copy link
Copy Markdown
Contributor

@MelvinBot MelvinBot commented Apr 27, 2026

Explanation of Change

The "Switch to Expensify Classic" button on the main Settings page (InitialSettingsPage) calls createDynamicRoute(EXIT_SURVEY_REASON.path), which builds the exit survey URL relative to the currently focused central pane. On wide screens the default central pane is Settings_Profile, but EXIT_SURVEY_REASON.entryScreens only allowed Settings_Troubleshoot. This caused getStateFromPath to reject the route and show a 404.

This PR adds SCREENS.SETTINGS.PROFILE.ROOT to the entryScreens of both EXIT_SURVEY_REASON and EXIT_SURVEY_CONFIRM so the exit survey is reachable when the default Profile central pane is active.

Fixed Issues

$ #88986
PROPOSAL: #88986 (comment)

Tests

  1. Supportal as one of the affected users (e.g. https://expensify.slack.com/archives/C07NMDKEFMH/p1777307175469079) into NewDot
  2. Go to Account -> Switch to Expensify Classic
  3. Check if the reason drawer appears
  4. Enter reason, check if you're redirected to OldDot properly
  • Verify that no errors appear in the JS console

Offline tests

N/A - this is a route configuration change with no network dependency.

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 shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

The "Switch to Expensify Classic" button on InitialSettingsPage navigates
to EXIT_SURVEY_REASON using createDynamicRoute, which builds the URL
relative to the current central pane. On wide screens the default central
pane is Settings_Profile, but that screen was not in entryScreens, causing
getStateFromPath to reject the route and show a 404.

Add SCREENS.SETTINGS.PROFILE.ROOT to both EXIT_SURVEY_REASON and
EXIT_SURVEY_CONFIRM entryScreens so the exit survey is reachable from the
default settings central pane.

Co-authored-by: mjasikowski <mjasikowski@users.noreply.github.com>
Co-authored-by: Michał Jasikowski <mjasikowski@users.noreply.github.com>
@github-actions
Copy link
Copy Markdown
Contributor

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

@github-actions

This comment has been minimized.

@mjasikowski mjasikowski added the InternalQA This pull request required internal QA label Apr 27, 2026
@mjasikowski mjasikowski marked this pull request as ready for review April 27, 2026 19:33
@mjasikowski mjasikowski requested a review from a team as a code owner April 27, 2026 19:33
@melvin-bot melvin-bot Bot requested review from joekaufmanexpensify and parasharrajat and removed request for a team April 27, 2026 19:33
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented Apr 27, 2026

@parasharrajat 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 a team and youssef-lr and removed request for a team April 27, 2026 19:33
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented Apr 27, 2026

@youssef-lr 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 requested review from trjExpensify and removed request for joekaufmanexpensify April 27, 2026 19:45
Copy link
Copy Markdown
Contributor

@trjExpensify trjExpensify left a comment

Choose a reason for hiding this comment

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

Add all settings central pane screens to EXIT_SURVEY_REASON.entryScreens in src/ROUTES.ts:346-349. The sidebar button can be clicked while any central pane is focused (not just Profile), so we need to allow all of them. The same fix should also be applied to EXIT_SURVEY_CONFIRM at line 350-353, since InitialSettingsPage can navigate directly to it as well (line 344).

Only partially fixes the bug. Melvin was right about this commentary above.

2026-04-27_20-53-38.mp4

@trjExpensify
Copy link
Copy Markdown
Contributor

@youssef-lr for this to work if launched from any of the settings pages, I think this needs to be:

entryScreens: [SCREENS.SETTINGS.TROUBLESHOOT, SCREENS.SETTINGS.PROFILE.ROOT, SCREENS.SETTINGS.WALLET, SCREENS.SETTINGS.SUBSCRIPTION, SCREENS.SETTINGS.RULES, SCREENS.SETTINGS.PREFERENCES, SCREENS.SETTINGS.SECURITY, SCREENS.SETTINGS.HELP, SCREENS.SETTINGS.ABOUT, SCREENS.SETTINGS.TEACHERSUNITE]

Comment thread src/ROUTES.ts Outdated
Comment thread src/ROUTES.ts Outdated
@youssef-lr
Copy link
Copy Markdown
Contributor

@MelvinBot let's play it safe and allow all screens to lead to the exit survey, in case new screens come up in the future that do this.

Co-authored-by: Youssef Lourayad <youssef@expensify.com>
@youssef-lr youssef-lr requested a review from a team as a code owner April 27, 2026 22:00
@melvin-bot melvin-bot Bot requested review from dangrous and removed request for a team April 27, 2026 22:01
MelvinBot and others added 3 commits April 27, 2026 22:19
…uestStepUpgrade

Co-authored-by: Michał Jasikowski <mjasikowski@users.noreply.github.com>
…com/Expensify/App into claude-exitSurveyMissingEntryScreen

Co-authored-by: Michał Jasikowski <mjasikowski@users.noreply.github.com>
Co-authored-by: Michał Jasikowski <mjasikowski@users.noreply.github.com>
@MelvinBot MelvinBot dismissed stale reviews from francoisl, pecanoro, and blimpich via c83f18d April 27, 2026 22:20
@MelvinBot
Copy link
Copy Markdown
Contributor Author

Fixed the failing typecheck: after merging main, a duplicate allPolicyTags hook declaration and duplicate policyTagList property in the changeTransactionsReport call were introduced by the merge. Removed the duplicates to resolve the TS2345 error.

@MelvinBot
Copy link
Copy Markdown
Contributor Author

The previous TypeScript check failures were from CI runs that started before the fix in commit c83f18d was pushed. The current CI run includes that fix and all checks are either passing or still in progress — no failures remain.

I verified locally that typecheck passes cleanly on the current branch state. No further changes needed.

@youssef-lr youssef-lr dismissed trjExpensify’s stale review April 27, 2026 22:46

changes implemented

@youssef-lr youssef-lr merged commit c074c85 into main Apr 27, 2026
40 checks passed
@youssef-lr youssef-lr deleted the claude-exitSurveyMissingEntryScreen branch April 27, 2026 22:46
@github-actions
Copy link
Copy Markdown
Contributor

🚧 @youssef-lr 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.

@youssef-lr youssef-lr changed the title Add Settings_Profile to exit survey entryScreens [CP Staging & Prod] Add Settings_Profile to exit survey entryScreens Apr 27, 2026
@OSBotify
Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/youssef-lr in version: 9.3.62-13 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot
Copy link
Copy Markdown
Contributor Author

No help site changes are required for this PR.

This PR is a pure route configuration fix (changing entryScreens to '*' wildcards). It doesn't add, remove, or rename any UI elements, buttons, or user flows. The Switch between New Expensify and Expensify Classic article correctly documents the Troubleshoot path, which remains the primary and universally available way to switch — the Settings page button is only conditionally shown for nudge-migration users.

OSBotify pushed a commit that referenced this pull request Apr 28, 2026
…yScreen

(cherry picked from commit c074c85)

(cherry-picked to production by arosiclair)
@m-natarajan
Copy link
Copy Markdown

@mjasikowski @youssef-lr @blimpich @dangrous Supportal is blocked for Applause, Can this one please be tested internally?

@trjExpensify
Copy link
Copy Markdown
Contributor

We've internally QA'd it on prod via this thread in deployers. 👍

@OSBotify
Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/marcaaron in version: 9.3.63-0 🚀

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

Bundle Size Analysis (Sentry):

@OSBotify
Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/youssef-lr in version: 9.3.63-1 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot
Copy link
Copy Markdown
Contributor Author

No help site changes are required for this PR.

This PR is a route configuration bug fix — it changes entryScreens from specific screen references to '*' wildcard so the exit survey doesn't 404 when navigated from certain settings screens. No UI elements, buttons, labels, or user flows were added or changed.

The relevant help article (Switch between New Expensify and Expensify Classic) documents the path as Profile > Troubleshoot > Switch to Expensify Classic, which remains accurate.

@OSBotify
Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/youssef-lr in version: 9.3.64-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot
Copy link
Copy Markdown
Contributor Author

No help site changes are required for this PR.

This is a routing configuration fix (entryScreens wildcard in src/ROUTES.ts) that prevents a 404 when the exit survey is triggered from different settings central panes. The user-facing navigation path documented in Switch between New Expensify and Expensify ClassicProfile picture → Troubleshoot → Switch to Expensify Classic — is unchanged.

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

Labels

CP Production InternalQA This pull request required internal QA

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants