Add DeleteMoneyRequest #19095

luacmartins · 2023-05-17T03:01:23Z

Details

Introduces the ability to delete requests

cc @mountiny @Julesssss will you please review?

Fixed Issues

$ #19066

Tests

Should be tested with Auth and Web-E PRs

Scenario 1: Deleting from IOU report

Request money from another user two times
Tap the report preview to navigate to the IOU report
Hover on the request preview for the 1st request and verify that you can see the Trashcan icon
Tap the icon and delete the 1st request
Verify that the 1st request is deleted
Do the same for the 2nd request
Verify that the iou report is deleted as well and you are navigated to the chat report
Verify that the report preview in the chat report was also deleted
Request money again
Navigate to the IOU report
Send a comment
Delete the only transaction on the report
Verify that the IOU report is not deleted and the total is $0

Scenario 2: Deleting from transaction view

Request money from another user two times
Tap the report preview to navigate to the IOU report
Tap on the 1st request preview to navigate to the 1st request thread
From the three dot menu, delete the transaction
Verify that the transaction and thread are deleted and you are navigated back to the IOU report
Tap on the remaining request preview to navigate to the request thread
Send a comment in the thread
From the three dot menu, delete the transaction
Verify that the header is updated to show only [Deleted request]
Navigate to the IOU report
Verify that the request preview now shows [Deleted request] and 1 reply
Verify that the IOU total is $0
Navigate to the chat report
Verify that the report preview is still there and total is $0

Verify that no errors appear in the JS console

Offline tests

Same as test steps, but performed offline

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

web.mov

Mobile Web - Chrome

Mobile Web - Safari

safari.mov

Desktop

desktop.mov

iOS

ios.mov

Android

android.mov

aimane-chnaif · 2023-07-26T17:18:54Z

Test result on expense report, expense request with some messages:

When delete request on expense report, minus balance shows on payer's side along with Pay button
i.e. deleting $88, -$176 shows in video

Screen.Recording.2023-07-26.at.6.05.12.PM.mov

