Update MoneyRequestView for time expenses by mhawryluk · Pull Request #77748 · Expensify/App

mhawryluk · 2025-12-16T10:56:07Z

Explanation of Change

Disables showing the tax information when viewing existing time expenses (created in old dot). Displays showing expense type next to the "Amount" row label.

Fixed Issues

$ #77379
PROPOSAL: N/A

Tests

Create a Workspace that has Time Tracking and Taxes enabled. (Time Tracking can be enabled in Old Dot).
Create a time expense in old dot and submit it to that Workspace.
Open it in new dot.
Time expenses should never show or allow tax options.
Ensure that Editing Merchant/Amount works as expected.
There should be no "Cash" label in the "Amount" row description.
In report preview view there should be "Time" label, instead of "Cash".

Offline tests

N/A

QA Steps

Same as tests.

PR Author Checklist

Screenshots/Videos

Android: Native

Nagranie.z.ekranu.2025-12-22.o.10.37.29.mov

Android: mWeb Chrome

Nagranie.z.ekranu.2025-12-22.o.10.35.07.mov

iOS: Native

Simulator.Screen.Recording.-.iPhone.16.Pro.Max.-.2025-12-22.at.10.32.39.mp4

iOS: mWeb Safari

Simulator.Screen.Recording.-.iPhone.16.Pro.Max.-.2025-12-22.at.10.29.39.mp4

MacOS: Chrome / Safari

codecov · 2025-12-16T11:04:15Z

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	`53.73% <100.00%> (ø)`
src/libs/TransactionUtils/index.ts	`72.33% <100.00%> (+0.03%)`	⬆️
src/libs/Violations/ViolationsUtils.ts	`69.74% <100.00%> (+1.77%)`	⬆️
src/libs/TransactionPreviewUtils.ts	`71.05% <50.00%> (-0.23%)`	⬇️
...c/components/ReportActionItem/MoneyRequestView.tsx	`0.42% <0.00%> (-0.01%)`	⬇️
... and 31 files with indirect coverage changes

melvin-bot · 2025-12-22T09:45:54Z

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

ShridharGoel · 2025-12-22T10:09:02Z

src/components/ReportActionItem/MoneyRequestView.tsx

