Revert changes

Expensify · May 3, 2024 · 8c5f825 · 8c5f825
1 parent eee05d6
commit 8c5f825
Showing 1 changed file with 6 additions and 35 deletions.
diff --git a/src/pages/home/HeaderView.tsx b/src/pages/home/HeaderView.tsx
@@ -1,4 +1,4 @@
-import React, {memo, useCallback, useMemo, useState} from 'react';
+import React, {memo, useMemo} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
@@ -82,8 +82,7 @@ function HeaderView({
     onNavigationMenuButtonClicked,
     shouldUseNarrowLayout = false,
 }: HeaderViewProps) {
-    const [isDeleteTaskConfirmModalVisible, setIsDeleteTaskConfirmModalVisible] = useState(false);
-    const [isLastMemberLeavingGroupModalVisible, setIsLastMemberLeavingGroupModalVisible] = useState(false);
+    const [isDeleteTaskConfirmModalVisible, setIsDeleteTaskConfirmModalVisible] = React.useState(false);
     const {windowWidth} = useWindowDimensions();
     const {translate} = useLocalize();
     const theme = useTheme();
@@ -158,17 +157,8 @@ function HeaderView({
         Report.updateNotificationPreference(reportID, report.notificationPreference, CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS, false, report.parentReportID, report.parentReportActionID),
     );
 
-    const leaveChat = useCallback(() => {
-        if (isChatRoom) {
-            const isWorkspaceMemberLeavingWorkspaceRoom = !isChatThread && (report.visibility === CONST.REPORT.VISIBILITY.RESTRICTED || isPolicyExpenseChat) && isPolicyEmployee;
-            Report.leaveRoom(report.reportID, isWorkspaceMemberLeavingWorkspaceRoom);
-            return;
-        }
-        Report.leaveGroupChat(report.reportID);
-    }, [isChatRoom, isChatThread, isPolicyEmployee, isPolicyExpenseChat, report.reportID, report.visibility]);
-
-    const canJoinOrLeave = !isSelfDM && (isChatThread || isUserCreatedPolicyRoom || canLeaveRoom || canLeavePolicyExpenseChat);
-    const canJoin = canJoinOrLeave && !isWhisperAction && report.notificationPreference === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN && !isGroupChat;
+    const canJoinOrLeave = !isSelfDM && !isGroupChat && (isChatThread || isUserCreatedPolicyRoom || canLeaveRoom || canLeavePolicyExpenseChat);
+    const canJoin = canJoinOrLeave && !isWhisperAction && report.notificationPreference === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN;
     const canLeave = canJoinOrLeave && ((isChatThread && !!report.notificationPreference?.length) || isUserCreatedPolicyRoom || canLeaveRoom || canLeavePolicyExpenseChat);
     if (canJoin) {
         threeDotMenuItems.push({
@@ -177,17 +167,11 @@ function HeaderView({
             onSelected: join,
         });
     } else if (canLeave) {
+        const isWorkspaceMemberLeavingWorkspaceRoom = !isChatThread && (report.visibility === CONST.REPORT.VISIBILITY.RESTRICTED || isPolicyExpenseChat) && isPolicyEmployee;
         threeDotMenuItems.push({
             icon: Expensicons.ChatBubbles,
             text: translate('common.leave'),
-            onSelected: Session.checkIfActionIsAllowed(() => {
-                if ((report?.participantAccountIDs ?? []).length === 1 && isGroupChat) {
-                    setIsLastMemberLeavingGroupModalVisible(true);
-                    return;
-                }
-
-                leaveChat();
-            }),
+            onSelected: Session.checkIfActionIsAllowed(() => Report.leaveRoom(reportID, isWorkspaceMemberLeavingWorkspaceRoom)),
         });
     }
 
@@ -388,19 +372,6 @@ function HeaderView({
                                 cancelText={translate('common.cancel')}
                                 danger
                             />
-                            <ConfirmModal
-                                danger
-                                title={translate('groupChat.lastMemberTitle')}
-                                isVisible={isLastMemberLeavingGroupModalVisible}
-                                onConfirm={() => {
-                                    setIsLastMemberLeavingGroupModalVisible(false);
-                                    Report.leaveGroupChat(report.reportID);
-                                }}
-                                onCancel={() => setIsLastMemberLeavingGroupModalVisible(false)}
-                                prompt={translate('groupChat.lastMemberWarning')}
-                                confirmText={translate('common.leave')}
-                                cancelText={translate('common.cancel')}
-                            />
                         </>
                     )}
                 </View>