Reinstate fix get all ancestors in a thread by kmbcook · Pull Request #43518 · Expensify/App

kmbcook · 2024-06-12T01:19:23Z

Details

This pull request corrects an error getting all ancestors in a thread. The steps for reproducing this issue are no longer relevant because report preview actions are no longer displayed as parent actions in a thread. The root cause of this issue still exists, which causes inconsistency and confusion in the code. The purpose of this PR is to clean up the code.

See proposals in all three issues:
#41519 (comment)
#43175 (comment)
#43190 (comment)

Fixed Issues

$ #41519
$ #43175
$ #43190
PROPOSAL: #41519 (comment)

Tests

The primary test required for this change is covered by a revised unit test, which is included in this PR. Other testing is just to ensure that there are no regressions.

Verify that no errors appear in the JS console

Offline tests

Covered by revised unit test.

QA Steps

Covered by revised unit test.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android-Native.mov

Android: mWeb Chrome

Android-Chrome.mov

iOS: Native

IOS-Native.mov

iOS: mWeb Safari

IOS-Safari.mov

MacOS: Chrome / Safari

Mac-Chrome.mov

MacOS: Desktop

Mac-Desktop.mov

…t.parentReportID to ancestor.report.reportID.

…4-fix/issue-41519-get-all-ancestors" This reverts commit 01c418d, reversing changes made to 4c86fbf.

melvin-bot · 2024-06-12T01:19:28Z

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

rushatgabhane · 2024-06-16T13:07:58Z

@kmbcook im not able to load the header of any room/workspace

kmbcook · 2024-06-17T15:01:15Z

@rushatgabhane it is working for me. I did just merge main and resolve a conflict in ThreadDivider, and I cleared my cache, but I'm not sure that any of those things would affect the problem you are seeing. Here are my screenshots.

rushatgabhane · 2024-06-25T22:25:47Z

@kmbcook this PR breaks trips -

The parent action is shown instead of trip data

kmbcook · 2024-06-26T15:24:26Z

@rushatgabhane it looks like it is difficult for me to look into the problem you are talking about with trips because I am not on the travel beta. I'd be glad to look at the problem further is someone could add kevincook13@gmail.com to the beta. Since travel is still in beta do you want to go ahead with this PR even if it does break trips, and let trips work around this change? Or, do you want to wait until travel is out of beta and ensure that this PR does not break trips then?

…estor report action is trip preview.

kmbcook · 2024-07-15T20:44:10Z

@rushatgabhane I think that problem you pointed out with trips is fixed now.

rushatgabhane · 2024-07-23T01:01:18Z

reviewing

rushatgabhane · 2024-07-26T03:37:37Z

@kmbcook travel looks good 👍

rushatgabhane

Bug: invoice detail is duplitcated

Screen.Recording.2024-07-26.at.06.36.51.mov

kmbcook · 2024-07-26T14:33:35Z

@rushatgabhane I just merged main and took a video of opening invoice detail on main, and on this PR. Both videos look identical.

This PR:

PR.mov

Main:

Main.mov

rushatgabhane · 2024-07-29T20:42:21Z

@kmbcook the bug i mentioned is different. It has the payment details show two times. This is for expenses that have been approved

Steps:

Submit an expense from account A
Login as the approver from account B
Approve the expense.

kmbcook · 2024-07-29T22:06:55Z

@rushatgabhane I still can't reproduce the problem you are showing me. Here is what I see. (I just merged main again)

Account A (Kevin) submitted an expense.
Account B (Fred) approved the expense.
Video of Fred's view:

Fred.mov

Video of Kevin's view:

Kevin.mov

kmbcook · 2024-07-29T22:44:45Z

@rushatgabhane I wonder if this problem is specific to invoices. I see in the first video you sent that the header displays "Rushat's Expenses" and "Invoices". In my videos the header displays differently.

rushatgabhane · 2024-07-29T22:48:16Z

my bad! yeah could be for invoices

green +
send invoice

if you don't see this, enable all betas in permissions.ts

kmbcook · 2024-07-29T23:09:07Z

I see it!

kmbcook · 2024-07-30T14:41:31Z

@rushatgabhane the same problem exists on main.

rushatgabhane · 2024-08-02T06:43:18Z

the same problem exists on main

yeah you're right.

rushatgabhane · 2024-08-02T06:48:36Z

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

Same bug present on main

MacOS: Desktop

rushatgabhane · 2024-08-04T22:58:10Z

@kmbcook LGTM!

i understand that the unit tests cover everything but please add some screenshots as they are required

marcochavezf · 2024-08-05T16:15:36Z

Conflicts

kmbcook · 2024-08-05T19:51:13Z

@rushatgabhane videos are now posted, and conflicts resolved.

marcochavezf

LGTM, thanks!

OSBotify · 2024-08-06T16:36:14Z

✋ 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-08-07T22:11:27Z

🚀 Deployed to staging by https://github.com/marcochavezf in version: 9.0.18-0 🚀

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

OSBotify · 2024-08-12T10:02:40Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.18-10 🚀

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

allgandalf · 2024-11-28T06:15:49Z

src/libs/ReportUtils.ts

@@ -6897,14 +6897,12 @@ function getAllAncestorReportActions(report: Report | null | undefined): Ancesto
    let parentReportID = report.parentReportID;


With these changes the reportID contains the reportID of the report where the action belongs to, if we create a thread from report A, the reportID will be report A instead of B. So, isThreadFirstChat will always be false.

This caused the Join Thread to shows up for thread first chat. This resulted in #50262

thesahindia · 2025-01-09T11:47:10Z

We had a regression. Quoting from #52146 (comment):

"the reportID now contains the reportID of the report where the action belongs to (the ancestor tree is lifted 1 level above).

