Skip to content

Add freezing for Approved, Paid and/or Done splits during updating other splits - #100281

Merged
lakchote merged 20 commits into
Expensify:mainfrom
ZhenjaHorbach:fix/99190-split-expense-frozen-amount
Oct 9, 2026
Merged

lakchote merged 20 commits into
Expensify:mainfrom
ZhenjaHorbach:fix/99190-split-expense-frozen-amount

Conversation

@ZhenjaHorbach

@ZhenjaHorbach ZhenjaHorbach commented Sep 3, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #99190
PROPOSAL:

Tests

Precondition:

Admin creates a manual expense in the workspace chat and splits it into 2 expenses
One of the splits is moved to a new report and Approved (or Paid)

Steps:

  1. Open New Expensify
  2. Go to the workspace chat
  3. Open the non approved/paid split expense (still in draft)
  4. Click More > Edit splits > arrow on the remaining split > Remove split > Save
  5. Verify the approved/paid split's amount does not change and does not revert
  6. Repeat as the Submitter instead of Admin - same result
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

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

  • 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 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-09-04.11.31.24.mov

… statusNum to use actual statuses for splits
@codecov

codecov Bot commented Sep 3, 2026 •

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 Δ
src/hooks/useFrozenSplitTransactionIDs.ts 100.00% <100.00%> (ø)
src/libs/SplitExpenseUtils.ts 100.00% <100.00%> (ø)
src/libs/actions/IOU/SplitTransactionUpdate.ts 91.43% <100.00%> (+0.09%) ⬆️
src/pages/iou/DynamicSplitExpensePage.tsx 73.85% <100.00%> (+73.85%) ⬆️
...ou/updateSplitTransactionsFromSplitExpensesFlow.ts 92.85% <100.00%> (+0.10%) ⬆️
src/libs/actions/IOU/SplitExpenseItems.ts 95.06% <92.85%> (-0.31%) ⬇️
src/pages/iou/DynamicSplitExpenseEditPage.tsx 0.00% <0.00%> (ø)
... and 365 files with indirect coverage changes

@ZhenjaHorbach ZhenjaHorbach changed the title Add freezing for Approved, Paid and/or Done splits during updating splits Add freezing for Approved, Paid and/or Done splits during updating other splits Sep 3, 2026
@ZhenjaHorbach
ZhenjaHorbach marked this pull request as ready for review September 4, 2026 09:32
@ZhenjaHorbach
ZhenjaHorbach requested review from a team as code owners September 4, 2026 09:32
@melvin-bot
melvin-bot Bot requested a review from dmkt9 September 4, 2026 09:32
@melvin-bot

melvin-bot Bot commented Sep 4, 2026

Copy link
Copy Markdown

@dmkt9 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 JmillsExpensify and removed request for a team September 4, 2026 09:32
JmillsExpensify
JmillsExpensify previously approved these changes Sep 4, 2026

@JmillsExpensify JmillsExpensify 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.

LGTM

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

Copy link
Copy Markdown

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: 3d8a7c1e7e

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

