feat: ✨ Hide join default channels on user editing page

RocketChat · Jul 30, 2024 · f92f17d · f92f17d
1 parent 6cd4678
commit f92f17d
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/apps/meteor/client/views/admin/users/AdminUserForm.tsx b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
@@ -353,20 +353,22 @@ const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleD
 						</FieldRow>
 						{errors?.roles && <FieldError>{errors.roles.message}</FieldError>}
 					</Field>
-					<Field>
-						<Box display='flex' flexDirection='row' alignItems='center' justifyContent='space-between' flexGrow={1}>
-							<FieldLabel htmlFor={joinDefaultChannelsId}>{t('Join_default_channels')}</FieldLabel>
-							<FieldRow>
-								<Controller
-									control={control}
-									name='joinDefaultChannels'
-									render={({ field: { ref, onChange, value } }) => (
-										<ToggleSwitch id={joinDefaultChannelsId} ref={ref} onChange={onChange} checked={value} />
-									)}
-								/>
-							</FieldRow>
-						</Box>
-					</Field>
+					{isNewUserPage && (
+						<Field>
+							<Box display='flex' flexDirection='row' alignItems='center' justifyContent='space-between' flexGrow={1}>
+								<FieldLabel htmlFor={joinDefaultChannelsId}>{t('Join_default_channels')}</FieldLabel>
+								<FieldRow>
+									<Controller
+										control={control}
+										name='joinDefaultChannels'
+										render={({ field: { ref, onChange, value } }) => (
+											<ToggleSwitch id={joinDefaultChannelsId} ref={ref} onChange={onChange} checked={value} />
+										)}
+									/>
+								</FieldRow>
+							</Box>
+						</Field>
+					)}
 					<Field>
 						<Box display='flex' flexDirection='row' alignItems='center' justifyContent='space-between' flexGrow={1} mbe={8}>
 							<FieldLabel htmlFor={sendWelcomeEmailId} disabled={!isSmtpEnabled}>