[CP Staging] Fix DB issues of Merge Expenses by hoangzinh · Pull Request #70334 · Expensify/App

hoangzinh · 2025-09-11T01:13:16Z

Explanation of Change

Fixed Issues

$ #70329
$ #70331
$ #70336
$ #70338
$ #70356
$ #70352
$ #70345
$ #70412
$ #70351

PROPOSAL:

Tests

Same as QA

Verify that no errors appear in the JS console

Offline tests

Same as QA

QA Steps

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

Case 1: Disable merge IOU expenses

Go to 1:1 DM
Submit any expense
Open the expense report
Tap on "More" button
Verify that there is no "Merge" option

Case 2: Fix After merging expenses offline, the original amount is still retained

Go to workspace chat.
Create two expenses with different amount in the workspace chat.
Open the expense report.
Go offline.
Select the second expense via checkbox.
Click dropdown button > Merge.
Select the other expense > Continue.
Select all details from the other expense (the expense selected in Step 6).
Click Continue.
Click Merge expenses.
Verify that the amount will optimistically update to the selected amount.

Case 3: Fix "It´s not here" page displayed when merging expenses from different WS on "Reports"

Prerequisite: Account has at least two workspaces available.

Open the staging.new.expensify.com
Open any workspace chat.
Create a manual expense.
Navigate to another workspace chat.
Create a different manual expense.
Navigate to "Reports"
Open the last created expense.
Tap on "More" and select "Merge"
Select the first created expense to merge with.
Tap on "Continue"
Select the amount and report of the first created expense.
Tap on "Continue" and confirm the expenses merge.
Verify App navigates to merged expense

Case 4: Fix "Moved this expense to" without report number seen after merging track expense.

Prerequisite: Account has at least two workspaces.
Prerequisite 2: Account has a Self DM.

Open the staging.new.expensify.com website.
Open any workspace chat.
Create a manual expense.
Return to "Inbox"
Create a new manual expense and submit it to Self DM.
Tap on "Submit to someone" below the expense.
Submit the expense to a workspace different than the used on step 2.
Navigate to workspace where track expense was submitted.
Open the report.
Tap on "More" and select "Merge"
Select the expense created on step 3 and tap on "Continue"
Select all the details of expense created on step 3 and finish the merging process.
When redirected to chat, navigate to the report of the remaining expense.
Verify that "Moved this expense to" message is displayed correctly

Case 5: Fix Select details page is blank when merging with card transaction

Precondition:

Workspace has imported card transactions.
Create an expense that shares the same amount, merchant, description, category and date as the card transaction on the same report.

Go to staging.new.expensify.com
Go to workspace chat.
Open the expense report that has card and cash transactions from above.
Open the CASH expense.
Click More > Merge.
Select the CARD transaction (same details as the cash expense).
Click Continue.
Verify App navigates to confirmation page

Case 6: Fix Merge expense - Second line of sentence is cut off when device font size is minimum

Precondition:

Device font size is the smallest.
Go to staging.new.expensify.com
Go to workspace chat.
Create two expenses with workspace chat. At least one of them has a long merchant.
Open expense report.
Long tap on the expense with long merchant > Select.
Tap dropdown button > Merge.
Verify The second line of sentence under Merge expenses header will not be cut off.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-09-11.at.19.28.06.android.mp4

Android: mWeb Chrome

Screen.Recording.2025-09-11.at.19.38.34.android.chrome.mp4

iOS: Native

Screen.Recording.2025-09-11.at.20.00.24.mov

iOS: mWeb Safari

Screen.Recording.2025-09-11.at.19.47.20.ios.safari.mp4

MacOS: Chrome / Safari

Screen.Recording.2025-09-11.at.08.54.33.web.mov

MacOS: Desktop

Screen.Recording.2025-09-11.at.18.06.08.desktop.mov

melvin-bot · 2025-09-11T12:45:44Z

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

hoangzinh · 2025-09-11T13:14:03Z

Hi @thienlnam. I think @youssef-lr will handle this PR

youssef-lr · 2025-09-11T13:33:52Z

cc @dominictb

dominictb · 2025-09-11T15:32:11Z

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
- MacOS: Desktop
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.2025-09-11.at.23.19.33-compressed.mov

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

Untitled.mov

Untitled.2.mov

MacOS: Desktop

dominictb · 2025-09-11T15:48:08Z

src/pages/TransactionMerge/ConfirmationPage.tsx

        setIsMergingExpenses(true);
        mergeTransactionRequest(transactionID, mergeTransaction, targetTransaction, sourceTransaction);
-        Navigation.dismissModal();
+        Navigation.dismissModalWithReport({reportID});


Does this fix the navigation after merge that I mentioned here?

I think yes, it does

src/libs/MergeTransactionUtils.ts

dominictb

We can merge once the above updates are resolved 👍

hoangzinh · 2025-09-11T19:29:16Z

On it.

srikarparsi · 2025-09-11T19:32:37Z

Testing that this fixed #70412

francoisl · 2025-09-11T20:40:03Z

All right, let's do it!

…ffline (cherry picked from commit 3c79df2) (cherry-picked to staging by francoisl)

OSBotify · 2025-09-11T20:50:04Z

✋ 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 · 2025-09-11T21:31:54Z

🚀 Cherry-picked to staging by https://github.com/francoisl in version: 9.2.12-3 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2025-09-12T00:18:46Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.2.12-4 🚀

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

OSBotify · 2025-09-12T00:32:26Z

🚀 Cherry-picked to staging by https://github.com/francoisl in version: 9.2.13-0 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2025-09-15T12:20:53Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.2.13-1 🚀

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

