Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for redesign thread ancestry feature #39343

Merged
merged 23 commits into from
May 6, 2024

Conversation

rayane-djouah
Copy link
Contributor

@rayane-djouah rayane-djouah commented Apr 1, 2024

a follow-up to #38722

cc @allroundexperts

Details

Fixed Issues

$ #39331
$ #39246
$ #39301
PROPOSAL: N/A

Tests

Test 1:

  1. Click on FAB > Start chat
  2. Create a group chat with Users B and C
  3. Send a message in the group chat
  4. Right-click on the message > Reply in the thread
  5. Mention User D and invite User D from the Concierge whisper
  6. As User D, navigate to the thread
  7. As User D, verify that the blue "Thread" above the parent message is disabled because they are not a member of the main chat.
  8. As User D, verify that the blue "Thread" above the parent message color is gray.
  9. As User D, verify that the parent message is not clickable (and has a default cursor)
  10. As User D, verify that the header does not contain a "From ..." link to the parent thread

Test 2:

  1. Send a message
  2. Right-click on the message > Reply in the thread
  3. Send a reply
  4. Delete the reply
  5. Verify that when the reply is deleted, the gray "Replies" disappear together with the deleted reply

Test 3 (Only on Web and Desktop):

  1. Send a message in chat.
  2. Right-click on the message > Reply in the thread.
  3. Right-click on the parent message in the thread > Edit comment.
  4. Hover over the text in the edit composer.
  5. Verify that the cursor is text cursor when hovering over edit composer in the thread.

Test 4 (Only on Web and Desktop):

  1. Send a message
  2. Right-click on the message > Reply in the thread
  3. Send a message in the thread
  4. Verify that you can't select and copy "Thread" and "Replies words in thread dividers.
  • Verify that no errors appear in the JS console

Offline tests

Same behavior.

QA Steps

Same as tests.

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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.

Screenshots/Videos

Android: Native

Uploading Recording 2024-04-02 042921.mp4…

Android: mWeb Chrome
Recording.2024-04-02.040000.mp4
iOS: Native
Recording.2024-04-02.041233.mp4
iOS: mWeb Safari
Recording.2024-04-02.035533.mp4
MacOS: Chrome / Safari
Recording.2024-04-02.033236.compressed.mp4
Recording.2024-04-02.183651.mp4
MacOS: Desktop

Uploading Recording 2024-04-02 040344.mp4…

@rayane-djouah rayane-djouah requested a review from a team as a code owner April 1, 2024 01:59
@melvin-bot melvin-bot bot removed the request for review from a team April 1, 2024 01:59
Copy link

melvin-bot bot commented Apr 1, 2024

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

@melvin-bot melvin-bot bot requested a review from hungvu193 April 1, 2024 01:59
@rayane-djouah
Copy link
Contributor Author

cc @allroundexperts for review

@rayane-djouah rayane-djouah changed the title Feat redesign thread ancestry Fixes for redesign thread ancestry feature Apr 1, 2024
@rayane-djouah
Copy link
Contributor Author

I will complete author checklist in my morning

@pecanoro
Copy link
Contributor

pecanoro commented Apr 1, 2024

@rayane-djouah I see you linked #39331 here, so does that mean the blocker will get fixed in this PR as well?

@rayane-djouah
Copy link
Contributor Author

@pecanoro yes, it will be fixed by this PR as well

@pecanoro pecanoro self-requested a review April 1, 2024 15:51
@pecanoro
Copy link
Contributor

pecanoro commented Apr 1, 2024

Ah nice, I will add myself for review as well then so I can take a look when it's ready

@hungvu193
Copy link
Contributor

Seems @allroundexperts will review this one.

@pecanoro
Copy link
Contributor

pecanoro commented Apr 2, 2024

@rayane-djouah You are missing the screenshots/videos

src/pages/home/report/ThreadDivider.tsx Outdated Show resolved Hide resolved
src/components/ParentNavigationSubtitle.tsx Show resolved Hide resolved
@rayane-djouah
Copy link
Contributor Author

@Expensify/design should we display a different color for the "Thread" link when it's disabled, like a gray color?

Recording.2024-04-02.043944.mp4

@dubielzyk-expensify
Copy link
Contributor

@dannymcclain will hold the answer but given we used the link color to signify a link, I think we probably should. But I also don't mind it being the same color cause it does separate the Thread from Replies. But yeah, let's see what Danny says :)

@shawnborton
Copy link
Contributor

Yeah, that makes sense to me but also curious for Danny's opinion.

@dannymcclain
Copy link
Contributor

Yeah I guess we probably should change it if it's not actually clickable. I think we have two options:

  • Use same color as "Replies" (text-supporting)
  • Keep the blue but make it 50% opacity (this would follow our disabled button state pattern)

But also, why is it disabled? How does it become disabled? Will it become un-disabled at some point? I think these questions are key to knowing which of the above choices is best.

