refactor

Expensify · May 10, 2024 · 2611633 · 2611633
1 parent cd29b00
commit 2611633
Showing 1 changed file with 15 additions and 19 deletions.
diff --git a/src/pages/NewChatPage.tsx b/src/pages/NewChatPage.tsx
@@ -94,32 +94,28 @@ function useOptions({isGroupChat}: NewChatPageProps) {
         if (!newGroupDraft?.participants) {
             return;
         }
-        const selectedParticipants: OptionData[] = [];
-        newGroupDraft.participants.forEach((p) => {
-            if (p.accountID === personalData.accountID) {
+        const newSelectedOptions: OptionData[] = [];
+        newGroupDraft.participants.forEach((participant) => {
+            if (participant.accountID === personalData.accountID) {
                 return;
             }
-            const participant = listOptions.personalDetails.find((option) => option.accountID === p.accountID);
-            if (participant) {
-                selectedParticipants.push(participant);
-                return;
+            let participantOption: OptionData | undefined | null = listOptions.personalDetails.find((option) => option.accountID === participant.accountID);
+            if (!participantOption) {
+                participantOption = OptionsListUtils.getUserToInviteOption({
+                    searchValue: participant.login,
+                    betas,
+                });
             }
-            const userToInvite = OptionsListUtils.getUserToInviteOption({
-                searchValue: p.login,
-                betas,
-            });
-            if (!userToInvite) {
+            if (!participantOption) {
                 return;
             }
-            selectedParticipants.push(userToInvite);
+            newSelectedOptions.push({
+                ...participantOption,
+                isSelected: true,
+            });
         });
-        const newSelectedOptions = selectedParticipants.map((participant) => ({
-            ...participant,
-            reportID: participant?.reportID ?? '',
-            isSelected: true,
-        }));
         setSelectedOptions(newSelectedOptions);
-    }, [newGroupDraft, listOptions.personalDetails, betas, personalData]);
+    }, [newGroupDraft?.participants, listOptions.personalDetails, betas, personalData.accountID]);
 
     return {...options, searchTerm, debouncedSearchTerm, setSearchTerm, areOptionsInitialized: areOptionsInitialized && didScreenTransitionEnd, selectedOptions, setSelectedOptions};
 }