Don't show GBR to AM/guides for managed customer employee invitations #40160

nkdengineer · 2024-04-12T04:39:12Z

Details

Don't show GBR to AM/guides for managed customer employee invitations

Fixed Issues

$ #39659
PROPOSAL: #39659 (comment)

Tests

Verify that no errors appear in the JS console

Offline tests

QA Steps

Expensify account manager/guide is added to customer's workspace to assist them.
Employee requests to join workspace.
Verify that Account manager/guide should not have the workspace join request pinned to their LHN, since they are not a part of the company, and should not action it on their behalf.

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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-04-15T02:39:13Z

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

Pujan92 · 2024-04-15T14:03:06Z

@nkdengineer I know this needs to be tested correctly on staging by expensify team, but can you plz post a recording by specifying hardcoded your email id in the isExpensifyTeam function to test the change?

nkdengineer · 2024-04-16T10:10:52Z

@Pujan92 The record is here, nkdengineer+1266@outlook.com is owner and nkdengineer+1234@outlook.com is a admin of the workspace.

Screen.Recording.2024-04-16.at.17.08.31.mov

Pujan92 · 2024-04-16T16:00:21Z

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

MacOS: Desktop

Pujan92 · 2024-04-16T16:03:12Z

src/libs/ReportUtils.ts

@@ -1169,6 +1169,12 @@ function isJoinRequestInAdminRoom(report: OnyxEntry<Report>): boolean {
    if (!report) {
        return false;
    }
+    if (report.policyID) {
+        const policy = getPolicy(report.policyID);
+        if (!PolicyUtils.isExpensifyTeam(policy.owner) && PolicyUtils.isExpensifyTeam(currentUserPersonalDetails?.login)) {


@nkdengineer plz add a comment on why we are doing this, can inspire by this comment

App/src/pages/workspace/WorkspaceMembersPage.tsx

Lines 328 to 331 in 5efea54

// If this policy is owned by Expensify then show all support (expensify.com or team.expensify.com) emails

// We don't want to show guides as policy members unless the user is a guide. Some customers get confused when they

// see random people added to their policy, but guides having access to the policies help set them up.

if (PolicyUtils.isExpensifyTeam(details?.login ?? details?.displayName)) {

@Pujan92 I updated the comment. Please help to check again.

Pujan92

LGTM!

OSBotify · 2024-04-17T16:43:15Z

✋ 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-04-18T04:59:50Z

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

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

twisterdotcom · 2024-04-18T09:24:53Z

YESSSSSSSSSSSSS! They have gone! This is amazing.

kbecciv · 2024-04-19T13:03:30Z

@Pujan92 @nkdengineer The QA steps seem a bit unclear. Could you provide some clarification or guidance to help us understand better?

twisterdotcom · 2024-04-19T14:02:38Z

I have tested this on Staging already.

kbecciv · 2024-04-19T14:10:31Z

@twisterdotcom Thank you for doing that, checking off

OSBotify · 2024-04-22T15:00:49Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.63-21 🚀

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

Don't show GBR to AM/guides for managed customer employee invitations

3525b1a

nkdengineer marked this pull request as ready for review April 15, 2024 02:39

nkdengineer requested a review from a team as a code owner April 15, 2024 02:39

melvin-bot bot removed the request for review from a team April 15, 2024 02:39

melvin-bot bot requested a review from Pujan92 April 15, 2024 02:39

nkdengineer mentioned this pull request Apr 15, 2024

[payment DUE] [$250] Don't show GBR to AM/guides for managed customer employee invitations #39659

Closed

6 tasks

Merge branch 'main' into fix/39659

40cc0e5

Pujan92 reviewed Apr 16, 2024

View reviewed changes

nkdengineer added 3 commits April 17, 2024 13:09

Merge branch 'main' into fix/39659

bdd1b0d

Add explain comment

93e1aa8

fix lint

0a370f7

Pujan92 approved these changes Apr 17, 2024

View reviewed changes

melvin-bot bot requested a review from marcochavezf April 17, 2024 09:35

marcochavezf approved these changes Apr 17, 2024

View reviewed changes

marcochavezf merged commit c647c30 into Expensify:main Apr 17, 2024
16 checks passed

github-actions bot mentioned this pull request Apr 18, 2024

Deploy Checklist: New Expensify 2024-04-18 #40392

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Don't show GBR to AM/guides for managed customer employee invitations #40160

Don't show GBR to AM/guides for managed customer employee invitations #40160

nkdengineer commented Apr 12, 2024

melvin-bot bot commented Apr 15, 2024

Pujan92 commented Apr 15, 2024

nkdengineer commented Apr 16, 2024

Pujan92 commented Apr 16, 2024 •

edited

Loading

Pujan92 Apr 16, 2024

nkdengineer Apr 17, 2024

Pujan92 left a comment

OSBotify commented Apr 17, 2024

OSBotify commented Apr 18, 2024

twisterdotcom commented Apr 18, 2024

kbecciv commented Apr 19, 2024

twisterdotcom commented Apr 19, 2024

kbecciv commented Apr 19, 2024

OSBotify commented Apr 22, 2024

	// If this policy is owned by Expensify then show all support (expensify.com or team.expensify.com) emails
	// We don't want to show guides as policy members unless the user is a guide. Some customers get confused when they
	// see random people added to their policy, but guides having access to the policies help set them up.
	if (PolicyUtils.isExpensifyTeam(details?.login ?? details?.displayName)) {

Don't show GBR to AM/guides for managed customer employee invitations #40160

Don't show GBR to AM/guides for managed customer employee invitations #40160

Conversation

nkdengineer commented Apr 12, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 15, 2024

Pujan92 commented Apr 15, 2024

nkdengineer commented Apr 16, 2024

Pujan92 commented Apr 16, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

Pujan92 Apr 16, 2024

Choose a reason for hiding this comment

nkdengineer Apr 17, 2024

Choose a reason for hiding this comment

Pujan92 left a comment

Choose a reason for hiding this comment

OSBotify commented Apr 17, 2024

OSBotify commented Apr 18, 2024

twisterdotcom commented Apr 18, 2024

kbecciv commented Apr 19, 2024

twisterdotcom commented Apr 19, 2024

kbecciv commented Apr 19, 2024

OSBotify commented Apr 22, 2024

Pujan92 commented Apr 16, 2024 •

edited

Loading