Skip to content

Conversation

@ZhenjaHorbach
Copy link
Contributor

@ZhenjaHorbach ZhenjaHorbach commented Jun 9, 2025

Split expense flow (Phase 2 - Editing existing split expenses)

Explanation of Change

Fixed Issues

$ #61028
$ #70481
$ #69371

PROPOSAL: NA

Tests

  1. Enable newDotUpdateSplits beta
  2. Navigate to an eligible expense in your reports or expenses list.
  3. Open the More menu.
  4. Click the Split button.
  5. Save the splits.
  6. Open the created split transaction.
  7. Verify that the amount label contains the word “Split.”
  8. Open the More menu.
  9. Verify that “Edit splits” is displayed instead of “Split”
  10. Click the Edit splits button or click the amount.
  11. Verify that the split UI appears with the “Edit splits” header.
  12. Verify that the split item from which the split expense was opened is selected.
  13. Click on any split.
  14. Verify that the Report menu item is displayed with the current report name (Report menu item is not editable).
  15. Make some changes and save the splits.
  16. Verify that the splits have been updated correctly, with messages confirming the changes to split data (amount, description, tag, etc.).
  • 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]."

  1. Enable newDotUpdateSplits beta
  2. Navigate to an eligible expense in your reports or expenses list.
  3. Open the More menu.
  4. Click the Split button.
  5. Save the splits.
  6. Open the created split transaction.
  7. Verify that the amount label contains the word “Split.”
  8. Open the More menu.
  9. Verify that “Edit splits” is displayed instead of “Split”
  10. Click the Edit splits button or click the amount.
  11. Verify that the split UI appears with the “Edit splits” header.
  12. Verify that the split item from which the split expense was opened is selected.
  13. Click on any split.
  14. Verify that the Report menu item is displayed with the current report name (Report menu item is not editable).
  15. Make some changes and save the splits.
  16. Verify that the splits have been updated correctly, with messages confirming the changes to split data (amount, description, tag, etc.).
  • 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
2025-09-29.16.52.42.mov
Android: mWeb Chrome
2025-09-29.16.52.42.mov
iOS: Native
2025-09-29.16.52.42.mov
iOS: mWeb Safari
2025-09-29.16.52.42.mov
MacOS: Chrome / Safari
2025-09-29.16.52.42.mov
MacOS: Desktop
2025-09-29.16.52.42.mov

@lakchote lakchote requested review from eh2077 and lakchote June 9, 2025 16:39
@ZhenjaHorbach ZhenjaHorbach marked this pull request as ready for review June 10, 2025 09:30
@ZhenjaHorbach ZhenjaHorbach requested review from a team as code owners June 10, 2025 09:30
@melvin-bot melvin-bot bot requested review from dominictb and removed request for a team June 10, 2025 09:30
@melvin-bot
Copy link

melvin-bot bot commented Jun 10, 2025

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

@ZhenjaHorbach
Copy link
Contributor Author

ZhenjaHorbach commented Jun 10, 2025

@dominictb
Oh
Sorry for assignment
But we already have a reviewer 😅

@ZhenjaHorbach
Copy link
Contributor Author

@Expensify/design

Could you please help me with one thing?

We need to change the background color of the element we are trying to edit
We use for this theme.messageHighlightBG
But what color should we use in case of hover or if we select an element using the keyboard?

Снимок экрана 2025-06-10 в 11 34 21 Снимок экрана 2025-06-10 в 11 33 59

@lakchote lakchote removed the request for review from dominictb June 10, 2025 09:45
@lakchote
Copy link
Contributor

@eh2077 @ZhenjaHorbach told me you could test the whole flow with optimistic data already. Could you do that please, so we can identify bugs before backend changes are done?

@shawnborton
Copy link
Contributor

We use for this theme.messageHighlightBG

This seems incorrect to me. Anything in the product that is selected uses the same global selectedBG color. Can we please update to that?
CleanShot 2025-06-10 at 11 49 30@2x

But what color should we use in case of hover or if we select an element using the keyboard?

Similar to above, we have a global "row-hover" color we should use here:
CleanShot 2025-06-10 at 11 50 03@2x

