From 44ea40db20a46deaf52e94a46c0f792afd5dcccf Mon Sep 17 00:00:00 2001
From: Dnyanesh Bharambe <dnyaneshbharambe2006@gmail.com>
Date: Tue, 27 Jan 2026 19:23:39 +0000
Subject: [PATCH 1/4] fix: vertically align app icons in GenericMenu

---
 .../GenericMenu/GenericMenuItem.tsx           | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/packages/ui-client/src/components/GenericMenu/GenericMenuItem.tsx b/packages/ui-client/src/components/GenericMenu/GenericMenuItem.tsx
index dcf6043d5a23c..e948ef7c2cb95 100644
--- a/packages/ui-client/src/components/GenericMenu/GenericMenuItem.tsx
+++ b/packages/ui-client/src/components/GenericMenu/GenericMenuItem.tsx
@@ -1,4 +1,4 @@
-import { MenuItemColumn, MenuItemContent, MenuItemIcon, MenuItemInput } from '@rocket.chat/fuselage';
+import { Box, MenuItemColumn, MenuItemContent, MenuItemIcon, MenuItemInput } from '@rocket.chat/fuselage'; // 1. Added Box import
 import type { ComponentProps, MouseEvent, ReactNode } from 'react';
 
 export type GenericMenuItemProps = {
@@ -17,13 +17,18 @@ export type GenericMenuItemProps = {
 };
 
 const GenericMenuItem = ({ icon, iconColor, content, addon, status, gap, tooltip }: GenericMenuItemProps) => (
-	<>
-		{gap && <MenuItemColumn />}
-		{icon && <MenuItemIcon name={icon} color={iconColor} />}
-		{status && <MenuItemColumn>{status}</MenuItemColumn>}
-		{content && <MenuItemContent title={tooltip}>{content}</MenuItemContent>}
-		{addon && <MenuItemInput>{addon}</MenuItemInput>}
-	</>
+    <>
+        {gap && <MenuItemColumn />}
+        {/* 2. Wrap the icon in a flexbox container */}
+        {icon && (
+            <Box display='flex' alignItems='center' justifyContent='center' width='x20'>
+                <MenuItemIcon name={icon} color={iconColor} />
+            </Box>
+        )}
+        {status && <MenuItemColumn>{status}</MenuItemColumn>}
+        {content && <MenuItemContent title={tooltip}>{content}</MenuItemContent>}
+        {addon && <MenuItemInput>{addon}</MenuItemInput>}
+    </>
 );
 
-export default GenericMenuItem;
+export default GenericMenuItem;
\ No newline at end of file

From 9a05b1f80b8a32e4542a8b209ec8aa300784d1ed Mon Sep 17 00:00:00 2001
From: Dnyanesh Bharambe <dnyaneshbharambe2006@gmail.com>
Date: Wed, 28 Jan 2026 16:54:53 +0000
Subject: [PATCH 2/4] fix: update avatar URL placeholder to example format

---
 .../components/avatar/UserAvatarEditor/UserAvatarEditor.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx b/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx
index b88acc2781335..15a85e403b554 100644
--- a/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx
+++ b/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx
@@ -111,7 +111,7 @@ function UserAvatarEditor({ currentUsername, username, setAvatarObj, name, disab
 					<TextInput
 						id={imageUrlField}
 						flexGrow={0}
-						placeholder={t('Use_url_for_avatar')}
+						placeholder="https://example.com/avatar.png"
 						value={avatarFromUrl}
 						mis={4}
 						onChange={handleAvatarFromUrlChange}

From 17939ca5119091e533bf4bf4c9d07fac99ab6bc3 Mon Sep 17 00:00:00 2001
From: Dnyanesh Bharambe <dnyaneshbharambe2006@gmail.com>
Date: Fri, 30 Jan 2026 06:31:44 +0000
Subject: [PATCH 3/4] fix: prevent creating discussions with whitespace-only
 names

---
 .../client/components/CreateDiscussion/CreateDiscussion.tsx  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
index 7aae6736909b5..b1fd09704c0ef 100644
--- a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
+++ b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
@@ -162,7 +162,10 @@ const CreateDiscussion = ({ onClose, defaultParentRoom, parentMessageId, nameSug
 							<Controller
 								name='name'
 								control={control}
-								rules={{ required: t('Required_field', { field: t('Name') }) }}
+								rules={{ 
+									required: t('Required_field', { field: t('Name') }),
+									validate: (value) => value.trim().length > 0 || t('Required_field', { field: t('Name') })
+								}}
 								render={({ field }) => (
 									<TextInput
 										id={discussionNameId}

From ec53e8b385058c0ec9d7c8bbe9de3764cca66d2e Mon Sep 17 00:00:00 2001
From: Dnyanesh Bharambe <dnyaneshbharambe2006@gmail.com>
Date: Fri, 30 Jan 2026 12:59:03 +0530
Subject: [PATCH 4/4] Refactor validation rules for discussion name field

---
 .../CreateDiscussion/CreateDiscussion.tsx     | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
index 664164e740fc3..59640343a7e78 100644
--- a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
+++ b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
@@ -132,20 +132,6 @@ const CreateDiscussion = ({
 						{defaultParentRoom && (
 							<Controller
 								control={control}
-								rules={{ 
-									required: t('Required_field', { field: t('Name') }),
-									validate: (value) => value.trim().length > 0 || t('Required_field', { field: t('Name') })
-								}}
-								render={({ field }) => (
-									<TextInput
-										id={discussionNameId}
-										{...field}
-										aria-invalid={Boolean(errors.name)}
-										aria-required='true'
-										aria-describedby={`${discussionNameId}-error ${discussionNameId}-hint`}
-										addon={<Icon name='baloons' size='x20' />}
-									/>
-								)}
 								name='parentRoom'
 								render={() => <DefaultParentRoomField defaultParentRoom={defaultParentRoom} id={parentRoomId} />}
 							/>
@@ -188,7 +174,10 @@ const CreateDiscussion = ({
 						<Controller
 							name='name'
 							control={control}
-							rules={{ required: t('Required_field', { field: t('Name') }) }}
+							rules={{ 
+								required: t('Required_field', { field: t('Name') }),
+								validate: (value) => value.trim().length > 0 || t('Required_field', { field: t('Name') })
+							}}
 							render={({ field }) => (
 								<TextInput
 									id={discussionNameId}