Fix distance rate auto-selection and tax sync on date change by Krishna2323 · Pull Request #93237 · Expensify/App

Krishna2323 · 2026-06-11T01:43:01Z

Explanation of Change

Fixed Issues

$ #93142
$ #93389
$ #93603
PROPOSAL:

Tests

Test 1 (#93142):

Precondition:
- Log in with Expensifail account.
- Enable Distance rates and Taxes.
- Create the following distance rates:
- Rate A: "2025 mileage" — $0.50/mile, start: 2025-01-01, end: 2025-12-31
- Rate B: "2026 mileage" — $0.60/mile, start: 2026-01-01, end: 2026-12-31
- Enable Track tax in Distance rates > Settings.
- Add tax to the distance rates as follow:
- Rate A: "2025 mileage" — Tax rate 0%, Tax reclaimable amount 0.40
- Rate B: "2026 mileage" — Tax rate 5%, Tax reclaimable amount 0.40
Steps

Go to staging.new.expensify.com
Go to workspace chat.
Click + > Track distance > Manual.
Enter amount > Next.
On confirm page, click Date and select any date from 2025.
→ Verify tax field shows Rate A with Tax rate 0%.

Test 2 (#93142):

Precondition:
- Signed in with expensifail account

Workspace with distance rates enabled
Launch Hybrid app
Go to workspace settings >> Distance rates
Tap Add rate button
Enter name, amount per mile fields
Tap start date field & select a date
Observe Save button jumps
Tap end date & select a date
Verify save button doesn't jump

Test 3 (#93603):

Precondition:
- Signed in with expensifail account
- Create the following distance rates:
  - Rate A: $0.67/mi, valid Jan 1 2025 - Dec 31 2025
  - Rate B: $0.70/mi, valid Jan 1 2026 - Dec 31 2026

Launch Expensify app.
Go to workspace chat.
Tap + > Track distance > Manual.
Enter amount > Next.
Tap Date and select date to 2025.
Save the date.
On confirm page, after tooltip appears, scroll up.
Verify tooltip reappears after user scrolling stops

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests
Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android_hybrid_scroll_issue.mp4

Android: mWeb Chrome

iOS: Native

ios_hybrid_save_button_jump.mp4

ios_hybrid.mp4

iOS: mWeb Safari

MacOS: Chrome / Safari

web_chrome_tax_rate_update.mp4

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

codecov · 2026-06-11T01:56:54Z

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/components/MenuItem.tsx	`88.19% <ø> (ø)`
...oneyRequestConfirmationList/sections/DateField.tsx	`77.77% <ø> (ø)`
...oneyRequestConfirmationList/sections/RateField.tsx	`82.60% <100.00%> (ø)`
src/pages/iou/request/step/IOURequestStepDate.tsx	`0.00% <ø> (ø)`
src/libs/ComposerFocusManager.ts	`32.67% <0.00%> (-0.67%)`	⬇️
src/libs/TransactionUtils/index.ts	`88.48% <0.00%> (-0.16%)`	⬇️
...workspace/distanceRates/CreateDistanceRatePage.tsx	`0.00% <0.00%> (ø)`
src/libs/actions/IOU/MoneyRequest.ts	`65.96% <0.00%> (-1.55%)`	⬇️
...ltip/EducationalTooltip/BaseEducationalTooltip.tsx	`0.00% <0.00%> (ø)`
src/components/DatePicker/index.tsx	`50.46% <11.53%> (-5.58%)`	⬇️
... and 9 files with indirect coverage changes

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 · 2026-06-18T23:24:06Z

@codex review

chatgpt-codex-connector · 2026-06-18T23:29:42Z

Codex Review: Didn't find any major issues. More of your lovely PRs please.

Reviewed commit: 10dc0e4e2d

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

…ckers. Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 · 2026-06-19T00:34:15Z

@codex review

chatgpt-codex-connector · 2026-06-19T00:41:33Z

Codex Review: Didn't find any major issues. Keep it up!

Reviewed commit: faa6637e56

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

melvin-bot · 2026-06-19T00:44:17Z

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

melvin-bot · 2026-06-19T00:44:24Z

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

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

thelullabyy · 2026-06-21T21:34:54Z

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

Screen.Recording.2026-06-28.at.20.03.03.mov

Screen.Recording.2026-06-28.at.20.04.50.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-06-24.at.20.45.06.mov

thelullabyy · 2026-06-21T21:35:02Z

@Krishna2323 Conflicts

thelullabyy · 2026-06-21T21:44:46Z

+    const rateChanged = rateID !== currentRateID;
+    setCustomUnitRateID(transactionID, rateID, transaction, effectivePolicy, rateChanged);
+
+    if (rateChanged && rateID && isTaxTrackingEnabled(isPolicyExpenseChat || isTrackExpense, effectivePolicy, true)) {


Should we match the condition with IOURequestStepDistanceRate?

const shouldShowTax = isTaxTrackingEnabled(isPolicyExpenseChat || isTrackExpense || isExpenseUnreported(currentTransaction), policy, isDistanceRequest);

…ction

…date change Signed-off-by: krishna2323 <belivethatkg@gmail.com>

…-rate-selection

Krishna2323 · 2026-06-24T08:18:29Z

@thelullabyy friendly bump

thelullabyy · 2026-06-24T21:58:29Z

Overall code looks good. Doing final review round... Hope it can be merged today

thelullabyy · 2026-06-25T00:52:54Z

Test 3 is failed when newManualExpense flag enabled

It looks like we didn't handle for that case @Krishna2323

We are going to remove the flag shortly, we need to cover this case as well

Screen.Recording.2026-06-24.at.20.50.15.mov

thelullabyy · 2026-06-25T00:53:13Z

Others look good to me

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

…-rate-selection

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 · 2026-06-25T11:36:38Z

Test 3 is failed when newManualExpense flag enabled

fixed

thelullabyy · 2026-06-26T01:08:14Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 991aa3410f

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

thelullabyy · 2026-06-26T01:29:59Z

@Krishna2323 Please check ^ comments

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 · 2026-06-26T12:52:05Z

@thelullabyy comments addressed.

…-rate-selection

thelullabyy · 2026-06-29T00:56:58Z

@Krishna2323 Test 1 is failed now

Screen.Recording.2026-06-28.at.19.55.42.mov

thelullabyy · 2026-06-29T00:58:15Z

@Krishna2323 Could you please test again all three 3 cases with new manual expense flow beta enabled?

thelullabyy · 2026-06-29T01:00:26Z

Test 2 tile is wrong, it should be for #93389

Krishna2323 added 2 commits June 11, 2026 05:22

Fix date-bound rate selection and tax sync on date change

a10903c

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Track manual rate selection to preserve user intent on date change

6f92a06

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

melvin-bot Bot assigned Krishna2323 Jun 11, 2026

MelvinBot mentioned this pull request Jun 11, 2026

Fix: return to confirmation page after creating a category from the confirm step #93247

Closed

51 tasks

Krishna2323 added 3 commits June 19, 2026 04:13

merge main and resolve conflicts.

2d4f49f

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Fix distance rate tax sync on create and Save button jump on Add rate.

b26448c

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Fix mileage rate tooltip not reappearing after scroll on native.

10dc0e4

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Fix Add rate form layout jump and keyboard flash when opening date pi…

faa6637

…ckers. Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Krishna2323 marked this pull request as ready for review June 19, 2026 00:44

Krishna2323 requested review from a team as code owners June 19, 2026 00:44

melvin-bot Bot requested review from thelullabyy and trjExpensify and removed request for a team and trjExpensify June 19, 2026 00:44

melvin-bot Bot removed the request for review from a team June 19, 2026 00:44

github-actions Bot reviewed Jun 19, 2026

View reviewed changes

Comment thread src/libs/TransactionUtils/index.ts

add comment for disabled rule.

8aad437

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

thelullabyy reviewed Jun 21, 2026

View reviewed changes

Krishna2323 added 3 commits June 22, 2026 12:04

Merge branch 'main' into krishna/fix-93145-93142-date-bound-rate-sele…

e00461c

…ction

Match distance rate tax condition with IOURequestStepDistanceRate on …

56cdf9c

…date change Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Merge branch 'Expensify:main' into krishna/fix-93145-93142-date-bound…

2b0762c

…-rate-selection

Krishna2323 added 3 commits June 25, 2026 16:38

Fix mileage rate tooltip scroll re-show with new manual expense flow

52972e8

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Merge branch 'Expensify:main' into krishna/fix-93145-93142-date-bound…

9f5b39e

…-rate-selection

Fix duplicate getDistanceRateTaxUpdates after main merge

991aa34

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

chatgpt-codex-connector Bot reviewed Jun 26, 2026

View reviewed changes

Comment thread src/components/Tooltip/EducationalTooltip/BaseEducationalTooltip.tsx Outdated

Comment thread src/components/DatePicker/index.tsx Outdated

Address Codex review feedback for date picker focus and tooltip timing

46b8cd9

Signed-off-by: krishna2323 <belivethatkg@gmail.com>

Merge branch 'Expensify:main' into krishna/fix-93145-93142-date-bound…

70d70aa

…-rate-selection

Uh oh!

Conversation

Krishna2323 commented Jun 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Test 1 (#93142):

Test 2 (#93142):

Test 3 (#93603):

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov Bot commented Jun 11, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Krishna2323 commented Jun 18, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jun 18, 2026

Uh oh!

Krishna2323 commented Jun 19, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jun 19, 2026

Uh oh!

melvin-bot Bot commented Jun 19, 2026

Uh oh!

melvin-bot Bot commented Jun 19, 2026

Uh oh!

Uh oh!

thelullabyy commented Jun 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

thelullabyy commented Jun 21, 2026

Uh oh!

thelullabyy Jun 21, 2026

Choose a reason for hiding this comment

Uh oh!

Krishna2323 Jun 22, 2026

Choose a reason for hiding this comment

Uh oh!

Krishna2323 commented Jun 24, 2026

Uh oh!

thelullabyy commented Jun 24, 2026

Uh oh!

thelullabyy commented Jun 25, 2026

Uh oh!

thelullabyy commented Jun 25, 2026

Uh oh!

Krishna2323 commented Jun 25, 2026

Uh oh!

thelullabyy commented Jun 26, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

thelullabyy commented Jun 26, 2026

Uh oh!

Krishna2323 commented Jun 26, 2026

Uh oh!

thelullabyy commented Jun 29, 2026

Uh oh!

thelullabyy commented Jun 29, 2026

Uh oh!

thelullabyy commented Jun 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

Krishna2323 commented Jun 11, 2026 •

edited

Loading

codecov Bot commented Jun 11, 2026 •

edited by github-actions Bot

Loading

thelullabyy commented Jun 21, 2026 •

edited

Loading