+            amountDescription += ` ${CONST.DOT_SEPARATOR} ${translate('iou.time')}`;
+        } else if (isDistanceRequest) {
+            amountDescription += ` ${CONST.DOT_SEPARATOR} ${translate('common.distance')}`;
+        } else if (isPerDiemRequest) {
+            amountDescription += ` ${CONST.DOT_SEPARATOR} ${translate('common.perDiem')}`;
+        } else if (isCardTransaction) {
+            amountDescription += ` ${CONST.DOT_SEPARATOR} ${translate('iou.card')}`;
+        } else {
            amountDescription += ` ${CONST.DOT_SEPARATOR} ${translate('iou.cash')}`;


Since ${CONST.DOT_SEPARATOR} is common in all, can we append it before the if-else ?

sure, great idea

done + I refactored this part a little bit

ShridharGoel · 2025-12-22T11:08:13Z

src/components/ReportActionItem/MoneyRequestView.tsx

+    } else if (isPerDiemRequest) {
+        amountDescription += translate('common.perDiem');
+    } else if (isCardTransaction) {
+        amountDescription += translate('iou.card');


This card one looks newly added, is that expected?

yeah, from what I've seen on Figma we want to display all expense types in the amountDescription, the way we do for "cash" currently. cc: @dannymcclain

I mean, I personally think that makes the most sense. Why would we label one type but no others? cc @dubielzyk-expensify @Expensify/product

Yeah I'm a big fan of the consistency of label all types

We use the space of the dot separator to house original currency and converted currency and stuff like that with card transactions, and I think there will be a necessity for cash expenses as well on the converted amount front (CC: @JmillsExpensify).

I'm actually not sure why we still have the Cash dot separator here to be honest. I think it's a bit of a hangover from a very early world of not having the Type column and table. We don't seem to be showing Distance or Per diem on prod either.

I think the comment about Card not appearing threw me, because we can see that in the preview. Same with Per diem and Distance.

no, you're right, this part of code is for the expense view amount field. so should I remove this part of the amount label?

I love removing this for simplicity

ShridharGoel · 2025-12-22T11:34:11Z

In MoneyRequestConfirmationList.tsx, isTimeRequest flag is not being passed when calling isTaxTrackingEnabled

mhawryluk · 2025-12-22T11:38:34Z

In MoneyRequestConfirmationList.tsx, isTimeRequest flag is not being passed when calling isTaxTrackingEnabled

I believe this component is used for when we're creating new expenses, not viewing existing ones. I will handle that part in this PR: #78137

ShridharGoel · 2025-12-22T12:02:30Z

Shows "Cash" instead of "Time" in the preview, is that expected? Will the preview be handled later?

ShridharGoel · 2025-12-22T12:16:38Z

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

mhawryluk · 2025-12-22T12:31:48Z

Shows "Cash" instead of "Time" in the preview, is that expected? Will the preview be handled later?

ooh, good catch. it should be a quick fix, I will handle it in this PR

mhawryluk · 2025-12-22T12:48:27Z

Shows "Cash" instead of "Time" in the preview, is that expected? Will the preview be handled later?

ooh, good catch. it should be a quick fix, I will handle it in this PR

done!

DylanDylann · 2025-12-24T08:51:34Z

@mhawryluk Should we update the icon in the expense report?

DylanDylann · 2025-12-24T08:48:48Z

src/libs/PolicyUtils.ts


-function isTaxTrackingEnabled(isPolicyExpenseChat: boolean, policy: OnyxEntry<Policy>, isDistanceRequest: boolean, isPerDiemRequest = false): boolean {
-    if (isPerDiemRequest) {
+function isTaxTrackingEnabled(isPolicyExpenseChat: boolean, policy: OnyxEntry<Policy>, isDistanceRequest: boolean, isPerDiemRequest = false, isTimeRequest = false): boolean {


NAB (Don't block merge): I suggest passing requestType instead of a boolean parameter, so we can handle each request type explicitly (e.g. isDistanceRequest, isPerDiemRequest, isTimeRequest)

This will make it easier to scale and maintain

that would be great, but I think in most places where the isTaxTrackingEnabled function is used we have type information stored as a series of boolean values. so we would need to convert those to a string requestType value. changing the whole repository to not pass around the boolean values would be quite complicated. we could create a util function that would accept the boolean values and spit out a single string, but then we would have 2 patterns, but maybe that's okay? or at the very least I could make isTaxTrackingEnabled accept an object, so that the parameters are named when passed. what do you think?

oh, I forgot we have getRequestType function. I think we can use it here

nevermind, we can't use it yet, getRequestType is modified to include time requests in the expense creation PR, because that's when we add the new request type

we don't use type for distance at the moment, only time and per diem I believe are really using it right now. So we might need to clean up a few things for this suggestion

DylanDylann · 2025-12-24T08:54:08Z

src/libs/TransactionPreviewUtils.ts

+    } else if (isTimeRequest(transaction)) {
+        previewHeaderText = [{translationPath: 'iou.time'}];


NAB: Suggest using a mapping instead of checking each case one by one

not sure how to achieve this. we don't have a requestType variable that we could use as a key for the mapping, instead we determine type by running the is<Type>Request functions. do you mean we should first determine requestType by running all the function and then set previewHeaderText using a map?

DylanDylann · 2025-12-24T09:01:03Z

src/components/ReportActionItem/MoneyRequestView.tsx

+    } else if (isCardTransaction) {
+        amountDescription += translate('iou.card');


@mhawryluk The card transaction is handled below. I don’t think this change aligns with the design doc or could you please share the design document related to this change?

The same to per diem and distance requests. This change seems unrelated to our project. To avoid regressions after merging this PR, I’d like to confirm that this change is intentional

yeah, I took this from a discussion on Figma, but it looks like we are going to remove this part of the label after all. waiting for the confirmation on this one.

cc: @dannymcclain it's this label:

Yeah I believe that's what @trjExpensify was saying: we don't need this dot separator type indicator on these Amount push inputs. Those would only show on the preview. Tom can confirm!

Yep, exactly!

awesome, removed!

DylanDylann · 2026-01-07T11:23:23Z

@mhawryluk Kindly bump

mhawryluk · 2026-01-07T11:32:53Z

@mhawryluk Should we update the icon in the expense report?

it should be updated by this PR: #77753

OSBotify · 2026-01-07T18:00:47Z

✋ 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 · 2026-01-08T16:48:22Z

🚀 Deployed to staging by https://github.com/grgia in version: 9.2.96-1 🚀

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

OSBotify · 2026-01-09T18:17:21Z

🚀 Deployed to production by https://github.com/arosiclair in version: 9.2.96-6 🚀

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

OSBotify · 2026-01-09T19:13:43Z

🚀 Deployed to production by https://github.com/arosiclair in version: 9.2.96-6 🚀

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

OSBotify · 2026-01-09T19:20:39Z

🚀 Deployed to production by https://github.com/arosiclair in version: 9.2.96-6 🚀

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

Time expenses do not support taxes (established in Expensify#77748). This fix hides TAX_RATE and TAX_AMOUNT columns for time expense transactions in the Reports > Expenses view. Fixes Expensify#80208

rojiphil · 2026-02-13T15:06:35Z

src/components/ReportActionItem/MoneyRequestView.tsx

    const shouldShowAttendees = shouldShowAttendeesTransactionUtils(iouType, policy);

-    const shouldShowTax = isTaxTrackingEnabled(isPolicyExpenseChat, policy, isDistanceRequest, isPerDiemRequest);
+    const shouldShowTax = isTaxTrackingEnabled(isPolicyExpenseChat, policy, isDistanceRequest, isPerDiemRequest, isTimeRequest);


For time expenses, tax and tax rate should also be empty in search columns. We fixed this in #80208

Disable taxes on time expenses

fe9daef

melvin-bot bot assigned mhawryluk Dec 16, 2025

Hide "cash" label next to amount for time expenses

0741f23

mhawryluk changed the title ~~Disable taxes on time expenses~~ Update MoneyRequestView for time expenses Dec 16, 2025

mhawryluk added 4 commits December 18, 2025 13:39

Merge branch 'main' into feat/time-expense-report-view

775e60f

Merge branch 'main' into feat/time-expense-report-view

4c534b1

Show "time" label next to amount in MoneyRequestView

6365c36

Merge branch 'main' into feat/time-expense-report-view

0d86bb6

mhawryluk marked this pull request as ready for review December 22, 2025 09:45

mhawryluk requested review from a team as code owners December 22, 2025 09:45

melvin-bot bot requested review from ShridharGoel and heyjennahay and removed request for a team and heyjennahay December 22, 2025 09:45

ShridharGoel reviewed Dec 22, 2025

View reviewed changes

Refactor displaying expense type in amount description

5f59927

mhawryluk requested a review from ShridharGoel December 22, 2025 11:04

ShridharGoel reviewed Dec 22, 2025

View reviewed changes

ShridharGoel mentioned this pull request Dec 22, 2025

[Due for payment 2026-01-16] [$250] [Time Tracking] Update UI To Support Existing Time Expenses in Reports #77379

Closed

Display "Time" label in TransactionPreview

2d016c2

ShridharGoel approved these changes Dec 22, 2025

View reviewed changes

melvin-bot bot requested a review from grgia December 22, 2025 13:12

DylanDylann reviewed Dec 24, 2025

View reviewed changes

mhawryluk added 4 commits January 7, 2026 12:43

Merge branch 'main' into feat/time-expense-report-view

48717a5

Fix after merge

07b4ee2

Prettier fix

1f03ef6

Remove expense type from the amount row label in MoneyRequestView

b744171

grgia approved these changes Jan 7, 2026

View reviewed changes

grgia merged commit 1d3c041 into Expensify:main Jan 7, 2026
38 checks passed

OSBotify mentioned this pull request Jan 8, 2026

Deploy Checklist: New Expensify 2026-01-08 #79110

Closed

76 tasks

mhawryluk mentioned this pull request Jan 8, 2026

Report - "Cash" is missing next to amount on expense report #79118

Closed

7 tasks

mitarachim mentioned this pull request Jan 14, 2026

[Due for payment 2026-02-03] [Time Tracking] Time expense in Merge expenses list and Split shows "Cash" instead of "Time" #79574

Closed

7 tasks

jponikarchuk mentioned this pull request Jan 22, 2026

[$250] Reports - Tax and Tax rate column are populated with tax data for time expense #80208

Closed

7 tasks

cosmicvulpes mentioned this pull request Jan 30, 2026

fix: hide tax columns for time expenses in TransactionItemRow #81024

Merged

53 tasks

rojiphil reviewed Feb 13, 2026

View reviewed changes

		} else if (isTimeRequest(transaction)) {
		previewHeaderText = [{translationPath: 'iou.time'}];

		} else if (isCardTransaction) {
		amountDescription += translate('iou.card');

Conversation

mhawryluk commented Dec 16, 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!

codecov bot commented Dec 16, 2025 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

melvin-bot bot commented Dec 22, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ShridharGoel commented Dec 22, 2025

Uh oh!

mhawryluk commented Dec 22, 2025

Uh oh!

ShridharGoel commented Dec 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ShridharGoel commented Dec 22, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

mhawryluk commented Dec 22, 2025

Uh oh!

mhawryluk commented Dec 22, 2025

Uh oh!

DylanDylann commented Dec 24, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DylanDylann Dec 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

mhawryluk commented Dec 16, 2025 •

edited

Loading

codecov bot commented Dec 16, 2025 •

edited by github-actions bot

Loading

ShridharGoel commented Dec 22, 2025 •

edited

Loading

DylanDylann Dec 24, 2025 •

edited

Loading