Skip to content

Enable Billable field in tracked expense and IOU track#73211

Merged
cristipaval merged 7 commits intoExpensify:mainfrom
callstack-internal:feat/72233-billable-field
Nov 6, 2025
Merged

Enable Billable field in tracked expense and IOU track#73211
cristipaval merged 7 commits intoExpensify:mainfrom
callstack-internal:feat/72233-billable-field

Conversation

@koko57
Copy link
Contributor

@koko57 koko57 commented Oct 22, 2025

This is part of the Unreported Expenses in NewDot project.

Explanation of Change

This PR adds the Billable field to unreported expenses in selfDM.

Fixed Issues

$ #72233
PROPOSAL:

Tests

Tracked Expenses

Prerequisites for default workspace: enable rules, set Billable default to billable

User with no workspace / User with several non-default workspaces

  1. Go to selfDM
  2. Go to an expense
  3. Verify that the billable field is NOT displayed

User with a default workspace / only one non-default workspace

  1. Go to selfDM
  2. Go to an expense
  3. Verify that the billable field is displayed if the billable rule is enabled on the workspace
  4. Verify that the value is set to the default billable field value for the workspace (default/only one non-default)
  5. Verify that you can change the field value and no errors are displayed
  6. Go back to the selfDM
  7. Click "Submit to someone" under the expense you've just visited
  8. Choose a workspace
  9. Verify that the value is set to the default billable field value for the chosen workspace (if it's not enabled in rules, it should not be displayed)

Creating a tracked expense

User with no workspace / User with several non-default workspaces

  1. Go to selfDM
  2. Click Composer + -> Create expense
  3. On the Confirmation step, verify that the billable field is NOT displayed

User with a default workspace / only one non-default workspace

  1. Go to selfDM
  2. Click Composer + -> Create expense
  3. On the Confirmation step, verify that the billable field is displayed (if the billable is enabled in rules)
  4. Verify that the value is set to the default billable field value for the workspace (default/only one non-default)
  5. Submit the expense
  6. Go to the newly created expense
  7. Verify that the billable field is set to the value you selected during the creation of the expense
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

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
    • MacOS: Desktop
  • 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.2025-11-04.at.10.32.23.mp4
Screen.Recording.2025-11-04.at.10.31.46.mp4
MacOS: Desktop

@codecov
Copy link

codecov bot commented Oct 22, 2025

Codecov Report

❌ Patch coverage is 66.66667% with 1 line in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
...c/components/ReportActionItem/MoneyRequestView.tsx 0.00% 1 Missing ⚠️
Files with missing lines Coverage Δ
src/components/MoneyRequestConfirmationList.tsx 66.27% <ø> (ø)
...es/iou/request/step/IOURequestStepConfirmation.tsx 48.43% <100.00%> (ø)
...c/components/ReportActionItem/MoneyRequestView.tsx 0.28% <0.00%> (ø)
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@cristipaval cristipaval self-requested a review October 23, 2025 19:45
@koko57 koko57 marked this pull request as ready for review November 4, 2025 10:02
@koko57 koko57 requested review from a team as code owners November 4, 2025 10:02
@melvin-bot melvin-bot bot requested review from hoangzinh and removed request for a team November 4, 2025 10:02
@melvin-bot
Copy link

melvin-bot bot commented Nov 4, 2025

@hoangzinh 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 JmillsExpensify and removed request for a team November 4, 2025 10:03
@koko57 koko57 marked this pull request as draft November 4, 2025 10:03
@github-actions
Copy link
Contributor

github-actions bot commented Nov 4, 2025

LGTM 👍 Thank you for your hard work!

@parasharrajat
Copy link
Member

This needs tags PR to be merged for billable to show up.

@parasharrajat
Copy link
Member

parasharrajat commented Nov 4, 2025

BUG: the billable checkbox should be set on the confirm page when sending it someone.

Steps:

  1. Set the billable checked on tracked expense.
  2. Send the expense to someone and select and workspace where billable checkbox is enabled.
  3. Verify that the billable checkbox is checked as well.

@hoangzinh
Copy link
Contributor

@parasharrajat will you review this PR?

@parasharrajat
Copy link
Member

Yes. @hoangzinh

@cristipaval cristipaval requested review from parasharrajat and removed request for hoangzinh November 4, 2025 15:27
@koko57 koko57 marked this pull request as ready for review November 4, 2025 15:53
@koko57
Copy link
Contributor Author

koko57 commented Nov 4, 2025

BUG: the billable checkbox should be set on the confirm page when sending it someone.

Steps:

  1. Set the billable checked on tracked expense.
  2. Send the expense to someone and select and workspace where billable checkbox is enabled.
  3. Verify that the billable checkbox is checked as well.

@parasharrajat but it's working this way. Did you set the Default billable to billable?

@github-actions
Copy link
Contributor

github-actions bot commented Nov 4, 2025

LGTM :feelsgood:. Thank you for your hard work!

@parasharrajat
Copy link
Member

Did you set the Default billable to billable?

No, I checked the billable checkbox on the self Dm expense and then on the Confirm page it was shown unchecked.

@koko57
Copy link
Contributor Author

koko57 commented Nov 5, 2025

@parasharrajat Can you attach a video? I'm trying to repro but I can't

@koko57
Copy link
Contributor Author

koko57 commented Nov 5, 2025

ok, I got it, can you retest?

Copy link
Contributor

@JmillsExpensify JmillsExpensify left a comment

Choose a reason for hiding this comment

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

Part of a well-documented project. No concerns from a product perspective.

@parasharrajat
Copy link
Member

parasharrajat commented Nov 5, 2025

Screenshots

🔲 iOS / native

06.11.2025_00.20.18_REC.mp4

🔲 iOS / Safari

06.11.2025_00.23.42_REC.mp4

🔲 MacOS / Desktop

🔲 MacOS / Chrome

05.11.2025_20.57.53_REC.mp4
05.11.2025_20.56.23_REC.mp4

🔲 Android / Chrome

05.11.2025_23.18.17_REC.mp4

🔲 Android / native

05.11.2025_23.08.44_REC.mp4

Copy link
Member

@parasharrajat parasharrajat left a comment

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 tests pass on all platforms & I tested again on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • 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 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • 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.js 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 form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label 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.
  • 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.

🎀 👀 🎀 C+ reviewed

@cristipaval cristipaval merged commit 4beeb98 into Expensify:main Nov 6, 2025
28 of 30 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Nov 6, 2025

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

OSBotify commented Nov 6, 2025

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.2.46-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Nov 7, 2025

🚀 Deployed to production by https://github.com/luacmartins in version: 9.2.46-3 🚀

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

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.

6 participants