Skip to content

fix: added distance param in transaction, when submitting track expense to workspace#76423

Merged
aldo-expensify merged 13 commits into
Expensify:mainfrom
Burhan-Rashid:fix/74641
Dec 12, 2025
Merged

fix: added distance param in transaction, when submitting track expense to workspace#76423
aldo-expensify merged 13 commits into
Expensify:mainfrom
Burhan-Rashid:fix/74641

Conversation

@Burhan-Rashid

@Burhan-Rashid Burhan-Rashid commented Dec 1, 2025

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$#74641
PROPOSAL:#74641 (comment)

Tests

Prerequisites:
• Self-DM chat available
• Workspace available

Steps:

  1. Go to Self-DM.
  2. Select Track distance → Manual > Create expense
  3. Click Submit to someone.
  4. Submit it to the workspace.(on the confirmation page, you might get error 'Rate not valid', Select a valid rate and proceed).
  5. Verify that distance field doesn't show pending and Expense should submit successfully with no error.
  • Verify that no errors appear in the JS console

Offline tests

Same as 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
  • 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.native.mp4
Android: mWeb Chrome
android.web.mp4
iOS: Native
ios.native.mp4
iOS: mWeb Safari
ios.web.mp4
MacOS: Chrome / Safari
macos.Web.mp4

@codecov

codecov Bot commented Dec 1, 2025

Copy link
Copy Markdown

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 Δ
...es/iou/request/step/IOURequestStepConfirmation.tsx 49.45% <0.00%> (-0.11%) ⬇️
src/libs/actions/IOU.ts 64.85% <0.00%> (+0.21%) ⬆️
... and 20 files with indirect coverage changes

@Burhan-Rashid Burhan-Rashid marked this pull request as ready for review December 1, 2025 19:07
@Burhan-Rashid Burhan-Rashid requested review from a team as code owners December 1, 2025 19:07
@melvin-bot melvin-bot Bot requested review from DylanDylann and removed request for a team December 1, 2025 19:07
@melvin-bot

melvin-bot Bot commented Dec 1, 2025

Copy link
Copy Markdown

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

@DylanDylann

Copy link
Copy Markdown
Contributor

@Burhan-Rashid Coujld you merge latest main?

@Burhan-Rashid

Copy link
Copy Markdown
Contributor Author

@Burhan-Rashid Coujld you merge latest main?

done @DylanDylann

@DylanDylann

Copy link
Copy Markdown
Contributor

@Burhan-Rashid Could you please test this PR again on a new account? I still get the error

Screen.Recording.2025-12-03.at.16.58.15.mov

@Burhan-Rashid

Copy link
Copy Markdown
Contributor Author

@Burhan-Rashid Could you please test this PR again on a new account? I still get the error

Let me check again. @DylanDylann

@Burhan-Rashid

Copy link
Copy Markdown
Contributor Author

@Burhan-Rashid Could you please test this PR again on a new account? I still get the error

Are you able to reproduce it everytime? @DylanDylann
I tried but i am only able to reproduce it once in 10-20 tries.
Whenever i am able to reproduce it, i see that even after sending distance param to API at that time, the backend returns the transaction with distance as 0, which again cause this issue.
I am still figuring out if there is anything wrong on the UI side or if the issue is in the backend. I will let you know once i get any valuable info regarding this.

@joekaufmanexpensify joekaufmanexpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Fix makes sense 👍

@Burhan-Rashid

Copy link
Copy Markdown
Contributor Author

@DylanDylann I tried multiple times today as well but was not able to reproduce it.
If i remove my changes, then the issue is reproducible all the time.
I guess there is some backend issue also related to this one.
Yesterday i was able to reproduce it once, at that time the backend was still sending the transaction distance as 0 even if we passed the distance param correctly to the API.
If you can reproduce this issue and after that if we clear cache and reset, and then again open the report, the report is getting some additional auth related error which makes me suspect that there is something wrong in backend, in addition to the distance param.

@DylanDylann

Copy link
Copy Markdown
Contributor

@Burhan-Rashid Please merge the latest main and try again with a new account. I can reproduce it consistently.

Screen.Recording.2025-12-08.at.15.50.47.mov

@DylanDylann

Copy link
Copy Markdown
Contributor

You also can try on mobile device

@Burhan-Rashid

Burhan-Rashid commented Dec 8, 2025

Copy link
Copy Markdown
Contributor Author

@Burhan-Rashid Please merge the latest main and try again with a new account. I can reproduce it consistently.

The issue is currently caused due to changes in this PR https://github.com/Expensify/App/pull/75542/files#diff-e0bbc1d7016fc365a636f5e1d9928913f99dc8a5e532727c6ebb9c2bbd1181bbR1400-R1403
in the this function:

