Skip to content

83830 migrate workspace general#85337

Merged
mjasikowski merged 14 commits intoExpensify:mainfrom
huult:83830-migrate-workspace-general
Apr 1, 2026
Merged

83830 migrate workspace general#85337
mjasikowski merged 14 commits intoExpensify:mainfrom
huult:83830-migrate-workspace-general

Conversation

@huult
Copy link
Copy Markdown
Contributor

@huult huult commented Mar 16, 2026

Explanation of Change

Fixed Issues

$ #83830
PROPOSAL:

Tests

Same QA step

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

WORKSPACE_OVERVIEW_PLAN:

  1. Open the Expensify app.
  2. Tap Workspace and open the Workspace Overview.
  3. Tap Plan Type.
  4. Verify that Plan Type opens correctly and that you can navigate back normally.

WORKSPACE_INVITE:

Case 1:

  1. Open the Expensify app.
  2. Tap Workspace and open the Workspace Overview.
  3. Tap the Invite button in the Workspace Overview header.
  4. Verify that the Invite Member page opens correctly and that you can navigate back normally.

Case 2:

  1. Open the Expensify app.
  2. Tap Workspace and open Workspace Members.
  3. Tap the Invite button in the Workspace Members header.
  4. Verify that the Invite Member page opens correctly and that you can navigate back normally.

WORKSPACE_INVITE_MESSAGE:

Case 1:

  1. Open the Expensify app.
  2. Tap Workspace and open the Workspace Overview.
  3. Tap the Invite button in the Workspace Overview header.
  4. Select any user and tap Next.
  5. Verify that you can navigate to the Invite Message page and that back navigation works normally.

Case 2:

  1. Open the Expensify app.
  2. Tap Workspace and open Workspace Members.
  3. Tap the Invite button in the Workspace Members header.
  4. Select any user and tap Next.
  5. Verify that you can navigate to the Invite Message page and that back navigation works normally.

WORKSPACE_INVITE_MESSAGE_ROLE

Case 1:

  1. Open the Expensify app.
  2. Tap Workspace and open the Workspace Overview.
  3. Tap the Invite button in the Workspace Overview header.
  4. Select any user and tap Next.
  5. Tap Role.
  6. Verify that the Role page opens correctly and that you can navigate back normally.

Case 2:

  1. Open the Expensify app.
  2. Tap Workspace and open Workspace Members.
  3. Tap the Invite button in the Workspace Members header.
  4. Select any user and tap Next.
  5. Tap Role.
  6. Verify that the Role page opens correctly and that you can navigate back normally.
  • 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 there are no new alerts related to the canBeMissing param for useOnyx
  • 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
Screen.Recording.2026-03-16.at.15.48.48.mov

@huult huult requested review from a team as code owners March 16, 2026 08:49
@melvin-bot melvin-bot bot requested review from mananjadhav and trjExpensify and removed request for a team March 16, 2026 08:49
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Mar 16, 2026

@mananjadhav 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 March 16, 2026 08:49
@codecov
Copy link
Copy Markdown

codecov bot commented Mar 16, 2026

Codecov Report

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

Files with missing lines Coverage Δ
src/ROUTES.ts 15.96% <ø> (+0.05%) ⬆️
src/SCREENS.ts 100.00% <ø> (ø)
...gation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts 100.00% <ø> (ø)
src/libs/Navigation/linkingConfig/config.ts 76.92% <ø> (ø)
...es/workspace/DynamicWorkspaceInviteMessagePage.tsx 0.00% <ø> (ø)
...orkspace/DynamicWorkspaceInviteMessageRolePage.tsx 0.00% <ø> (ø)
...workspace/DynamicWorkspaceOverviewPlanTypePage.tsx 0.00% <ø> (ø)
src/pages/workspace/WorkspaceOverviewPage.tsx 0.00% <ø> (ø)
src/pages/workspace/withPolicy.tsx 100.00% <ø> (ø)
src/pages/workspace/WorkspaceMembersPage.tsx 63.12% <0.00%> (ø)
... and 3 more
... and 10 files with indirect coverage changes

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

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: 2dcbcb4621

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

@huult
Copy link
Copy Markdown
Contributor Author

huult commented Mar 16, 2026

Screen.Recording.2026-03-16.at.16.46.13.mov

@collectioneur @mananjadhav When you two did the migration, did you encounter the same issue as me? When I reload the page and then navigate back, the route path updates to only the dynamic route path like above.

