From 48f3e333256b32b1351179e43a718b9d6777fd5e Mon Sep 17 00:00:00 2001
From: rique223 <henrique.jobs1@gmail.com>
Date: Mon, 16 Oct 2023 17:13:05 -0300
Subject: [PATCH] refactor: :recycle: Ensure requirePasswordChange is true when
 setRandomPassword is true

Created some logic to make sure the requirePasswordChange field will be true even if the user changed it to false and then changed setRandomPassword to true. Also changed some strings and sizes to follow figma specs.
---
 .../client/views/admin/users/AdminUserForm.tsx       | 12 +++++++++---
 .../packages/rocketchat-i18n/i18n/en.i18n.json       |  6 +++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/apps/meteor/client/views/admin/users/AdminUserForm.tsx b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
index f6e5867bf20e..5b576bba65b1 100644
--- a/apps/meteor/client/views/admin/users/AdminUserForm.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
@@ -107,6 +107,8 @@ const UserForm = ({ userData, onReload, setCreatedUsersCount, ...props }: AdminU
 		mode: 'onBlur',
 	});
 
+	const { avatar, username, setRandomPassword, password } = watch();
+
 	useEffect(() => {
 		resetField('sendWelcomeEmail', { defaultValue: isSmtpEnabled });
 		// eslint-disable-next-line react-hooks/exhaustive-deps
@@ -117,6 +119,12 @@ const UserForm = ({ userData, onReload, setCreatedUsersCount, ...props }: AdminU
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [isSmtpEnabled, userData?._id]);
 
+	useEffect(() => {
+		resetField('requirePasswordChange', { defaultValue: setRandomPassword });
+
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [setRandomPassword]);
+
 	const eventStats = useEndpointAction('POST', '/v1/statistics.telemetry');
 	const updateUserAction = useEndpoint('POST', '/v1/users.update');
 	const createUserAction = useEndpoint('POST', '/v1/users.create');
@@ -126,8 +134,6 @@ const UserForm = ({ userData, onReload, setCreatedUsersCount, ...props }: AdminU
 
 	const availableRoles: SelectOption[] = roleData?.roles.map(({ _id, name, description }) => [_id, description || name]) || [];
 
-	const { avatar, username, setRandomPassword, password } = watch();
-
 	const updateAvatar = useUpdateAvatar(avatar, userData?._id || '');
 
 	const handleUpdateUser = useMutation({
@@ -238,7 +244,7 @@ const UserForm = ({ userData, onReload, setCreatedUsersCount, ...props }: AdminU
 								<FieldLabel htmlFor={verifiedId} p={0} disabled={!isSmtpEnabled || !isVerificationNeeded}>
 									{t('Mark_email_as_verified')}
 								</FieldLabel>
-								<Icon name='info-circled' size='x21' mis={8} title={t('Activate_to_bypass_email_verification')} color='default' />
+								<Icon name='info-circled' size='x20' mis={8} title={t('Enable_to_bypass_email_verification')} color='default' />
 							</Box>
 							<Controller
 								control={control}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
index 4fd9f3076ba0..f2d7ee45eb51 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -295,7 +295,7 @@
   "Action_Available_After_Custom_Content_Added": "This action will become available after the custom content has been added",
   "Action_Available_After_Custom_Content_Added_And_Visible": "This action will become available after the custom content has been added and made visible to everyone",
   "Activate": "Activate",
-  "Activate_to_bypass_email_verification": "Activate to bypass email verification",
+  "Enable_to_bypass_email_verification": "Enable to bypass email verification",
   "Active": "Active",
   "Active_users": "Active users",
   "Activity": "Activity",
@@ -1844,7 +1844,7 @@
   "Email_subject": "Email Subject",
   "Email_verified": "Email verified",
   "Email_sent": "Email sent",
-  "Email_verification_isnt_required": "Email verification is not required. Change this registration option in <a href=\"{{url}}\">accounts settings</a> to enable.",
+  "Email_verification_isnt_required": "Email verification to login is not required. To require, enable setting in <a href=\"{{url}}\">Accounts</a> > Registration",
   "Emoji": "Emoji",
   "Emoji_picker": "Emoji picker",
   "EmojiCustomFilesystem": "Custom Emoji Filesystem",
@@ -3292,7 +3292,7 @@
   "Managing_assets": "Managing assets",
   "Managing_integrations": "Managing integrations",
   "Manual_Selection": "Manual Selection",
-  "Manually_created_users_briefing": "Manually created users will initially be listed under the 'Pending' tab. Once they log in for the first time, they will be moved to the 'Active' tab.",
+  "Manually_created_users_briefing": "Manually created users will initially be shown as pending. Once they log in for the first time, they will be shown as active.",
   "Manufacturing": "Manufacturing",
   "MapView_Enabled": "Enable Mapview",
   "MapView_Enabled_Description": "Enabling mapview will display a location share button on the right of the chat input field.",