Skip to content

Handle the Distance and Rate fields for splits#79099

Merged
lakchote merged 49 commits intoExpensify:mainfrom
ZhenjaHorbach:handle-Distance-and-Rate-fields-for-splits
Feb 10, 2026
Merged

Handle the Distance and Rate fields for splits#79099
lakchote merged 49 commits intoExpensify:mainfrom
ZhenjaHorbach:handle-Distance-and-Rate-fields-for-splits

Conversation

@ZhenjaHorbach
Copy link
Contributor

@ZhenjaHorbach ZhenjaHorbach commented Jan 8, 2026

Explanation of Change

Fixed Issues

$ #78891
PROPOSAL:

Tests

Preconditions: User is an Expensifail account and admin have a Workspace

  1. Open App
  2. Create a distance expense ( manual or map)
  3. Tap on the expense detail
  4. Tap on the More button
  5. Tap on the Split
  6. Tap on any split item
  7. Verify that the distance and rate field rows should get added to the Edit Splits screen, which can be changed as well
  8. Try to increase or decrease amounts for splits to be more or less than the original, and try to save
  9. Verify that the user can save these splits (Still show the warning in the split table, but allow them to save)
  10. After creating splits, try to press on the distance or rate field on the transaction details screen
  11. Verify that the user can edit the distance rate and distance on individual splits without opening the split table
  • Verify that no errors appear in the JS console

Offline tests

Preconditions: User is an Expensifail account and admin have a Workspace

  1. Open App
  2. Create a distance expense ( manual or map)
  3. Tap on the expense detail
  4. Tap on the More button
  5. Tap on the Split
  6. Tap on any split item
  7. Verify that the distance and rate field rows should get added to the Edit Splits screen, which can be changed as well
  8. Try to increase or decrease amounts for splits to be more or less than the original, and try to save
  9. Verify that the user can save these splits (Still show the warning in the split table, but allow them to save)
  10. After creating splits, try to press on the distance or rate field on the transaction details screen
  11. Verify that the user can edit the distance rate and distance on individual splits without opening the split table

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Preconditions: User is an Expensifail account and admin have a Workspace

  1. Open App
  2. Create a distance expense ( manual or map)
  3. Tap on the expense detail
  4. Tap on the More button
  5. Tap on the Split
  6. Tap on any split item
  7. Verify that the distance and rate field rows should get added to the Edit Splits screen, which can be changed as well
  8. Try to increase or decrease amounts for splits to be more or less than the original, and try to save
  9. Verify that the user can save these splits (Still show the warning in the split table, but allow them to save)
  10. After creating splits, try to press on the distance or rate field on the transaction details screen
  11. Verify that the user can edit the distance rate and distance on individual splits without opening the split table
  • 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: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
2026-01-13.13.21.34.mov

@codecov
Copy link

codecov bot commented Jan 8, 2026

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/CONST/index.ts 87.39% <ø> (ø)
src/components/MoneyRequestHeader.tsx 0.00% <ø> (ø)
src/hooks/useSelectedTransactionsActions.ts 85.22% <ø> (ø)
src/libs/API/types.ts 100.00% <ø> (ø)
src/pages/iou/SplitExpenseCreateDateRagePage.tsx 0.00% <ø> (ø)
src/components/MoneyReportHeader.tsx 0.00% <0.00%> (ø)
...c/components/ReportActionItem/MoneyRequestView.tsx 0.24% <0.00%> (+<0.01%) ⬆️
src/libs/TransactionUtils/index.ts 76.36% <94.44%> (+0.48%) ⬆️
src/pages/Search/SearchPage.tsx 23.99% <0.00%> (-0.09%) ⬇️
src/pages/iou/SplitExpensePage.tsx 0.00% <0.00%> (ø)
... and 10 more
... and 10 files with indirect coverage changes

@ZhenjaHorbach ZhenjaHorbach marked this pull request as ready for review January 13, 2026 12:44
@ZhenjaHorbach ZhenjaHorbach requested review from a team as code owners January 13, 2026 12:44
@melvin-bot melvin-bot bot requested a review from suneox January 13, 2026 12:44
@melvin-bot
Copy link

melvin-bot bot commented Jan 13, 2026

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

