fix: hide new marker for pending deleted action in online mode #33162

s-alves10 · 2023-12-15T13:19:38Z

Details

Hide the delete pending actions

Fixed Issues

$ #33118
PROPOSAL: #33118 (comment)

Tests

Open ND and log in with any account
Go to any chat
Send a message and mark the message unread
Deleted the last message
Verify that "New" marker disappears immediately
Switch to offline mode
Send a message and mark that unread
Delete the last message
Switch to online
Verify that "New" marker disappears immediately
[WEB AND DESKTOP] Send two messages(A and B)
[WEB AND DESKTOP] Press ArrowUp key to switch the last message B to edit mode
[WEB AND DESKTOP] Delete all contents and press Enter and confirm to delete the message B
[WEB AND DESKTOP] Press ArrowUp key
[WEB AND DESKTOP] Verify that message A is switched to edit mode

Verify that no errors appear in the JS console

Offline tests

Open ND and log in with any account
Go to any chat
Send a message and mark the message unread
Deleted the last message
Verify that "New" marker disappears immediately

QA Steps

Open ND and log in with any account
Go to any chat
Send a message and mark the message unread
Deleted the last message
Verify that "New" marker disappears immediately
Switch to offline mode
Send a message and mark that unread
Delete the last message
Switch to online
Verify that "New" marker disappears immediately
[WEB AND DESKTOP] Send two messages(A and B)
[WEB AND DESKTOP] Press ArrowUp key to switch the last message B to edit mode
[WEB AND DESKTOP] Delete all contents and press Enter and confirm to delete the message B
[WEB AND DESKTOP] Press ArrowUp key
[WEB AND DESKTOP] Verify that message A is switched to edit mode

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

33118_android_native.mp4

Android: mWeb Chrome

33118_android_chrome.mp4

iOS: Native

33118_ios_native.mp4

iOS: mWeb Safari

33118_ios_safari.mp4

MacOS: Chrome / Safari

33118_mac_chrome.mp4

MacOS: Desktop

33118_mac_desktop.mp4

melvin-bot · 2023-12-15T13:47:05Z

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

MonilBhavsar · 2023-12-15T14:04:36Z

@ArekChr could you please help to review this as it is regression from a PR

MonilBhavsar · 2023-12-15T17:01:41Z

src/pages/home/report/ReportActionItem.js

