From e1d763121505382ddf7f1c5d4837d1ebf322a1b8 Mon Sep 17 00:00:00 2001
From: Romit <85230081+romitg2@users.noreply.github.com>
Date: Fri, 18 Jul 2025 17:25:52 +0530
Subject: [PATCH] fix: Editing RR weights adds all hosts (#22623)

* fixed

* chore

* chore
---
 .../EditWeightsForAllTeamMembers.tsx          | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/packages/features/eventtypes/components/EditWeightsForAllTeamMembers.tsx b/packages/features/eventtypes/components/EditWeightsForAllTeamMembers.tsx
index 2fef42dc7d..452f962c06 100644
--- a/packages/features/eventtypes/components/EditWeightsForAllTeamMembers.tsx
+++ b/packages/features/eventtypes/components/EditWeightsForAllTeamMembers.tsx
@@ -146,16 +146,19 @@ export const EditWeightsForAllTeamMembers = ({
     const existingHostsMap = new Map(value.map((host) => [host.userId.toString(), host]));
 
     // Create the updated value by processing all team members
-    const updatedValue = teamMembers.map((member) => {
-      const existingHost = existingHostsMap.get(member.value);
-      return {
-        ...existingHost,
-        userId: parseInt(member.value, 10),
-        isFixed: existingHost?.isFixed ?? false,
-        priority: existingHost?.priority ?? 0,
-        weight: localWeights[member.value] ?? existingHost?.weight ?? 100,
-      };
-    });
+    const updatedValue = teamMembers
+      .map((member) => {
+        const existingHost = existingHostsMap.get(member.value);
+        if (!existingHost) return null;
+        return {
+          ...existingHost,
+          userId: parseInt(member.value, 10),
+          isFixed: existingHost?.isFixed ?? false,
+          priority: existingHost?.priority ?? 0,
+          weight: localWeights[member.value] ?? existingHost?.weight ?? 100,
+        };
+      })
+      .filter(Boolean) as Host[];
 
     onChange(updatedValue);
     setIsOpen(false);