/**
* Check if the transaction has a defined route
*/
function hasRoute(transaction: OnyxEntry<Transaction>, isDistanceRequestType?: boolean): boolean {
return !!transaction?.routes?.route0?.geometry?.coordinates || (!!isDistanceRequestType && transaction?.comment?.customUnit?.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
}

Which causes the hasRoute to return false for track distance requests created in selfDM, which makes both amount and distance field to show incorrect data on UI and also while creating the track distance request, it sends the merchant field as pending which is causing the issue currently.
After reverting the these changes locally, the issue is still difficult to reproduce on web.
I am still debugging the mobile device. Is there a way to check the network requests of IOS simulator currently @DylanDylann

track.distance.issue.mp4

@DylanDylann

Copy link
Copy Markdown
Contributor

Which causes the hasRoute to return false for track distance requests created in selfDM, which makes both amount and distance field to show incorrect data on UI and also while creating the track distance request, it sends the merchant field as pending which is causing the issue currently.

@Burhan-Rashid Thanks for your investigation. Do you have any suggestion to fix this?

@Burhan-Rashid

Copy link
Copy Markdown
Contributor Author

@Burhan-Rashid Thanks for your investigation. Do you have any suggestion to fix this?

Yes, @DylanDylann we can fix that by adding the name: CONST.CUSTOM_UNITS.NAME_DISTANCE property inside the comment.customUnit here for draft transactions:

App/src/libs/actions/IOU.ts

Lines 1106 to 1113 in fb3822e

if (newIouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE || newIouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE_MAP || newIouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE_MANUAL) {
if (!isFromGlobalCreate) {
const isPolicyExpenseChat = isPolicyExpenseChatReportUtil(report) || isPolicyExpenseChatReportUtil(parentReport);
const customUnitRateID = DistanceRequestUtils.getCustomUnitRateID({reportID, isPolicyExpenseChat, policy, lastSelectedDistanceRates});
comment.customUnit = {customUnitRateID};
} else if (hasOnlyPersonalPolicies(allPolicies)) {
comment.customUnit = {customUnitRateID: CONST.CUSTOM_UNITS.FAKE_P2P_ID};
}

 if (!isFromGlobalCreate) {
            const isPolicyExpenseChat = isPolicyExpenseChatReportUtil(report) || isPolicyExpenseChatReportUtil(parentReport);
            const customUnitRateID = DistanceRequestUtils.getCustomUnitRateID({reportID, isPolicyExpenseChat, policy, lastSelectedDistanceRates});
            comment.customUnit = {customUnitRateID, name: CONST.CUSTOM_UNITS.NAME_DISTANCE};
        } else if (hasOnlyPersonalPolicies(allPolicies)) {
            comment.customUnit = {customUnitRateID: CONST.CUSTOM_UNITS.FAKE_P2P_ID, name: CONST.CUSTOM_UNITS.NAME_DISTANCE};
        }

@DylanDylann

DylanDylann commented Dec 8, 2025

Copy link
Copy Markdown
Contributor

@Burhan-Rashid This fix works on all platform, right?

@Burhan-Rashid

Copy link
Copy Markdown
Contributor Author

@Burhan-Rashid This fix works on all platform, right?

I still need to test the IOS simulator. I will update you after i properly investigate the Original issue. @DylanDylann

@Burhan-Rashid

Copy link
Copy Markdown
Contributor Author

The issue was still happening for some specific distance values( very large values e.g 1.80435000100005).
Since the selfDM distance unit was in KM and workspace unit was in MILES, And while moving the expense from selfDM to workspace we had to change the rate to miles before proceeding and while converting KM's to miles, we were getting very large decimal values for some specific distances.
I have used rounded to 2 decimal values just like how we are doing here:

const distanceAsFloat = roundToTwoDecimalPlaces(parseFloat(amount));
setMoneyRequestDistance(transactionID, distanceAsFloat, isTransactionDraft);

Now it is working perfectly fine.
I have also added the fix that was discussed here @DylanDylann

@Burhan-Rashid

Copy link
Copy Markdown
Contributor Author

There is some failing test on latest main not related to our changes. I will merge the latest main, once the test gets fixed by someone.

@DylanDylann

Copy link
Copy Markdown
Contributor

@Burhan-Rashid Could you merge the new main?

@Burhan-Rashid

Copy link
Copy Markdown
Contributor Author

@Burhan-Rashid Could you merge the new main?

done @DylanDylann

@DylanDylann

DylanDylann commented Dec 10, 2025

Copy link
Copy Markdown
Contributor

@Burhan-Rashid The change is working fine. Thanks for the quick fix

@DylanDylann

DylanDylann commented Dec 10, 2025

Copy link
Copy Markdown
Contributor

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
Screen.Recording.2025-12-11.at.16.27.48.mov
Android: mWeb Chrome
Screen.Recording.2025-12-10.at.18.34.44.mov
iOS: HybridApp
Screen.Recording.2025-12-11.at.16.28.56.mov
iOS: mWeb Safari
Screen.Recording.2025-12-10.at.18.31.46.mov
MacOS: Chrome / Safari
Screen.Recording.2025-12-10.at.18.29.19.mov

@melvin-bot melvin-bot Bot requested a review from aldo-expensify December 11, 2025 09:31
@aldo-expensify aldo-expensify merged commit 66c18cf into Expensify:main Dec 12, 2025
31 checks passed
@OSBotify

Copy link
Copy Markdown
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
Copy Markdown
Contributor

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

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

@OSBotify

Copy link
Copy Markdown
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