-
Notifications
You must be signed in to change notification settings - Fork 3k
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
Block system user from Inviting into Workspace #4781
Conversation
Please check the copy text. Let me know what would be the correct one and their translations. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mostly looks good, but I had a few comments and want to get this copy + these translations vetted before we move forward.
src/libs/reportUtils.js
Outdated
* @param {String} login - user email | ||
* @return {Boolean} | ||
*/ | ||
function isSystemUser(login) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NAB but reportUtils
feels like a weird place for this. Not sure I have a better suggestion for now unless we create userUtils
or something?
@@ -88,9 +90,16 @@ class WorkspaceInvitePage extends React.Component { | |||
Growl.error(this.props.translate('workspace.invite.pleaseEnterValidLogin'), 5000); | |||
return; | |||
} | |||
|
|||
const isEnteredLoginSystemLogin = _.some(logins, login => isSystemUser(login)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
const isEnteredLoginSystemLogin = _.some(logins, login => isSystemUser(login)); | |
const didEnterSystemLogin = _.some(logins, login => isSystemUser(login)); |
Getting some copy reviewed in the linked issue. However, in it's current state I don't think we'll want |
src/languages/en.js
Outdated
pleaseEnterValidLogin: 'Please ensure the email or phone number is valid (e.g. +15005550006).', | ||
pleaseEnterUniqueLogin: 'That user is already a member of this workspace.', | ||
genericFailureMessage: 'An error occurred inviting the user to the workspace, please try again.', | ||
systemUserError: 'Please ensure email or phone number is not a system User.', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Coming back from the linked issue, the copy we landed on here is:
Sorry, you cannot invite [email protected] to a workspace.
Using whichever invalid email was found first.
I think |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mostly LGTM, but we should have someone buddy-check these translations after you make the next few changes.
src/languages/en.js
Outdated
personalMessagePrompt: 'Add a Personal Message (Optional)', | ||
enterEmailOrPhone: 'Email or Phone', | ||
enterEmailOrPhone: 'Emails or Phones', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
enterEmailOrPhone: 'Emails or Phones', | |
enterEmailOrPhone: 'Emails or phone numbers', |
OK. It will look like this with numberoflines 2 after #4649 is merged. |
Okay. This PR is not urgent so let's HOLD on #4649 |
@shawnborton Before we commit, I would like your feedback on the Changes to the Phone & email input here. #4781 (comment) |
Looks good to me. It seems like with this issue here, we might end up changing this page a bit but I think we still need to go through the design phase first. The only other feedback is that we should be consistent with how we capitalize the labels used in each textarea on this page. Let's just stick with sentence case? |
@roryabraham #4649 is merged. Let's move with this now. Thanks. |
Okay, let me get the translations checked |
Translations are updated https://expensify.slack.com/archives/C01GTK53T8Q/p1629953043008900 |
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
🚀 Deployed to staging by @roryabraham in version: 1.0.88-3 🚀
|
🚀 Deployed to production by @roryabraham in version: 1.0.90-2 🚀
|
Details
Fixed Issues
$ #4646
Tests | QA Steps
Test 1
Test 2
Test 3
Tested On
Screenshots
Web | Desktop | Mobile Web
iOS
Android