Skip to content

fix: skip auto-redistribution when adding splits with manual edits#87124

Open
ikevin127 wants to merge 4 commits intoExpensify:mainfrom
ikevin127:ikevin127-fixNewAutoSplitEdit
Open

fix: skip auto-redistribution when adding splits with manual edits#87124
ikevin127 wants to merge 4 commits intoExpensify:mainfrom
ikevin127:ikevin127-fixNewAutoSplitEdit

Conversation

@ikevin127
Copy link
Copy Markdown
Contributor

@ikevin127 ikevin127 commented Apr 4, 2026

Explanation of Change

When a user manually edits split amounts and then adds a new split, the previous logic would auto-redistribute amounts among unedited splits. This caused incorrect calculations when the manually edited amount exceeded the total (e.g., editing a -$10 split to -$20 and adding a new split).

Now, new splits start at $0.00 when manual edits exist, allowing users to fully control the distribution.

Fixed Issues

$ #82455
PROPOSAL:

Tests

  1. Open a workspace chat in the app.
  2. Create an expense with amount -$10.00 (negative).
  3. Open the expense report and tap More > Split.
  4. Edit the first split amount to -$20.00 (more than total).
  5. Save the split.
  6. Open any of the 2 generated splits and tap on the Amount field.
  7. Tap Add split to create a new split.
  8. Verify: The newly created split amount is $0.00.
  9. Verify: The first split remains -$20.00.
  10. Verify: When pressing Save, user gets 🔴 Please enter a valid amount before continuing. validation error.

Warning

Note that the auto-redistribution issues caused by editing previously existing splits AFTER adding the new ones are out of scope for this PR as mentioned here.

  • Verify that no errors appear in the JS console

Offline tests

N/A

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
  • 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 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

Screen.Recording.2026-04-03.at.19.30.58.mov

@ikevin127 ikevin127 requested review from a team as code owners April 4, 2026 03:17
@melvin-bot melvin-bot bot requested review from ShridharGoel and joekaufmanexpensify and removed request for a team and joekaufmanexpensify April 4, 2026 03:18
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Apr 4, 2026

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

@ShridharGoel
Copy link
Copy Markdown
Contributor

ShridharGoel commented Apr 4, 2026

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 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.2026-04-04.at.5.00.33.PM.mov
Android: mWeb Chrome
Screen.Recording.2026-04-04.at.5.07.17.PM.mov
iOS: HybridApp
Screen.Recording.2026-04-04.at.5.12.25.PM.mov
iOS: mWeb Safari
Screen.Recording.2026-04-04.at.5.13.41.PM.mov
MacOS: Chrome / Safari
Screen.Recording.2026-04-04.at.4.54.03.PM.mov

@ShridharGoel
Copy link
Copy Markdown
Contributor

@ikevin127 Isn't the auto-distribution wrong here?

Screen.Recording.2026-04-04.at.5.10.22.PM.mov

@ikevin127
Copy link
Copy Markdown
Contributor Author

Not sure, is this something that differs from current staging behaviour (meaning it only happens on this PR) ?

If yes, could you please provide some minimal steps for how you reached the scenario in the video and the exected / actual result ? Would help with debugging 🙌

Aside: AFAIK we didn't have auto-redistribution on the Edit split page - but that might've been added in the meantime by somebody else.

@ShridharGoel
Copy link
Copy Markdown
Contributor

I think we can't compare with staging since there the total is wrong from the beginning itself (the issue that we are fixing in this PR). So, even after changing one of the newly added splits, the total isn't correct there.

Staging video:

Screen.Recording.2026-04-04.at.5.36.38.PM.mov

Steps:

  1. Open a workspace chat in the app.
  2. Create an expense with amount -$10.00 (negative).
  3. Open the expense report and tap More > Split.
  4. Edit the first split amount to -$20.00 (more than total).
  5. Save the split.
  6. Open any of the 2 generated splits and tap on the Amount field.
  7. Tap Add split to create a new split.
  8. Click Add split again.
  9. Edit one of the old splits.
  10. Notice that the auto-distributed values don't sum up to the original total.

