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

Use oldPolicyName report field for archived workspace chats #8436

Merged
merged 37 commits into from
May 10, 2022

Conversation

roryabraham
Copy link
Contributor

@roryabraham roryabraham commented Apr 1, 2022

Details

Uses the oldPolicyName rNVP to display the policy name on archived workspace chats.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/204324

Tests / QA Steps

  1. Sign in as user A.
  2. Create another user, user B.
  3. Create another user, user C. Give this user a first and last name.
  4. Create another user using a phone number (including +COUNTRY_CODE prefix), user D.
  5. Sign back in as user A.
  6. Create a 1:1 DM with user B.
  7. Verify that you see the user's email in the DM chat header.
  8. (web/desktop) Hover over the user's email in the DM chat header. Verify that you see the user's email in a tooltip.
  9. Create a 1:1 DM with user C.
  10. Verify that you see the user's full name in the DM chat header.
  11. (web/desktop) Hover over the user's full name in the DM chat header. Verify that you see the user's email in a tooltip.
  12. Create a 1:1 DM with user D.
  13. Verify that you see the user's phone number without a country code in the DM chat header.
  14. (web/desktop) Hover over the user's phone number in the DM chat header. Verify that you see the full phone number, including the country code, in a tooltip.
  15. Create a group DM with users B, C, and D.
  16. Verify that you see user B's first name, user C's email, and user D's phone number without the country code.
  17. (web/desktop) Hover over B's first name. Verify that you see their email in a tooltip.
  18. (web/desktop) Hover over C's email. Verify that you see their email in a tooltip.
  19. (web/desktop) Hover over D's phone number. Verify that you see the full phone number, including the country code, in a tooltip.
  20. Create a workspace (if needed).
  21. Open a default room for the workspace, such as #admins. Verify that you see the name of the room in the chat header. Verify that you see the name of the policy as a subtitle in the chat header.
  22. Invite users B, C, and D to the workspace.
  23. Open the workspace chat for user B.
  24. Verify that you see the user B's full name in the chat header, and the workspace name as a subtitle in the chat header.
  25. (web/desktop) Hover over user B's full name in the chat header. Verify that you see user B's email in a tooltip.
  26. Open the workspace chat for user C.
  27. Verify that you see user C's email in the chat header, and the workspace name as a subtitle in the chat header.
  28. (web/desktop) Hover over user C's email in the chat header. Verify that you see the same email in a tooltip.
  29. Open the workspace chat for user D.
  30. Verify that you see user D's phone number (without country code) in the chat header, and the workspace name as a subtitle in the chat header.
  31. (web/desktop) Hover over user D's phone number in the chat header. Verify that you see the full phone number (including country code) in a tooltip.
  32. Sign into Expensify as user B.
  33. Open your workspace chat.
  34. Verify that you see the workspace name as the title in the chat header.
  35. Verify that you see just Workspace as the subtitle in the chat header.
  36. Go to Settings -> Preferences and change your language to Español.
  37. Open your workspace chat and verify that you see the workspace name as the title in the chat header.
  38. Verify that you see just Espacio de trabajo as the subtitle in the chat header.
  39. Go to Settings -> Preferences and change your language back to English.
  40. Sign into OldDot as user A.
  41. Go to Settings -> Policies and delete the workspace.
  42. Sign into NewDot as user A.
  43. Open a default room for the archived workspace, such as #admins. Verify that you see #admins (archived) in the chat header.
  44. Go to Settings -> Preferences and change your language to Español.
  45. Open the #admins room. Verify that you see #admins (archivado) in the chat header.
  46. Go to Settings -> Preferences and change your language back to English.
  47. Open the workspace chat for user B.
  48. Verify that you see user B's full name followed by (archived) in the chat header, and the workspace name as a subtitle in the chat header.
  49. (web/desktop) Hover over user B's full name and verify that you see their email in a tooltip.
  50. Change your language to Spanish.
    1 Open the workspace chat for user B.
  51. Verify that you see user B's full name followed by (archivado) in the chat header, and the workspace name as a subtitle in the chat header.
  52. Change your language back to English.
  53. Open the workspace chat for user C.
  54. Verify that you see user C's email followed by (archived) in the chat header, and the workspace name as a subtitle in the chat header.
  55. (web/desktop) Hover over user C's email and verify that you see the email in a tooltip.
  56. Change your language to Spanish.
  57. Open the workspace chat for user C.
  58. Verify that you see user C's email followed by (archivado) in the chat header, and the workspace name as a subtitle in the chat header.
  59. Change your language back to English.
  60. Open the workspace chat for user D.
  61. Verify that you see user D's phone number (without country code) followed by (archived) in the chat header, and the workspace name as a subtitle in the chat header.
  62. (web/desktop) Hover over user D's phone number and verify that you see the full phone number (including country code) in a tooltip.
  63. Change your language to Spanish.
  64. Open the workspace chat for user D.
  65. Verify that you see user D's phone number (without country code) followed by (archivado) in the chat header, and the workspace name as a subtitle in the chat header.
  66. Change your language back to English.
  67. Sign into NewDot as user B.
  68. Open your workspace chat and verify that you see the workspace name followed by (archived) in the chat header, and just Workspace as the subtitle.
  69. Change your language to Spanish.
  70. Open your workspace chat and verify that you see the workspace name followed by (archivado) in the chat header, and Espacio de trabajo as the subtitle.

