Hide transaction detail and dismiss the edit modal when the request is deleted #24590

dukenv0307 · 2023-08-15T17:38:24Z

Details

We will hide transaction detail and dismiss the edit modal when the request money is deleted

Fixed Issues

$ #24578
PROPOSAL: #24578 (comment)

Tests

Hide transaction detail

Login with any account
Create a request money
Go to the thread of transaction detail
Send a message
Click on three dot in header
Click on the delete request and confirm the modal to delete the request money
Verify after deleting request money, transaction detail is hidden

The edit request page should be dismissed when the request is paid or deleted

From user A, create a request money with user B
Go to the thread of transaction detail
Send a message
Click on the amonut to go to edit page
From user B, paid the request money
From user A, verify that the edit page is dismissed

Verify that no errors appear in the JS console

Offline tests

QA Steps

Hide transaction detail

Login with any account
Create a request money
Go to the thread of transaction detail
Send a message
Click on three dot in header
Click on the delete request and confirm the modal to delete the request money
Verify after deleting request money, transaction detail is hidden

The edit request page should be dismissed when the request is paid or deleted

From user A, create a request money with user B
Go to the thread of transaction detail
Send a message
Click on the amonut to go to edit page
From user B, paid the request money
From user A, verify that the edit page is dismissed

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Hide transaction detail

Screencast.from.16-08-2023.00.04.05.webm

The edit request page should be dismissed when the request is paid or deleted

Screencast.from.15-08-2023.23.25.12.webm

Mobile Web - Chrome

Hide transaction detail

Record_2023-08-15-23-30-26.mp4

The edit request page should be dismissed when the request is paid or deleted

Record_2023-08-16-00-16-23.mp4

Mobile Web - Safari

Hide transaction detail

Screen.Recording.2023-08-16.at.00.19.41.mov

The edit request page should be dismissed when the request is paid or deleted

Screen.Recording.2023-08-16.at.00.22.06.mov

Desktop

Hide transaction detail

Screen.Recording.2023-08-16.at.00.08.53.mov

The edit request page should be dismissed when the request is paid or deleted

Screen.Recording.2023-08-16.at.00.09.51.mov

iOS

Hide transaction detail

Screen.Recording.2023-08-16.at.00.39.42.mov

The edit request page should be dismissed when the request is paid or deleted

Screen.Recording.2023-08-16.at.00.41.51.mov

Android

Hide transaction detail

24578-1.webm

The edit request page should be dismissed when the request is paid or deleted

24578-2.webm

melvin-bot · 2023-08-15T18:40:13Z

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

src/components/ReportActionItem/MoneyRequestView.js

Ollyws · 2023-08-15T21:08:14Z

src/pages/EditRequestPage.js

+        if (!isDeleted && !isSetted) {
+            return;
+        }
+        Navigation.dismissModal();


With the modal open, If you delete a money request without any message you'll be lead to the "Hmm it's not here" page. Is this intended?

I think we should go to the parent report then

Same logic as when deleting the request without the modal

When we delete the request if the report of the request has a comment, we don't navigate to parent report. If not, report will be deleted, and then we cannot get the parent report from the report, so I think dismissing the modal will be fine.

Besides, if user A is currently in the thread transaction report and on another device user A deletes the request, not found page will also appear.

lets just mimic the same behaviour as if the modal would not be opened (+dismiss it)

In EditRequestPage, for the case, we delete the request from another device if the report doesn't have any message, report will be deleted so we cannot get the parentReport through report to navigate to parent report.

And the behavior is already the same when we delete the request from another device.

Screencast.from.16-08-2023.07.25.58.webm

Seeing as this is the current behaviour on production, perhaps it's out of scope here.

src/components/ReportActionItem/MoneyRequestView.js

src/libs/TransactionUtils.js

mountiny · 2023-08-15T21:59:59Z

src/pages/EditRequestPage.js

+        if (!isDeleted && !isSetted) {
+            return;
+        }
+        Navigation.dismissModal();


I think we should go to the parent report then

mountiny · 2023-08-15T22:03:37Z

src/pages/EditRequestPage.js

+        if (!isDeleted && !isSetted) {
+            return;
+        }
+        Navigation.dismissModal();


Same logic as when deleting the request without the modal

Ollyws · 2023-08-16T10:41:27Z

Something to note is that along with messages, the MODIFIEDEXPENSE actions will remain after the request has been deleted:

Ollyws · 2023-08-16T11:23:09Z

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 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 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

Web

MacOS_Chrome_Delete_Request.mov

MacOS_Chrome_Dismiss_modal.mov

Mobile Web - Chrome

Android_Chome_Delete_request.mov

Android_Chrome_Dismiss_modal.mov

Mobile Web - Safari

iOS_Safari_Delete_request.mov

iOS_Safari_Dismiss_modal.mov

Desktop

MacOS_Desktop_Delete_request.mov

MacOS_Desktop_Dismiss_modal.mov

iOS

iOS_Native_Delete_request.mov

iOS_Native_Dismiss_modal.mov

Android

Android_Native_Delete_request.mov

Android_Native_Dismiss_modal.mov