@Expensify/design what do you think?

@rayane-djouah
Copy link
Contributor Author

But also, why is it disabled? How does it become disabled? Will it become un-disabled at some point? I think these questions are key to knowing which of the above choices is best.

It can be disabled when the user does not have permission to access the parent report chat and got invited in thread by mention.

👍 for keeping the blue but make it 50% opacity (this would follow our disabled button state pattern.

@shawnborton
Copy link
Contributor

I prefer the idea of just "unlinking" the text and making it look gray. I think we try to avoid the disabled pattern if we can, especially since it looks a lot like offline patterns.

@dannymcclain
Copy link
Contributor

I prefer the idea of just "unlinking" the text and making it look gray. I think we try to avoid the disabled pattern if we can, especially since it looks a lot like offline patterns.

That works for me. 👍

@shawnborton
Copy link
Contributor

One question though - how far "up the chain" do we expose parent comments to a user who only has access to a child thread? For example, if I have:

  • Thread Level 1
    • Thread Level 2
      • Thread Level 3

And I only have access to view Thread Level 3, should I even be able to see the original comment from Thread Level 1?

@allroundexperts
Copy link
Contributor

@rayane-djouah #39301 is still not fixed. Now we're completely hiding the parent message. I think we should still display the parent message but just not allow a click to it.

Screen.Recording.2024-04-10.at.1.30.32.AM.mov

@allroundexperts
Copy link
Contributor

Looks solid otherwise.

@rayane-djouah
Copy link
Contributor Author

@allroundexperts you meant to link #39331

I can confirm that the bug exists. However, it is also reproducible on main. looks like it is a recent regression.

@allroundexperts
Copy link
Contributor

allroundexperts commented Apr 9, 2024

@rayane-djouah Why have we mentioned #39246 #39331 in the issue description as a fixed issue then?

@rayane-djouah
Copy link
Contributor Author

@allroundexperts #39246 is also fixed by this PR.

Recording.2024-04-09.221533.mp4

I meant that the reported bug here is related to #39331, not to #39246

@allroundexperts
Copy link
Contributor

Okay, lets reset. Is #39331 fixed in this PR?

@allroundexperts
Copy link
Contributor

allroundexperts commented Apr 9, 2024

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
Screen.Recording.2024-04-10.at.2.18.21.AM.mov
Android: mWeb Chrome
Screen.Recording.2024-04-10.at.2.17.19.AM.mov
iOS: Native
Screen.Recording.2024-04-10.at.2.13.54.AM.mov
iOS: mWeb Safari
Screen.Recording.2024-04-10.at.2.12.32.AM.mov
MacOS: Chrome / Safari
Screen.Recording.2024-04-10.at.1.40.01.AM.mov
MacOS: Desktop
Screen.Recording.2024-04-10.at.2.08.01.AM.mov

@rayane-djouah
Copy link
Contributor Author

rayane-djouah commented Apr 9, 2024

Okay, lets reset. Is #39331 fixed in this PR?

Yes! But we have this bug, which is also reproducible on main. I've just reported it here.

@rayane-djouah rayane-djouah changed the title Fixes for redesign thread ancestry feature [on Hold for a bug on main] Fixes for redesign thread ancestry feature Apr 9, 2024
@rayane-djouah
Copy link
Contributor Author

this PR is on hold for this bug: https://expensify.slack.com/archives/C049HHMV9SM/p1712697976186759

@rayane-djouah rayane-djouah changed the title [on Hold for a bug on main] Fixes for redesign thread ancestry feature Fixes for redesign thread ancestry feature Apr 30, 2024
@rayane-djouah
Copy link
Contributor Author

rayane-djouah commented Apr 30, 2024

The holding bug is now fixed, @allroundexperts could you please review this PR when you get a chance?

Copy link
Contributor

@pecanoro pecanoro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good! Waiting for C+ review before doing a quick test myself!

@pecanoro
Copy link
Contributor

pecanoro commented May 6, 2024

@allroundexperts Friendly bump!

@allroundexperts
Copy link
Contributor

Verified the last bug. It seems to work well!

Screen.Recording.2024-05-06.at.8.15.48.PM.mov

Copy link
Contributor

@allroundexperts allroundexperts left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@melvin-bot melvin-bot bot requested a review from thienlnam May 6, 2024 15:17
@pecanoro
Copy link
Contributor

pecanoro commented May 6, 2024

@thienlnam All yours!

Copy link
Contributor

@thienlnam thienlnam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Look good to me, thanks!

@thienlnam thienlnam merged commit de8439b into Expensify:main May 6, 2024
16 of 17 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented May 6, 2024

✋ 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
Copy link
Contributor

OSBotify commented May 9, 2024

🚀 Deployed to production by https://github.com/marcaaron in version: 1.4.71-6 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants