fix: Handle distance unit update when sharing by paultsimura · Pull Request #54048 · Expensify/App

paultsimura · 2024-12-12T17:25:48Z

Explanation of Change

Fix the case when the workspace distance unit differs from the tracked expense's when sharing from Self DM.

Fixed Issues

$ #53988
PROPOSAL: #53988 (comment)

Tests

Same as QA

Offline tests

Same as QA

QA Steps

Precondition:

Workspace with distance rates enabled.
Workspace distance unit (miles) is different from individual distance unit (kilometers).

Test:

Go to self DM.
Track a distance expense.
Click "Share it with my accountant".
Select the workspace.
Verify the Distance field shows "kilometers".
Click "Rate".
Select any rate with Miles as a unit.
Verify the Distance field shows "miles" with a value converted from km to mi.
Verify the amount was corrected as well.
Click Submit.
Verify the amount on the expense preview in the main chat shows the same value as in step 9
Click on the expense preview.
Verify the amount on the transaction view shows the same value as in step 9
Go back to the main chat.
Verify the amount on the expense preview in the main chat remains the same

PR Author Checklist

Screenshots/Videos

Android: Native

android.webm

Android: mWeb Chrome

chrome.webm

iOS: Native

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-12-12.at.18.17.50.mp4

iOS: mWeb Safari

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-12-12.at.18.16.29.mp4

MacOS: Chrome / Safari

Screen.Recording.2024-12-12.at.18.02.32.mov

MacOS: Desktop

Screen.Recording.2024-12-12.at.18.08.22.mov

melvin-bot · 2024-12-12T21:02:48Z

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

paultsimura · 2024-12-23T13:38:22Z

@Pujan92 we probably should hold this one because the original PR was reverted 😿

Pujan92 · 2024-12-23T13:40:10Z

Oh yes, I just got to know about the revert.

# Conflicts: # src/libs/actions/IOU.ts

Pujan92 · 2025-01-31T07:54:21Z

@paultsimura Is this ready for review now?

paultsimura · 2025-01-31T07:55:54Z

@paultsimura Is this ready for review now?

I'll merge main, give it another round of testing, and will ping you. Thanks 🙌

# Conflicts: # tests/unit/TransactionUtilsTest.ts

paultsimura · 2025-01-31T16:02:27Z

Ready for review @Pujan92

paultsimura · 2025-02-04T12:18:57Z

Bump for review @Pujan92

Pujan92 · 2025-02-05T08:24:47Z

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 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.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 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.
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: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2025-02-05.at.14.16.39.mov

MacOS: Desktop

Pujan92

LGTM!

MariaHCD

Looks good overall, @neil-marcellini do you want to give this a review since it is a follow up to #51517 (review)?

MariaHCD · 2025-02-05T20:38:42Z

src/libs/TransactionUtils/index.ts

 * Calculates tax amount from the given expense amount and tax percentage
 */
-function calculateTaxAmount(percentage: string, amount: number, currency: string) {
+function calculateTaxAmount(percentage: string | undefined, amount: number, currency: string) {


Why is percentage optional?

This is a byproduct of the Lint fix. We used to pass an empty string before:

App/src/pages/iou/request/step/IOURequestStepDistanceRate.tsx

Lines 90 to 91 in 5d3622d

const taxPercentage = TransactionUtils.getTaxValue(policy, transaction, taxRateExternalID) ?? '';

taxAmount = CurrencyUtils.convertToBackendAmount(TransactionUtils.calculateTaxAmount(taxPercentage, taxableAmount, rates[customUnitRateID].currency ?? CONST.CURRENCY.USD));

To make it more clear, I've changed '' to undefined, and therefore had to make the percentage param string | undefined.

If you prefer, I can revert the param change and try to modify the logic where I'm calling this function instead.

Ah, thanks for clarifying. Yeah, I think it's a bit strange to call calculateTaxAmount with no percentage. It would be good to modify the place where the function is called but it's beyond the scope of this PR so I think it's fine as it is.

neil-marcellini

Overall looks good, but I have one question.

neil-marcellini · 2025-02-06T19:57:18Z

src/libs/actions/IOU.ts

+        comment: {
+            customUnit: {
+                customUnitRateID,
+                defaultP2PRate: null,


We should only clear this if there's a policy right?

I've checked the code - this function is called in only 1 place - when a user manually changes the distance rate:

App/src/pages/iou/request/step/IOURequestStepDistanceRate.tsx

Lines 96 to 102 in ad708d7

if (currentRateID !== customUnitRateID) {

setMoneyRequestDistanceRate(transactionID, customUnitRateID, policy, shouldUseTransactionDraft(action));

if (isEditing && transaction?.transactionID) {

updateMoneyRequestDistanceRate(transaction.transactionID, reportID, customUnitRateID, policy, policyTags, policyCategories, taxAmount, taxRateExternalID);

}

}

This action is not accessible for non-policy requests, as we use only default P2P rate for 1:1 requests.
But I will add a policy-only condition here.

neil-marcellini

Great thanks. Yeah even though it's not a problem in the current flow it's always good to have the check so someone doesn't add a call and accidentally create a bug.

github-actions · 2025-02-11T02:37:56Z

🚀 Deployed to staging by https://github.com/neil-marcellini in version: 9.0.96-0 🚀

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

github-actions · 2025-02-12T01:43:27Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.0.96-1 🚀

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

paultsimura added 2 commits December 12, 2024 18:00

Handle distance unit update when sharing

f48bf59

Merge branch 'refs/heads/main' into fix/53988-share-unit

716cc97

paultsimura marked this pull request as ready for review December 12, 2024 21:02

paultsimura requested a review from a team as a code owner December 12, 2024 21:02

melvin-bot bot requested a review from Pujan92 December 12, 2024 21:02

melvin-bot bot removed the request for review from a team December 12, 2024 21:02

paultsimura added 2 commits January 27, 2025 20:06

Merge branch 'main' into fix/53988-share-unit

a50ca0b

# Conflicts: # src/libs/actions/IOU.ts

Lint fixes

ad708d7

Merge branch 'main' into fix/53988-share-unit

c711490

# Conflicts: # tests/unit/TransactionUtilsTest.ts

Pujan92 approved these changes Feb 5, 2025

View reviewed changes

melvin-bot bot requested a review from MariaHCD February 5, 2025 08:50

MariaHCD reviewed Feb 5, 2025

View reviewed changes

MariaHCD previously approved these changes Feb 5, 2025

View reviewed changes

MariaHCD requested a review from neil-marcellini February 5, 2025 22:33

neil-marcellini requested changes Feb 6, 2025

View reviewed changes

Unset defaultP2PRate only if submitting to a policy

cb2cca5

paultsimura dismissed MariaHCD’s stale review via cb2cca5 February 7, 2025 16:14

paultsimura requested a review from neil-marcellini February 7, 2025 16:14

neil-marcellini approved these changes Feb 10, 2025

View reviewed changes

MariaHCD approved these changes Feb 10, 2025

View reviewed changes

neil-marcellini merged commit 04e1c07 into Expensify:main Feb 10, 2025
16 checks passed

github-actions bot mentioned this pull request Feb 11, 2025

Deploy Checklist: New Expensify 2025-02-11 #56625

Closed

69 tasks

melvin-bot bot mentioned this pull request Feb 12, 2025

[Due for payment 2025-02-19] [$250] Track - Amount on the expense preview does not update when track distance expense is submitted #53988

Closed

8 tasks

ahmedGaber93 mentioned this pull request Feb 27, 2026

[$250] Incorrect Tax Amount Calculated When Applying Tax Rate to Foreign Currency Receipt #80490

Closed

7 tasks

	const taxPercentage = TransactionUtils.getTaxValue(policy, transaction, taxRateExternalID) ?? '';
	taxAmount = CurrencyUtils.convertToBackendAmount(TransactionUtils.calculateTaxAmount(taxPercentage, taxableAmount, rates[customUnitRateID].currency ?? CONST.CURRENCY.USD));

	if (currentRateID !== customUnitRateID) {
	setMoneyRequestDistanceRate(transactionID, customUnitRateID, policy, shouldUseTransactionDraft(action));

	if (isEditing && transaction?.transactionID) {
	updateMoneyRequestDistanceRate(transaction.transactionID, reportID, customUnitRateID, policy, policyTags, policyCategories, taxAmount, taxRateExternalID);
	}
	}

Conversation

paultsimura commented Dec 12, 2024 • 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 Dec 12, 2024

Uh oh!

paultsimura commented Dec 23, 2024

Uh oh!

Pujan92 commented Dec 23, 2024

Uh oh!

Pujan92 commented Jan 31, 2025

Uh oh!

paultsimura commented Jan 31, 2025

Uh oh!

paultsimura commented Jan 31, 2025

Uh oh!

paultsimura commented Feb 4, 2025

Uh oh!

Pujan92 commented Feb 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Pujan92 left a comment

Choose a reason for hiding this comment

Uh oh!

MariaHCD left a comment

Choose a reason for hiding this comment

Uh oh!

MariaHCD Feb 5, 2025

Choose a reason for hiding this comment

Uh oh!

paultsimura Feb 5, 2025

Choose a reason for hiding this comment

Uh oh!

MariaHCD Feb 5, 2025

Choose a reason for hiding this comment

Uh oh!

neil-marcellini left a comment

Choose a reason for hiding this comment

Uh oh!

neil-marcellini Feb 6, 2025

Choose a reason for hiding this comment

Uh oh!

paultsimura Feb 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

neil-marcellini left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Feb 11, 2025

Uh oh!

github-actions bot commented Feb 12, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

paultsimura commented Dec 12, 2024 •

edited

Loading

Pujan92 commented Feb 5, 2025 •

edited

Loading

paultsimura Feb 7, 2025 •

edited

Loading