const itemTransaction = allTransactions?.[transactionKey] ?? searchResultsData?.[transactionKey];
const reportKey = `${ONYXKEYS.COLLECTION.REPORT}${itemTransaction?.reportID}` as const;
const itemReport = allReports?.[reportKey] ?? searchResultsData?.[reportKey] ?? fallbackReport;
if (isSplitExpenseFrozen(itemReport)) {

@dmkt9 dmkt9 Sep 8, 2026 •

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.

Why don't we use a function like isSplitExpenseEditable in DynamicSplitExpensePage?

@ZhenjaHorbach ZhenjaHorbach Sep 8, 2026 •

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.

I'm not sure about it
Since isSplitExpenseEditable is a broad permission gate for the whole flow
But we need a narrow rule: when the report is already approved/paid/closed and the amount is fixed

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.

Yeah, I'm not sure about it as well.
But if a split expense isn't editable while its amount can still change when I delete another split expense, that feels a bit odd.
@lakchote WDYT?

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.

But okay
I think we can use isSplitAction here
But I would prefer to leave isSplitExpenseFrozen guard here also, since isSplitAction short-circuits true for selfDM regardless of status, so it alone wouldn't catch a selfDM report that's somehow approved/settled/closed even if it's an edge case

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.

I agree with dmkt9 here. The rows on DynamicSplitExpensePage still get isEditable from isSplitExpenseEditable. That one only checks Onyx, falls back to the current report, and has no frozen check. So from Spend a frozen split can still show an editable amount input. Typing there or saving it is silently ignored by the new guards. Can we base the row's isEditable on frozenSplitTransactionIDs too, so the list and the actions agree? Then isSplitExpenseEditable can go.

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.

@ZhenjaHorbach the other 4 look good, thanks. This one's still open though. The rows on DynamicSplitExpensePage still get isEditable from isSplitExpenseEditable, which has no frozen check, so from Spend a frozen split still shows an editable amount. Can you also fill in Explanation of Change and the QA steps in the description?

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.

Oh
Right
Fixed!

@dmkt9

dmkt9 commented Sep 8, 2026 •

Copy link
Copy Markdown
Contributor

I found a bug. I think this is a BE bug. The original transaction isn't available after "clear cache and restart" when the two split transactions are in separate reports. cc @lakchote

2026-09-08.09-31-06.mp4

@dmkt9

dmkt9 commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

@codex review

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

Copy link
Copy Markdown

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: da7368376e

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

@dmkt9

dmkt9 commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

@codex review

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

Copy link
Copy Markdown

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: bfe1710673

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

@dmkt9

dmkt9 commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot review, find any potential bugs

@MelvinBot

MelvinBot commented Sep 8, 2026 •

Copy link
Copy Markdown
Contributor

🤖 Reviewed the diff. The core approach (derive frozen-ness live from each split's own report instead of a cached statusNum) looks right, and the no-frozen-splits path is behavior-identical to the old code. Four things I'd fix before merge, roughly in order of severity.

1. The snapshot fallback can silently miss, re-opening the exact bug this PR fixes

SplitTransactionUpdate.ts:316 and :2052 look up only allSnapshots[snapshot_<searchContext.currentSearchHash>]. Two comments in this same file — L1477-L1480 and L1547-L1551 — say currentSearchHash is undefined when the user starts the flow from a non-search route (selfDM, Expenses page), and both nearby blocks iterate every snapshot instead.

Failure: the split's report is missing from the Onyx REPORT collection but present in a snapshot, and currentSearchHash is undefined. hasEditableSplitExpenseLeft then falls back to STATUS_NUM.OPEN, isReverseSplitOperation flips true, and the Approved split gets reverted — the original symptom. Your own new test proves this path matters; it just pins currentSearchHash so the gap isn't exercised. Suggest scanning all snapshots for the report key, mirroring the two existing blocks.

2. Per diem gets the same dead-end that the card guard exists to prevent

DynamicSplitExpenseEditPage.tsx:162-164 hides Remove only when isManagedCardTransaction(transaction). But computeSplitSaveErrorMessage blocks sum-below-total for isPerDiem || isCard.

Failure: per diem expense, splits A (Approved) and B (open). Remove is shown on B. Removing it leaves A frozen at its old amount, sum < total → "total amount less than original" on Save, and there's nothing left to edit to fix it. The user is stuck. canRemoveSplit should use isManagedCardTransaction(transaction) || isPerDiemRequest(transaction).

3. The frozen split is still tappable and editable when its report only exists in the search snapshot

useFrozenSplitTransactionIDs reads searchResultsData, but isSplitExpenseEditable — which gates the amount input and onSelectRow — does not; it does allReports?.[...] ?? report.

So in the scenario your new test adds (Approved report present only in the snapshot), the Approved split still renders as editable: the user can open it and hit Remove, which drops it from the draft entirely. Redistribution is frozen but the row isn't. Worth routing both through the same resolver.

4. useFrozenSplitTransactionIDs ignores splitExpense.reportID

Its sibling in this PR, hasEditableSplitExpenseLeft, resolves allTransactionsList?.[key]?.reportID ?? expense.reportID. The hook skips the ?? item.reportID step and jumps to fallbackReport, which in the edit page is the currently edited split's report (the route is built with item.reportID), not the parent's. Any split whose transaction isn't loaded therefore has its frozen-ness decided by an unrelated report. Aligning the two resolvers would remove the divergence.

Smaller notes
  • redistributeExcludingFrozenSplits: the restore step puts isFrozenSplit(item) inside the find predicate, so it re-evaluates per candidate and the restore is O(n²). isFrozenSplit(item) ? (splitExpenses.find(...) ?? item) : item reads better, or key a Map by transactionID.
  • Same function: the doc comment says unlocking happens "so the total still has somewhere to redistribute to", but when every remaining split is frozen nothing gets unlocked, redistributeSplitExpenseAmounts returns early on uneditedCount === 0, and the draft is left with sum ≠ total. For cash that saves silently with a shrunken total. If that's intended, the comment should say so.
  • SplitExpenseUtils.test.ts: the isWaitingOnBankAccount case uses stateNum: SUBMITTED + statusNum: APPROVED, which isn't a state the backend produces — a real approved-and-waiting-on-bank report has stateNum: APPROVED and is frozen via isReportApproved. The test passes but documents behavior that doesn't exist.
  • Splits on a submitted (not yet approved) report are not frozen, while hasEditableSplitExpenseLeft treats statusNum >= SUBMITTED as non-editable. Probably deliberate, but the two definitions of "locked" now differ — worth a comment.
  • Verified no other redistribution path was missed: evenlyDistributeSplitExpenseAmounts and resetSplitExpensesByDateRange both rewrite every amount, but both are reachable only behind isInitialSplit, so no approved children can exist. All three live redistribution call sites are covered.

Findings 1–3 are the ones I'd want addressed; 4 and the notes are cleanup. This was a static review of the diff — I didn't run the flow.


view run · view recording

@dmkt9

dmkt9 commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

I found a bug. I think this is a BE bug. The original transaction isn't available after "clear cache and restart" when the two split transactions are in separate reports. cc @lakchote

2026-09-08.09-31-06.mp4

We can still reproduce this bug from Spend:

2026-10-05.21-06-49.mp4

@dmkt9

dmkt9 commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

I just noticed a new bug on staging:

2026-10-05.20-49-48.mp4

@lakchote lakchote 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.

Thanks for this @ZhenjaHorbach. One real issue on the Spend route (the frozen split restore can flip the sign), plus a couple of smaller ones. Can you also fill in Explanation of Change and the QA steps in the description? They're still empty.

Comment thread src/types/onyx/IOU.ts Resolved
@lakchote

lakchote commented Oct 6, 2026

Copy link
Copy Markdown
Contributor

@dmkt9 thanks, this one's on the backend and not from this PR. When you open an expense report, OpenReport returns its expenses but not the original split transaction, so after a cache clear Edit splits has nothing to load and shows not found. Opening an existing expense thread does return the original, which is probably why it only shows up when the splits end up in separate reports. I'll fix it in Auth separately.

@lakchote

lakchote commented Oct 8, 2026

Copy link
Copy Markdown
Contributor

@ZhenjaHorbach can you handle comments here and fix conflicts please?

@ZhenjaHorbach

Copy link
Copy Markdown
Contributor Author

@lakchote
Done!

@lakchote

lakchote commented Oct 8, 2026

Copy link
Copy Markdown
Contributor

Thanks! BE fix for the bug reported by @dmkt9 has been merged and should go out with the next deploy

@lakchote lakchote 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.

LGTM

@lakchote
lakchote merged commit 7c5788c into Expensify:main Oct 9, 2026
35 of 37 checks passed
@github-actions

github-actions Bot commented Oct 9, 2026

Copy link
Copy Markdown
Contributor

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

@OSBotify OSBotify mentioned this pull request Oct 9, 2026
74 tasks done
@OSBotify

OSBotify commented Oct 9, 2026

Copy link
Copy Markdown
Contributor

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

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

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update needed. This PR is a bug fix that makes the app match what Split expenses already says: "Splits are locked if they're on a report that's approved, reimbursed, or closed."


view run

@lanitochka17

Copy link
Copy Markdown

Deploy Blocker #103791 was identified to be related to this PR.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.5.7-3 🚀

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

Bundle Size Analysis (Sentry):

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