Screen.Recording.2026-03-16.at.16.28.05.mov

If I don’t reload the page, it works well.

trjExpensify
trjExpensify previously approved these changes Mar 16, 2026
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.

BackTo project PR 👍

@collectioneur
Copy link
Copy Markdown
Contributor

Hey @huult! I noticed you're stacking the dynamic suffixes (WORKSPACE_INVITE, WORKSPACE_INVITE_MESSAGE, WORKSPACE_INVITE_MESSAGE_ROLE) in your code. I actually haven't finished building out and testing the suffix layering logic for dynamic routes yet, which is why it's breaking on page refresh for you right now.
I was planning to finish path parameters, but I can implement suffix layering first if it's blocking you. Let me know!

@huult
Copy link
Copy Markdown
Contributor Author

huult commented Mar 16, 2026

Hey @huult! I noticed you're stacking the dynamic suffixes (WORKSPACE_INVITE, WORKSPACE_INVITE_MESSAGE, WORKSPACE_INVITE_MESSAGE_ROLE) in your code. I actually haven't finished building out and testing the suffix layering logic for dynamic routes yet, which is why it's breaking on page refresh for you right now. I was planning to finish path parameters, but I can implement suffix layering first if it's blocking you. Let me know!

@collectioneur Yeah, this issue is blocking me on this PR because it can't be merged if this problem happens. If possible, could you adjust the priority to work on this first (suffix layering)? Many thanks.

@huult
Copy link
Copy Markdown
Contributor Author

huult commented Mar 18, 2026

@mananjadhav This PR is ready for review

@mananjadhav
Copy link
Copy Markdown
Collaborator

mananjadhav commented Mar 26, 2026

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

Android: HybridApp
android-bt-workspace-general.mov
Android: mWeb Chrome
mweb-chrome-bt-workspace-general.mov
iOS: HybridApp
iOS: mWeb Safari
mweb-safari-bt-workspace-general.mov
MacOS: Chrome / Safari
web-bt-workspace-general-2.mov
web-bt-workspace-general-1.mov

Copy link
Copy Markdown
Collaborator

@mananjadhav mananjadhav left a comment

Choose a reason for hiding this comment

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

Issues with my iOS setup. Tested on all other platforms.

@melvin-bot melvin-bot bot requested a review from mjasikowski March 26, 2026 20:46
@mjasikowski
Copy link
Copy Markdown
Contributor

@huult can you address the AI reviewer comments too?

@huult
Copy link
Copy Markdown
Contributor Author

huult commented Mar 28, 2026

@mjasikowski Resolved. I’ve updated the entry to fix it.

mjasikowski
mjasikowski previously approved these changes Mar 28, 2026
@mjasikowski
Copy link
Copy Markdown
Contributor

@huult fix the conflict and we're good to merge

@huult
Copy link
Copy Markdown
Contributor Author

huult commented Mar 30, 2026

@huult fix the conflict and we're good to merge

@mjasikowski Resolved

@huult
Copy link
Copy Markdown
Contributor Author

huult commented Apr 1, 2026

@huult fix the conflict and we're good to merge

@mjasikowski all yours

@mjasikowski mjasikowski merged commit 57f4877 into Expensify:main Apr 1, 2026
31 checks passed
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 1, 2026

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

@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Apr 1, 2026

✋ 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

OSBotify commented Apr 2, 2026

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.3.52-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot
Copy link
Copy Markdown
Contributor

🤖 No help site changes required.

This PR migrates four workspace routes (WORKSPACE_OVERVIEW_PLAN, WORKSPACE_INVITE, WORKSPACE_INVITE_MESSAGE, WORKSPACE_INVITE_MESSAGE_ROLE) from static to dynamic route definitions. These are purely internal navigation/routing refactors — no user-facing features, UI labels, or workflows changed.

I reviewed the relevant help site articles:

  • docs/articles/new-expensify/workspaces/Managing-Workspace-Members.md — describes the invite flow using UI labels (e.g., "Invite Member", "Role"), which remain unchanged.
  • docs/articles/new-expensify/billing-and-subscriptions/Plan-types-and-pricing.md — describes plan types and pricing, unaffected by this change.

Neither article references internal route paths, and the user-facing steps remain accurate.

@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Apr 7, 2026

🚀 Deployed to production by https://github.com/roryabraham in version: 9.3.52-9 🚀

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

@melvin-bot melvin-bot bot mentioned this pull request Apr 7, 2026
5 tasks
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