Feat: Add ability to unreport transactions v3 by waterim · Pull Request #67048 · Expensify/App

waterim · 2025-07-24T10:50:37Z

Details

Fixed Issues

$ #60288
$ #63946
PROPOSAL: N/A

Tests

Open app
Create a workspace
Submit an expense
Go to the transaction thread.
Open the Report field
Observe new design with unreport transaction

Also go through all these tickets: #63946
Also go through all these tickets: #64259 (comment)

Verify that no errors appear in the JS console

Offline tests

Same as tests

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 / Chrome
- iOS / native
- iOS / 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 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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 verified the translation was requested/reviewed 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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.js 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 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
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
- 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(themeColors.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 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.
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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Details

Screen.Recording.2025-05-09.at.00.29.24.mov

…eat/waterim/unreport-transaction-v2" This reverts commit 457d170.

melvin-bot · 2025-07-24T12:24:13Z

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

waterim · 2025-07-24T12:24:16Z

@luacmartins opened a PR

waterim · 2025-07-24T12:24:29Z

Couldn't reproduce this one

shubham1206agra · 2025-07-24T16:10:42Z

src/pages/iou/request/step/IOURequestEditReport.tsx

+        if (shouldTurnOffSelectionMode) {
+            turnOffMobileSelectionMode();
+        }


@waterim Why do we have different behavior here? We should either always turn off mobile selection mode or do this conditionally for all options.

We are turning off mobile selection mode in case when user removes expense from a report and only one transaction is left.

@waterim Why do we always turn off mobile selection while moving reports then? Can you add an explanation here for future context?

@shubham1206agra It was a regression from this PR
@SzymczakJ Can you please help with explaining this changes?

Sure thing! The bug that my closed PR fixed was that, when the user selects 2 out of 3 expenses in the report and then unreports them, we are redirected back to the report screen, but the selection mode is still on.
On report screen that has only one transaction the selection mode doesn't make sense, so in this case we should call turnOffMobileSelectionMode when unreporting expenses in removeFromReport callback.

shubham1206agra · 2025-07-24T16:18:28Z

@waterim I don't think 85c2a6c will work as a solution of #66122. As if we are moving reports between workspace, then the remove will be shortly hidden then too, which is something we don't want.

waterim · 2025-07-28T11:14:12Z

Update: Working on a fix for an issue above

waterim · 2025-07-28T11:23:22Z

@shubham1206agra update solution for 66122

luacmartins · 2025-07-28T17:54:12Z

@waterim we have conflicts

…rt-transaction-v3

waterim · 2025-07-28T18:59:13Z

@luacmartins resolved

luacmartins · 2025-07-28T19:02:47Z

@shubham1206agra @allgandalf let's prioritize reviewing this PR please

…rt-transaction-v3

waterim · 2025-07-29T14:50:25Z

resolved conflicts again

luacmartins · 2025-07-29T17:24:27Z

@shubham1206agra @allgandalf let's prioritize this one please

allgandalf · 2025-07-30T07:12:10Z

@shubham1206agra are you happy with this resolution?

@shubham1206agra update solution for 66122

shubham1206agra · 2025-07-30T08:19:37Z

@allgandalf Yes

allgandalf · 2025-07-30T09:21:53Z

are you completing the checklist or should i?

shubham1206agra · 2025-07-30T09:32:37Z

@allgandalf You can

allgandalf · 2025-07-30T17:32:05Z

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

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

allgandalf

Hope we have no significant deploy blockers this time 🤞

luacmartins

LGTM

src/ROUTES.ts

luacmartins · 2025-07-30T18:50:49Z

I'll be out tomorrow and Friday, so @waterim @allgandalf please keep an eye out for blockers and revert the PR if needed.

github-actions · 2025-07-31T12:17:56Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.1.88-0 🚀

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

github-actions · 2025-08-04T19:24:51Z

🚀 Deployed to production by https://github.com/grgia in version: 9.1.88-3 🚀

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

rushatgabhane · 2025-08-19T02:54:19Z

src/pages/iou/request/step/IOURequestEditReport.tsx

+        if (!transactionReport || selectedTransactionIDs.length === 0) {
+            return;
+        }
+        changeTransactionsReport(selectedTransactionIDs, CONST.REPORT.UNREPORTED_REPORT_ID);


caused a bug - #67811 (comment)

Use InteractionManager.runAfterInteractions()

parasharrajat · 2025-09-01T08:50:09Z

src/libs/ReportUtils.ts

@@ -4237,6 +4237,12 @@ function canEditFieldOfMoneyRequest(
    }

    if (fieldToEdit === CONST.EDIT_REQUEST_FIELD.REPORT) {


we should only allow this action for outstanding reports. #67583

waterim added 7 commits July 24, 2025 12:48

Reapply "Merge pull request Expensify#64259 from callstack-internal/f…

4a6d471

…eat/waterim/unreport-transaction-v2" This reverts commit 457d170.

fix 66104

5e36497

fix 66156

08caba0

fix 66123

78acac8

fix 66200

2bcc2eb

fix 66111

1b9553b

fix 66122

85c2a6c

waterim marked this pull request as ready for review July 24, 2025 12:24

waterim requested a review from a team as a code owner July 24, 2025 12:24

melvin-bot bot requested review from allgandalf and removed request for a team July 24, 2025 12:24

waterim added 2 commits July 24, 2025 14:52

fix ts

fd40f86

fix spell checking

e0285f1

luacmartins self-requested a review July 24, 2025 15:18

luacmartins assigned waterim Jul 24, 2025

luacmartins requested a review from shubham1206agra July 24, 2025 15:53

shubham1206agra reviewed Jul 24, 2025

View reviewed changes

fix 66122 v2

a16218b

Merge remote-tracking branch 'upstream/main' into feat/waterim/unrepo…

61a5a3d

…rt-transaction-v3

Merge remote-tracking branch 'upstream/main' into feat/waterim/unrepo…

7c3bb17

…rt-transaction-v3

allgandalf approved these changes Jul 30, 2025

View reviewed changes

luacmartins approved these changes Jul 30, 2025

View reviewed changes

src/ROUTES.ts Show resolved Hide resolved

luacmartins merged commit 5ec41d0 into Expensify:main Jul 30, 2025
20 checks passed

This was referenced Jul 30, 2025

[Due for payment 2025-08-19] [$250] LHN - "Moved this expense to your personal space" is translated on report but not on LHN. #66227

Closed

[No QA] Fix quotes #67449

Merged

github-actions bot mentioned this pull request Jul 31, 2025

Deploy Checklist: New Expensify 2025-07-31 #67499

Closed

90 tasks

lanitochka17 mentioned this pull request Jul 31, 2025

[Due for payment 2025-08-29] [$250] Expense - The report field shouldn't be editable on expenses when Workflows are disabled #67583

Closed

16 tasks

grgia mentioned this pull request Aug 2, 2025

[$250] [RCA #67117] Unapproved card - “Feed:” fast filter shows duplicated “Expensify Card” #67702

Closed

16 tasks

melvin-bot bot mentioned this pull request Aug 4, 2025

[Due for payment 2025-08-11] [$250] Follow up for "Feature: Implement ChangeTransactionsReport" #60288

Closed

20 tasks

rushatgabhane reviewed Aug 19, 2025

View reviewed changes

NJ-2020 mentioned this pull request Aug 23, 2025

fix: selected report is not highlighted with a checkmark on confirmation page #67711

Merged

51 tasks

parasharrajat reviewed Sep 1, 2025

View reviewed changes

blazejkustra mentioned this pull request Feb 20, 2026

[BATCH 3] Migrate Navigation usage v2 #83064

Open

		@@ -4237,6 +4237,12 @@ function canEditFieldOfMoneyRequest(
		}

		if (fieldToEdit === CONST.EDIT_REQUEST_FIELD.REPORT) {

Conversation

waterim commented Jul 24, 2025

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jul 24, 2025

Uh oh!

waterim commented Jul 24, 2025

Uh oh!

waterim commented Jul 24, 2025

Uh oh!

shubham1206agra Jul 24, 2025

Choose a reason for hiding this comment

Uh oh!

waterim Jul 25, 2025

Choose a reason for hiding this comment

Uh oh!

shubham1206agra Jul 26, 2025

Choose a reason for hiding this comment

Uh oh!

waterim Jul 28, 2025

Choose a reason for hiding this comment

Uh oh!

SzymczakJ Jul 28, 2025

Choose a reason for hiding this comment

Uh oh!

shubham1206agra commented Jul 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

waterim commented Jul 28, 2025

Uh oh!

waterim commented Jul 28, 2025

Uh oh!

luacmartins commented Jul 28, 2025

Uh oh!

waterim commented Jul 28, 2025

Uh oh!

luacmartins commented Jul 28, 2025

Uh oh!

waterim commented Jul 29, 2025

Uh oh!

luacmartins commented Jul 29, 2025

Uh oh!

allgandalf commented Jul 30, 2025

Uh oh!

shubham1206agra commented Jul 30, 2025

Uh oh!

allgandalf commented Jul 30, 2025

Uh oh!

shubham1206agra commented Jul 30, 2025

Uh oh!

allgandalf commented Jul 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

allgandalf left a comment

Choose a reason for hiding this comment

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

luacmartins commented Jul 30, 2025

Uh oh!

Uh oh!

github-actions bot commented Jul 31, 2025

Uh oh!

github-actions bot commented Aug 4, 2025

Uh oh!

rushatgabhane Aug 19, 2025

Choose a reason for hiding this comment

Uh oh!

parasharrajat Sep 1, 2025

Choose a reason for hiding this comment

shubham1206agra commented Jul 24, 2025 •

edited

Loading

allgandalf commented Jul 30, 2025 •

edited

Loading