ahmedGaber93 · 2025-10-15T19:33:26Z

src/libs/actions/MergeTransaction.ts

+                      [iouActionOfSourceTransaction.reportActionID]: {
+                          pendingAction: null,
+                      },


We also need to clear the pendingAction in success data to fix this #71045

parasharrajat · 2026-01-13T13:31:41Z

src/pages/TransactionMerge/ConfirmationPage.tsx

+            Navigation.dismissModal();
+        }
+    }, [targetTransaction, mergeTransaction, sourceTransaction, transactionID, targetTransactionThreadReportID]);



Here we didn't handle the navigation properly for reports pages. It caused #73057

Fix amount is not optimictic updated when merge offline

7bfaaf8

melvin-bot bot assigned hoangzinh Sep 11, 2025

hoangzinh added 3 commits September 11, 2025 08:46

Temporary not support merge IOU reports

730bab1

Filter not updated value

6c51b5f

Navigate to target report after merge

44d06cc

hoangzinh mentioned this pull request Sep 11, 2025

[Due for payment 2025-09-22] [$250] Reports -"It´s not here" page displayed when merging expenses from different WS on "Reports" #70336

Closed

8 tasks

hoangzinh added 4 commits September 11, 2025 13:53

Fix report name is empty when merge expense multiple times

cd78af6

Fix able to merge with deleted expense when offline

15d3a54

Fix details page is blank when merging with identical card transaction

86fc7b5

Fix second line of sentence is cut off when device font size is minimum

78d42bd

hoangzinh mentioned this pull request Sep 11, 2025

[Due for payment 2025-09-22] Android - Merge expense - Second line of sentence is cut off when device font size is minimum #70352

Closed

8 tasks

hoangzinh added 2 commits September 11, 2025 17:45

Fix eslint

9439c15

Merge branch 'main' into fix/70329-merging-expenses-offline

3288b6a

garrettmknight requested a review from dominictb September 11, 2025 11:00

hoangzinh changed the title ~~Fix amount is not optimictic updated when merge offline~~ Fix DB issues of Merge Expenses Sep 11, 2025

hoangzinh marked this pull request as ready for review September 11, 2025 12:45

hoangzinh requested a review from a team as a code owner September 11, 2025 12:45

melvin-bot bot requested review from thienlnam and removed request for a team September 11, 2025 12:45

youssef-lr requested review from youssef-lr and removed request for thienlnam September 11, 2025 14:28

dominictb reviewed Sep 11, 2025

View reviewed changes

src/libs/MergeTransactionUtils.ts Outdated Show resolved Hide resolved

dominictb mentioned this pull request Sep 11, 2025

[Due for payment 2025-09-22] Merge expense - Cat on the empty state is cut off differently on web and native apps #70412

Closed

8 tasks

dominictb approved these changes Sep 11, 2025

View reviewed changes

melvin-bot bot requested a review from thienlnam September 11, 2025 16:36

Fix Two expense previews appear briefly after merging with split

74a355c

srikarparsi self-requested a review September 11, 2025 19:31

Fix navigation bug when merge with unreported expense

f1950f5

hoangzinh dismissed stale reviews from francoisl and thienlnam via f1950f5 September 11, 2025 19:38

srikarparsi approved these changes Sep 11, 2025

View reviewed changes

francoisl approved these changes Sep 11, 2025

View reviewed changes

francoisl merged commit 3c79df2 into Expensify:main Sep 11, 2025
25 checks passed

francoisl changed the title ~~Fix DB issues of Merge Expenses~~ [CP Staging] Fix DB issues of Merge Expenses Sep 11, 2025

OSBotify pushed a commit that referenced this pull request Sep 11, 2025

Merge pull request #70334 from hoangzinh/fix/70329-merging-expenses-o…

3627f28

…ffline (cherry picked from commit 3c79df2) (cherry-picked to staging by francoisl)

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Sep 11, 2025

OSBotify mentioned this pull request Sep 11, 2025

Deploy Checklist: New Expensify 2025-09-10 #70325

Closed

francoisl mentioned this pull request Sep 11, 2025

[HOLD][CP Staging] Hide the option to merge expenses #70419

Closed

51 tasks

lorretheboy mentioned this pull request Sep 12, 2025

[$250] Expense - "moved this expense to your personal space" is missing sender, empty message on Reports #70444

Closed

8 tasks

ahmedGaber93 reviewed Oct 15, 2025

View reviewed changes

parasharrajat reviewed Jan 13, 2026

View reviewed changes

Conversation

hoangzinh commented Sep 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Sep 11, 2025

Uh oh!

hoangzinh commented Sep 11, 2025

Uh oh!

youssef-lr commented Sep 11, 2025

Uh oh!

dominictb commented Sep 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

dominictb Sep 11, 2025

Choose a reason for hiding this comment

Uh oh!

hoangzinh Sep 11, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dominictb left a comment

Choose a reason for hiding this comment

Uh oh!

hoangzinh commented Sep 11, 2025

Uh oh!

srikarparsi commented Sep 11, 2025

Uh oh!

francoisl commented Sep 11, 2025

Uh oh!

Uh oh!

OSBotify commented Sep 11, 2025

Uh oh!

OSBotify commented Sep 11, 2025

Uh oh!

OSBotify commented Sep 12, 2025

Uh oh!

OSBotify commented Sep 12, 2025

Uh oh!

OSBotify commented Sep 15, 2025

Uh oh!

ahmedGaber93 Oct 15, 2025

Choose a reason for hiding this comment

Uh oh!

parasharrajat Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

hoangzinh commented Sep 11, 2025 •

edited

Loading

dominictb commented Sep 11, 2025 •

edited

Loading