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: timezone shown for our own email #9642

Merged
merged 2 commits into from
Jul 18, 2022
Merged

fix: timezone shown for our own email #9642

merged 2 commits into from
Jul 18, 2022

Conversation

Puneet-here
Copy link
Contributor

@Puneet-here Puneet-here commented Jun 30, 2022

Details

Fixed timezone showing up for our own email at rooms when there is no user except you

Fixed Issues

$ #9238

Tests

  1. Click on fab icon > new workspace (if you don't have any workspace)
  2. Search #announce room and open it (note: the room should not contain any other member except you)
  3. Check that you aren't seeing timezone above the composer

  1. Click on fab icon > new workspace (if you don't have any workspace)
  2. Search #announce room and open it (note: the room should only contain one other member except you)
  3. Check that you see the timezone of that other user

  1. Click on fab icon > new workspace (if you don't have any workspace)
  2. Search #announce room and open it (note: the room should contain 2 users excluding you)
  3. Check that you aren't seeing timezone
  • Verify that no errors appear in the JS console

PR Review Checklist

Contributor (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 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 included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • 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 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 was added in all src/languages/* files
    • I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team 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
  • 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 */
    • Any functional components have the displayName property
    • 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
  • 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 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.

PR Reviewer Checklist

  • 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 verified tests pass on all platforms & I tested again on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • 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 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 was added in all src/languages/* files
    • I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team 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 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 */
    • Any functional components have the displayName property
    • 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 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 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.

QA Steps

  1. Click on fab icon > new workspace (if you don't have any workspace)
  2. Search #announce room and open it (note: the room should not contain any other member except you)
  3. Check that you aren't seeing timezone above the composer

  1. Click on fab icon > new workspace (if you don't have any workspace)
  2. Search #announce room and open it (note: the room should only contain one other member except you)
  3. Check that you see the timezone of that other user

  1. Click on fab icon > new workspace (if you don't have any workspace)
  2. Search #announce room and open it (note: the room should contain 2 users excluding you)
  3. Check that you aren't seeing timezone
  • Verify that no errors appear in the JS console

Screenshots

Web

Screen.Recording.2022-06-30.at.10.38.54.PM.mov
Screen.Recording.2022-06-30.at.10.40.45.PM.mov
Screen.Recording.2022-06-30.at.10.40.17.PM.mov

Mobile Web

Screen.Recording.2022-06-30.at.10.43.29.PM.mov

Desktop

Screen.Recording.2022-06-30.at.10.59.21.PM.mov

iOS

Screen.Recording.2022-06-30.at.10.47.52.PM.mov

Android

Screen.Recording.2022-06-30.at.10.56.30.PM.mov

@Puneet-here Puneet-here requested a review from a team as a code owner June 30, 2022 17:33
@melvin-bot melvin-bot bot requested review from mananjadhav and thienlnam and removed request for a team June 30, 2022 17:34
src/libs/ReportUtils.js Show resolved Hide resolved
Copy link
Collaborator

@mananjadhav mananjadhav left a comment

Choose a reason for hiding this comment

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

@Puneet-here I've posted the comment and also suggestion of the function.

I would also request:

  1. Mark every item in the checklist. If it applies then test and mark, if it doesn't apply then just mark so that we know we've gone through it and adhere to it.
  2. QA Steps says go to #announce-room, can we post atleast in one of the steps how to create an Announce with participants?

@Puneet-here
Copy link
Contributor Author

For some reason the commit to merge main branch wasn't signed so I had to reset it and force push.

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.

This is getting there! Just a few more comments

src/libs/ReportUtils.js Outdated Show resolved Hide resolved
src/libs/ReportUtils.js Show resolved Hide resolved
src/pages/home/report/ReportActionCompose.js Show resolved Hide resolved
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.

Can we also see a video for:

Chat with concierge (No timezone should be shown)
Chat with 1:1 (Timezone should be shown)
Chat with another user and concierge ( Timezone should be shown)

src/libs/ReportUtils.js Outdated Show resolved Hide resolved
src/libs/ReportUtils.js Show resolved Hide resolved
src/pages/home/report/ReportActionCompose.js Show resolved Hide resolved
@Puneet-here
Copy link
Contributor Author

Removed the function.

And here's the video -

Screen.Recording.2022-07-15.at.11.05.35.PM.mov

@mananjadhav
Copy link
Collaborator

@Puneet-here Did we make the null handling change? I can't find it.

@Puneet-here
Copy link
Contributor Author

@mananjadhav, no I didn't. As It's not needed.

Same as above, this might be fine since participantsWithoutExpensifyEmails will be an empty array

@thienlnam
Copy link
Contributor

Sweet, @mananjadhav please go ahead and complete testing for this PR

@mananjadhav
Copy link
Collaborator

@thienlnam Tests well and changes look good.

🎀 👀 🎀 
C+ reviewed

Quick comment: The timezone text is aligned a bit on the right. It is right aligned in the main chat as well and doesn't need to be changed here, but I thought I'll just highlight it here.

image

PR Reviewer Checklist

The Contributor+ will copy/paste it into a new comment and complete it after the author checklist is completed

  • 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 verified tests pass on all platforms & I tested again on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • 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 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 was added in all src/languages/* files
    • I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team 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 */
    • Any functional components have the displayName property
    • 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 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 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.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

@thienlnam
Copy link
Contributor

Quick comment: The timezone text is aligned a bit on the right. It is right aligned in the main chat as well and doesn't need to be changed here, but I thought I'll just highlight it here.

This doesn't seem related to any changes made here, should be happening on prod as well so feel free to report in the #expensify-open-source channel for us to create a new issue

@thienlnam thienlnam merged commit 2e0eca5 into Expensify:main Jul 18, 2022
@OSBotify
Copy link
Contributor

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

@mananjadhav
Copy link
Collaborator

@Puneet-here I just took the latest main branch pull and it seems this change is crashing the App on a fresh login.

image

image

cc - @thienlnam

@mananjadhav mananjadhav mentioned this pull request Jul 18, 2022
93 tasks
@mananjadhav
Copy link
Collaborator

mananjadhav commented Jul 18, 2022

@thienlnam IMP: Please check this PR for the login crash on this report - #9966

I still couldn't understand why it worked fine beforehand (especially with the typo in the prop name) and now its crashing.

@chiragsalian
Copy link
Contributor

Yup i am seeing the same issue and dev is broken for me. Was going to push the same fix but you got to it sooner. Checking your code.

@OSBotify
Copy link
Contributor

🚀 Deployed to production by @luacmartins in version: 1.1.85-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.

5 participants