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

Fix subtitle displayed wrong in LHN when clicking reply in thread #20235

Merged
merged 1 commit into from
Jun 6, 2023

Conversation

dukenv0307
Copy link
Contributor

@dukenv0307 dukenv0307 commented Jun 6, 2023

Details

Subtitle displayed wrong briefly in LHN when clicking reply in thread

Fixed Issues

$ #19349
PROPOSAL: #19349 (comment)

Tests

  1. Login with any account
  2. If doesn't have any workspace, create a new workspace
  3. Go to announce or admin chat of any workspace
  4. Send any message
  5. Clicking on reply in thread
  6. Verify that subtitle that is displayed in LHN follows the pattern 'Workspace Name • #roomName' with correct workspace name
  • Verify that no errors appear in the JS console

Offline tests

Same above

QA Steps

  1. Login with any account
  2. If doesn't have any workspace, create a new workspace
  3. Go to announce or admin chat of any workspace
  4. Send any message
  5. Clicking on reply in thread
  6. Verify that subtitle that is displayed in LHN follows the pattern 'Workspace Name • #roomName' with correct workspace name
  • 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 / Chrome
    • iOS / native
    • iOS / 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 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 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 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(themeColors.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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web
Screencast.from.06-06-2023.09.50.46.webm
Mobile Web - Chrome
Record_2023-06-06-01-47-22.mp4
Mobile Web - Safari
processed-AD4FC88A-C6B6-47FE-AD95-9217EC3E13F6-9C01E48A-C84A-491A-95B8-D70AE5A90647.mp4
Desktop
Screen.Recording.2023-06-06.at.14.47.28.mov
iOS
Screen.Recording.2023-06-06.at.14.57.53.mov
Android
19349.mp4

@dukenv0307 dukenv0307 marked this pull request as ready for review June 6, 2023 08:02
@dukenv0307 dukenv0307 requested a review from a team as a code owner June 6, 2023 08:02
@melvin-bot melvin-bot bot requested review from abdulrahuman5196 and amyevans and removed request for a team June 6, 2023 08:02
@melvin-bot
Copy link

melvin-bot bot commented Jun 6, 2023

@amyevans @abdulrahuman5196 One of you needs to 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]

Copy link
Contributor

@amyevans amyevans left a comment

Choose a reason for hiding this comment

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

NBD, but looks like the videos for mWeb - Safari and Desktop are swapped

@dukenv0307
Copy link
Contributor Author

Just updated

@abdulrahuman5196
Copy link
Contributor

abdulrahuman5196 commented Jun 6, 2023

@amyevans @dukenv0307

Seems there is some bug in main not allowing the threads to be created optimistically. @dukenv0307 Even in your videos attached i am not seeing optimistic chat being created.
I don't think we can test this fix without optimistic thread creation. https://expensify.slack.com/archives/C049HHMV9SM/p1686027554583339

@amyevans What do you think we should do? Should we rebase this fix on top of a older main commit(main branch at may 31st didn't have this issue)?

@abdulrahuman5196
Copy link
Contributor

@dukenv0307 @amyevans I have raised this issue in expensify-open-source slack channel as well - https://expensify.slack.com/archives/C01GTK53T8Q/p1686064782564449

@amyevans
Copy link
Contributor

amyevans commented Jun 6, 2023

Should we rebase this fix on top of a older main commit(main branch at may 31st didn't have this issue)?

This solution seems fine, it'll enable us to fully test the fix in this PR, without becoming dependent on a fix for the unrelated issue in main.

@abdulrahuman5196
Copy link
Contributor

@amyevans

This solution seems fine, it'll enable us to fully test the fix in this PR, without becoming dependent on a fix for the unrelated issue in main

The solution is fine. But I don't think we can test it fully. Even if we remove the author's commits, we can still see the same behaviour due to the main issue. Its like with or without this fix we are seeing the same behaviour during thread creation. Since the issue of "No activity yet" will only come during the skeleton view load phase we won't be able to test if this solution fixes it.

@amyevans
Copy link
Contributor

amyevans commented Jun 6, 2023

@abdulrahuman5196 Hmm I'm not sure I follow what you're saying.

I am testing with these steps:

I'm okay with not pursuing the route of rebasing the fix on top of a older main commit if you have an alternate proposal (such as putting this PR on HOLD for X), but I'm just not currently understanding the need 😅

@abdulrahuman5196
Copy link
Contributor

abdulrahuman5196 commented Jun 6, 2023

@amyevans

You are actually checking out a older commit head and cherry picking this fix on top of that and testing. It will work that way.

In your first step git checkout 2977c04baf(this commit is from may 30).

If instead of the above, if you checkout the git checkout main and cherry pick this it won't work. Like the skeleton view itself is not loading on main or on latest commits. Same will happen if you checkout this PR directly.

Screen.Recording.2023-06-06.at.8.16.51.PM.mov

If we want we can test the same way as you tested like checking out old commit and cherry picking fix commit on top of that(Basically that's the rebase if we want to test locally). Do we want to do that way so that we are not blocked on main fix? I am ok with that as well

@abdulrahuman5196
Copy link
Contributor

Anyways we don't have a GH issue for the skeleton view not present issue on main. So I am following to test with this way #20235 (comment) so that we don't have to wait.

@amyevans
Copy link
Contributor

amyevans commented Jun 6, 2023

Anyways we don't have a GH issue for the skeleton view not present issue on main. So I am following to test with this way #20235 (comment) so that we don't have to wait.

Yes, let's test that way. (Side note, earlier I think we were saying the same thing, just somehow not understanding one another 😄). Thanks!

@abdulrahuman5196
Copy link
Contributor

abdulrahuman5196 commented Jun 6, 2023

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 / Chrome
    • iOS / native
    • iOS / 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(themeColors.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 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

Web
Screen.Recording.2023-06-07.at.12.08.37.AM.mov
Mobile Web - Chrome
az_recorder_20230607_001307.mp4
Mobile Web - Safari
ScreenRecording.mov
Desktop
Screen.Recording.2023-06-06.at.11.04.52.PM.mov
iOS
Screen.Recording.2023-06-06.at.11.46.49.PM.mov
Android
az_recorder_20230607_002619.mp4

Copy link
Contributor

@abdulrahuman5196 abdulrahuman5196 left a comment

Choose a reason for hiding this comment

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

Changes looks good and works well. Reviewers checklist is also complete.

All yours now @amyevans . (I think we got derailed in the conversions a bit)

@amyevans amyevans merged commit 865a9b8 into Expensify:main Jun 6, 2023
@OSBotify
Copy link
Contributor

OSBotify commented Jun 6, 2023

✋ 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 Jun 6, 2023

🚀 Deployed to staging by https://github.com/amyevans in version: 1.3.25-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Jun 8, 2023

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.25-8 🚀

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.

4 participants