@ikevin127
Copy link
Copy Markdown
Contributor Author

@ShridharGoel Looked into it, what you're seeing is a previously existing logic bug (verifiable on staging as well).

The fix I applied is working somewhat correctly, but after taking a second look at it - it's a bit too broad, blocking any auto-redistributions (keeps amount at 0) whenever any of the other existing splits were previously edited manually - this is wrong given our issue's expected result:

The new split amount will be 0.00 as it redistributes to match the total amount.

I think the expected in the OP is what we want. Using the example:

  • Original expense is -10
  • Splits are created: A = -20 so B = 10 to equal -10
  • When a new split, C, is created, it should default to 0 since A and B already equal the original amount.

🔄 Reworking the solution to make sure the new split will be 0 only when the other existing splits are already equal to the total amount. Will try to also find a fix for the staging bug you pointed out where existing negative amount total is flipping to positive amount whenever new splits are added / updated / removed.

@ikevin127
Copy link
Copy Markdown
Contributor Author

@ShridharGoel Update:

  • reworked solution for our issue (the one this PR was opened for) such that when the other existing splits are already equal to the total amount, newly added splits will be 0

☝️ This works only for the initial addition of new splits, if you adjust some of the initial splits: the issues you mentioned here and here will occur just like on current staging (which is out of scope for this PR).

🟢 Applied reworked solution and adjusted tests.

@ikevin127
Copy link
Copy Markdown
Contributor Author

@codex review

Copy link
Copy Markdown

@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: 2e309483da

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

// Auto-redistribute amounts for all splits if this is not a distance request
if (!isDistanceRequest) {
// Skip redistribution if existing splits already match the total (new split stays at 0)
if (!isDistanceRequest && !splitsAlreadyMatchTotal) {
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Limit redistribution skip to manually edited splits

addSplitExpenseField now bypasses redistribution whenever existing splits already sum to the transaction total, but that condition is true for normal unedited splits as well. In a common flow (for example, two unedited 50/50 splits), adding a new split will now keep amounts as 500, 500, 0 instead of rebalancing across all unedited splits, which regresses the expected auto-adjust behavior described in this module and user flow. The skip condition should be tied to manual-edit state, not just sum equality.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Correct, this would regress the initial split scenario when none of the splits were manually edited yet and we add new splits - will apply fix shortly.

@ikevin127
Copy link
Copy Markdown
Contributor Author

@codex review

Copy link
Copy Markdown

@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: 58e67c50c2

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

// Check if existing splits already sum to the total
const existingSum = existingSplits.reduce((sum, split) => sum + split.amount, 0);
const hasManuallyEditedSplits = existingSplits.some((split) => split.isManuallyEdited);
const splitsAlreadyMatchTotal = Math.abs(existingSum) === Math.abs(total);
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Compare split totals with sign before skipping redistribution

Using Math.abs(existingSum) === Math.abs(total) treats opposite-signed totals as a match, so a negative transaction can incorrectly skip redistribution when manually edited splits sum to the positive magnitude (for example, +1000 vs -1000). In that case shouldRedistribute becomes false, the added split stays at 0, and the draft remains unbalanced, which then blocks saving with validation errors; this regression is introduced by the new skip condition and can be avoided by checking signed equality instead of absolute equality.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

@ikevin127 ikevin127 Apr 5, 2026

Choose a reason for hiding this comment

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

This is intended, as using absolute values to check equality between splits sum amount and total transaction amount is the only reliable way that works for both positive and negative amounts ✅

@codecov
Copy link
Copy Markdown

codecov bot commented Apr 5, 2026

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/libs/actions/IOU/Split.ts 80.51% <100.00%> (+0.08%) ⬆️
... and 16 files with indirect coverage changes

@melvin-bot melvin-bot bot requested a review from blimpich April 5, 2026 11:10
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.

2 participants