Skip to content

Add fallback routes to Copy Policy Settings navigation and clear features on workspace change - #93546

Merged
yuwenmemon merged 17 commits into
Expensify:mainfrom
fedirjh:fedirjh/fix-copy-settings-navigation-91792
Jun 17, 2026
Merged

yuwenmemon merged 17 commits into
Expensify:mainfrom
fedirjh:fedirjh/fix-copy-settings-navigation-91792

Conversation

@fedirjh

@fedirjh fedirjh commented Jun 14, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

This PR fixes incorrect navigation behavior in the Copy Policy Settings flow after page refresh.

Fixed Issues

$ #91792
$ #92385

Tests

Prerequisite: Account has at least two workspaces.

Test 1: Back navigation from SELECT_FEATURES after refresh

  1. Navigate to "Workspaces"
  2. Click on the three dots icon on any workspace → "Copy Settings"
  3. Select any workspace and click "Next"
  4. On the feature list page, refresh the browser
  5. Click the back button on the top left corner of RHP
  6. Verify you land on the workspace selector page

Test 2: Back navigation from CONFIRM after refresh

  1. Navigate to "Workspaces"
  2. Click on the three dots icon on any workspace → "Copy Settings"
  3. Select any workspace and click "Next"
  4. Select some features and click "Next" to reach the Confirm page
  5. Refresh the browser
  6. Click the back button
  7. Verify you land on the feature selection page

Test 3: Normal navigation without a refresh

  1. Navigate to "Workspaces" → three dots → "Copy Settings"
  2. Select workspace → Next → Select features → Next (Confirm page)
  3. Click the back button
  4. Verify you return to features selection
  5. Click the back button again
  6. Verify you return to the workspace selector

Test 4: Selected features are cleared when selected workspaces changes

  1. Navigate to "Workspaces" → three dots → "Copy Settings"
  2. Select a workspace (e.g., Workspace A) and click "Next"
  3. Select some features (e.g., Categories, Tags) and click "Next" to reach the Confirm page
  4. Click the "Workspaces" menu item to edit workspace selection
  5. Change the workspace selection (add or remove a workspace)
  6. Click "Next"
  7. Verify previously selected features are cleared (no features are checked)
  8. Repeat steps 2-6 but without changing workspace selection
  9. Verify previously selected features are still checked
  • Verify that no errors appear in the JS console

Offline tests

Same as tests

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

CleanShot.2026-06-14.at.14.59.43.mp4
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

fedirjh added 4 commits June 14, 2026 14:38
After a page refresh, the navigation state is reconstructed from the URL
alone, missing intermediate screens. This adds a fallback route to
Navigation.goBack() so back navigation works correctly even after refresh.

Fixes part of Expensify#91792
Similar to SELECT_FEATURES, the CONFIRM page back button now navigates
to SELECT_FEATURES with a fallback route, ensuring correct navigation
after page refresh.

Fixes part of Expensify#91792
When navigating from Confirm page to edit workspaces, if the user changes
their workspace selection, the previously selected features are cleared.
This prevents stale/incompatible feature selections when target workspaces
change.

Fixes Expensify#92385
Add unit tests covering:
- Back button route construction for SELECT_FEATURES and CONFIRM pages
- Route construction verification for all Copy Policy Settings routes
- Workspace selection change detection logic
@codecov

codecov Bot commented Jun 14, 2026

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/libs/actions/Policy/CopyPolicySettings.ts 76.02% <100.00%> (+1.36%) ⬆️
...ettings/CopyPolicySettingsSelectWorkspacesPage.tsx 82.35% <100.00%> (+82.35%) ⬆️
...ySettings/CopyPolicySettingsSelectFeaturesPage.tsx 72.26% <66.66%> (+0.20%) ⬆️
...pyPolicySettings/CopyPolicySettingsConfirmPage.tsx 0.00% <0.00%> (ø)
... and 14 files with indirect coverage changes

@fedirjh
fedirjh marked this pull request as ready for review June 14, 2026 14:02
@fedirjh
fedirjh requested review from a team as code owners June 14, 2026 14:02
@melvin-bot

melvin-bot Bot commented Jun 14, 2026

Copy link
Copy Markdown

@shubham1206agra 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 June 14, 2026 14:02
@fedirjh
fedirjh requested review from ishpaul777 and yuwenmemon June 14, 2026 14:04

