Skip to content

Tax field on unreported expense#76636

Merged
cristipaval merged 11 commits intoExpensify:mainfrom
callstack-internal:feat/72238-taxes-field-v2
Dec 11, 2025
Merged

Tax field on unreported expense#76636
cristipaval merged 11 commits intoExpensify:mainfrom
callstack-internal:feat/72238-taxes-field-v2

Conversation

@koko57
Copy link
Contributor

@koko57 koko57 commented Dec 3, 2025

Reapplying changes from #74441 reverted in #76502

Explanation of Change

Fixed Issues

$ #72238
PROPOSAL:

Tests

Prerequisites: SelfDM, create several tracked expenses

Tracked Expenses

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

  1. Go to selfDM
  2. Go to an expense
  3. Verify that the Tax and Tax Amount fields are NOT displayed

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

Taxes not enabled

  1. Go to selfDM
  2. Go to an expense
  3. Verify that the Tax and Tax Amount fields are NOT displayed

Taxes enabled

  1. Be invited to a workspace with Taxes enabled
    OR
  2. Go to the default/only workspace More features settings
  3. Enable Taxes
  4. Go to selfDM
  5. Go to an expense
  6. Verify that the Tax and Tax Amount fields are displayed
  7. Click on the Tax field, verify that the Tax selector opens
  8. Verify that you can choose a tax rate, the selector closes, and the chosen tax rate is displayed in the Tax field
  9. Click on the Tax Amount field
  10. Verify that Tax Amount screen appears (in RHP)
  11. Verify that you can change the value to a smaller amount and submit the change
  12. Go back to the selfDM
  13. Click "Submit to someone" under the expense you've just visited
  14. Choose a workspace (the default one)
  15. Verify that the Tax and Tax Amount fields values are set to the values chosen in step 10 and 13

Submitting the expense to the default workspace

  1. Go back to self DM or in the expense with tax rate set open the expense details
  2. Click Submit to someone
  3. Choose the default workspace
  4. Verify that on the confirmation page the tax rate and tax amount values are preserved from the self DM expense
  5. Submit the expense, verify that no error appears

Prerequisites: another workspace with taxes enabled
Submitting the expense to a different workspace with taxes enabled

  1. Add a new tax rate to the default workspace
  2. Create a new tracked expense
  3. Set the tax rate to the newly created one
  4. Go back to self DM or in the expense with tax rate set open the expense details
  5. Click Submit to someone
  6. Choose a different workspace with tax enabled
  7. Verify that on the confirmation page the tax rate and tax amount values are preserved from the self DM expense
  8. Fill in the merchant
  9. Click "Create X expense"
  10. Verify that you see the error for the tax rate
  11. Change the tax rate
  12. Verify that after changing the tax rate no error appears and you can submit the expense

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 Tax and Tax Amount fields are NOT displayed

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

Taxes not enabled

  1. Go to selfDM
  2. Click Composer + -> Create expense
  3. On the Confirmation step, verify that the Tax and Tax Amount fields are NOT displayed

Taxes enabled

  1. Go to selfDM
  2. Click Composer + -> Create expense
  3. On the Confirmation step, verify that the Tax and Tax Amount fields are displayed
  4. Click on the Tax field, verify that the Tax selector opens
  5. Verify that you can choose a tax rate, the selector closes, and the chosen tax rate is displayed in the Tax field
  6. Click on the Tax Amount field
  7. Verify that Tax Amount screen appears (in RHP)
  8. Verify that you can change the value to a smaller amount and submit the change
  9. Submit the expense
  10. Go to the newly created expense
  11. Verify that the Tax and Tax Amount fields are set to the values you selected during the creation of the expense

Fixed frontend issue: #76495

Prerequisites: default tax rate for a foreign currency

  1. Go to self DM
  2. Create an expense in workspace's default currency
  3. Open the expense report
  4. Go offline
  5. Click Amount, change the currency, save it
  6. Verify that the tax rate is updated to the foreign currency default tax rate
  • 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]."

  • 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 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 Screenshot 2025-11-06 at 14 40 56
Screen.Recording.2025-11-06.at.16.12.58.mp4
Screen.Recording.2025-11-06.at.16.12.42.mp4