@@ -679,7 +679,7 @@ function ReportActionItem(props) {
            >
                {(hovered) => (
                    <View style={highlightedBackgroundColorIfNeeded}>
-                        {props.shouldDisplayNewMarker && <UnreadActionIndicator reportActionID={props.action.reportActionID} />}
+                        {props.shouldDisplayNewMarker && ReportActionsUtils.shouldShowNewMarker(props.action) && <UnreadActionIndicator reportActionID={props.action.reportActionID} />}


Instead of here, can we add this logic in ReportActionsList component instead where we determine if we should display marker or not. Just to keep all logic at same place

@MonilBhavsar

In this case, the new marker would be at the next message(if exists). Is this expected?

@MonilBhavsar Can you please check the PR again? I moved the logic to ReportActionsList

Here is the best place to add IMO https://github.com/Expensify/App/pull/33162/files#diff-9ac76d645ad53156c86195c1a8f5adb3bb9b71f78351e43c4e1b6d6896921c4eR336

@MonilBhavsar
Can you please check if the link is correct?

It was updated after merging main
https://github.com/Expensify/App/pull/33162/files#diff-9ac76d645ad53156c86195c1a8f5adb3bb9b71f78351e43c4e1b6d6896921c4eR351

@MonilBhavsar

In that case, unread marker would move to the next message(if exists) when deleting a message with unread marker. Is this an expected behavior?

Yes expected!
Clarification: message should be from sender

MonilBhavsar · 2023-12-27T11:49:50Z

@ArekChr could you also please take a look and help with checklist, thanks!

situchan · 2023-12-27T11:52:59Z

@ArekChr is now not in C+ team, but developer role focusing on waves

tylerkaraszewski · 2023-12-28T23:33:39Z

@MonilBhavsar - I think we need a new C+ for this.

situchan · 2023-12-29T03:23:08Z

Can I be?

MonilBhavsar · 2023-12-29T04:59:26Z

Yes! @situchan please review.
Also comment need to be addressed by #33162 (comment)

MonilBhavsar · 2024-01-03T11:51:23Z

@s-alves10 @situchan 👋

situchan · 2024-01-03T11:55:54Z

@s-alves10 please sync main as 2.3k commits are behind

s-alves10 · 2024-01-03T12:51:01Z

@situchan

Will you take a look again?

MonilBhavsar · 2024-01-03T12:57:29Z

Please take a look at this comment #33162 (comment)

s-alves10 · 2024-01-03T16:12:20Z

@situchan @MonilBhavsar

I updated the logic as per #33162 (comment)
Please take a look

situchan · 2024-01-04T11:42:45Z

src/pages/home/report/ReportActionsList.js

@@ -350,7 +350,7 @@ function ReportActionsList({
            if (!currentUnreadMarker) {
                const nextMessage = sortedReportActions[index + 1];
                const isCurrentMessageUnread = isMessageUnread(reportAction, lastReadTimeRef.current);
-                shouldDisplay = isCurrentMessageUnread && (!nextMessage || !isMessageUnread(nextMessage, lastReadTimeRef.current));
+                shouldDisplay = isCurrentMessageUnread && (!nextMessage || !isMessageUnread(nextMessage, lastReadTimeRef.current)) && !ReportActionsUtils.shouldHideNewMarker(reportAction);


Just to confirm:
This PR fully reverts #32474 and this line is the real fix of #31637, right?

situchan · 2024-01-04T11:48:50Z

src/libs/ReportActionsUtils.ts

    return !isDeleted || isPending || isDeletedParentAction(reportAction) || isReversedTransaction(reportAction);
 }

+/**
+ * Checks if the new marker should be shown for the report action.


Suggested change

* Checks if the new marker should be shown for the report action.

* Checks if the new marker should be hidden for the report action.

situchan · 2024-01-04T12:10:39Z

lint failing

situchan · 2024-01-04T12:32:41Z

@s-alves10 the bug (#31637) is still reproducible on this branch

Screen.Recording.2024-01-04.at.6.31.42.PM.mov

s-alves10 · 2024-01-04T18:29:25Z

@situchan

The above bug was fixed. Will you check it again?

situchan · 2024-01-05T09:55:07Z

Latest change looks good

situchan · 2024-01-05T09:59:33Z

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

android.mov

Android: mWeb Chrome

mchrome.mov

iOS: Native

ios.mov

iOS: mWeb Safari

msafari.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

tylerkaraszewski

Waiting for the co0nversation with @MonilBhavsar to be finalized.

s-alves10 · 2024-01-09T00:11:17Z

Waiting for the co0nversation with @MonilBhavsar to be finalized.

What does this mean?

tylerkaraszewski · 2024-01-09T00:23:48Z

My mistake, I was looking at stale comments.

OSBotify · 2024-01-09T00:29:44Z

✋ 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:15Z

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

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

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

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

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

sangar-1028 added 2 commits December 15, 2023 06:58

revert PR 32474

b0c4771

fix: hide new marker for pending deleted action in online mode

7aa66e9

s-alves10 marked this pull request as ready for review December 15, 2023 13:46

s-alves10 requested a review from a team as a code owner December 15, 2023 13:47

melvin-bot bot requested review from eVoloshchak and removed request for a team December 15, 2023 13:47

s-alves10 mentioned this pull request Dec 15, 2023

[HOLD for payment 2024-01-17] Web – Chat – Edit mode doesn’t open when Press ArrowUp in DM if delete message using keyboard #33118

Closed

6 tasks

MonilBhavsar requested review from MonilBhavsar and removed request for eVoloshchak December 15, 2023 14:04

MonilBhavsar reviewed Dec 15, 2023

View reviewed changes

sangar-1028 added 2 commits December 16, 2023 05:09

fix move new marker logic to ReportActionsList

93c32e6

fix: wrong logic to hide new marker

4fb31f2

Merge branch 'main' into fix/issue-33118

b95df44

fix: move should-hide logic to the shouldDisplayNewMarker

8e4bb46

situchan reviewed Jan 4, 2024

View reviewed changes

sangar-1028 added 2 commits January 4, 2024 05:53

fix: comment for shouldHideNewMarker function

2dea8cd

Merge branch 'main' into fix/issue-33118

7dc384c

sangar-1028 added 2 commits January 4, 2024 10:14

Merge branch 'main' into fix/issue-33118

8e64689

fix: get unread marker from visible actions

a070efa

situchan approved these changes Jan 5, 2024

View reviewed changes

melvin-bot bot requested a review from tylerkaraszewski January 5, 2024 10:00

tylerkaraszewski reviewed Jan 9, 2024

View reviewed changes

tylerkaraszewski approved these changes Jan 9, 2024

View reviewed changes

tylerkaraszewski merged commit 06c64de into Expensify:main Jan 9, 2024
17 checks passed

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

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

Closed

87 tasks

youssef-lr mentioned this pull request Jan 14, 2024

[$250] Chat - Green line and 'New' label disappear after clicking 'New Messages' and scrolling down #34419

Closed

5 tasks

	* Checks if the new marker should be shown for the report action.
	* Checks if the new marker should be hidden for the report action.

fix: hide new marker for pending deleted action in online mode #33162

fix: hide new marker for pending deleted action in online mode #33162

Conversation

s-alves10 commented Dec 15, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Dec 15, 2023

MonilBhavsar commented Dec 15, 2023

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

MonilBhavsar Jan 3, 2024 • edited Loading

Choose a reason for hiding this comment

MonilBhavsar commented Dec 27, 2023

situchan commented Dec 27, 2023

tylerkaraszewski commented Dec 28, 2023

situchan commented Dec 29, 2023

MonilBhavsar commented Dec 29, 2023

MonilBhavsar commented Jan 3, 2024

situchan commented Jan 3, 2024

s-alves10 commented Jan 3, 2024

MonilBhavsar commented Jan 3, 2024

s-alves10 commented Jan 3, 2024

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

situchan commented Jan 4, 2024

situchan commented Jan 4, 2024

s-alves10 commented Jan 4, 2024

situchan commented Jan 5, 2024

situchan commented Jan 5, 2024

Reviewer Checklist

Screenshots/Videos

tylerkaraszewski left a comment

Choose a reason for hiding this comment

s-alves10 commented Jan 9, 2024

tylerkaraszewski commented Jan 9, 2024

OSBotify commented Jan 9, 2024

OSBotify commented Jan 9, 2024

OSBotify commented Jan 10, 2024

s-alves10 commented Dec 15, 2023 •

edited

Loading

MonilBhavsar Jan 3, 2024 •

edited

Loading