Fix reply in thread shows for thread parent by bernhardoj · Pull Request #51721 · Expensify/App

bernhardoj · 2024-10-30T10:12:03Z

Explanation of Change

A reply in the thread still shows for the parent thread message. This PR fixes it by passing isThreadFirstChat as param for every thread parent message.

Fixed Issues

$ #50262
PROPOSAL: #50262 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

Send a message to any chat
Right-click/long-press and choose reply in thread
Right-click/long-press the thread parent message
Verify there is no Reply in thread option
(Web/Desktop) Hover over the message and press the 3-dot button
Verify there is no Reply in thread option

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mp4

Android: mWeb Chrome

android.mweb.mp4

iOS: Native

ios.mp4

iOS: mWeb Safari

ios.mweb.mp4

MacOS: Chrome / Safari

web.mp4

MacOS: Desktop

desktop.mp4

melvin-bot · 2024-10-30T10:12:09Z

@allgandalf 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 · 2024-10-30T10:20:22Z

src/libs/ReportUtils.ts

-                return canDeleteTransaction(linkedReport);
+            if (!isEmptyObject(report) && (isMoneyRequestReport(report) || isInvoiceReport(report))) {
+                return canDeleteTransaction(report);
            }


canDeleteReportAction is only being used in ContextMenuActions.

const linkedReport = isThreadFirstChat(reportAction, reportID) ? getReportOrDraftReport(report?.parentReportID) : report;

This logic was added in #40287 because the reportID of the thread parent message is the currently view report. But because the reportID now contains the reportID of the report action, we don't need this anymore.

makes sense to me

Makes sense, but can we please write a manual test that will verify this?

bernhardoj · 2024-10-30T10:24:16Z

This will be the last usage of isThreadFirstChat. I'm tempted to remove it but getOriginalReportID is being used in many places, so I didn't touch it.

App/src/libs/ReportUtils.ts

