Skip to content

Remove isPolicyExpenseChatEnabled from PolicyUtils.ts helpers#93588

Open
fedirjh wants to merge 8 commits into
Expensify:mainfrom
fedirjh:fedy/remove-isPolicyExpenseChatEnabled-A1
Open

Remove isPolicyExpenseChatEnabled from PolicyUtils.ts helpers#93588
fedirjh wants to merge 8 commits into
Expensify:mainfrom
fedirjh:fedy/remove-isPolicyExpenseChatEnabled-A1

Conversation

@fedirjh

@fedirjh fedirjh commented Jun 15, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

This is PR A1 of the isPolicyExpenseChatEnabled removal plan from https://github.com/Expensify/Expensify/issues/370320.

All isPolicyExpenseChatEnabled checks in App are already paired with isPaidGroupPolicy() or equivalent, making the flag redundant. This PR removes the flag from 3 simple helper functions in PolicyUtils.ts:

  1. getActivePoliciesWithExpenseChat() - Removed isPolicyExpenseChatEnabled from filter, keeping other conditions (pendingAction, name, id, getPolicyRole)
  2. canSubmitPerDiemExpenseFromWorkspace() - Removed isPolicyExpenseChatEnabled, keeping perDiem checks only
  3. getDefaultChatEnabledPolicy() - Removed isPolicyExpenseChatEnabled, keeping isGroupPolicy() check

Fixed Issues

$ Part of https://github.com/Expensify/Expensify/issues/370320

Tests

Prerequisites:

  • Create a test account with + in email (e.g., yourname+test1@gmail.com) to mark it as a test account
  • You will need access to at least one paid workspace (Team or Corporate type)
  • If you don't have a paid workspace, create one via Settings → Workspaces → New Workspace → Select "Team" or "Corporate"

Test 1: Create an Expense — Choose recipient (Personal / self-DM vs. Workspace)

  1. Log in with a test account that is a member of a Team or Corporate workspace
  2. Tap the green FAB (+) button → "Create expense" from the menu
  3. Enter an amount (e.g., $25.00) on the Manual tab and tap Next
  4. On the "Choose recipient" page, Verify the following appears:
    • Personal (your own name/avatar at the top) — this creates a tracked expense in your self-DM
    • Your Team/Corporate workspaces — selecting one submits the expense to that workspace
  5. Tap your own name (Personal) and create the expense
  6. Verify: The expense is created in your self-DM (the "(you)" chat)
Screenshot 2026-06-15 at 5 48 40 PM

Test 1b: Create Expense — Submit to a workspace

  1. Repeat steps 1–3 above
  2. Select one of your Team/Corporate workspaces instead of Personal
  3. Verify: The confirmation opens with that workspace as the recipient
  4. Tap Create expense
  5. Verify: The expense is created on the selected workspace
Screenshot 2026-06-15 at 5 49 25 PM

Test 1c: Create Expense — Per Diem recipient filtering

  1. Ensure at least one Corporate workspace has Per diem enabled with rates and another paid workspace does NOT
  2. Tap FAB (+)"Create expense" → switch to the Per Diem tab
  3. Enter a per diem destination/details and proceed to "Choose recipient"
  4. Verify: Only workspaces where per diem can be submitted are listed; the workspace without per diem is NOT shown
Screenshot 2026-06-15 at 5 49 52 PM

Test 2: Per Diem Expense

Setup: On a Corporate workspace, go to Settings → Workspaces → [workspace] → Per diem, enable Per diem, and add a rate (e.g., "Daily", $100).

  1. Tap the green FAB (+) button → "Create expense"Per Diem tab
  2. Verify: Only workspaces with Per Diem enabled appear; others are NOT shown
  3. Select the workspace, pick your rate, enter dates, and create the expense
  4. Verify: The per diem expense is created with no console errors
Screenshot 2026-06-15 at 5 59 00 PM Screenshot 2026-06-15 at 5 50 23 PM

Test 2b: Per Diem — no eligible workspace

  1. Disable Per Diem on all your workspaces
  2. Tap FAB (+)"Create expense"
  3. Verify: Per Diem tab is not available for selection
Screenshot 2026-06-15 at 5 59 18 PM

Test 3: Time Tracking

Setup: On a Corporate workspace, go to Settings → Workspaces → [workspace] → Time and enable Time tracking.

  1. Tap the green FAB (+) button → "Create expense"Time tab
  2. Verify: Only workspaces with Time tracking enabled appear
  3. Select the workspace, enter time (e.g., 2 hours), add a description, and create the expense
  4. Verify: The time expense is created with no console errors
Screenshot 2026-06-15 at 6 02 25 PM Screenshot 2026-06-15 at 6 02 50 PM

Test 4: Split Expense

  1. Open a DM chat with another user
  2. Tap the green FAB (+) button → "Split expense"
  3. Enter an amount (e.g., $50.00) and select participants
  4. For a distance split, Verify: rates from your paid workspaces appear in the Rate field
  5. Submit the split
  6. Verify: The split appears in the chat with no console errors
Screenshot 2026-06-15 at 10 23 42 PM Screenshot 2026-06-15 at 10 24 13 PM

Test 5: Change Expense Workspace

  1. Log in with an account that has at least 2 paid workspaces
  2. Open an expense on Workspace A and tap more Change Workspace
  3. Verify: Only eligible paid workspaces are shown;
  4. Select Workspace B and save
  5. Verify: The expense moves to Workspace B with no console errors
Screenshot 2026-06-15 at 10 31 43 PM
  • Verify that no errors appear in the JS console

Offline tests

N/A - This PR removes redundant checks; offline behavior is unchanged.

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

Android: Native

