From 3d2ae1b827617fce5665f47a1cb149c95a3d8102 Mon Sep 17 00:00:00 2001
From: Sbragul26 <sbragul26@gmail.com>
Date: Wed, 17 Jun 2026 00:46:24 +0530
Subject: [PATCH 1/2] fix: handle React key prop correctly

Signed-off-by: Sbragul26 <sbragul26@gmail.com>
---
 src/custom/UserSearchField/UserSearchFieldInput.tsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/custom/UserSearchField/UserSearchFieldInput.tsx b/src/custom/UserSearchField/UserSearchFieldInput.tsx
index c0858afbb..895aeae7b 100644
--- a/src/custom/UserSearchField/UserSearchFieldInput.tsx
+++ b/src/custom/UserSearchField/UserSearchFieldInput.tsx
@@ -201,8 +201,10 @@ const UserSearchField: React.FC<UserSearchFieldProps> = ({
             }}
           />
         )}
-        renderOption={(props, option: User) => (
-          <li {...props} id={option.userId}>
+        renderOption={(props, option: User) => {
+          const { key, ...restProps } = props;
+          return (
+            <li key={key} {...restProps} id={option.userId}>
             <Box sx={{ '& > img': { mr: 2, flexShrink: 0 } }}>
               {' '}
               <Grid2 container sx={{ alignItems: 'center' }}>
@@ -232,7 +234,8 @@ const UserSearchField: React.FC<UserSearchFieldProps> = ({
               </Grid2>
             </Box>
           </li>
-        )}
+          );
+        }}
       />
       {showNotifyCheckbox && !isCreate && handleNotifyPref && (
         <FormGroup row={true}>

From 43a30c5ec2b34f17f3e6a3a91b5142389b61fe10 Mon Sep 17 00:00:00 2001
From: Sbragul26 <sbragul26@gmail.com>
Date: Wed, 17 Jun 2026 00:58:22 +0530
Subject: [PATCH 2/2] fix: address review feedback

Signed-off-by: Sbragul26 <sbragul26@gmail.com>
---
 src/custom/UserSearchField/UserSearchFieldInput.tsx | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/custom/UserSearchField/UserSearchFieldInput.tsx b/src/custom/UserSearchField/UserSearchFieldInput.tsx
index 895aeae7b..6bb028339 100644
--- a/src/custom/UserSearchField/UserSearchFieldInput.tsx
+++ b/src/custom/UserSearchField/UserSearchFieldInput.tsx
@@ -201,10 +201,8 @@ const UserSearchField: React.FC<UserSearchFieldProps> = ({
             }}
           />
         )}
-        renderOption={(props, option: User) => {
-          const { key, ...restProps } = props;
-          return (
-            <li key={key} {...restProps} id={option.userId}>
+        renderOption={({ key, ...restProps }: React.HTMLAttributes<HTMLLIElement> & { key?: React.Key }, option: User) => (
+          <li key={key} {...restProps} id={option.userId}>
             <Box sx={{ '& > img': { mr: 2, flexShrink: 0 } }}>
               {' '}
               <Grid2 container sx={{ alignItems: 'center' }}>
@@ -234,8 +232,7 @@ const UserSearchField: React.FC<UserSearchFieldProps> = ({
               </Grid2>
             </Box>
           </li>
-          );
-        }}
+        )}
       />
       {showNotifyCheckbox && !isCreate && handleNotifyPref && (
         <FormGroup row={true}>