From d4da2d7cadbe1c620c0c4b9c0760ac1775b64b9f Mon Sep 17 00:00:00 2001
From: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>
Date: Sat, 30 Mar 2024 05:40:12 +0100
Subject: [PATCH] Use draft only on init and on draft changes

---
 src/pages/NewChatPage.tsx | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/pages/NewChatPage.tsx b/src/pages/NewChatPage.tsx
index fda626c77758..c1c4717a295b 100755
--- a/src/pages/NewChatPage.tsx
+++ b/src/pages/NewChatPage.tsx
@@ -56,17 +56,30 @@ const excludedGroupEmails = CONST.EXPENSIFY_EMAILS.filter((value) => value !== C
 function NewChatPage({betas, isGroupChat, personalDetails, reports, isSearchingForReports, dismissedReferralBanners, newGroupDraft}: NewChatPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
+
+    const personalData = useCurrentUserPersonalDetails();
+
+    const getGroupParticipants = () => {
+        if (!newGroupDraft?.participants) {
+            return [];
+        }
+        const selectedParticipants = newGroupDraft.participants.filter((participant) => participant.accountID !== personalData.accountID);
+        const newSelectedOptions = selectedParticipants.map((participant): OptionData => {
+            const baseOption = OptionsListUtils.getParticipantsOption({accountID: participant.accountID, login: participant.login, reportID: ''}, personalDetails);
+            return {...baseOption, reportID: baseOption.reportID ?? ''};
+        });
+        return newSelectedOptions;
+    };
+
     const [searchTerm, setSearchTerm] = useState('');
     const [filteredRecentReports, setFilteredRecentReports] = useState<ReportUtils.OptionData[]>([]);
     const [filteredPersonalDetails, setFilteredPersonalDetails] = useState<ReportUtils.OptionData[]>([]);
     const [filteredUserToInvite, setFilteredUserToInvite] = useState<ReportUtils.OptionData | null>();
-    const [selectedOptions, setSelectedOptions] = useState<OptionData[]>([]);
+    const [selectedOptions, setSelectedOptions] = useState<OptionData[]>(getGroupParticipants);
     const {isOffline} = useNetwork();
     const {isSmallScreenWidth} = useWindowDimensions();
     const [didScreenTransitionEnd, setDidScreenTransitionEnd] = useState(false);
 
-    const personalData = useCurrentUserPersonalDetails();
-
     const maxParticipantsReached = selectedOptions.length === CONST.REPORT.MAXIMUM_PARTICIPANTS;
     const setSearchTermAndSearchInServer = useSearchTermAndSearch(setSearchTerm, maxParticipantsReached);
 
@@ -188,16 +201,6 @@ function NewChatPage({betas, isGroupChat, personalDetails, reports, isSearchingF
     };
 
     const updateOptions = useCallback(() => {
-        let newSelectedOptions;
-        if (newGroupDraft?.participants) {
-            const selectedParticipants = newGroupDraft.participants.filter((participant) => participant.accountID !== personalData.accountID);
-            newSelectedOptions = selectedParticipants.map((participant): OptionData => {
-                const baseOption = OptionsListUtils.getParticipantsOption({accountID: participant.accountID, login: participant.login, reportID: ''}, personalDetails);
-                return {...baseOption, reportID: baseOption.reportID ?? ''};
-            });
-            setSelectedOptions(newSelectedOptions);
-        }
-
         const {
             recentReports,
             personalDetails: newChatPersonalDetails,
@@ -207,7 +210,7 @@ function NewChatPage({betas, isGroupChat, personalDetails, reports, isSearchingF
             personalDetails,
             betas ?? [],
             searchTerm,
-            newSelectedOptions ?? selectedOptions,
+            selectedOptions,
             isGroupChat ? excludedGroupEmails : [],
             false,
             true,
@@ -225,7 +228,7 @@ function NewChatPage({betas, isGroupChat, personalDetails, reports, isSearchingF
         setFilteredUserToInvite(userToInvite);
         // props.betas is not added as dependency since it doesn't change during the component lifecycle
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [reports, personalDetails, searchTerm, newGroupDraft]);
+    }, [reports, personalDetails, searchTerm]);
 
     useEffect(() => {
         const interactionTask = doInteractionTask(() => {
@@ -241,6 +244,11 @@ function NewChatPage({betas, isGroupChat, personalDetails, reports, isSearchingF
         };
     }, []);
 
+    useEffect(() => {
+        setSelectedOptions(getGroupParticipants());
+        // eslint-disable-next-line react-hooks/exhaustive-deps -- Overwrite participants only if the draft changes
+    }, [newGroupDraft?.participants]);
+
     useEffect(() => {
         if (!didScreenTransitionEnd) {
             return;