Important: When staging QA is complete, make sure that the above steps are added to the regression testing suite in TestRail.

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

Screenshots

Web

image

image

image

image

(I know that the sidebar still isn't correct – want to treat that as a separate issue).

image

Mobile Web

Desktop

iOS

Android

@roryabraham
Copy link
Contributor Author

# Conflicts:
#	src/components/ArchivedReportFooter.js
#	src/components/ReportWelcomeText.js
#	src/libs/OptionsListUtils.js
@roryabraham roryabraham reopened this Apr 20, 2022
@roryabraham roryabraham self-assigned this Apr 21, 2022
@roryabraham roryabraham changed the title [HOLD] Use oldPolicyName report field for archived workspace chats Use oldPolicyName report field for archived workspace chats Apr 21, 2022
@roryabraham roryabraham marked this pull request as ready for review April 21, 2022 22:17
@roryabraham roryabraham requested review from marcaaron and a team as code owners April 21, 2022 22:17
@melvin-bot melvin-bot bot removed the request for review from a team April 21, 2022 22:18
# Conflicts:
#	src/libs/OptionsListUtils.js
#	src/libs/actions/ReportActions.js
#	src/pages/home/report/ReportActionsView.js
#	src/pages/home/sidebar/SidebarLinks.js
@@ -7,7 +7,7 @@ import CONST from '../CONST';
* @returns {String}
*/
function getEmailWithoutMergedAccountPrefix(email) {
return email.replace(/^MERGED_0@/, '');
return email.replace(/^MERGED_\d@/, '');
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is a random fix, but this code makes it look like theoretically we could have MERGED_1 or MERGED_2

@roryabraham roryabraham requested a review from marcaaron May 5, 2022 15:59
@roryabraham
Copy link
Contributor Author

@marcaaron Thanks for the thorough review, this is ready for another round of reviews.

@roryabraham roryabraham dismissed marcaaron’s stale review May 10, 2022 22:54

Hopefully everything you mentioned in your review has been addressed. Dismissing since you're OOO this week

@roryabraham roryabraham merged commit e00ed6f into main May 10, 2022
@roryabraham roryabraham deleted the Rory-ArchivedPolicyName branch May 10, 2022 22:54
@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.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by @roryabraham in version: 1.1.58-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by @AndrewGable in version: 1.1.60-3 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 failure ❌
🕸 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