Ollyws

LGTM

mountiny

Thanks everyone!

OSBotify · 2023-08-16T14:56:58Z

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

ayazhussain79 · 2023-08-16T17:20:15Z

@mountiny @Ollyws Has the behavior intended background been removed following the deletion of the money request? And is the indication of "[Deleted request]" not appearing, similar to how it is when a thread is deleted?

Ollyws · 2023-08-16T17:42:32Z

@ayazhussain79 Yeah that's expected because for now we are just hiding the transaction detail, which is just a temporary measure.

OSBotify · 2023-08-17T02:20:43Z

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

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

OSBotify · 2023-08-21T22:27:16Z

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

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

OSBotify · 2023-08-24T03:10:17Z

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.56-24 🚀

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

tgolen · 2023-12-04T19:54:31Z

src/components/ReportActionItem/MoneyRequestView.js

@@ -83,6 +83,12 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, polic
        description += ` • ${translate('iou.pending')}`;
    }

+    // A temporary solution to hide the transaction detail


@dukenv0307 What was the plan for this once the transaction is added as a prop (which it is now)?

dukenv0307 added 6 commits August 15, 2023 21:54

Hide transaction detail when the request is deleted

5b5e039

Dismiss modal when the request is paid or deleted

1be995b

return null if request is deleted

9ad5423

fix crash when deleting request

c913c46

subscribe parent report for dynamic update

63ef191

fix crash in edit request page when deleting request money

b753252

dukenv0307 marked this pull request as ready for review August 15, 2023 18:02

dukenv0307 requested a review from a team as a code owner August 15, 2023 18:02

melvin-bot bot requested review from Ollyws and removed request for a team August 15, 2023 18:40

Julesssss reviewed Aug 15, 2023

View reviewed changes

src/components/ReportActionItem/MoneyRequestView.js Outdated Show resolved Hide resolved

Ollyws reviewed Aug 15, 2023

View reviewed changes

mountiny assigned dukenv0307 Aug 15, 2023

mountiny mentioned this pull request Aug 15, 2023

[HOLD for payment 2023-08-30] Re-render the ReportActionItem when transaction is deleted #24608

Closed

mountiny reviewed Aug 15, 2023

View reviewed changes

dukenv0307 added 2 commits August 16, 2023 06:55

edit comment

de34408

clear condition

d7821f5

Ollyws approved these changes Aug 16, 2023

View reviewed changes

melvin-bot bot requested a review from mountiny August 16, 2023 11:51

mountiny approved these changes Aug 16, 2023

View reviewed changes

mountiny merged commit 3538ba8 into Expensify:main Aug 16, 2023

OSBotify mentioned this pull request Aug 17, 2023

Deploy Checklist: New Expensify 2023-08-17 #25160

Closed

75 tasks

OSBotify mentioned this pull request Aug 21, 2023

Deploy Checklist: New Expensify 2023-08-21 #25625

Closed

melvin-bot bot mentioned this pull request Aug 21, 2023

[HOLD for payment 2023-08-28] [$1000] Requests are editable after being paid or deleted #24578

Closed

6 tasks

tgolen reviewed Dec 4, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Hide transaction detail and dismiss the edit modal when the request is deleted #24590

Hide transaction detail and dismiss the edit modal when the request is deleted #24590

dukenv0307 commented Aug 15, 2023 •

edited

Loading

melvin-bot bot commented Aug 15, 2023

Ollyws Aug 15, 2023 •

edited

Loading

mountiny Aug 15, 2023

mountiny Aug 15, 2023

dukenv0307 Aug 15, 2023

dukenv0307 Aug 15, 2023

mountiny Aug 15, 2023

dukenv0307 Aug 16, 2023

dukenv0307 Aug 16, 2023

Ollyws Aug 16, 2023

mountiny Aug 15, 2023

mountiny Aug 15, 2023

Ollyws commented Aug 16, 2023

Ollyws commented Aug 16, 2023

Ollyws left a comment

mountiny left a comment

OSBotify commented Aug 16, 2023

ayazhussain79 commented Aug 16, 2023

Ollyws commented Aug 16, 2023

OSBotify commented Aug 17, 2023

OSBotify commented Aug 21, 2023

OSBotify commented Aug 24, 2023

tgolen Dec 4, 2023

Hide transaction detail and dismiss the edit modal when the request is deleted #24590

Hide transaction detail and dismiss the edit modal when the request is deleted #24590

Conversation

dukenv0307 commented Aug 15, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Aug 15, 2023

Ollyws Aug 15, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ollyws commented Aug 16, 2023

Ollyws commented Aug 16, 2023

Reviewer Checklist

Screenshots/Videos

Ollyws left a comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Aug 16, 2023

ayazhussain79 commented Aug 16, 2023

Ollyws commented Aug 16, 2023

OSBotify commented Aug 17, 2023

OSBotify commented Aug 21, 2023

OSBotify commented Aug 24, 2023

Choose a reason for hiding this comment

dukenv0307 commented Aug 15, 2023 •

edited

Loading

Ollyws Aug 15, 2023 •

edited

Loading