Fix a fail to add and edit/delete message doesn't get cleared when closing the error message #33198

bernhardoj · 2023-12-16T06:32:24Z

Details

When we do multiple actions on a message while offline, the previous pending action is overwritten, and if one of them fails, the pending action is cleared.

Fixed Issues

$ #32529
PROPOSAL: #32529 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Create a workspace if you don't have one
Go to the #admins or #announce chat of the workspace
Go offline
Send 3 messages
Edit the first message and delete the 2nd message
From another device on the same account, delete that workspace
Back to the main device, go back online
Verify all messages have an error message and have reduced opacity
Close the error message one by one
Verify the message is removed once you close it

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2023-12-16.at.14.23.17.mov

Android: mWeb Chrome

Screen.Recording.2023-12-16.at.14.16.48.mov

iOS: Native

Screen.Recording.2023-12-16.at.14.19.16.mov

iOS: mWeb Safari

Screen.Recording.2023-12-18.at.19.33.11.mov

MacOS: Chrome / Safari

Screen.Recording.2023-12-16.at.14.04.01.mov

MacOS: Desktop

Screen.Recording.2023-12-16.at.14.05.48.mov

melvin-bot · 2023-12-16T06:32:29Z

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

bernhardoj · 2023-12-16T06:38:28Z

src/libs/actions/Task.js