So when we delete the comment, reportID does not point to the current thread report >> isThreadParentMessage is false because it compares the reportID with childReportID >> shouldHideOnDelete is true causing the message to be hidden for a while...:"

kmbcook added 2 commits June 11, 2024 14:49

Add hideThreadReplies prop to ReportActionItem. Change ancestor.repor…

35d8dc1

…t.parentReportID to ancestor.report.reportID.

Revert "Merge pull request Expensify#43201 from Expensify/revert-4255…

54c1b67

…4-fix/issue-41519-get-all-ancestors" This reverts commit 01c418d, reversing changes made to 4c86fbf.

kmbcook requested a review from a team as a code owner June 12, 2024 01:19

melvin-bot bot requested review from rushatgabhane and removed request for a team June 12, 2024 01:19

kmbcook added 2 commits June 12, 2024 08:38

hideThreadReplies is optional

a401c7c

Fix lint error

af7b65b

kmbcook mentioned this pull request Jun 12, 2024

[HOLD for payment 2024-08-19] [$250] Expense - Payment options displayed before submitting in thread created inside details page #41519

Closed

6 tasks

Resolve conflicts in ThreadDivider to finishing merging main

9c2148b

twisterdotcom mentioned this pull request Jun 20, 2024

[HOLD for payment 2024-08-19] [HOLD for payment 2024-06-20] [HOLD for payment 2024-06-18] Thread - Blue "Thread" above the parent message in thread is disable #43190

Closed

6 tasks

kmbcook added 2 commits June 25, 2024 17:15

Merge main and resolve conflicts

0b6188f

Resolve another conflict due to merging main

d846f68

dangrous mentioned this pull request Jun 28, 2024

[HOLD for payment 2024-08-19] [HOLD for payment 2024-06-20] [HOLD for payment 2024-06-18] [$250] Chat - "Deleted Message" Notification Appears with Its Reply in IOU #43175

Closed

6 tasks

kmbcook added 7 commits July 1, 2024 08:38

Merge main and fix confict

381c32a

Merge main

a3a34f7

Merge main

e223a58

Merge branch 'main' into fix/issue-41519-get-all-ancestors

8c649f7

Merge branch 'main' into fix/issue-41519-get-all-ancestors

60f01c1

Show trip details view instead of report action item, when thread anc…

8ec355f

…estor report action is trip preview.

After npm run prettier

cdf0560

Merge main

2984e6d

rushatgabhane suggested changes Jul 26, 2024

View reviewed changes

Merge branch 'main' into fix/issue-41519-get-all-ancestors

3a5faf1

Merge branch 'main' into fix/issue-41519-get-all-ancestors

41624fa

rushatgabhane approved these changes Aug 4, 2024

View reviewed changes

melvin-bot bot requested a review from marcochavezf August 4, 2024 22:57

Resolve conflicts and merge main

daacbd0

rushatgabhane approved these changes Aug 5, 2024

View reviewed changes

marcochavezf approved these changes Aug 6, 2024

View reviewed changes

marcochavezf merged commit 9aa6134 into Expensify:main Aug 6, 2024

github-actions bot mentioned this pull request Aug 7, 2024

Deploy Checklist: New Expensify 2024-08-07 #47006

Closed

88 tasks

bernhardoj mentioned this pull request Oct 5, 2024

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

Closed

6 tasks

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

allgandalf reviewed Nov 28, 2024

View reviewed changes

bernhardoj mentioned this pull request Jan 23, 2025

[Due for payment 2025-03-13] [$250] LHN - Mark as unread doesn't work with IOU report #55614

Closed

8 tasks

		@@ -6897,14 +6897,12 @@ function getAllAncestorReportActions(report: Report \| null \| undefined): Ancesto
		let parentReportID = report.parentReportID;

Conversation

kmbcook commented Jun 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jun 12, 2024

Uh oh!

rushatgabhane commented Jun 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kmbcook commented Jun 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rushatgabhane commented Jun 25, 2024

Uh oh!

kmbcook commented Jun 26, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kmbcook commented Jul 15, 2024

Uh oh!

rushatgabhane commented Jul 23, 2024

Uh oh!

rushatgabhane commented Jul 26, 2024

Uh oh!

rushatgabhane left a comment

Choose a reason for hiding this comment

Uh oh!

kmbcook commented Jul 26, 2024

Uh oh!

rushatgabhane commented Jul 29, 2024

Uh oh!

kmbcook commented Jul 29, 2024

Uh oh!

kmbcook commented Jul 29, 2024

Uh oh!

rushatgabhane commented Jul 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kmbcook commented Jul 29, 2024

Uh oh!

kmbcook commented Jul 30, 2024

Uh oh!

rushatgabhane commented Aug 2, 2024

Uh oh!

rushatgabhane commented Aug 2, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Same bug present on main

Uh oh!

rushatgabhane commented Aug 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

marcochavezf commented Aug 5, 2024

Uh oh!

kmbcook commented Aug 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

marcochavezf left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Aug 6, 2024

Uh oh!

OSBotify commented Aug 7, 2024

Uh oh!

OSBotify commented Aug 12, 2024

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

thesahindia commented Jan 9, 2025

Uh oh!

Reviewers

kmbcook commented Jun 12, 2024 •

edited

Loading

rushatgabhane commented Jun 16, 2024 •

edited

Loading

kmbcook commented Jun 17, 2024 •

edited

Loading

kmbcook commented Jun 26, 2024 •

edited

Loading

rushatgabhane commented Jul 29, 2024 •

edited

Loading

rushatgabhane commented Aug 2, 2024 •

edited

Loading

rushatgabhane commented Aug 4, 2024 •

edited

Loading

kmbcook commented Aug 5, 2024 •

edited

Loading

allgandalf Nov 28, 2024 •

edited

Loading