Fix: Reimbursable Toggle Missing for Collect Workspace Users — Expenses Defaulting to Non-Reimbursable by twilight2294 · Pull Request #72098 · Expensify/App

twilight2294 · 2025-10-08T13:49:56Z

Explanation of Change

Fixed Issues

$ #71831
PROPOSAL: #71831 (comment)

Tests

Verify that no errors appear in the JS console

Offline tests

QA Steps

Log in as a user in a Collect workspace who doesn't have disabledFields and defaultReimbursable in their policy onyx data
Navigate to Workspaces → Rules → confirm Rules section is unavailable
Create a new expense in NewDot
On the confirmation page , look for the Reimbursable toggle

If you do not have a workspace with the above requirement then do the following in the console:

perform the following in console:

Onyx.merge('policy_<policyID>', {disabledFields: {reimbursable: null}});

Onyx.merge('policy_<policyID>', {defaultReimbursable: null});

Verify that you can see the toggle and it is defaulted to enabled

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…s Defaulting to Non-Reimbursable

melvin-bot · 2025-10-08T13:50:02Z

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

twilight2294 · 2025-10-08T13:51:02Z

@jjcoffee i noticed your comment here, i opened the PR up since this is critical issue, fixing the tests if they fail and adding videos, please dont hold up your review on these things, i'm working on them ASAP

jjcoffee · 2025-10-08T13:57:55Z

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
- MacOS: Desktop
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
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: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

codecov · 2025-10-08T14:01:17Z

Codecov Report

❌ Patch coverage is 0% with 2 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
src/libs/actions/Policy/Policy.ts	0.00%	2 Missing ⚠️

📢 Thoughts on this report? Let us know!

twilight2294 · 2025-10-08T14:44:46Z

-    const shouldShowReimbursable = isPolicyExpenseChat && policy?.disabledFields?.reimbursable === false && !isCardTransaction(transaction) && !isTypeInvoice;
+    const shouldShowReimbursable =
+        isPolicyExpenseChat &&
+        (policy?.disabledFields?.reimbursable === false || (policy?.disabledFields?.reimbursable === undefined && policy?.defaultReimbursable === undefined)) &&


@jjcoffee do you think we should ease this condition and only check for policy?.disabledFields?.reimbursable === undefined ?

saying so cause the work of policy?.defaultReimbursable is only to have the toggle enabled by default, but by looking at the bug data of the customer , they don't have defaultReimbursable, so should we keep this as is or update?

They don't have either from the looks of it. I think you're right that it doesn't make sense to check for defaultReimbursable here. I think we can just do policy?.disabledFields?.reimbursable != true unless I'm mistaken?

yeahh makes sense to me, lets take this to slack for better and faster communication 😄

jjcoffee

Approving now as it's my EOD. Test steps need to be updated and recordings added.

I've tested the change I suggested here and can confirm that it also works correctly.

jjcoffee · 2025-10-08T15:19:52Z

@puneetlath I don't know if you want to trigger a build and test against the workspace where the issue was occurring? I couldn't replicate it with a new workspace, so I just simulated based on the data @trjExpensify provided here.

OSBotify · 2025-10-08T17:46:32Z

✋ 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 · 2025-10-08T21:57:47Z

🚀 Deployed to staging by https://github.com/puneetlath in version: 9.2.28-0 🚀

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

OSBotify · 2025-10-10T10:52:10Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.2.28-5 🚀

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

Fix Reimbursable Toggle Missing for Collect Workspace Users — Expense…

64d7e51

…s Defaulting to Non-Reimbursable

twilight2294 requested a review from a team as a code owner October 8, 2025 13:49

melvin-bot Bot assigned twilight2294 Oct 8, 2025

melvin-bot Bot requested a review from jjcoffee October 8, 2025 13:50

melvin-bot Bot removed the request for review from a team October 8, 2025 13:50

twilight2294 commented Oct 8, 2025

View reviewed changes

jjcoffee approved these changes Oct 8, 2025

View reviewed changes

melvin-bot Bot requested a review from puneetlath October 8, 2025 15:18

apply clean up

7f3ae1f

puneetlath approved these changes Oct 8, 2025

View reviewed changes

puneetlath merged commit 97a1103 into Expensify:main Oct 8, 2025
22 checks passed

OSBotify mentioned this pull request Oct 8, 2025

Deploy Checklist: New Expensify 2025-10-08 #72135

Closed

62 tasks

melvin-bot Bot mentioned this pull request Oct 10, 2025

[Due for payment 2025-10-17] [CMB] [$500] Reimbursable Toggle Missing for Collect Workspace Users — Expenses Defaulting to Non-Reimbursable #71831

Closed

16 tasks

Uh oh!

Conversation

twilight2294 commented Oct 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Oct 8, 2025

Uh oh!

twilight2294 commented Oct 8, 2025

Uh oh!

jjcoffee commented Oct 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

codecov Bot commented Oct 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

twilight2294 Oct 8, 2025

Choose a reason for hiding this comment

Uh oh!

twilight2294 Oct 8, 2025

Choose a reason for hiding this comment

Uh oh!

jjcoffee Oct 8, 2025

Choose a reason for hiding this comment

Uh oh!

twilight2294 Oct 8, 2025

Choose a reason for hiding this comment

Uh oh!

jjcoffee left a comment

Choose a reason for hiding this comment

Uh oh!

jjcoffee commented Oct 8, 2025

Uh oh!

Uh oh!

OSBotify commented Oct 8, 2025

Uh oh!

OSBotify commented Oct 8, 2025

Uh oh!

OSBotify commented Oct 10, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

twilight2294 commented Oct 8, 2025 •

edited

Loading

jjcoffee commented Oct 8, 2025 •

edited

Loading

codecov Bot commented Oct 8, 2025 •

edited

Loading