Skip to content

Align workspace selector logic - #101430

Merged
roryabraham merged 4 commits into
Expensify:mainfrom
software-mansion-labs:fix/align-workspace-selector-logic
Sep 21, 2026
Merged

roryabraham merged 4 commits into
Expensify:mainfrom
software-mansion-labs:fix/align-workspace-selector-logic

Conversation

@jmusial

@jmusial jmusial commented Sep 17, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

A follow up to #98973. Details in #98973 (comment).

  • Skip the workspace selector when the user's domain security group locks them to a preferred workspace.
  • Keep the active workspace inside the FAB's two-policy slice so an eligible default outside the first two entries creates the report directly instead of opening the selector.

Fixed Issues

$ #101560
PROPOSAL:

Tests

Scenario 1 (default workspace beyond the first two)

  1. Open app with an account invited to 3+ workspaces, none owned, and no empty report on the third one.
  2. Navigate to Settings > Workspaces, open the third workspace's menu and choose "Set as default workspace".
  3. Press FAB > Create report.
  4. Verify that the report is created on the default workspace and no workspace selector opens.

Scenario 2 (domain locks user to a preferred workspace)

  1. Open app with an account on a domain whose security group restricts members to a preferred workspace, member of 2+ workspaces.
  2. Press FAB > Create report.
  3. Verify that no workspace selector opens and the report is created on the preferred workspace, not the default one.
  4. If the preferred workspace's owner is past due beyond the grace period, verify that the billing restriction page opens instead.

Offline tests

N/A

QA Steps

Same as tests

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

MacOS: Chrome / Safari

Scenario 1

Screen.Recording.2026-09-18.at.13.58.46.mov

Scenario 2

Screen.Recording.2026-09-18.at.13.59.21.mov
Screen.Recording.2026-09-18.at.14.00.39.mov

@jmusial

jmusial commented Sep 17, 2026

Copy link
Copy Markdown
Contributor Author

@codex review

@codecov

codecov Bot commented Sep 17, 2026 •

Copy link
Copy Markdown

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
...rch/SearchRouter/useCreateNavigationSuggestions.ts 98.68% <100.00%> (-0.02%) ⬇️
src/hooks/useCreateReport.tsx 100.00% <100.00%> (ø)
src/pages/Search/EmptySearchView.tsx 74.64% <50.00%> (-0.18%) ⬇️
...BPopoverContent/menuItems/CreateReportMenuItem.tsx 86.20% <66.66%> (-1.30%) ⬇️
... and 13 files with indirect coverage changes

@jmusial
jmusial marked this pull request as ready for review September 18, 2026 12:02
@jmusial
jmusial requested review from a team as code owners September 18, 2026 12:02
@melvin-bot
melvin-bot Bot requested a review from sobitneupane September 18, 2026 12:02
@melvin-bot

melvin-bot Bot commented Sep 18, 2026

Copy link
Copy Markdown

@sobitneupane 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 September 18, 2026 12:02

@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 clearing this up! 👍

@jmusial

jmusial commented Sep 21, 2026

Copy link
Copy Markdown
Contributor Author

@sobitneupane kind bump

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

Screenshots/Videos

Android: HybridApp
Screen.Recording.2026-09-21.at.14.27.04.mov
Android: mWeb Chrome
Screen.Recording.2026-09-21.at.14.10.23.mov
iOS: HybridApp
Screen.Recording.2026-09-21.at.14.18.04.mov
iOS: mWeb Safari
Screen.Recording.2026-09-21.at.13.52.55.mov
MacOS: Chrome / Safari
Screen.Recording.2026-09-21.at.13.36.14.mov
Screen.Recording.2026-09-21.at.13.36.56.mov
Screen.Recording.2026-09-21.at.13.42.43.mov
Screen.Recording.2026-09-21.at.13.32.52.mov

@sobitneupane

Copy link
Copy Markdown
Contributor

Scenario 2 (domain locks user to a preferred workspace)

I have tested a few scenarios and they all work as expected. However, I was not able to test scenario 2 (domain locks user to a preferred workspace) because I couldn't set up the scenario.

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

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 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
    • 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 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
Screen.Recording.2026-09-21.at.14.27.04.mov
Android: mWeb Chrome
Screen.Recording.2026-09-21.at.14.10.23.mov
iOS: HybridApp
Screen.Recording.2026-09-21.at.14.18.04.mov
iOS: mWeb Safari
Screen.Recording.2026-09-21.at.13.52.55.mov
MacOS: Chrome / Safari
Screen.Recording.2026-09-21.at.13.36.14.mov
Screen.Recording.2026-09-21.at.13.36.56.mov
Screen.Recording.2026-09-21.at.13.42.43.mov
Screen.Recording.2026-09-21.at.13.32.52.mov

@melvin-bot
melvin-bot Bot requested a review from roryabraham September 21, 2026 08:42
@roryabraham
roryabraham merged commit 247f311 into Expensify:main Sep 21, 2026
39 of 46 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

🚧 roryabraham 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/roryabraham in version: 9.4.92-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

Yes — help site changes are required. Draft PR: Docs updates for E/A#101430 clarify which workspace new reports open on (Expensify/App#101988), labeled HelpDot and assigned to jmusial.

Why: this PR changes which workspace a new report lands on, and the help site documented only the old, simpler rule.

Today Create-and-Submit-Reports.md says only "Reports are opened on your default workspace" — no mention of the Preferred Workspace override, and no mention of when a member is asked to Choose a workspace for this report.

What the docs PR changes

docs/articles/new-expensify/reports-and-expenses/Create-and-Submit-Reports.md

  • Step 2 now covers all three outcomes: Preferred Workspace override, default workspace, and being asked to choose.
  • Two new FAQ entries: which workspace a new report opens on, and how to set a default workspace so the list stops appearing (Workspaces > three dots (⋮) > Set as default workspace).
  • Added default workspace, choose a workspace, and preferred workspace keywords.

docs/articles/new-expensify/domains/Create-and-Manage-Domain-Groups.md

  • What Preferred Workspace does now states the preferred workspace beats each member's own default workspace and that members are not asked to choose.
  • New FAQ entry covering the same for Create report.

Labels were checked against src/languages/en.ts — Create report, "Choose a workspace for this report.", Set as default workspace, Preferred Workspace. I could not verify them in a browser: browser control was unavailable in this run.

One case I left out: when the preferred workspace owner is past due beyond the grace period, the restricted-action page opens instead (scenario 2, step 4 of your test steps). Tell me if you want that documented and I'll add it.

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

@jponikarchuk

Copy link
Copy Markdown

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/lakchote in version: 9.4.92-8 🚀

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

Bundle Size Analysis (Sentry):

@jmusial jmusial mentioned this pull request Oct 2, 2026
43 tasks done
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