Lines 7205 to 7211 in a739661

    
           function getOriginalReportID(reportID: string, reportAction: OnyxInputOrEntry<ReportAction>): string | undefined { 
        
               const reportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`]; 
        
               const currentReportAction = reportActions?.[reportAction?.reportActionID ?? '-1'] ?? null; 
        
               const transactionThreadReportID = ReportActionsUtils.getOneTransactionThreadReportID(reportID, reportActions ?? ([] as ReportAction[])); 
        
               if (Object.keys(currentReportAction ?? {}).length === 0) { 
        
                   return isThreadFirstChat(reportAction, reportID) 
        
                       ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]?.parentReportID

allgandalf · 2024-10-31T18:21:05Z

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

Screen.Recording.2024-11-08.at.3.35.56.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-11-08.at.3.34.40.PM.mov

iOS: Native

Screen.Recording.2024-11-08.at.3.43.00.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-11-08.at.3.44.34.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-11-08.at.1.40.12.PM.mov

MacOS: Desktop

Screen.Recording.2024-11-08.at.3.22.21.PM.mov

allgandalf · 2024-11-08T08:23:26Z

@bernhardoj apologies for the delayed review, can you please merge main ?

…arent

bernhardoj · 2024-11-08T08:52:16Z

Done

allgandalf

Changes LGTM, this works well in offline mode too.

neil-marcellini

After seeing the code, I'm starting to think the proposal wasn't the best idea. I probably should have thought about it more carefully. I mostly have a lot of questions. The main question is, shouldn't we be able to determine if an action is a parent report action for a thread? If so, can we tweak the existing function to work reliably? Why or why not?

neil-marcellini · 2024-11-08T18:51:33Z

src/libs/ReportUtils.ts

-                return canDeleteTransaction(linkedReport);
+            if (!isEmptyObject(report) && (isMoneyRequestReport(report) || isInvoiceReport(report))) {
+                return canDeleteTransaction(report);
            }


Makes sense, but can we please write a manual test that will verify this?

src/libs/ReportUtils.ts

src/pages/home/report/ContextMenu/BaseReportActionContextMenu.tsx

…arent

bernhardoj · 2024-11-09T03:43:08Z

shouldn't we be able to determine if an action is a parent report action for a thread?

We can't tell if it's the thread first chat from the action alone. As seen in the function, we compare the action childReportID with a reportID.

App/src/libs/ReportUtils.ts

Lines 1594 to 1596 in c75b1bc

    
           function isThreadFirstChat(reportAction: OnyxInputOrEntry<ReportAction>, reportID: string): boolean { 
        
               return reportAction?.childReportID?.toString() === reportID; 
        
           }

What makes an action a thread first chat action? From the logic above, an action is a thread-first chat action if the action childReportID equals reportID. Which reportID? We can pass any ID to the function. We can use this function anywhere and isThreadFirstChat will return true as long as we pass the reportID the same as the childReportID.

So, in my proposal, I think the better way is to mark an action as thread first chat in ReportActionItemParentAction. Only action that is rendered by ReportActionItemParentAction is a thread first chat.

allgandalf · 2024-11-11T09:48:56Z

Note

@neil-marcellini is OoO this week, I will raise the issue on slack to see if we should hold or add another internal reviewer :)

allgandalf · 2024-11-12T08:27:15Z

I think this is low priority so we can wait until neil is back

…arent

allgandalf · 2024-11-20T05:46:56Z

welcome back @neil-marcellini , would you be able to re-review the PR this week ?

neil-marcellini

Ok thanks so much for explaining again. It's a pretty tricky and nuanced issue, and I agree with your reasoning that it's fragile and maybe confusing to pass a reportID into such a function. I don't like that we have to do so much parameter passing, but I guess it's the best way for now. There are still some outstanding issues to resolve but they should be pretty easy.

…arent

bernhardoj · 2024-11-21T05:28:06Z

@neil-marcellini done

neil-marcellini

Good to go, thanks!

OSBotify · 2024-11-21T23:03:25Z

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

github-actions · 2024-11-22T20:31:06Z

🚀 Deployed to staging by https://github.com/neil-marcellini in version: 9.0.66-0 🚀

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

github-actions · 2024-11-26T16:12:28Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.66-8 🚀

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

bernhardoj added 2 commits October 30, 2024 17:56

fix reply in thread shown for thread parent

47c03d9

remove unnecessary isThreadFirstChat

6035ef4

bernhardoj requested a review from a team as a code owner October 30, 2024 10:12

melvin-bot bot requested review from allgandalf and removed request for a team October 30, 2024 10:12

bernhardoj added 2 commits October 30, 2024 18:16

prettier

1385681

update test

70fede0

bernhardoj commented Oct 30, 2024

View reviewed changes

mkzie2 mentioned this pull request Nov 7, 2024

[HOLD for payment 2024-12-19] [$250] Web - Chat - Temporary thread message disappearance when deleting a thread message #52146

Closed

8 tasks

Merge branch 'main' into fix/50262-reply-in-thread-shows-for-thread-p…

b98ce3b

…arent

allgandalf approved these changes Nov 8, 2024

View reviewed changes

melvin-bot bot requested a review from neil-marcellini November 8, 2024 10:15

neil-marcellini requested changes Nov 8, 2024

View reviewed changes

Merge branch 'main' into fix/50262-reply-in-thread-shows-for-thread-p…

167be80

…arent

update comment

9fe7049

Merge branch 'main' into fix/50262-reply-in-thread-shows-for-thread-p…

79a7dc6

…arent

neil-marcellini requested changes Nov 20, 2024

View reviewed changes

bernhardoj added 4 commits November 21, 2024 13:10

Merge branch 'main' into fix/50262-reply-in-thread-shows-for-thread-p…

c2ea94b

…arent

check whether its thread first chat without using the function

cf7ee19

remove isThreadFirstChat function

31a1ea1

rename

d7e888f

bernhardoj added 2 commits November 21, 2024 13:27

update comment

cfc41bc

prettier

39acd92

neil-marcellini approved these changes Nov 21, 2024

View reviewed changes

neil-marcellini merged commit e04d145 into Expensify:main Nov 21, 2024

github-actions bot mentioned this pull request Nov 22, 2024

Deploy Checklist: New Expensify 2024-11-22 #52978

Closed

75 tasks

melvin-bot bot mentioned this pull request Nov 26, 2024

[HOLD for payment 2024-12-03] [$250] Threads - Reply in threads option shown for parent message in thread #50262

Closed

6 tasks

Conversation

bernhardoj commented Oct 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Oct 30, 2024

Uh oh!

bernhardoj Oct 30, 2024

Choose a reason for hiding this comment

Uh oh!

allgandalf Nov 8, 2024

Choose a reason for hiding this comment

Uh oh!

neil-marcellini Nov 8, 2024

Choose a reason for hiding this comment

Uh oh!

bernhardoj commented Oct 30, 2024

Uh oh!

allgandalf commented Oct 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

allgandalf commented Nov 8, 2024

Uh oh!

bernhardoj commented Nov 8, 2024

Uh oh!

allgandalf left a comment

Choose a reason for hiding this comment

Uh oh!

neil-marcellini left a comment

Choose a reason for hiding this comment

Uh oh!

neil-marcellini Nov 8, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

bernhardoj commented Nov 9, 2024

Uh oh!

allgandalf commented Nov 11, 2024

Uh oh!

allgandalf commented Nov 12, 2024

Uh oh!

allgandalf commented Nov 20, 2024

Uh oh!

neil-marcellini left a comment

Choose a reason for hiding this comment

Uh oh!

bernhardoj commented Nov 21, 2024

Uh oh!

neil-marcellini left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Nov 21, 2024

Uh oh!

github-actions bot commented Nov 22, 2024

Uh oh!

github-actions bot commented Nov 26, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

bernhardoj commented Oct 30, 2024 •

edited

Loading

allgandalf commented Oct 31, 2024 •

edited

Loading