fix undo message after delete #25583

namhihi237 · 2023-08-21T13:20:48Z

Details

Fixed Issues

$ #24445
PROPOSAL: #24445 (comment)

Tests

Login account on 2 devices or 2 browsers
2 devices open the same report
On device 1 sends a message
On device 2 reply the message in a new thread
In the thread, edit that message but do not save it
Device 1 delete that message
On device 2 verify that the composer edit message exit and show [delete message]

Verify that no errors appear in the JS console

Offline tests

QA Steps

The same test

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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

web.mov

Mobile Web - Chrome

Screen.Recording.2023-08-21.at.21.44.46.mov

Mobile Web - Safari

safari.mov

Desktop

desk.mov

iOS

ios.mov

Android

Screen.Recording.2023-08-21.at.21.40.52.mov

melvin-bot · 2023-08-21T14:48:24Z

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

namhihi237 · 2023-08-21T14:50:17Z

@fedirjh We have synced the draft message here, so the case of 1 device no longer occurs. So this PR I fix the issue that occurred on 2 devices

fedirjh

Left a comment about the code.

fedirjh · 2023-08-22T08:20:18Z

src/pages/home/report/ReportActionItem.js

+        if (ReportActionsUtils.isDeletedAction(props.action)) {
+            Report.saveReportActionDraft(props.report.reportID, props.action, '');
+        }


Let's move it to a separate hook and we should add another check isDeleted && !isDraftEmpty

useEffect(() => { if (isDraftEmpty || !ReportActionsUtils.isDeletedAction(props.action)) { return; } Report.saveReportActionDraft(props.report.reportID, props.action, ''); }, [isDraftEmpty, props.action, props.report.reportID]);

@fedirjh thanks for review, I updated

fedirjh · 2023-08-22T15:09:38Z

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

CleanShot.2023-08-22.at.12.44.42.mp4

Mobile Web - Chrome

CleanShot.2023-08-22.at.13.15.17.mp4

Mobile Web - Safari

CleanShot.2023-08-22.at.12.59.01.mp4

Desktop

CleanShot.2023-08-22.at.12.50.06.mp4

iOS

CleanShot.2023-08-22.at.13.02.47.mp4

Android

CleanShot.2023-08-22.at.13.46.40.mp4

fedirjh

Looks good to me.

🎀 👀 🎀 C+ reviewed

fedirjh · 2023-08-23T09:24:09Z