@koko57 koko57 requested review from a team as code owners December 3, 2025 16:35
@melvin-bot melvin-bot bot requested review from heyjennahay and parasharrajat and removed request for a team December 3, 2025 16:35
@melvin-bot
Copy link

melvin-bot bot commented Dec 3, 2025

@parasharrajat 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 removed the request for review from a team December 3, 2025 16:36
const [reportPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`, {canBeMissing: true});
const policy = isUnreportedExpense || isCreatingTrackExpense ? policyForMovingExpenses : reportPolicy;

return {policy};
Copy link
Contributor

Choose a reason for hiding this comment

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

❌ PERF-4 (docs)

This hook returns a new object literal on every render, which causes unnecessary re-renders in consuming components. React uses referential equality to determine if props changed, so a new object instance triggers re-renders even when the actual data hasn't changed.

Suggested fix: Wrap the return value in useMemo to maintain referential stability:

return useMemo(
    () => ({policy}),
    [policy]
);

Copy link
Member

Choose a reason for hiding this comment

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

@koko57 Let's optimize this. Can we just return policy directly?

@codecov
Copy link

codecov bot commented Dec 3, 2025

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 Δ
src/libs/PolicyUtils.ts 55.26% <100.00%> (ø)
src/libs/TransactionUtils/index.ts 71.28% <100.00%> (ø)
...es/iou/request/step/IOURequestStepConfirmation.tsx 49.55% <100.00%> (ø)
.../components/MoneyRequestConfirmationListFooter.tsx 84.30% <87.50%> (-0.03%) ⬇️
...c/components/ReportActionItem/MoneyRequestView.tsx 0.26% <0.00%> (ø)
src/libs/actions/IOU.ts 64.82% <66.66%> (+0.48%) ⬆️
...rc/pages/iou/request/step/IOURequestStepAmount.tsx 6.52% <0.00%> (-0.08%) ⬇️
...ges/iou/request/step/IOURequestStepTaxRatePage.tsx 0.00% <0.00%> (ø)
...es/iou/request/step/IOURequestStepParticipants.tsx 0.00% <0.00%> (ø)
src/components/MoneyRequestConfirmationList.tsx 58.47% <75.00%> (-0.09%) ⬇️
... and 2 more
... and 6 files with indirect coverage changes

@parasharrajat
Copy link
Member

Will test this once all backend issues are resolved.

@koko57
Copy link
Contributor Author

koko57 commented Dec 9, 2025

@parasharrajat PR ready for review

@@ -1727,7 +1728,7 @@ function getWorkspaceTaxesSettingsName(policy: OnyxEntry<Policy>, taxCode: strin
*/
function getTaxName(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transaction>) {
const defaultTaxCode = getDefaultTaxCode(policy, transaction);
return Object.values(transformedTaxRates(policy, transaction)).find((taxRate) => taxRate.code === (transaction?.taxCode ?? defaultTaxCode))?.modifiedName;
return Object.values(transformedTaxRates(policy, transaction)).find((taxRate) => taxRate.code === (transaction?.taxCode || defaultTaxCode))?.modifiedName;
Copy link
Member

@parasharrajat parasharrajat Dec 9, 2025

Choose a reason for hiding this comment

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

Please add a detailed comment on why we need || here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't know why this change isn't displayed as I added the comment

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Screenshot 2025-12-10 at 09 48 30

Copy link
Contributor Author

Choose a reason for hiding this comment

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

still, I think it's pretty obvious why we would want || instead of ?? - the first value might be an empty string or zero that we want to ignore as it's falsy

@parasharrajat
Copy link
Member

parasharrajat commented Dec 10, 2025

BUG: Taxes page show empty list when user submit to someone while offline.

Reason: the workspace taxes are not loaded yet which caused this issue.

Steps:

  1. Login with an account with default worksapce which has taxes enabled.
  2. Set user offline.
  3. Open Self DM.
  4. Create a new tracked expense.
    5 click the taxes field.
10.12.2025_15.49.22_REC.mp4

@parasharrajat
Copy link
Member

parasharrajat commented Dec 10, 2025

BUG: the violations are shown in self DM expenses.

I thought we disabled violatios on self DM

Steps:

  1. Select an workspace A as default.
  2. Create a tracked expense. Select a category and tax.
  3. Change the default workspace which does not have that category.
  4. Change the tax rate to different value.
  5. Notice the error on category field.
10.12.2025_15.54.32_REC.mp4

@parasharrajat

This comment was marked as resolved.

@parasharrajat

This comment was marked as resolved.

@parasharrajat
Copy link
Member

@koko57 Can you please merge main as I see that issue on this PR only?

@parasharrajat

This comment was marked as resolved.

@koko57
Copy link
Contributor Author

koko57 commented Dec 10, 2025

BUG: Taxes page show empty list when user submit to someone while offline.

Reason: the workspace taxes are not loaded yet which caused this issue.

10.12.2025_15.49.22_REC.mp4

so not a FE issue

@koko57
Copy link
Contributor Author

koko57 commented Dec 10, 2025

BUG: the violations are shown in self DM expenses.

I thought we disabled violatios on self DM

10.12.2025_15.54.32_REC.mp4

but it's out of the scope of this PR if it's error on different field

@parasharrajat
Copy link
Member

so not a FE issue

It is as user is offline so it will not call the API to get the data then user will stuck in a loop that tax is not valid and won't be able to create the expense offline.

@koko57
Copy link
Contributor Author

koko57 commented Dec 10, 2025

@cristipaval should we get the default policy's data on the startup then?

@koko57
Copy link
Contributor Author

koko57 commented Dec 10, 2025

@parasharrajat I merged with main, can you check those issues you weren't sure about?

#76484

This is not yet solved. @koko57

also can you share repro steps with all the details, I checked it yesterday first and it was working

@koko57
Copy link
Contributor Author

koko57 commented Dec 10, 2025

#76484

This is not yet solved. @koko57

@parasharrajat have you checked on a newly created expense? There could be a problem with the old ones

@parasharrajat
Copy link
Member

Let me check again.

@parasharrajat
Copy link
Member

@koko57 I have hid all the issues that are resolved.

@parasharrajat
Copy link
Member

parasharrajat commented Dec 10, 2025

So, except for this #76636 (comment) we are all good.

@koko57
Copy link
Contributor Author

koko57 commented Dec 10, 2025

@parasharrajat
It happens only when you want to submit to other workspace - if you submit to the default workspace it works as we get the default workspace data on the startup.
I don't think we can solve this problem - we either would need to get all the data for all the policies on the startup or disable submitting the expense when offline

@cristipaval
Copy link
Contributor

So, except for this #76636 (comment) we are all good.

this is expected, as we can't load the taxes for the policy while offline 👍

@cristipaval
Copy link
Contributor

cristipaval commented Dec 11, 2025

So, except for this #76636 (comment) we are all good.

this is expected, as we can't load the taxes for the policy while offline 👍

Also, this problem can be reproduced in the current staging as follows:

  1. Have a non-default workspace with taxes enabled
  2. Go offline after a fresh sign-in (or clear cache from the Troubleshoot menu)
  3. Start creating an expense from Global Create and choose the workspace with taxes as the recipient

Issue: The Tax Rate field is empty, and when you click on it, you get an empty list to pick from

@parasharrajat
Copy link
Member

@koko57 Please resolve conflicts.

@parasharrajat
Copy link
Member

Screenshots

🔲 iOS / native

29.11.2025_14.05.33_REC.mp4

🔲 iOS / Safari

29.11.2025_14.08.51_REC.mp4

🔲 MacOS / Chrome

29.11.2025_13.16.12_REC.mp4

🔲 Android / Chrome

29.11.2025_14.11.17_REC.mp4

🔲 Android / native

29.11.2025_13.51.32_REC.mp4
29.11.2025_13.53.30_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

@melvin-bot melvin-bot bot requested a review from cristipaval December 11, 2025 11:21
@cristipaval cristipaval merged commit ffe620f into Expensify:main Dec 11, 2025
31 checks passed
@OSBotify
Copy link
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
Contributor

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

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

@nkuoch
Copy link
Contributor

nkuoch commented Dec 14, 2025

@koko57 I think this introduced this deploy blocker? Can you check?

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.2.78-8 🚀

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

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.

5 participants