Revert "Merge pull request #48445" #49770

c3024 · 2024-09-26T05:55:47Z

Details

#48445 fixed #47735. After completion of regression period for this PR, these changes were found to be causing #49525 likely due to new code changes from other PRs. Reverting #48445 seems to be the best option to fix #49525.

Fixed Issues

$ #49525
PROPOSAL: https://expensify.slack.com/archives/C02NK2DQWUX/p1727302638734859?thread_ts=1727264968.921709&cid=C02NK2DQWUX

Tests

Test 1:

Log on to ND
"Reply in thread" on a message in a chat with User A
Send a reply in this thread
Click on "From User A" in the header to go back to the parent report action
Verify that there is no unread indicator shown in this parent chat

Test 2:

Log on to ND
Open any chat
Send a message
Mark this message as unread ("Mark as unread")
Delete this message
Send a message again
Verify there is no unread indicator shown in the chat

Verify that no errors appear in the JS console

Offline tests

None

QA Steps

Same as Tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

unreadAndroid.mp4

Android: mWeb Chrome

unreadAndroidmWeb.mp4

unreadAndroidmWebTest2.mp4

iOS: Native

unreadiOS.mp4

iOS: mWeb Safari

unreadiOSmWeb.mp4

MacOS: Chrome / Safari

unreadChrome.mp4

MacOS: Desktop

unreadDesktop.mp4

…unread-line-shows-on-a-new-msg" This reverts commit 2d1f8cd, reversing changes made to 5db0996.

melvin-bot · 2024-09-26T06:00:05Z

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

s77rt · 2024-09-26T10:43:45Z

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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design 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: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

web.2.mov

MacOS: Desktop

s77rt · 2024-09-26T10:45:12Z

@c3024 Can you please complete the checklist

s77rt · 2024-09-26T12:14:56Z

@c3024 Please revert the last commit. Let's keep only the changes that reverts the linked PR (the failing test will be fixed by another PR)

This reverts commit 93fea45.

dangrous · 2024-09-26T14:41:11Z

Straight revert looks good, two things though:

Can we get videos for Android mWeb confirming that the original bug [$250] mWeb - chat-After deleting mark us unread msg, new green line shown in new msg sent. #47735 isn't reintroduced by this? I see the test steps in the description, but we don't have the video.
Re: the lint errors, are you thinking we should merge with the error, or is there a PR actively in the works that fixes these (and we should HOLD on that)?

Thanks!

c3024 · 2024-09-26T14:56:45Z

Added the video for Android mWeb.
I don't think there is a PR fixing that lint error.

dangrous · 2024-09-26T18:19:05Z

Asking about the lint errors here - https://expensify.slack.com/archives/C01GTK53T8Q/p1727374729163949

melvin-bot · 2024-09-26T18:32:16Z

@dangrous 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.

dangrous · 2024-09-26T18:32:59Z

Not an emergency, did not fix lint errors to keep this a clean revert. Discussed here - https://expensify.slack.com/archives/C01GTK53T8Q/p1727374729163949

OSBotify · 2024-09-26T18:42:07Z

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

…s-with-unread-messages (cherry picked from commit dbcd30e) (CP triggered by thienlnam)

github-actions · 2024-09-27T17:21:24Z

🚀 Cherry-picked to staging by https://github.com/thienlnam in version: 9.0.40-6 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

github-actions · 2024-09-27T17:46:27Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.0.40-6 🚀

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

Revert "Merge pull request Expensify#48445 from bernhardoj/fix/47735-…

9af3f11

…unread-line-shows-on-a-new-msg" This reverts commit 2d1f8cd, reversing changes made to 5db0996.

c3024 marked this pull request as ready for review September 26, 2024 05:59

c3024 requested a review from a team as a code owner September 26, 2024 05:59

melvin-bot bot requested review from s77rt and removed request for a team September 26, 2024 06:00

rename deprecated measurePerformance

93fea45

Revert "rename deprecated measurePerformance"

4a6d6d2

This reverts commit 93fea45.

s77rt approved these changes Sep 26, 2024

View reviewed changes

melvin-bot bot requested a review from dangrous September 26, 2024 12:36

dangrous approved these changes Sep 26, 2024

View reviewed changes

dangrous merged commit dbcd30e into Expensify:main Sep 26, 2024
19 of 20 checks passed

melvin-bot bot added the Emergency label Sep 26, 2024

dangrous removed the Emergency label Sep 26, 2024

dangrous mentioned this pull request Sep 26, 2024

Fix ESLint Errors in tests/perf-test/ReportActionsList.perf-test.tsx #49806

Closed

c3024 mentioned this pull request Sep 27, 2024

Thread – New message button and green line appears when go back to main chat from thread #49751

Closed

6 tasks

OSBotify pushed a commit that referenced this pull request Sep 27, 2024

Merge pull request #49770 from c3024/correct-unread-marker-for-thread…

fb91699

…s-with-unread-messages (cherry picked from commit dbcd30e) (CP triggered by thienlnam)

github-actions bot added the CP Staging marks PRs that have been CP'd to staging label Sep 27, 2024

github-actions bot mentioned this pull request Sep 27, 2024

Deploy Checklist: New Expensify 2024-09-24 #49662

Closed

67 tasks

melvin-bot bot mentioned this pull request Sep 27, 2024

[HOLD for payment 2024-10-04] [$250] Chat - New message line marker shown in the wrong position #49525

Closed

6 tasks

rayane-djouah mentioned this pull request Oct 2, 2024

[$250] [Search v2.2] – All messages from pinned chat are displayed in search pinned section #49570

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Revert "Merge pull request #48445" #49770

Revert "Merge pull request #48445" #49770

c3024 commented Sep 26, 2024 •

edited

Loading

melvin-bot bot commented Sep 26, 2024

s77rt commented Sep 26, 2024

s77rt commented Sep 26, 2024

s77rt commented Sep 26, 2024

dangrous commented Sep 26, 2024

c3024 commented Sep 26, 2024

dangrous commented Sep 26, 2024

melvin-bot bot commented Sep 26, 2024

dangrous commented Sep 26, 2024

OSBotify commented Sep 26, 2024

github-actions bot commented Sep 27, 2024

github-actions bot commented Sep 27, 2024

Revert "Merge pull request #48445" #49770

Revert "Merge pull request #48445" #49770

Conversation

c3024 commented Sep 26, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 26, 2024

s77rt commented Sep 26, 2024

Reviewer Checklist

Screenshots/Videos

s77rt commented Sep 26, 2024

s77rt commented Sep 26, 2024

dangrous commented Sep 26, 2024

c3024 commented Sep 26, 2024

dangrous commented Sep 26, 2024

melvin-bot bot commented Sep 26, 2024

dangrous commented Sep 26, 2024

OSBotify commented Sep 26, 2024

github-actions bot commented Sep 27, 2024

github-actions bot commented Sep 27, 2024

c3024 commented Sep 26, 2024 •

edited

Loading