@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: 1a2ebee324

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

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

When workspace selection changes and parts are cleared, the Confirm page
could end up in a broken state with workspaces selected but no features.
Now it redirects to SELECT_FEATURES page when parts is empty but
targetPolicyIDs exists, allowing the user to re-select features.
Comment thread tests/unit/CopyPolicySettingsNavigationTest.tsx
fedirjh added 3 commits June 16, 2026 22:51
Replace manual `as jest.MockedFunction<typeof fn>` casts with the type-safe
`jest.mocked()` helper to resolve ESLint no-unsafe-type-assertion warnings.
Update the Onyx type definition to use Part[] instead of string[] for the
parts field, eliminating the need for unsafe type assertions in consuming
components.
@fedirjh
fedirjh requested a review from ishpaul777 June 16, 2026 22:00
- Remove redundant `as Part[]` cast in CopyPolicySettingsSelectFeaturesPage
  since the Onyx type now uses Part[] directly
- Add explicit assertions in navigation tests to fail clearly when
  workspace items aren't found
@shubham1206agra

Copy link
Copy Markdown
Contributor
Screen.Recording.2026-06-17.at.5.08.12.PM.mov

@fedirjh BUG: Double naviagtion on feature selection page

Wait for Onyx.merge to complete before navigating, and ensure ConfirmPage
checks that data is loaded before making redirect decisions.
const hasLoadedCopyPolicySettings = copyPolicySettingsState !== undefined;
const hasLoadedPolicies = policies !== undefined;
const parts = copyPolicySettingsState?.parts ?? [];
const isDataLoaded = policiesMetadata.status === 'loaded' && copyPolicySettingsMetadata.status === 'loaded';

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.

Use isLoadingOnyxValue function here

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.

Thanks, Done.

@shubham1206agra

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

Screen.Recording.2026-06-17.at.6.29.35.PM.mov

@yuwenmemon
yuwenmemon merged commit 3c3d41b into Expensify:main Jun 17, 2026
32 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

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/yuwenmemon in version: 9.4.10-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot

Copy link
Copy Markdown
Contributor

Help site review: no docs changes required

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

Conclusion: No help site updates are needed.

Why: This PR is a navigation bug fix for the Copy Policy Settings flow. The changes:

  • Add fallback routes so the back button lands on the correct previous step after a browser refresh (workspace selector / feature selection).
  • Clear previously selected features when the workspace selection changes.
  • Refactor internal Onyx loading/typing logic.

None of these change any user-facing feature names, menu items, button labels, or the documented end-to-end flow. The closest help article — Duplicate Workspace (docs/articles/new-expensify/workspaces/Duplicate-Workspace.md) — documents the user steps for carrying over settings, and those steps remain accurate. Back-navigation-after-refresh and internal state-clearing are correctness behaviors that aren't (and don't need to be) described in the help docs.

Since no documentation changes are required, I did not create a draft help site PR.

@fedirjh, please confirm you agree no help site changes are needed. If you'd like a docs PR created for any behavior here, let me know and I'll open one.

@nlemma

nlemma commented Jun 17, 2026

Copy link
Copy Markdown

Deploy Blocker #93879 was identified to be related to this PR.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/yuwenmemon in version: 9.4.12-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 No help site changes required.

I reviewed this PR against the relevant help article (Duplicate-Workspace.md) and the changes don't affect any documented behavior.

Why: This PR is a navigation/state bug fix only:

  • Adds fallback back-navigation routes so the back button lands on the correct page after a browser refresh (SELECT_FEATURES → workspace selector, CONFIRM → feature selection).
  • Clears previously selected features when the selected workspaces change.

The diff touches action/page/type/test files and no src/languages/* strings, UI labels, button text, tab names, or feature names changed. The help article documents who can duplicate a workspace, the step-by-step flow, and which settings carry over — none of which is altered here. Back-button behavior after a refresh and stale-selection clearing are internal correctness fixes that aren't (and don't need to be) documented.

Since there's no documented behavior change, I'm not opening a draft docs PR.

@fedirjh, if you'd like a docs update anyway (e.g., to document the multi-step copy flow in more detail), let me know and I'll draft one.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/yuwenmemon in version: 9.4.14-0 🚀

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

Bundle Size Analysis (Sentry):

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 9.4.14-1 🚀

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

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants