Fix delete conditions #62997

luacmartins · 2025-05-28T20:47:36Z

Explanation of Change

Only allow deleting expenses and reports in the following cases:

Expenses

Unreported: user is owner
IOU: user is owner and report is open/processing
Expense report: user is report submitter, report is open/processing, expense is not card transaction with corporate liability

Report

Unreported: cannot delete report
IOU: cannot delete report
Expense reports: user is report submitter, report is open or processing and has not been forwarded (i.e. hasn't been approved on any level)

Fixed Issues

$ #62722

Tests

Pre-conditions: 2 users

[user A] Track and expense
[user A] Verify that you can delete it in the More button
[user A] Send an IOU request to [user B]
[user B] Verify that you cannot delete the expense
[user A] Verify that you can delete the expense
[user A] Send 2 IOU requests to [user B]
[user A] Verify that you cannot delete the report, but you can delete the individual expenses
[user A] Send 2 IOU requests to [user B]
[user B] Pay the request
[user A] Verify that you cannot delete the report nor the individual expenses
[user B] Create [workspace] and invite [user A] as an employee
[user A] Submit one expense to [workspace]
[user B] Verify that you cannot delete the expense
[user A] Verify that you can delete the expense
[user A] Submit 2 requests to [workspace]
[user A] Verify that you can delete the individual expenses and the report
[user A] Submit 2 requests to [workspace]
[user B] Pay the report
[user A] Verify that you cannot delete the report nor the individual expenses

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

Screenshots/Videos

Screen.Recording.2025-05-28.at.2.09.46.PM.mov

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2025-05-28T21:03:25Z

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

allgandalf · 2025-05-29T05:39: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

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

allgandalf

this works nicely! great job with the tests @luacmartins 🫡

[user A] Track and expense
[user A] Verify that you can delete it in the More button

Screen.Recording.2025-05-29.at.11.26.43.AM.mov

[user A] Send an IOU request to [user B]
[user B] Verify that you cannot delete the expense
[user A] Verify that you can delete the expense

Screen.Recording.2025-05-29.at.11.28.07.AM.mov

[user A] Send 2 IOU requests to [user B]
[user A] Verify that you cannot delete the report, but you can delete the individual expenses

Screen.Recording.2025-05-29.at.11.29.22.AM.mov

Screen.Recording.2025-05-29.at.11.30.52.AM.mov

[user A] Send 2 IOU requests to [user B]
[user B] Pay the request
[user A] Verify that you cannot delete the report nor the individual expenses

Screen.Recording.2025-05-29.at.11.31.28.AM.mov

[user B] Create [workspace] and invite [user A] as an employee
[user A] Submit one expense to [workspace]
[user B] Verify that you cannot delete the expense
[user A] Verify that you can delete the expense

Screen.Recording.2025-05-29.at.11.41.02.AM.mov

[user A] Submit 2 requests to [workspace]
[user A] Verify that you can delete the individual expenses and the report.

Screen.Recording.2025-05-29.at.11.41.49.AM.mov

[user A] Submit 2 requests to [workspace]
[user B] Pay the report
[user A] Verify that you cannot delete the report nor the individual expenses

Screen.Recording.2025-05-29.at.11.46.37.AM.mov

melvin-bot · 2025-05-29T06:17:39Z

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

allgandalf · 2025-05-29T15:36:13Z

@luacmartins lets fix conflicts

luacmartins · 2025-05-29T17:24:57Z

Resolved! @blimpich all yours

OSBotify · 2025-05-29T18:19:24Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2025-06-02T19:57:22Z

🚀 Deployed to staging by https://github.com/blimpich in version: 9.1.55-0 🚀

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

github-actions · 2025-06-03T12:52:13Z

🚀 Deployed to staging by https://github.com/blimpich in version: 9.1.56-2 🚀

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

github-actions · 2025-06-03T20:04:38Z

🚀 Deployed to staging by https://github.com/blimpich in version: 9.1.58-0 🚀

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

github-actions · 2025-06-04T16:20:52Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.1.58-4 🚀

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

eh2077 · 2025-06-12T12:43:05Z

In src/components/MoneyRequestHeader.tsx, we need to handle delete money request and track expense differently, see #63273 (comment) and PR #63297

luacmartins added 4 commits May 28, 2025 13:55

fix delete condition

651bcad

add corporate liability case

13bad70

refactor

9308c3b

refactor some more

ddccb32

luacmartins self-assigned this May 28, 2025

luacmartins added 2 commits May 28, 2025 14:48

fix lint

6e31d56

add tets

23f8ee6

luacmartins marked this pull request as ready for review May 28, 2025 21:03

luacmartins requested a review from a team as a code owner May 28, 2025 21:03

melvin-bot bot requested review from hungvu193 and removed request for a team May 28, 2025 21:03

luacmartins requested review from allgandalf and removed request for hungvu193 May 28, 2025 21:07

luacmartins added 3 commits May 28, 2025 15:42

update conditional

ad1fe69

add test case

95286ac

fix eslint

1ba2cc0

allgandalf approved these changes May 29, 2025

View reviewed changes

melvin-bot bot requested a review from blimpich May 29, 2025 06:17

luacmartins mentioned this pull request May 29, 2025

Fix - WS chat - "Remove hold" in details page #62665

Merged

50 tasks

resolve conflicts

0aae599

fix lint

5e52621

blimpich approved these changes May 29, 2025

View reviewed changes

blimpich merged commit 5f9d2d2 into main May 29, 2025
20 checks passed

blimpich deleted the cmartins-fixDeleteConditions branch May 29, 2025 18:09

Beamanator mentioned this pull request May 29, 2025

Revert "Split expense flow" #63075

Merged

49 tasks

github-actions bot mentioned this pull request Jun 2, 2025

Deploy Checklist: New Expensify 2025-06-02 #63263

Closed

BlameGPT mentioned this pull request Jun 2, 2025

[Due for payment 2025-06-12] [Due for payment 2025-06-11] Expense - Expense is clickable when deleted offline which leads to infinite loading page #63273

Closed

8 tasks

aldo-expensify mentioned this pull request Jun 3, 2025

Revert "Fix delete conditions" #63294

Closed

Julesssss mentioned this pull request Jun 3, 2025

[Due for payment 2025-06-18] [$250] Report-Report is not shown in WS chat online after trying to move it to deleted WS offline #63276

Closed

8 tasks

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

[Due for payment 2025-06-11] [Simplified Actions] Incorrect system message for amount change after P2P expense becomes unreported #62722

Closed

8 tasks

Pujan92 mentioned this pull request Sep 2, 2025

[Due for payment 2025-10-07] [$250] Expense - Card expense can be deleted with cash expense, error deleting when moved to IOU #66902

Closed

8 tasks

Fix delete conditions #62997

Fix delete conditions #62997

Uh oh!

Conversation

luacmartins commented May 28, 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 May 28, 2025

Uh oh!

allgandalf commented May 29, 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!

melvin-bot bot commented May 29, 2025

Uh oh!

allgandalf commented May 29, 2025

Uh oh!

luacmartins commented May 29, 2025

Uh oh!

Uh oh!

OSBotify commented May 29, 2025

Uh oh!

github-actions bot commented Jun 2, 2025

Uh oh!

github-actions bot commented Jun 3, 2025

Uh oh!

github-actions bot commented Jun 3, 2025

Uh oh!

github-actions bot commented Jun 4, 2025

Uh oh!

eh2077 commented Jun 12, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

luacmartins commented May 28, 2025 •

edited

Loading

allgandalf commented May 29, 2025 •

edited

Loading