@melvin-bot melvin-bot bot requested review from joekaufmanexpensify and removed request for a team January 13, 2026 12:44
shouldShowRightIcon
titleStyle={styles.flex1}
style={[styles.moneyRequestMenuItem]}
onPress={() => {
Copy link
Contributor

Choose a reason for hiding this comment

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

❌ PERF-4 (docs)

Inline arrow function creates a new reference on every render, breaking memoization of the optimized MenuItemWithTopDescription component.

Use useCallback to memoize the onPress handler:

const handleDistancePress = useCallback(() => {
    if (isOdometerDistance) {
        Navigation.navigate(
            ROUTES.MONEY_REQUEST_STEP_DISTANCE_ODOMETER.getRoute(
                CONST.IOU.ACTION.EDIT,
                CONST.IOU.TYPE.SPLIT_EXPENSE,
                CONST.IOU.OPTIMISTIC_TRANSACTION_ID,
                reportID,
                Navigation.getActiveRoute(),
            ),
        );
        return;
    }
    // ... rest of the logic
}, [isOdometerDistance, isManualDistance, reportID]);

titleStyle={styles.flex1}
style={[styles.moneyRequestMenuItem]}
onPress={() => {
Navigation.navigate(
Copy link
Contributor

Choose a reason for hiding this comment

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

❌ PERF-4 (docs)

Inline arrow function creates a new reference on every render, breaking memoization of the optimized MenuItemWithTopDescription component.

Use useCallback to memoize the onPress handler:

const handleRatePress = useCallback(() => {
    Navigation.navigate(
        ROUTES.MONEY_REQUEST_STEP_DISTANCE_RATE.getRoute(
            CONST.IOU.ACTION.EDIT,
            CONST.IOU.TYPE.SPLIT_EXPENSE,
            CONST.IOU.OPTIMISTIC_TRANSACTION_ID,
            reportID,
            Navigation.getActiveRoute(),
        ),
    );
}, [reportID]);

Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 63bfa66d0a

ℹ️ 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".

Comment on lines 516 to 519
setOptimisticWaypoints(newWaypoints);
Promise.all([
removeWaypoint(transaction, emptyWaypointIndex.toString(), shouldUseTransactionDraft(action)),
removeWaypoint(currentTransaction, emptyWaypointIndex.toString(), shouldUseTransactionDraft(action)),
updateWaypointsUtil(transactionID, newWaypoints, shouldUseTransactionDraft(action)),

Choose a reason for hiding this comment

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

P2 Badge Persist split waypoint reorders to split drafts

When editing a split distance expense (iouType SPLIT/SPLIT_EXPENSE), this path still calls removeWaypoint/updateWaypointsUtil with only shouldUseTransactionDraft(action). For split edits that evaluates to false, so these helpers write to the main TRANSACTION (or TRANSACTION_DRAFT) store instead of SPLIT_TRANSACTION_DRAFT. As a result, dragging/reordering waypoints (or removing an empty waypoint after dragging) updates the wrong Onyx key and the split draft shown in SplitExpenseEditPage won’t reflect the change, so the edit is lost when saving the split. Consider passing the split draft into removeWaypoint and adding split-draft support to updateWaypointsUtil for this flow.

Useful? React with 👍 / 👎.

Copy link
Contributor

@lakchote lakchote Feb 9, 2026

Choose a reason for hiding this comment

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

cc @ZhenjaHorbach what do you think of codex's comment here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Makes sense
Fixed!

Copy link
Contributor

@joekaufmanexpensify joekaufmanexpensify left a comment

Choose a reason for hiding this comment

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

Good from a product perspective 👍

@suneox
Copy link
Contributor

suneox commented Jan 14, 2026

I’ll take a look at this PR later today. @ZhenjaHorbach, there's still a conflict and failing unit tests.

@lakchote
Copy link
Contributor

But except waypoints issue
we have the issue when we create splits with different customUnitRateIDs
BE returns transactions with the original customUnitRateID

I'm on it.

@lakchote
Copy link
Contributor

Backend PR is up for review, it fixes the issue.

@lakchote
Copy link
Contributor

lakchote commented Feb 6, 2026

@ZhenjaHorbach @suneox it's now fixed you can resume the PR/review, thanks!

@lakchote
Copy link
Contributor

lakchote commented Feb 9, 2026

@suneox can you review it please?

Copy link
Contributor

@suneox suneox left a comment

Choose a reason for hiding this comment

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

The remaining issue with splitting transactions using a new waypoint has been resolved, so we can proceed with the current change.

@melvin-bot melvin-bot bot requested a review from lakchote February 9, 2026 17:16
Copy link
Contributor

@lakchote lakchote left a comment

Choose a reason for hiding this comment

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

Left 2 comments

Comment on lines 516 to 519
setOptimisticWaypoints(newWaypoints);
Promise.all([
removeWaypoint(transaction, emptyWaypointIndex.toString(), shouldUseTransactionDraft(action)),
removeWaypoint(currentTransaction, emptyWaypointIndex.toString(), shouldUseTransactionDraft(action)),
updateWaypointsUtil(transactionID, newWaypoints, shouldUseTransactionDraft(action)),
Copy link
Contributor

@lakchote lakchote Feb 9, 2026

Choose a reason for hiding this comment

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

cc @ZhenjaHorbach what do you think of codex's comment here?

@lakchote
Copy link
Contributor

@codex review

Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 576c1bf0b4

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment on lines +13645 to +13646
} else if (splitExpenseDraftTransaction?.comment?.customUnit?.quantity) {
quantity = splitExpenseDraftTransaction?.comment?.customUnit?.quantity;

Choose a reason for hiding this comment

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

P1 Badge Preserve zero distance when saving split edits

Treating customUnit.quantity as a truthy check drops valid 0 values, so when a split distance is edited to zero the code skips the distance recalculation path and leaves updatedItem.amount at the old base splitExpenseDraftTransaction.amount. In the split-expense edit flow this means saving a zero-distance split can silently keep the previous non-zero amount, so the saved split no longer matches what the user entered.

Useful? React with 👍 / 👎.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think 0 is not a valid case for distance

Copy link
Contributor

Choose a reason for hiding this comment

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

It doesn't make sense to have a 0 distance split, in my opinion.

Copy link
Contributor

@lakchote lakchote left a comment

Choose a reason for hiding this comment

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

LGTM

@lakchote lakchote merged commit 431fce2 into Expensify:main Feb 10, 2026
32 checks passed
@github-actions
Copy link
Contributor

🚧 @lakchote has triggered a test Expensify/App build. You can view the workflow run here.

@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

🚀 Deployed to staging by https://github.com/lakchote in version: 9.3.17-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.17-9 🚀

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

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.

6 participants