Skip to content

Conversation

@dominictb
Copy link
Contributor

@dominictb dominictb commented Aug 27, 2025

Explanation of Change

Fixed Issues

$ #64849
PROPOSAL:

Tests

Precondtion:

  • manualDistance beta is enabled
  1. Press FAB > Create expense
  2. Verify Distance tab is not there
  3. Go to any group chat > + > Split expense
  4. Verify Distance tab is there

  1. Press FAB > Track distance
  2. Verify we have Map and Manual tabs
  3. Verify Map tab opens the first time using this feature
  4. Switch to Manual tab
  5. Close the RHP
  6. Press FAB > Track distance
  7. Verify Manual tab opens (last selected tab opens by default)

  1. Press FAB > Track distance > Map
  2. Proceed to create a map distance expense
  3. Verify everything works just like before

  1. Press FAB > Track distance > Manual
  2. Verify the distance unit matches workspace settings (km or mi, it's mi by default if workspace has not configured distance rates feature)
  3. Press Next
  4. Verify invalid distance error shows
  5. Input any distance amount > Next
  6. Verify the Amount is calculated properly based on Rate
  7. Verify receipt cell does not show
  8. Verify you can update the Rate and the Amount will be updated accordingly
  9. Press Create expense

  1. Go to self DM > + > Track distance > Manual
  2. Input any distance amount > Next
  3. Verify rate is $0.7 / mile by default and it's read only
  4. Verify the Amount is calculated properly based on Rate
  5. Verify receipt cell does not show
  6. Press Track expense

  1. Repeat steps 24 - 29 with any 1:1 DM

  1. Repeat steps 16 - 23 with any workspace chat
  2. It's expected that you cannot edit the Distance in either confirmation step or in expense report view for now. It would be implemented later

Precondition:

  • Account has self DM.
  • manualDistance beta is NOT enabled
  1. Go to self DM.
  2. Click + > Create expense > Distance.
  3. Enter waypoints > Next.
  4. Remember the amount and distance on the confirm page.
  5. Click Create expense.
  6. Open the transaction thread.
  7. Verify the amount is correct (equals distance multiplied by millage rate, matches the amount in step 4)

Precondition:

  • Account has self DM.
  • manualDistance beta is enabled
  1. Go to self DM.
  2. Click + > Track distance > Manual.
  3. Enter distance > Next.
  4. Remember the amount and distance on the confirm page.
  5. Click Create expense.
  6. Open the transaction thread.
  7. Verify the amount is correct (equals distance multiplied by millage rate, matches the amount in step 4)

  1. Go to workspace chat.
  2. Create a manual expense without receipt.
  3. Open the transaction thread.
  4. Click on the receipt.
  5. Verify app opens receipt upload/scan page
  • Verify that no errors appear in the JS console

Offline tests

None

QA Steps

Same as tests

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If 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
Screen.Recording.2025-08-15.at.02.42.54.mov

Normal distance expense:

Screen.Recording.2025-08-28.at.00.32.55-compressed.mov
iOS: mWeb Safari
MacOS: Chrome / Safari

Receipt is editable for manual distance and manual amount expenses:

Screenshot 2025-08-28 at 00 06 57 Screenshot 2025-08-28 at 00 06 42

Normal distance requests:

Screen.Recording.2025-08-28.at.00.08.21-compressed.mov

Split normal distance requests:

Screen.Recording.2025-08-28.at.00.10.57-compressed.mov

Map & Manual distance expense in self DM:

Screen.Recording.2025-08-28.at.00.04.46-compressed.mov

Map & Manual distance expense in IOU:

Screen.Recording.2025-08-28.at.00.15.33-compressed.mov
Screen.Recording.2025-08-28.at.00.16.34-compressed.mov

Workspace:

Screen.Recording.2025-08-28.at.00.27.06-compressed.mov
Screen.Recording.2025-08-28.at.00.31.12-compressed.mov

Move track expenses to workspace:

Screen.Recording.2025-08-28.at.00.18.15-compressed.mov

Categorize, Submit to someone, Share with accountant track expense:

Screen.Recording.2025-08-28.at.00.20.02-compressed.mov
MacOS: Desktop

@dominictb dominictb marked this pull request as ready for review August 27, 2025 19:16
@dominictb dominictb requested review from a team as code owners August 27, 2025 19:16
@melvin-bot melvin-bot bot requested review from allroundexperts and removed request for a team August 27, 2025 19:16
@melvin-bot
Copy link

melvin-bot bot commented Aug 27, 2025

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

@dominictb
Copy link
Contributor Author

Note that the auto focus issue in distance amount step is a known issue that has happened a lot recently. Like #69356, #69296 or #69242. It's being worked on.

@dominictb
Copy link
Contributor Author

And the crash issue that happened previously #69278 is not related to this PR

@allroundexperts
Copy link
Contributor

allroundexperts commented Aug 27, 2025

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

Unable to build android

Android: mWeb Chrome
Screen.Recording.2025-08-28.at.5.32.59.AM.mov
iOS: HybridApp
Screen.Recording.2025-08-28.at.5.21.30.AM.mov
iOS: mWeb Safari
Screen.Recording.2025-08-28.at.5.16.27.AM.mov
MacOS: Chrome / Safari
Screen.Recording.2025-08-28.at.4.22.56.AM.mov
Screen.Recording.2025-08-28.at.4.24.29.AM.mov
Screen.Recording.2025-08-28.at.4.25.32.AM.mov
Screen.Recording.2025-08-28.at.4.26.15.AM.mov
Screen.Recording.2025-08-28.at.4.30.23.AM.mov
MacOS: Desktop
Screen.Recording.2025-08-28.at.4.56.07.AM.mov
Screen.Recording.2025-08-28.at.4.57.01.AM.mov

@allroundexperts

This comment was marked as outdated.

@allroundexperts

This comment was marked as outdated.

@dominictb
Copy link
Contributor Author

This bug #69372 (comment) is expected for now because the edit distance page will be implemented later in #64368

@dominictb
Copy link
Contributor Author

This bug #69372 (comment) is expected as per design doc but we can disable it temporarily until #64369 gets done. Wdyt?

@allroundexperts
Copy link
Contributor

This bug #69372 (comment) is expected as per design doc but we can disable it temporarily until #64369 gets done. Wdyt?

Let's leave it as it is and address it in #64369

Copy link
Contributor

@allroundexperts allroundexperts left a comment

Choose a reason for hiding this comment

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

I tested this for #69256 & #69238 apart from the test steps in the OP and can verify that those work fine.

@melvin-bot melvin-bot bot requested a review from neil-marcellini August 28, 2025 00:48
Copy link
Contributor

@neil-marcellini neil-marcellini left a comment

Choose a reason for hiding this comment

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

Looks great and very thoroughly tested. Thanks!

@neil-marcellini neil-marcellini merged commit 7877ec4 into Expensify:main Aug 29, 2025
21 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

OSBotify commented Sep 2, 2025

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

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

@izarutskaya
Copy link

Hello @neil-marcellini This PR should be internal QA, as this #68402 (comment)? Thank you

@arosiclair
Copy link
Contributor

Same thing here. Please QA this when you get the chance @neil-marcellini

@OSBotify
Copy link
Contributor

OSBotify commented Sep 5, 2025

🚀 Deployed to production by https://github.com/arosiclair in version: 9.2.1-20 🚀

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

const isCreatingNewRequest = !(backTo || isEditing);

const customUnitRateID = getRateID(transaction);
const unit = DistanceRequestUtils.getRate({transaction, policy}).unit;
Copy link
Contributor

Choose a reason for hiding this comment

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

We missed an edge case for the default workspace. When starting Track Distance manual from the global button, we need to display the default workspace’s unit. Without that, the bug in #75154 occurs, we applied the fix here #76147.

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.

7 participants