@@ -183,7 +183,7 @@ function createTaskAndNavigate(parentReportID, title, description, assigneeEmail
    successData.push({
        onyxMethod: Onyx.METHOD.MERGE,
        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`,
-        value: {[optimisticAddCommentReport.reportAction.reportActionID]: {pendingAction: null}},
+        value: {[optimisticAddCommentReport.reportAction.reportActionID]: {pendingAction: null, isOptimisticAction: null}},
    });


I added the isOptimisticAction in buildOptimisticAddCommentReportAction. buildOptimisticAddCommentReportAction is also used to build the task optimistic message, so we need to clear it for task action too.

bernhardoj · 2023-12-16T06:42:01Z

Having iOS mWeb issue

bernhardoj · 2023-12-16T06:50:03Z

src/libs/actions/ReportActions.ts

@@ -13,7 +13,7 @@ function clearReportActionErrors(reportID: string, reportAction: ReportAction) {
        return;
    }

-    if (reportAction.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
+    if (reportAction.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD || reportAction.isOptimisticAction) {


We still need to check the specific pendingAction for other types of report action (iou, submitted expense, etc.).

bernhardoj · 2023-12-18T11:36:58Z

Added iOS Safari recording

bernhardoj · 2023-12-21T17:10:25Z

@eVoloshchak please review when you got the chance

eVoloshchak · 2024-01-02T16:23:18Z

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: mWeb Chrome
- iOS: Native
- 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 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(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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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.
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: Native

Screen.Recording.2024-01-08.at.17.09.50.mov

Android: mWeb Chrome

Screen.Recording.2024-01-08.at.17.20.54.mov

iOS: Native

Screen.Recording.2024-01-08.at.17.24.32.mov

iOS: mWeb Safari

Screen.Recording.2024-01-08.at.17.26.36.mov

MacOS: Chrome / Safari

Screen.Recording.2024-01-08.at.17.07.06.mov

MacOS: Desktop

Screen.Recording.2024-01-08.at.17.29.26.mov

eVoloshchak

@bernhardoj, the code looks good and tests well
Could you resolve the conflicts so I could test this once again with latest changes from main?

P.S. Apologies for the delay, was OOO

bernhardoj · 2024-01-03T02:37:51Z

@eVoloshchak conflicts solved

bernhardoj · 2024-01-08T12:31:05Z

@eVoloshchak please review when you got the chance 🙇

eVoloshchak

LGTM!

eVoloshchak · 2024-01-08T16:42:34Z

@bernhardoj, looks like the author checklist has had recent changes made to it, could you look into this please?

OSBotify · 2024-01-08T21:23:53Z

✋ 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 · 2024-01-09T05:36:21Z

🚀 Deployed to staging by https://github.com/marcaaron in version: 1.4.23-0 🚀

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

OSBotify · 2024-01-10T06:03:36Z

🚀 Deployed to production by https://github.com/thienlnam in version: 1.4.23-4 🚀

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

bernhardoj added 4 commits December 16, 2023 14:08

add isOptimisticAction optimistically and remove on success

af2bc11

remove optimistic action from onyx

9d06f48

fall back to add pending action if it's optimistic action

2445a22

clear isOptimisticAction on success data instead

6fb3faa

bernhardoj requested a review from a team as a code owner December 16, 2023 06:32

melvin-bot bot requested review from eVoloshchak and removed request for a team December 16, 2023 06:32

bernhardoj commented Dec 16, 2023

View reviewed changes

Merge branch 'main' into fix/32529-optimistic-add-is-lost

28c18d2

eVoloshchak reviewed Jan 2, 2024

View reviewed changes

Merge branch 'main' into fix/32529-optimistic-add-is-lost

39ce374

bernhardoj added 2 commits January 3, 2024 10:42

prettier

081e785

Merge branch 'main' into fix/32529-optimistic-add-is-lost

382a096

eVoloshchak approved these changes Jan 8, 2024

View reviewed changes

melvin-bot bot requested a review from marcaaron January 8, 2024 16:32

marcaaron approved these changes Jan 8, 2024

View reviewed changes

marcaaron merged commit c0c4d64 into Expensify:main Jan 8, 2024
14 of 15 checks passed

github-actions bot mentioned this pull request Jan 9, 2024

Deploy Checklist: New Expensify 2024-01-09 #34121

Closed

87 tasks

melvin-bot bot mentioned this pull request Jan 10, 2024

[HOLD for payment 2024-01-17] [$500] Workspace-Edited&deleted message remains in # when back online when other login delete workspace #32529

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix a fail to add and edit/delete message doesn't get cleared when closing the error message #33198

Fix a fail to add and edit/delete message doesn't get cleared when closing the error message #33198

bernhardoj commented Dec 16, 2023 •

edited by marcaaron

Loading

melvin-bot bot commented Dec 16, 2023

bernhardoj Dec 16, 2023

bernhardoj commented Dec 16, 2023

bernhardoj Dec 16, 2023

bernhardoj commented Dec 18, 2023

bernhardoj commented Dec 21, 2023

eVoloshchak commented Jan 2, 2024 •

edited

Loading

eVoloshchak left a comment

bernhardoj commented Jan 3, 2024

bernhardoj commented Jan 8, 2024

eVoloshchak left a comment

eVoloshchak commented Jan 8, 2024

OSBotify commented Jan 8, 2024

OSBotify commented Jan 9, 2024

OSBotify commented Jan 10, 2024

Fix a fail to add and edit/delete message doesn't get cleared when closing the error message #33198

Fix a fail to add and edit/delete message doesn't get cleared when closing the error message #33198

Conversation

bernhardoj commented Dec 16, 2023 • edited by marcaaron Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Dec 16, 2023

bernhardoj Dec 16, 2023

Choose a reason for hiding this comment

bernhardoj commented Dec 16, 2023

bernhardoj Dec 16, 2023

Choose a reason for hiding this comment

bernhardoj commented Dec 18, 2023

bernhardoj commented Dec 21, 2023

eVoloshchak commented Jan 2, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

eVoloshchak left a comment

Choose a reason for hiding this comment

bernhardoj commented Jan 3, 2024

bernhardoj commented Jan 8, 2024

eVoloshchak left a comment

Choose a reason for hiding this comment

eVoloshchak commented Jan 8, 2024

OSBotify commented Jan 8, 2024

OSBotify commented Jan 9, 2024

OSBotify commented Jan 10, 2024

bernhardoj commented Dec 16, 2023 •

edited by marcaaron

Loading

eVoloshchak commented Jan 2, 2024 •

edited

Loading