N/A - No UI changes

Android: mWeb Chrome

N/A - No UI changes

iOS: Native

N/A - No UI changes

iOS: mWeb Safari

N/A - No UI changes

MacOS: Chrome / Safari

N/A - No UI changes

This is PR A1 of the isPolicyExpenseChatEnabled removal plan.

All isPolicyExpenseChatEnabled checks in App are already paired with
isPaidGroupPolicy() or equivalent, making the flag redundant.

Changes:
- getActivePoliciesWithExpenseChat(): Remove isPolicyExpenseChatEnabled
  from filter, keep other conditions (pendingAction, name, id, role)
- canSubmitPerDiemExpenseFromWorkspace(): Remove isPolicyExpenseChatEnabled,
  keep perDiem checks only
- getDefaultChatEnabledPolicy(): Remove isPolicyExpenseChatEnabled, keep
  isGroupPolicy() check

Issue: Expensify/Expensify#370320
@fedirjh fedirjh requested review from a team as code owners June 15, 2026 14:35
@melvin-bot melvin-bot Bot requested review from Ollyws and joekaufmanexpensify and removed request for a team June 15, 2026 14:35
@melvin-bot

melvin-bot Bot commented Jun 15, 2026

Copy link
Copy Markdown

@Ollyws 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]

This is PR A1 of the isPolicyExpenseChatEnabled removal plan.

The isPolicyExpenseChatEnabled flag was always true for paid group policies
(TEAM/CORPORATE), making it redundant when used alongside policy type checks.

Changes:
- getActivePoliciesWithExpenseChat(): Replace isPolicyExpenseChatEnabled
  with isPaidGroupPolicy() to maintain the same semantic meaning
- canSubmitPerDiemExpenseFromWorkspace(): Remove isPolicyExpenseChatEnabled,
  perDiem checks are sufficient (only Control policies have per diem units)
- getDefaultChatEnabledPolicy(): Remove isPolicyExpenseChatEnabled, keep
  isGroupPolicy() check

Issue: Expensify/Expensify#370320

@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: c0846d8fe8

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

Comment thread src/libs/PolicyUtils.ts Outdated
Comment thread src/libs/PolicyUtils.ts Outdated
Combines PR A1 and A2 changes:

- getGroupPaidPoliciesWithExpenseChatEnabled(): Renamed to getGroupPaidPolicies()
  and removed isPolicyExpenseChatEnabled (isPaidGroupPolicy is sufficient)
- getGroupPoliciesWhereReportCanBeCreated(): Removed isPolicyExpenseChatEnabled,
  kept isPaidGroupPolicy and canAccessSubmitWorkspaceFeatures checks

Updated all usages of the renamed function in:
- IOURequestStepDistanceRate.tsx
- SplitExpenseEditPage.tsx
- ProductTrainingContext/index.tsx
- SplitExpenses.ts
@codecov

codecov Bot commented Jun 15, 2026

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/components/ProductTrainingContext/index.tsx 92.30% <100.00%> (ø)
src/libs/PolicyUtils.ts 74.56% <100.00%> (+1.86%) ⬆️
src/libs/actions/SplitExpenses.ts 87.00% <100.00%> (ø)
src/pages/iou/SplitExpenseEditPage.tsx 0.00% <0.00%> (ø)
...es/iou/request/step/IOURequestStepDistanceRate.tsx 0.00% <0.00%> (ø)
... and 422 files with indirect coverage changes

Address review feedback: Instead of just checking isGroupPolicy,
verify that activePolicy is actually in the groupPoliciesWithChatEnabled
list to ensure it passes the same filtering criteria as the callers.
@fedirjh fedirjh changed the title [No QA] Remove isPolicyExpenseChatEnabled from PolicyUtils.ts simple helpers [No QA] Remove isPolicyExpenseChatEnabled from PolicyUtils.ts helpers Jun 15, 2026
fedirjh added 2 commits June 15, 2026 17:06
Submit policies don't have isPolicyExpenseChatEnabled=true, so use
isPaidGroupPolicy (TEAM/CORPORATE only) instead of isGroupPolicy
to maintain the original behavior.
Maintain original isPolicyExpenseChatEnabled behavior by adding
isPaidGroupPolicy check alongside the perDiem unit checks.
@fedirjh fedirjh marked this pull request as draft June 15, 2026 16:20
Extract hasAnyPaidPolicy() helper to simplify boolean checks for
whether user has any paid workspaces. Use it in:
- SplitExpenseEditPage.tsx
- ProductTrainingContext/index.tsx
@fedirjh

fedirjh commented Jun 15, 2026

Copy link
Copy Markdown
Contributor Author

@codex

@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: 21474e2c8c

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

Comment thread src/libs/PolicyUtils.ts Outdated
Address review feedback: the membership check broke the FAB Create report
caller, which truncates groupPoliciesWithChatEnabled to 2 entries. Validate
the active policy directly via isPaidGroupPolicy instead, which preserves the
original isPolicyExpenseChatEnabled semantics (TEAM/CORPORATE only) and avoids
the truncated-list edge case.
@joekaufmanexpensify

Copy link
Copy Markdown
Contributor

No product review needed

@joekaufmanexpensify joekaufmanexpensify removed their request for review June 15, 2026 21:02
@fedirjh fedirjh requested a review from puneetlath June 15, 2026 21:37
@fedirjh fedirjh marked this pull request as ready for review June 15, 2026 21:37
@fedirjh fedirjh changed the title [No QA] Remove isPolicyExpenseChatEnabled from PolicyUtils.ts helpers Remove isPolicyExpenseChatEnabled from PolicyUtils.ts helpers Jun 15, 2026
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.

2 participants