Skip to content

fix: default new workspace to Control for annual subscription users#84095

Draft
MelvinBot wants to merge 2 commits intomainfrom
claude-defaultControlPolicyForAnnualSubscription
Draft

fix: default new workspace to Control for annual subscription users#84095
MelvinBot wants to merge 2 commits intomainfrom
claude-defaultControlPolicyForAnnualSubscription

Conversation

@MelvinBot
Copy link
Copy Markdown
Contributor

@MelvinBot MelvinBot commented Mar 3, 2026

Explanation of Change

When a user has an annual subscription, they are billed at the Control rate. New workspaces created by these users should default to Control (corporate) type instead of Collect (team) type.

The codebase already has a shouldCreateControlPolicy flag that creates Control workspaces for invoicing subscription users. This PR extends that check to also cover annual subscription users.

Context: The original fix (#67477) was merged in Aug 2025 but was reverted because it exposed a backend bug where the CreateWorkspace API didn't return rules data for Control policies (Expensify/Expensify#545433). That backend fix has now been deployed to production (Mar 3, 2026), so this FE change can safely be re-applied.

Fixed Issues

$ #65697
PROPOSAL: #65697 (comment)

Tests

Precondition: Account is on an annual subscription

  1. Create a new workspace
  2. Verify that the created workspace is of type Control (corporate)
  3. Verify workspace settings (rules, etc.) are populated correctly and not set to 0
  • Verify that no errors appear in the JS console

Offline tests

N/A — workspace creation already has offline handling. The subscription type is read from local Onyx data, so the Control policy determination works offline.

QA Steps

Precondition: Account is on an annual subscription

  1. Create a new workspace
  2. Verify that the created workspace is of type Control
  3. Verify workspace settings and rules are populated correctly
  • 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

N/A — logic-only change, no UI modifications

Android: mWeb Chrome

N/A — logic-only change, no UI modifications

iOS: Native

N/A — logic-only change, no UI modifications

iOS: mWeb Safari

N/A — logic-only change, no UI modifications

MacOS: Chrome / Safari

N/A — logic-only change, no UI modifications

@MelvinBot @JmillsExpensify
fix: default new workspace to Control for annual subscription users
e2eac4b 
Annual subscription users are billed at the Control rate, so new
workspaces should be created as Control (corporate) instead of
Collect (team). This adds an annual subscription check alongside the
existing invoicing subscription check.

Co-authored-by: Jason Mills <JmillsExpensify@users.noreply.github.com>
@MelvinBot MelvinBot requested a review from a team March 3, 2026 23:33
@MelvinBot MelvinBot mentioned this pull request Mar 3, 2026
Open
16 tasks
@MelvinBot @JmillsExpensify
Fix flaky useUpcomingTravelReservations test that fails after 23:00 UTC
3be0b61 
The test created a flight departing "today at 23:00" which was already
in the past when CI ran after that hour. Changed to depart tomorrow at
noon so the test is not sensitive to time of day.

Co-authored-by: Jason Mills <JmillsExpensify@users.noreply.github.com>
@MelvinBot
Copy link
Copy Markdown
Contributor Author

MelvinBot commented Mar 3, 2026

Fixed the failing check. The test (job 1) failure was caused by a flaky test in useUpcomingTravelReservations.test.ts — unrelated to this PR's changes in WorkspaceConfirmationPage.tsx.

Root cause: The test "should exclude reservation that departed yesterday" created a flight departing "today at 23:00 UTC" (daysFromNow(0, 23)). When CI ran after 23:00 UTC, that departure time was already in the past, so the hook correctly filtered it out — leaving 0 results instead of the expected 1.

Fix: Changed the "upcoming" flight to depart tomorrow at noon (daysFromNow(1, 12)), which is always in the future regardless of when the test runs. The test intent is preserved: one past reservation is excluded, one future reservation is included.

@codecov
Copy link
Copy Markdown

codecov bot commented Mar 4, 2026 •
edited by github-actions bot
Loading

Codecov Report

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

Files with missing lines Coverage Δ
src/pages/workspace/WorkspaceConfirmationPage.tsx 0.00% <0.00%> (ø)
... and 291 files with indirect coverage changes

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

Reviewers

No reviews

Assignees

@JmillsExpensify JmillsExpensify

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@MelvinBot @JmillsExpensify