cc @namhihi237 @Gonals The PR (#24544) that fixed the first case was reverted

Revert "Merge pull request #24544 from eh2077/21527-fix-sync-draft-and-edit-status-of-thread-first-chat" #25724

Should we hold this PR until the other issue is fixed?

namhihi237 · 2023-08-23T09:28:07Z

I think we have 2 options:

wait #24544 fixed
Continue with my proposal

Waiting for a decision from the team cc @fedirjh @Gonals

fedirjh · 2023-08-23T09:38:52Z

I think we should wait for #24544 to be fixed. I checked the deploy blocker ticket, It's a simple fix #25690 (comment), I think it does make sense to put this on hold.

namhihi237 · 2023-08-23T09:40:43Z

I totally agree, we should hold and wait for it.

Gonals · 2023-08-23T11:10:07Z

Let's wait on that, then :)

Gonals · 2023-08-31T08:22:59Z

@fedirjh @namhihi237, all good here? Do you want to retest?

namhihi237 · 2023-08-31T08:39:24Z

@Gonals I think we still hold because we are waiting for #21527 to fix. Or do we need to go ahead with my proposal? @fedirjh

fedirjh · 2023-09-06T09:08:29Z

It seems that #21527 is on hold for merge freeze.

situchan · 2023-09-28T15:48:11Z

Is #24445 reproducible even without this PR?

namhihi237 · 2023-09-28T15:52:53Z

@fedirjh @Gonals I see #21527 merged into the main. I just updated and tested:

Screen.Recording.2023-09-28.at.22.47.04.mov

Gonals · 2023-09-29T04:26:30Z

@fedirjh, can you do a final round of testing if needed? this seems ready to go

fedirjh · 2023-09-29T23:25:56Z

Seems we have a failing test.

cc @namhihi237

I see #21527 merged into the main. I just updated and tested:

Does the other PR fixes the case for 2 devices?

namhihi237 · 2023-09-30T00:05:49Z

Does the other PR fixes the case for 2 devices?

No. It does not fix this case

namhihi237 · 2023-09-30T00:13:47Z

@fedirjh I synced with the main and fixed the test fail

fedirjh

Looks good to me

OSBotify · 2023-10-02T08:27:13Z

✋ 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-10-02T17:46:22Z

🚀 Deployed to staging by https://github.com/Gonals in version: 1.3.76-0 🚀

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

OSBotify · 2023-10-03T15:47:19Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.76-6 🚀

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

OSBotify · 2023-10-03T16:11:42Z

🚀 Deployed to staging by https://github.com/Gonals in version: 1.3.77-0 🚀

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

OSBotify · 2023-10-05T00:18:32Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.77-7 🚀

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

namhihi237 added 2 commits August 21, 2023 20:19

fix undo message after delete

464b510

fix lint

ea3c194

namhihi237 marked this pull request as ready for review August 21, 2023 14:48

namhihi237 requested a review from a team as a code owner August 21, 2023 14:48

melvin-bot bot requested review from fedirjh and removed request for a team August 21, 2023 14:48

fedirjh reviewed Aug 22, 2023

View reviewed changes

separate hook

f286fff

fedirjh approved these changes Aug 22, 2023

View reviewed changes

melvin-bot bot requested a review from Gonals August 22, 2023 15:24

Gonals previously approved these changes Aug 23, 2023

View reviewed changes

namhihi237 added 2 commits September 28, 2023 22:33

Merge branch 'main' into fix-24445-undo-delete-message

a29fd40

merge main

0dd0e57

namhihi237 dismissed Gonals’s stale review via 0dd0e57 September 28, 2023 15:46

Merge branch 'main' into fix-24445-undo-delete-message

82e2bd9

fedirjh approved these changes Sep 30, 2023

View reviewed changes

melvin-bot bot requested a review from Gonals September 30, 2023 18:53

Gonals approved these changes Oct 2, 2023

View reviewed changes

Gonals merged commit c390d5e into Expensify:main Oct 2, 2023
12 checks passed

OSBotify mentioned this pull request Oct 2, 2023

Deploy Checklist: New Expensify 2023-10-02 #28635

Closed

melvin-bot bot mentioned this pull request Oct 3, 2023

[HOLD for payment 2023-10-10] [$1000] Web - Chat - Deleted message can be undo when in editing mode #24445

Closed

6 tasks

OSBotify mentioned this pull request Oct 3, 2023

Deploy Checklist: New Expensify 2023-10-03 #28727

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix undo message after delete #25583

fix undo message after delete #25583

namhihi237 commented Aug 21, 2023 •

edited

Loading

melvin-bot bot commented Aug 21, 2023

namhihi237 commented Aug 21, 2023

fedirjh left a comment

fedirjh Aug 22, 2023

namhihi237 Aug 22, 2023

fedirjh commented Aug 22, 2023

fedirjh left a comment

fedirjh commented Aug 23, 2023 •

edited

Loading

namhihi237 commented Aug 23, 2023 •

edited

Loading

fedirjh commented Aug 23, 2023

namhihi237 commented Aug 23, 2023

Gonals commented Aug 23, 2023

Gonals commented Aug 31, 2023

namhihi237 commented Aug 31, 2023

fedirjh commented Sep 6, 2023

situchan commented Sep 28, 2023

namhihi237 commented Sep 28, 2023 •

edited

Loading

Gonals commented Sep 29, 2023

fedirjh commented Sep 29, 2023

namhihi237 commented Sep 30, 2023

namhihi237 commented Sep 30, 2023

fedirjh left a comment

OSBotify commented Oct 2, 2023

OSBotify commented Oct 2, 2023

OSBotify commented Oct 3, 2023

OSBotify commented Oct 3, 2023

OSBotify commented Oct 5, 2023

fix undo message after delete #25583

fix undo message after delete #25583

Conversation

namhihi237 commented Aug 21, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Aug 21, 2023

namhihi237 commented Aug 21, 2023

fedirjh left a comment

Choose a reason for hiding this comment

fedirjh Aug 22, 2023

Choose a reason for hiding this comment

namhihi237 Aug 22, 2023

Choose a reason for hiding this comment

fedirjh commented Aug 22, 2023

Reviewer Checklist

Screenshots/Videos

fedirjh left a comment

Choose a reason for hiding this comment

fedirjh commented Aug 23, 2023 • edited Loading

namhihi237 commented Aug 23, 2023 • edited Loading

fedirjh commented Aug 23, 2023

namhihi237 commented Aug 23, 2023

Gonals commented Aug 23, 2023

Gonals commented Aug 31, 2023

namhihi237 commented Aug 31, 2023

fedirjh commented Sep 6, 2023

situchan commented Sep 28, 2023

namhihi237 commented Sep 28, 2023 • edited Loading

Gonals commented Sep 29, 2023

fedirjh commented Sep 29, 2023

namhihi237 commented Sep 30, 2023

namhihi237 commented Sep 30, 2023

fedirjh left a comment

Choose a reason for hiding this comment

OSBotify commented Oct 2, 2023

OSBotify commented Oct 2, 2023

OSBotify commented Oct 3, 2023

OSBotify commented Oct 3, 2023

OSBotify commented Oct 5, 2023

namhihi237 commented Aug 21, 2023 •

edited

Loading

fedirjh commented Aug 23, 2023 •

edited

Loading

namhihi237 commented Aug 23, 2023 •

edited

Loading

namhihi237 commented Sep 28, 2023 •

edited

Loading