mountiny · 2023-07-26T17:19:37Z

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 tests pass on all platforms & I tested again on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / 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 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 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
- 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 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.js 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(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 reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Many tests conducted in this PR and you can see the screenshots and videos in the backlog so I am not adding another ones here explicitly. There are some known issues we will track in a follow up PRs to fix as this pr is taking a lot of time and its hard to maintain due to merge conflicts.

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

mountiny · 2023-07-26T17:21:14Z

Ok I think we can go ahead and merge this, it was tested many time across platforms and we are aware of shortcomings we will nail in follow up PRs.

@luacmartins Can you make sure you keep an eye on #expensify-bugs to make sure we are not making duplicates for the issues we already know?

luacmartins · 2023-07-26T17:22:06Z

Will do!

aimane-chnaif · 2023-07-26T17:22:12Z

Please feel free to tag me as reviewer on follow-up PR as I am aware of bugs so far.

mountiny · 2023-07-26T17:22:52Z

@luacmartins can you add this one to the follow ups? #19095 (comment)

aimane-chnaif · 2023-07-26T17:23:38Z

@luacmartins Can you make sure you keep an eye on #expensify-bugs to make sure we are not making duplicates for the issues we already know?

I will also 👁️ them.

luacmartins · 2023-07-26T17:24:42Z

Added that issue to the follow ups and created a bunch of notification alerts for #expensify-bugs

mountiny

Great job on this one

melvin-bot · 2023-07-26T17:34:23Z

@mountiny looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

mountiny · 2023-07-26T17:36:08Z

Everything was passing

OSBotify · 2023-07-26T17:38:01Z

✋ 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 · 2023-07-27T22:07:15Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.3.47-0 🚀

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

OSBotify · 2023-07-31T18:35:45Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.3.47-6 🚀

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

roryabraham · 2023-08-21T16:51:06Z

Friendly piece of feedback that I think it would've been good to add some automated tests for this PR to the existing IOUTest test suite

allroundexperts · 2024-01-21T23:24:55Z

src/libs/actions/IOU.js

+    // STEP 2: Decide if we need to:
+    // 1. Delete the transactionThread - delete if there are no visible comments in the thread
+    // 2. Update the iouPreview to show [Deleted request] - update if the transactionThread exists AND it isn't being deleted
+    const shouldDeleteTransactionThread = transactionThreadID ? ReportActionsUtils.getLastVisibleMessage(transactionThreadID).lastMessageText.length === 0 : false;


We missed to take in to account that there could be MODIFIEDEXPENSE actions which would make the last visible message as non-empty, and thus, prevent the thread from getting deleted.

hoangzinh · 2024-01-24T17:10:09Z

src/libs/actions/IOU.js

            value: {
-                [optimisticIOUAction.reportActionID]: {
+                [reportAction.reportActionID]: {
+                    ...reportAction,


Coming from #33158, we're missing pendingAction: null when API is failed, which causes the above UI bug.

s77rt · 2024-02-13T20:13:32Z

src/libs/ReportUtils.js

@@ -259,6 +259,10 @@ function isCurrentUserSubmitter(reportID) {
 * @returns {Boolean}
 */
 function canDeleteReportAction(reportAction, reportID) {
+    const isActionOwner = reportAction.actorAccountID === currentUserAccountID;
+    if (isActionOwner && ReportActionsUtils.isMoneyRequestAction(reportAction) && !isSettled(reportAction.originalMessage.IOUReportID)) {


In addition to checking if the report is not settled we should have also checked if the report is submitted. In paid policies you can't delete a money request in a submitted report (unless you are the admin).

use deleteMoneyRequest

ea05ff8

luacmartins self-assigned this May 17, 2023

luacmartins mentioned this pull request May 18, 2023

[HOLD for payment 2023-08-07] Chat - Delete button is not functional #19066

Closed

6 tasks

luacmartins added 27 commits May 19, 2023 12:23

resolve conflicts

b056cf7

update display logic

d94f105

refactor chatReports and iouReports into allReports

4426261

optimistically rm create action

3cc573b

refactor updateIOUOwnerAndTotal

b9a7c44

Merge branch 'main' into cmartins-addDelete

69f2621

fix updateIOUOwnerAndTotal

66885a9

fix logic to display delete in MoneyRequestHeader

229f293

fix style

062bcf1

rm chatReportID param

aa1efde

rm iouReportID param

9e237fc

Merge branch 'main' into cmartins-addDelete

3d5dcb7

Merge branch 'main' into cmartins-addDelete

f68ca85

resolve conflicts

213270d

resolve conflicts

2405fe8

add currency to optimistic transaction

12d257e

update optimistic data

03fd433

pass right params to delete command

527250f

fix iterable error

8197f84

navigate when report is deleted

e55b292

Merge branch 'main' into cmartins-addDelete

a7a7548

rm transaction thread if no comments

60322cb

add delete logic to iou reports

ff564f2

add logic to delete transaction thread

d854d4d

update optimistic data logic

c1ea776

use transactionThreadID

8fa23b9

use onyx merge

22bc9fb

mountiny approved these changes Jul 26, 2023

View reviewed changes

mountiny merged commit fd887bd into main Jul 26, 2023
10 checks passed

mountiny deleted the cmartins-addDelete branch July 26, 2023 17:34

melvin-bot bot added the Emergency label Jul 26, 2023

mountiny removed the Emergency label Jul 26, 2023

OSBotify mentioned this pull request Jul 27, 2023

Deploy Checklist: New Expensify 2023-07-27 #23765

Closed

79 tasks

kbecciv mentioned this pull request Jul 28, 2023

Web - User is taken to concierge instead of chat screen when IOU is deleted #23785

Closed

6 tasks

mountiny mentioned this pull request Jul 31, 2023

[HOLD for payment 2023-08-08] Split bill - App crashed when delete split bill #23824

Closed

6 tasks

luacmartins mentioned this pull request Aug 21, 2023

[HOLD for payment 2023-10-02] [$1000] Add automated tests for DeleteMoneyRequest #25601

Closed

paultsimura mentioned this pull request Oct 3, 2023

[HOLD for payment 2023-10-18] [$500] Web - LHN of parent does not update immediately after delete task #27948

Closed

6 tasks

allroundexperts reviewed Jan 21, 2024

View reviewed changes

allroundexperts mentioned this pull request Jan 21, 2024

[HOLD for payment 2024-01-17] [$500] The request money preview does not change to "delete" after the request money has been deleted. #30219

Closed

6 tasks

hoangzinh reviewed Jan 24, 2024

View reviewed changes

hoangzinh mentioned this pull request Jan 24, 2024

[HOLD for payment 2024-01-25] [$500] Deleted IOU offline disappears after going online if it has already been paid for by another user. #33158

Closed

6 tasks

s77rt reviewed Feb 13, 2024

View reviewed changes

s77rt mentioned this pull request Feb 13, 2024

[HOLD for payment 2024-02-19] [$500] IOU -Deleting submitted report shows unexpected error with amount crossed out #34538

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add DeleteMoneyRequest #19095

Add DeleteMoneyRequest #19095

luacmartins commented May 17, 2023 •

edited

Loading

aimane-chnaif commented Jul 26, 2023

mountiny commented Jul 26, 2023 •

edited

Loading

mountiny commented Jul 26, 2023

luacmartins commented Jul 26, 2023

aimane-chnaif commented Jul 26, 2023

mountiny commented Jul 26, 2023

aimane-chnaif commented Jul 26, 2023 •

edited

Loading

luacmartins commented Jul 26, 2023 •

edited

Loading

mountiny left a comment

melvin-bot bot commented Jul 26, 2023

mountiny commented Jul 26, 2023

OSBotify commented Jul 26, 2023

OSBotify commented Jul 27, 2023

OSBotify commented Jul 31, 2023

roryabraham commented Aug 21, 2023

allroundexperts Jan 21, 2024

hoangzinh Jan 24, 2024

s77rt Feb 13, 2024

Add DeleteMoneyRequest #19095

Add DeleteMoneyRequest #19095

Conversation

luacmartins commented May 17, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

aimane-chnaif commented Jul 26, 2023

mountiny commented Jul 26, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

mountiny commented Jul 26, 2023

luacmartins commented Jul 26, 2023

aimane-chnaif commented Jul 26, 2023

mountiny commented Jul 26, 2023

aimane-chnaif commented Jul 26, 2023 • edited Loading

luacmartins commented Jul 26, 2023 • edited Loading

mountiny left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Jul 26, 2023

mountiny commented Jul 26, 2023

OSBotify commented Jul 26, 2023

OSBotify commented Jul 27, 2023

OSBotify commented Jul 31, 2023

roryabraham commented Aug 21, 2023

allroundexperts Jan 21, 2024

Choose a reason for hiding this comment

hoangzinh Jan 24, 2024

Choose a reason for hiding this comment

s77rt Feb 13, 2024

Choose a reason for hiding this comment

luacmartins commented May 17, 2023 •

edited

Loading

mountiny commented Jul 26, 2023 •

edited

Loading

aimane-chnaif commented Jul 26, 2023 •

edited

Loading

luacmartins commented Jul 26, 2023 •

edited

Loading