@ZhenjaHorbach
Copy link
Contributor Author

ZhenjaHorbach commented Jun 10, 2025

Oh
It's just that in the docs it looks like this

Снимок экрана 2025-06-10 в 11 57 58

@shawnborton
Copy link
Contributor

Ah, that seems like a mistake to me. Would you agree @Expensify/design ?

@dubielzyk-expensify
Copy link
Contributor

Yeah, that's definitely a mistake. Agree with what Shawn is saying that it should be the global selectedBG color

@ZhenjaHorbach
Copy link
Contributor Author

I fixed conflicts and updated the logic for distance and rate fields!

2025-10-07.10.37.29.mov

CC: @eh2077 @lakchote

@lakchote lakchote merged commit 332ca17 into Expensify:main Oct 7, 2025
20 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Oct 7, 2025

✋ 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 Oct 8, 2025

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

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

* Retrieves all “child” transactions associated with a given original transaction
*/
function getChildTransactions(originalTransactionID: string | undefined) {
return Object.values(allTransactions ?? {}).filter((currentTransaction) => {
Copy link
Contributor

Choose a reason for hiding this comment

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

@ZhenjaHorbach Please don't use allTransactions (let's pass it from UI)

Copy link
Contributor

Choose a reason for hiding this comment

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

cc @eh2077

Copy link
Contributor Author

@ZhenjaHorbach ZhenjaHorbach Oct 8, 2025

Choose a reason for hiding this comment

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

Yeah
Sorry
It's just the old PR
And perhaps at the time of writing this code, the Onyx connect refactoring project hadn't happened yet
But I think I'll update this in a future PR!

Copy link
Contributor

Choose a reason for hiding this comment

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

@ZhenjaHorbach Could you please raise a follow-up PR to address this?

cc @eh2077

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@OSBotify
Copy link
Contributor

OSBotify commented Oct 8, 2025

🚀 Deployed to production by https://github.com/lakchote in version: 9.2.27-6 🚀

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

optimisticData: deleteExpenseOptimisticData,
failureData: deleteExpenseFailureData,
successData: deleteExpenseSuccessData,
} = getDeleteTrackExpenseInformation(splitTransaction?.reportID ?? String(CONST.DEFAULT_NUMBER_ID), undeletedTransaction?.transactionID, currentReportAction);
Copy link
Contributor

Choose a reason for hiding this comment

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

@ZhenjaHorbach We will remove getReportNameValuePairs in the method canUserPerformWriteAction in #72585. This requires the methods that use canUserPerformWriteAction to use isReportArchived which is passed from the View. Please help to add it in getDeleteTrackExpenseInformation

Comment on lines +12783 to +12793
return {
transactionID: transactionID ?? transactionDetails?.transactionID ?? String(CONST.DEFAULT_NUMBER_ID),
amount: amount ?? transactionDetails?.amount ?? 0,
description: transactionDetails?.comment,
category: transactionDetails?.category,
tags: transaction?.tag ? [transaction?.tag] : [],
created: transactionDetails?.created ?? DateUtils.formatWithUTCTimeZone(DateUtils.getDBTime(), CONST.DATE.FNS_FORMAT_STRING),
merchant: transaction?.modifiedMerchant ? transaction.modifiedMerchant : (transaction?.merchant ?? ''),
statusNum: currentReport?.statusNum ?? 0,
reportID: reportID ?? transaction?.reportID ?? String(CONST.DEFAULT_NUMBER_ID),
};
Copy link
Contributor

Choose a reason for hiding this comment

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

We should have included the reimbursable field here as well. Not doing so caused #72396

delete transactionChanges[key as keyof typeof transactionChanges];
// Ensure we pass the currency to getUpdateMoneyRequestParams as well, so the amount message is created correctly
} else if (key === 'amount') {
transactionChanges.currency = originalTransactionDetails?.currency;
Copy link
Contributor

Choose a reason for hiding this comment

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

Coming #74265, we need to remove transactionID in transactionChanges when reversing the split. We do that to prevent showing changed the expense system message

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.