From f245c2fab7cc7475a988e7c3b7fa14e132692346 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Wed, 8 May 2024 09:18:21 +0200
Subject: [PATCH 01/15] Move Leave button into a row of the Report Details page

---
 src/CONST.ts                                  |  1 -
 src/components/ChatDetailsQuickActionsBar.tsx | 40 +++------
 src/libs/PolicyUtils.ts                       |  2 +-
 src/libs/ReportUtils.ts                       |  2 +-
 src/pages/ReportDetailsPage.tsx               | 82 ++++++++++++++-----
 5 files changed, 75 insertions(+), 52 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index efb0463457b1..ea35b7de34b9 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -2066,7 +2066,6 @@ const CONST = {
         INFO: 'info',
     },
     REPORT_DETAILS_MENU_ITEM: {
-        SHARE_CODE: 'shareCode',
         MEMBERS: 'member',
         INVITE: 'invite',
         SETTINGS: 'settings',
diff --git a/src/components/ChatDetailsQuickActionsBar.tsx b/src/components/ChatDetailsQuickActionsBar.tsx
index f15fc31aec45..d289587ce953 100644
--- a/src/components/ChatDetailsQuickActionsBar.tsx
+++ b/src/components/ChatDetailsQuickActionsBar.tsx
@@ -1,11 +1,12 @@
-import React, {useState} from 'react';
+import React from 'react';
 import {View} from 'react-native';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
 import * as Report from '@userActions/Report';
+import ROUTES from '@src/ROUTES';
 import type {Report as OnyxReportType} from '@src/types/onyx';
 import Button from './Button';
-import ConfirmModal from './ConfirmModal';
 import * as Expensicons from './Icon/Expensicons';
 
 type ChatDetailsQuickActionsBarProps = {
@@ -14,45 +15,26 @@ type ChatDetailsQuickActionsBarProps = {
 
 function ChatDetailsQuickActionsBar({report}: ChatDetailsQuickActionsBarProps) {
     const styles = useThemeStyles();
-    const [isLastMemberLeavingGroupModalVisible, setIsLastMemberLeavingGroupModalVisible] = useState(false);
     const {translate} = useLocalize();
     const isPinned = !!report.isPinned;
     return (
         <View style={[styles.flexRow, styles.ph5, styles.mb5]}>
             <View style={[styles.flex1, styles.pr3]}>
-                <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')}
-                />
                 <Button
-                    onPress={() => {
-                        if (Object.keys(report?.participants ?? {}).length === 1) {
-                            setIsLastMemberLeavingGroupModalVisible(true);
-                            return;
-                        }
-
-                        Report.leaveGroupChat(report.reportID);
-                    }}
-                    icon={Expensicons.Exit}
+                    onPress={() => Report.togglePinnedState(report.reportID, isPinned)}
+                    icon={Expensicons.Pin}
                     style={styles.flex1}
-                    text={translate('common.leave')}
+                    text={isPinned ? translate('common.unPin') : translate('common.pin')}
                 />
             </View>
             <View style={[styles.flex1]}>
                 <Button
-                    onPress={() => Report.togglePinnedState(report.reportID, isPinned)}
-                    icon={Expensicons.Pin}
+                    onPress={() => {
+                        Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS_SHARE_CODE.getRoute(report?.reportID ?? ''));
+                    }}
+                    icon={Expensicons.QrCode}
                     style={styles.flex1}
-                    text={isPinned ? translate('common.unPin') : translate('common.pin')}
+                    text={translate('common.share')}
                 />
             </View>
         </View>
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 51221ddb1236..cf4ab6e0d7b9 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -143,7 +143,7 @@ const isPolicyEmployee = (policyID: string, policies: OnyxCollection<Policy>): b
 /**
  * Checks if the current user is an owner (creator) of the policy.
  */
-const isPolicyOwner = (policy: OnyxEntry<Policy>, currentUserAccountID: number): boolean => policy?.ownerAccountID === currentUserAccountID;
+const isPolicyOwner = (policy: OnyxEntry<Policy> | EmptyObject, currentUserAccountID: number): boolean => policy?.ownerAccountID === currentUserAccountID;
 
 /**
  * Create an object mapping member emails to their accountIDs. Filter for members without errors if includeMemberWithErrors is false, and get the login email from the personalDetail object using the accountID.
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 64b77cae6313..fb3371e94491 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -6393,7 +6393,7 @@ function hasActionsWithErrors(reportID: string): boolean {
     return Object.values(reportActions).some((action) => !isEmptyObject(action.errors));
 }
 
-function canLeavePolicyExpenseChat(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>): boolean {
+function canLeavePolicyExpenseChat(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> | EmptyObject): boolean {
     return isPolicyExpenseChat(report) && !(PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPolicyOwner(policy, currentUserAccountID ?? -1) || isReportOwner(report));
 }
 
diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index ca66a0e97bb5..d38120d816c4 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -1,6 +1,6 @@
 import {useRoute} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useEffect, useMemo} from 'react';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
 import {View} from 'react-native';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
@@ -29,6 +29,7 @@ import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as Report from '@userActions/Report';
+import ConfirmModal from '@src/components/ConfirmModal';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -49,6 +50,7 @@ type ReportDetailsPageMenuItem = {
     action: () => void;
     brickRoadIndicator?: ValueOf<typeof CONST.BRICK_ROAD_INDICATOR_STATUS>;
     subtitle?: number;
+    shouldShowRightIcon?: boolean;
 };
 
 type ReportDetailsPageOnyxProps = {
@@ -65,10 +67,12 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
     const {isOffline} = useNetwork();
     const styles = useThemeStyles();
     const route = useRoute();
+    const [isLastMemberLeavingGroupModalVisible, setIsLastMemberLeavingGroupModalVisible] = useState(false);
     const policy = useMemo(() => policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID ?? ''}`], [policies, report?.policyID]);
     const isPolicyAdmin = useMemo(() => PolicyUtils.isPolicyAdmin(policy ?? null), [policy]);
     const isPolicyEmployee = useMemo(() => PolicyUtils.isPolicyEmployee(report?.policyID ?? '', policies), [report?.policyID, policies]);
     const shouldUseFullTitle = useMemo(() => ReportUtils.shouldUseFullTitleToDisplay(report), [report]);
+    const isPolicyExpenseChat = useMemo(() => ReportUtils.isPolicyExpenseChat(report), [report]);
     const isChatRoom = useMemo(() => ReportUtils.isChatRoom(report), [report]);
     const isUserCreatedPolicyRoom = useMemo(() => ReportUtils.isUserCreatedPolicyRoom(report), [report]);
     const isDefaultRoom = useMemo(() => ReportUtils.isDefaultRoom(report), [report]);
@@ -78,7 +82,8 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
     const isMoneyRequest = useMemo(() => ReportUtils.isMoneyRequest(report), [report]);
     const isInvoiceReport = useMemo(() => ReportUtils.isInvoiceReport(report), [report]);
     const canEditReportDescription = useMemo(() => ReportUtils.canEditReportDescription(report, policy), [report, policy]);
-    const shouldShowReportDescription = isChatRoom && (canEditReportDescription || report.description !== '');
+    const canLeaveRoom = useMemo(() => ReportUtils.canLeaveRoom(report, isPolicyEmployee), [report, isPolicyEmployee]);
+    const canLeavePolicyExpenseChat = useMemo(() => ReportUtils.canLeavePolicyExpenseChat(report, policy ?? {}), [report, policy]);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps -- policy is a dependency because `getChatRoomSubtitle` calls `getPolicyName` which in turn retrieves the value from the `policy` value stored in Onyx
     const chatRoomSubtitle = useMemo(() => ReportUtils.getChatRoomSubtitle(report), [report, policy]);
@@ -104,6 +109,10 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
 
     const isSelfDM = useMemo(() => ReportUtils.isSelfDM(report), [report]);
 
+    const shouldShowReportDescription = isChatRoom && (canEditReportDescription || report.description !== '');
+    const canLeave =
+        !isSelfDM && (isChatThread || isUserCreatedPolicyRoom || canLeaveRoom || canLeavePolicyExpenseChat) && report.notificationPreference !== CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN;
+
     useEffect(() => {
         // Do not fetch private notes if isLoadingPrivateNotes is already defined, or if the network is offline, or if the report is a self DM.
         if (isPrivateNotesFetchTriggered || isOffline || isSelfDM) {
@@ -113,6 +122,15 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
         Report.getReportPrivateNote(report?.reportID ?? '');
     }, [report?.reportID, isOffline, isPrivateNotesFetchTriggered, isSelfDM]);
 
+    const leaveChat = useCallback(() => {
+        if (isChatRoom) {
+            const isWorkspaceMemberLeavingWorkspaceRoom = (report.visibility === CONST.REPORT.VISIBILITY.RESTRICTED || isPolicyExpenseChat) && isPolicyEmployee;
+            Report.leaveRoom(report.reportID, isWorkspaceMemberLeavingWorkspaceRoom);
+            return;
+        }
+        Report.leaveGroupChat(report.reportID);
+    }, [isChatRoom, isPolicyEmployee, isPolicyExpenseChat, report.reportID, report.visibility]);
+
     const menuItems: ReportDetailsPageMenuItem[] = useMemo(() => {
         const items: ReportDetailsPageMenuItem[] = [];
 
@@ -120,16 +138,6 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
             return [];
         }
 
-        if (!isGroupDMChat) {
-            items.push({
-                key: CONST.REPORT_DETAILS_MENU_ITEM.SHARE_CODE,
-                translationKey: 'common.shareCode',
-                icon: Expensicons.QrCode,
-                isAnonymousAction: true,
-                action: () => Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS_SHARE_CODE.getRoute(report?.reportID ?? '')),
-            });
-        }
-
         if (isArchivedRoom) {
             return items;
         }
@@ -159,10 +167,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                     }
                 },
             });
-        } else if (
-            (isUserCreatedPolicyRoom && (!participants.length || !isPolicyEmployee)) ||
-            ((isDefaultRoom || ReportUtils.isPolicyExpenseChat(report)) && isChatThread && !isPolicyEmployee)
-        ) {
+        } else if ((isUserCreatedPolicyRoom && (!participants.length || !isPolicyEmployee)) || ((isDefaultRoom || isPolicyExpenseChat) && isChatThread && !isPolicyEmployee)) {
             items.push({
                 key: CONST.REPORT_DETAILS_MENU_ITEM.INVITE,
                 translationKey: 'common.invite',
@@ -196,10 +201,27 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
             });
         }
 
+        if (isGroupChat || (isChatRoom && canLeave)) {
+            items.push({
+                key: CONST.REPORT_DETAILS_MENU_ITEM.LEAVE_ROOM,
+                translationKey: 'common.leave',
+                icon: Expensicons.Exit,
+                isAnonymousAction: true,
+                shouldShowRightIcon: false,
+                action: () => {
+                    if (Object.keys(report?.participants ?? {}).length === 1 && isGroupChat) {
+                        setIsLastMemberLeavingGroupModalVisible(true);
+                        return;
+                    }
+
+                    leaveChat();
+                },
+            });
+        }
+
         return items;
     }, [
         isSelfDM,
-        isGroupDMChat,
         isArchivedRoom,
         isGroupChat,
         isDefaultRoom,
@@ -208,10 +230,14 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
         isUserCreatedPolicyRoom,
         participants.length,
         report,
+        isPolicyExpenseChat,
         isMoneyRequestReport,
         isInvoiceReport,
+        isChatRoom,
+        canLeave,
         activeChatMembers.length,
         session,
+        leaveChat,
     ]);
 
     const displayNamesWithTooltips = useMemo(() => {
@@ -320,7 +346,10 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                         </View>
                     </View>
                     {shouldShowReportDescription && (
-                        <OfflineWithFeedback pendingAction={report.pendingFields?.description}>
+                        <OfflineWithFeedback
+                            pendingAction={report.pendingFields?.description}
+                            style={!isGroupDMChat && styles.mb5}
+                        >
                             <MenuItemWithTopDescription
                                 shouldShowRightIcon={canEditReportDescription}
                                 interactive={canEditReportDescription}
@@ -332,7 +361,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                             />
                         </OfflineWithFeedback>
                     )}
-                    {isGroupChat && <ChatDetailsQuickActionsBar report={report} />}
+                    {!isGroupDMChat && <ChatDetailsQuickActionsBar report={report} />}
                     {menuItems.map((item) => {
                         const brickRoadIndicator =
                             ReportUtils.hasReportNameError(report) && item.key === CONST.REPORT_DETAILS_MENU_ITEM.SETTINGS ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined;
@@ -344,12 +373,25 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                                 icon={item.icon}
                                 onPress={item.action}
                                 isAnonymousAction={item.isAnonymousAction}
-                                shouldShowRightIcon
+                                shouldShowRightIcon={item.shouldShowRightIcon ?? true}
                                 brickRoadIndicator={brickRoadIndicator ?? item.brickRoadIndicator}
                             />
                         );
                     })}
                 </ScrollView>
+                <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')}
+                />
             </FullPageNotFoundView>
         </ScreenWrapper>
     );

From 43334c40496f1b250da083ffc719b726717ec975 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Mon, 13 May 2024 11:33:11 +0200
Subject: [PATCH 02/15] Remove condition for ChatDetailsQuickActionsBar

---
 src/pages/ReportDetailsPage.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index d38120d816c4..58f614340a1b 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -104,7 +104,6 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
         return !pendingMember || pendingMember.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? accountID : [];
     });
 
-    const isGroupDMChat = useMemo(() => ReportUtils.isDM(report) && participants.length > 1, [report, participants.length]);
     const isPrivateNotesFetchTriggered = report?.isLoadingPrivateNotes !== undefined;
 
     const isSelfDM = useMemo(() => ReportUtils.isSelfDM(report), [report]);
@@ -348,7 +347,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                     {shouldShowReportDescription && (
                         <OfflineWithFeedback
                             pendingAction={report.pendingFields?.description}
-                            style={!isGroupDMChat && styles.mb5}
+                            style={styles.mb5}
                         >
                             <MenuItemWithTopDescription
                                 shouldShowRightIcon={canEditReportDescription}
@@ -361,7 +360,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                             />
                         </OfflineWithFeedback>
                     )}
-                    {!isGroupDMChat && <ChatDetailsQuickActionsBar report={report} />}
+                    <ChatDetailsQuickActionsBar report={report} />
                     {menuItems.map((item) => {
                         const brickRoadIndicator =
                             ReportUtils.hasReportNameError(report) && item.key === CONST.REPORT_DETAILS_MENU_ITEM.SETTINGS ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined;

From ca4e3ada74bd9bf0c596f39f6f0995bc75ea6d2b Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Wed, 15 May 2024 13:03:25 +0200
Subject: [PATCH 03/15] Update condition for leave modal

---
 src/pages/ReportDetailsPage.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index 28a9388280b9..896b969c3879 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -87,6 +87,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
     const chatRoomSubtitle = useMemo(() => ReportUtils.getChatRoomSubtitle(report), [report, policy]);
     const parentNavigationSubtitleData = ReportUtils.getParentNavigationSubtitle(report);
     const isGroupChat = useMemo(() => ReportUtils.isGroupChat(report), [report]);
+    const isRootGroupChat = useMemo(() => ReportUtils.isRootGroupChat(report), [report]);
     const isThread = useMemo(() => ReportUtils.isThread(report), [report]);
     const participants = useMemo(() => {
         if (isGroupChat) {
@@ -204,7 +205,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                 isAnonymousAction: true,
                 shouldShowRightIcon: false,
                 action: () => {
-                    if (Object.keys(report?.participants ?? {}).length === 1 && isGroupChat) {
+                    if (Object.keys(report?.participants ?? {}).length === 1 && isRootGroupChat) {
                         setIsLastMemberLeavingGroupModalVisible(true);
                         return;
                     }

From d1814c12825e2579a14ecba274446df6db34e123 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Wed, 15 May 2024 13:29:38 +0200
Subject: [PATCH 04/15] Update dependency for menuItems

---
 src/pages/ReportDetailsPage.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index 896b969c3879..f3aefc1f4387 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -233,6 +233,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
         policy,
         activeChatMembers.length,
         session,
+        isRootGroupChat,
         leaveChat,
     ]);
 

From 7c630c8176801ac7a74501443d0e01649db98f18 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Wed, 15 May 2024 15:11:02 +0200
Subject: [PATCH 05/15] Update conditions for leave button

---
 src/pages/ReportDetailsPage.tsx | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index f3aefc1f4387..c112cf88f709 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -87,7 +87,6 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
     const chatRoomSubtitle = useMemo(() => ReportUtils.getChatRoomSubtitle(report), [report, policy]);
     const parentNavigationSubtitleData = ReportUtils.getParentNavigationSubtitle(report);
     const isGroupChat = useMemo(() => ReportUtils.isGroupChat(report), [report]);
-    const isRootGroupChat = useMemo(() => ReportUtils.isRootGroupChat(report), [report]);
     const isThread = useMemo(() => ReportUtils.isThread(report), [report]);
     const participants = useMemo(() => {
         if (isGroupChat) {
@@ -197,7 +196,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
             });
         }
 
-        if (isGroupChat || (isChatRoom && ReportUtils.canLeaveChat(report, policy ?? null))) {
+        if ((isGroupChat || (isChatRoom && ReportUtils.canLeaveChat(report, policy ?? null))) && !isThread) {
             items.push({
                 key: CONST.REPORT_DETAILS_MENU_ITEM.LEAVE_ROOM,
                 translationKey: 'common.leave',
@@ -205,7 +204,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                 isAnonymousAction: true,
                 shouldShowRightIcon: false,
                 action: () => {
-                    if (Object.keys(report?.participants ?? {}).length === 1 && isRootGroupChat) {
+                    if (Object.keys(report?.participants ?? {}).length === 1 && isGroupChat) {
                         setIsLastMemberLeavingGroupModalVisible(true);
                         return;
                     }
@@ -229,11 +228,11 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
         isPolicyExpenseChat,
         isMoneyRequestReport,
         isInvoiceReport,
+        isThread,
         isChatRoom,
         policy,
         activeChatMembers.length,
         session,
-        isRootGroupChat,
         leaveChat,
     ]);
 
@@ -281,10 +280,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
             />
         );
 
-    const reportName =
-        ReportUtils.isDeprecatedGroupDM(report) || ReportUtils.isGroupChat(report)
-            ? ReportUtils.getGroupChatName(undefined, false, report.reportID ?? '')
-            : ReportUtils.getReportName(report);
+    const reportName = ReportUtils.isDeprecatedGroupDM(report) || isGroupChat ? ReportUtils.getGroupChatName(undefined, false, report.reportID ?? '') : ReportUtils.getReportName(report);
     return (
         <ScreenWrapper testID={ReportDetailsPage.displayName}>
             <FullPageNotFoundView shouldShow={isEmptyObject(report)}>

From 564b82f6b300f90b96146a60ffb416beacb948cc Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Thu, 16 May 2024 12:31:17 +0200
Subject: [PATCH 06/15] Fix comments

---
 src/pages/ReportDetailsPage.tsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index c112cf88f709..bdc8abb59ee4 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -82,6 +82,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
     const isMoneyRequest = useMemo(() => ReportUtils.isMoneyRequest(report), [report]);
     const isInvoiceReport = useMemo(() => ReportUtils.isInvoiceReport(report), [report]);
     const canEditReportDescription = useMemo(() => ReportUtils.canEditReportDescription(report, policy), [report, policy]);
+    const shouldShowReportDescription = isChatRoom && (canEditReportDescription || report.description !== '');
 
     // eslint-disable-next-line react-hooks/exhaustive-deps -- policy is a dependency because `getChatRoomSubtitle` calls `getPolicyName` which in turn retrieves the value from the `policy` value stored in Onyx
     const chatRoomSubtitle = useMemo(() => ReportUtils.getChatRoomSubtitle(report), [report, policy]);
@@ -106,8 +107,6 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
 
     const isSelfDM = useMemo(() => ReportUtils.isSelfDM(report), [report]);
 
-    const shouldShowReportDescription = isChatRoom && (canEditReportDescription || report.description !== '');
-
     useEffect(() => {
         // Do not fetch private notes if isLoadingPrivateNotes is already defined, or if the network is offline, or if the report is a self DM.
         if (isPrivateNotesFetchTriggered || isOffline || isSelfDM) {
@@ -154,6 +153,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                 icon: Expensicons.Users,
                 subtitle: activeChatMembers.length,
                 isAnonymousAction: false,
+                shouldShowRightIcon: true,
                 action: () => {
                     if (isUserCreatedPolicyRoom || isChatThread) {
                         Navigation.navigate(ROUTES.ROOM_MEMBERS.getRoute(report?.reportID ?? ''));
@@ -168,6 +168,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                 translationKey: 'common.invite',
                 icon: Expensicons.Users,
                 isAnonymousAction: false,
+                shouldShowRightIcon: true,
                 action: () => {
                     Navigation.navigate(ROUTES.ROOM_INVITE.getRoute(report?.reportID ?? ''));
                 },
@@ -179,6 +180,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
             translationKey: 'common.settings',
             icon: Expensicons.Gear,
             isAnonymousAction: false,
+            shouldShowRightIcon: true,
             action: () => {
                 Navigation.navigate(ROUTES.REPORT_SETTINGS.getRoute(report?.reportID ?? ''));
             },
@@ -191,6 +193,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                 translationKey: 'privateNotes.title',
                 icon: Expensicons.Pencil,
                 isAnonymousAction: false,
+                shouldShowRightIcon: true,
                 action: () => ReportUtils.navigateToPrivateNotes(report, session),
                 brickRoadIndicator: Report.hasErrorInPrivateNotes(report) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
             });
@@ -202,7 +205,6 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                 translationKey: 'common.leave',
                 icon: Expensicons.Exit,
                 isAnonymousAction: true,
-                shouldShowRightIcon: false,
                 action: () => {
                     if (Object.keys(report?.participants ?? {}).length === 1 && isGroupChat) {
                         setIsLastMemberLeavingGroupModalVisible(true);
@@ -366,7 +368,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                                 icon={item.icon}
                                 onPress={item.action}
                                 isAnonymousAction={item.isAnonymousAction}
-                                shouldShowRightIcon={item.shouldShowRightIcon ?? true}
+                                shouldShowRightIcon={item.shouldShowRightIcon}
                                 brickRoadIndicator={brickRoadIndicator ?? item.brickRoadIndicator}
                             />
                         );

From 6c53db04faed3ec088cfdfada4e89b34da200314 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Thu, 16 May 2024 12:35:34 +0200
Subject: [PATCH 07/15] Disable ActionsBar for isGroupDMChat

---
 src/pages/ReportDetailsPage.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index bdc8abb59ee4..de64b01c774d 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -103,6 +103,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
         return !pendingMember || pendingMember.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? accountID : [];
     });
 
+    const isGroupDMChat = useMemo(() => ReportUtils.isDM(report) && participants.length > 1, [report, participants.length]);
     const isPrivateNotesFetchTriggered = report?.isLoadingPrivateNotes !== undefined;
 
     const isSelfDM = useMemo(() => ReportUtils.isSelfDM(report), [report]);
@@ -356,7 +357,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                             />
                         </OfflineWithFeedback>
                     )}
-                    <ChatDetailsQuickActionsBar report={report} />
+                    {!isGroupDMChat && <ChatDetailsQuickActionsBar report={report} />}
                     {menuItems.map((item) => {
                         const brickRoadIndicator =
                             ReportUtils.hasReportNameError(report) && item.key === CONST.REPORT_DETAILS_MENU_ITEM.SETTINGS ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined;

From f6202cc7a754850d283bb8646fd2575b16b0b326 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Tue, 28 May 2024 23:18:24 +0200
Subject: [PATCH 08/15] Fix comments

---
 src/pages/ReportDetailsPage.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index de64b01c774d..55e48c6b6636 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -103,7 +103,6 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
         return !pendingMember || pendingMember.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? accountID : [];
     });
 
-    const isGroupDMChat = useMemo(() => ReportUtils.isDM(report) && participants.length > 1, [report, participants.length]);
     const isPrivateNotesFetchTriggered = report?.isLoadingPrivateNotes !== undefined;
 
     const isSelfDM = useMemo(() => ReportUtils.isSelfDM(report), [report]);
@@ -200,7 +199,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
             });
         }
 
-        if ((isGroupChat || (isChatRoom && ReportUtils.canLeaveChat(report, policy ?? null))) && !isThread) {
+        if (isGroupChat || (isChatRoom && ReportUtils.canLeaveChat(report, policy ?? null))) {
             items.push({
                 key: CONST.REPORT_DETAILS_MENU_ITEM.LEAVE_ROOM,
                 translationKey: 'common.leave',
@@ -231,7 +230,6 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
         isPolicyExpenseChat,
         isMoneyRequestReport,
         isInvoiceReport,
-        isThread,
         isChatRoom,
         policy,
         activeChatMembers.length,
@@ -357,7 +355,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                             />
                         </OfflineWithFeedback>
                     )}
-                    {!isGroupDMChat && <ChatDetailsQuickActionsBar report={report} />}
+                    <ChatDetailsQuickActionsBar report={report} />
                     {menuItems.map((item) => {
                         const brickRoadIndicator =
                             ReportUtils.hasReportNameError(report) && item.key === CONST.REPORT_DETAILS_MENU_ITEM.SETTINGS ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined;

From 7d6fe50349f21b68cb0efc6ffa3c48b39275440d Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Tue, 28 May 2024 23:32:18 +0200
Subject: [PATCH 09/15] Fix ts issue

---
 src/pages/ReportDetailsPage.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index 06bbc9e66e6b..e5bcf95684b7 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -71,7 +71,6 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
     const policy = useMemo(() => policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID ?? ''}`], [policies, report?.policyID]);
     const isPolicyAdmin = useMemo(() => PolicyUtils.isPolicyAdmin(policy ?? null), [policy]);
     const isPolicyEmployee = useMemo(() => PolicyUtils.isPolicyEmployee(report?.policyID ?? '', policies), [report?.policyID, policies]);
-    const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report);
     const shouldUseFullTitle = useMemo(() => ReportUtils.shouldUseFullTitleToDisplay(report), [report]);
     const isPolicyExpenseChat = useMemo(() => ReportUtils.isPolicyExpenseChat(report), [report]);
     const isChatRoom = useMemo(() => ReportUtils.isChatRoom(report), [report]);

From 1c8f9d3229c9abcdfe6c28cfa9adb7d8c2b9ff5b Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Tue, 28 May 2024 23:33:19 +0200
Subject: [PATCH 10/15] Fix eslint issue

---
 src/pages/ReportDetailsPage.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index e5bcf95684b7..c77dffe0824e 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -228,7 +228,6 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
         isUserCreatedPolicyRoom,
         participants.length,
         report,
-        isPolicyExpenseChat,
         isMoneyRequestReport,
         isInvoiceReport,
         isChatRoom,

From 2436d71c88e505d48934568cf863d07fa88307e2 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Tue, 28 May 2024 23:40:48 +0200
Subject: [PATCH 11/15] Move isPolicyExpenseChat

---
 src/pages/ReportDetailsPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index c77dffe0824e..8fb95f895641 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -71,8 +71,8 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
     const policy = useMemo(() => policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID ?? ''}`], [policies, report?.policyID]);
     const isPolicyAdmin = useMemo(() => PolicyUtils.isPolicyAdmin(policy ?? null), [policy]);
     const isPolicyEmployee = useMemo(() => PolicyUtils.isPolicyEmployee(report?.policyID ?? '', policies), [report?.policyID, policies]);
-    const shouldUseFullTitle = useMemo(() => ReportUtils.shouldUseFullTitleToDisplay(report), [report]);
     const isPolicyExpenseChat = useMemo(() => ReportUtils.isPolicyExpenseChat(report), [report]);
+    const shouldUseFullTitle = useMemo(() => ReportUtils.shouldUseFullTitleToDisplay(report), [report]);
     const isChatRoom = useMemo(() => ReportUtils.isChatRoom(report), [report]);
     const isUserCreatedPolicyRoom = useMemo(() => ReportUtils.isUserCreatedPolicyRoom(report), [report]);
     const isDefaultRoom = useMemo(() => ReportUtils.isDefaultRoom(report), [report]);

From ec498935e3b939201a9fda0cb0ddf88e9031e627 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Wed, 29 May 2024 01:23:53 +0200
Subject: [PATCH 12/15] Add condition for share button

---
 src/components/ChatDetailsQuickActionsBar.tsx | 34 +++++++++++--------
 src/pages/ReportDetailsPage.tsx               |  5 ++-
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/components/ChatDetailsQuickActionsBar.tsx b/src/components/ChatDetailsQuickActionsBar.tsx
index d289587ce953..ac864f25a8c3 100644
--- a/src/components/ChatDetailsQuickActionsBar.tsx
+++ b/src/components/ChatDetailsQuickActionsBar.tsx
@@ -1,8 +1,9 @@
-import React from 'react';
+import React, {useMemo} from 'react';
 import {View} from 'react-native';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
+import * as ReportUtils from '@libs/ReportUtils';
 import * as Report from '@userActions/Report';
 import ROUTES from '@src/ROUTES';
 import type {Report as OnyxReportType} from '@src/types/onyx';
@@ -11,32 +12,37 @@ import * as Expensicons from './Icon/Expensicons';
 
 type ChatDetailsQuickActionsBarProps = {
     report: OnyxReportType;
+    participants: number[];
 };
 
-function ChatDetailsQuickActionsBar({report}: ChatDetailsQuickActionsBarProps) {
+function ChatDetailsQuickActionsBar({report, participants}: ChatDetailsQuickActionsBarProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const isPinned = !!report.isPinned;
+    const isGroupDMChat = useMemo(() => ReportUtils.isDM(report) && participants.length > 1, [report, participants.length]);
+
     return (
         <View style={[styles.flexRow, styles.ph5, styles.mb5]}>
-            <View style={[styles.flex1, styles.pr3]}>
+            <View style={[styles.flex1, isGroupDMChat ? styles.alignItemsCenter : styles.pr3]}>
                 <Button
                     onPress={() => Report.togglePinnedState(report.reportID, isPinned)}
                     icon={Expensicons.Pin}
-                    style={styles.flex1}
+                    style={[isGroupDMChat ? styles.w50 : styles.flex1]}
                     text={isPinned ? translate('common.unPin') : translate('common.pin')}
                 />
             </View>
-            <View style={[styles.flex1]}>
-                <Button
-                    onPress={() => {
-                        Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS_SHARE_CODE.getRoute(report?.reportID ?? ''));
-                    }}
-                    icon={Expensicons.QrCode}
-                    style={styles.flex1}
-                    text={translate('common.share')}
-                />
-            </View>
+            {!isGroupDMChat && (
+                <View style={[styles.flex1]}>
+                    <Button
+                        onPress={() => {
+                            Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS_SHARE_CODE.getRoute(report?.reportID ?? ''));
+                        }}
+                        icon={Expensicons.QrCode}
+                        style={[styles.flex1]}
+                        text={translate('common.share')}
+                    />
+                </View>
+            )}
         </View>
     );
 }
diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index 8fb95f895641..c23020812150 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -357,7 +357,10 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                             />
                         </OfflineWithFeedback>
                     )}
-                    <ChatDetailsQuickActionsBar report={report} />
+                    <ChatDetailsQuickActionsBar
+                        report={report}
+                        participants={participants}
+                    />
                     {menuItems.map((item) => {
                         const brickRoadIndicator =
                             ReportUtils.hasReportNameError(report) && item.key === CONST.REPORT_DETAILS_MENU_ITEM.SETTINGS ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined;

From 0b0126ebdd3b6eaf4157390b7e8940bda06ee87a Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Wed, 29 May 2024 22:39:11 +0200
Subject: [PATCH 13/15] Add comment for isHidden

---
 src/components/HeaderWithBackButton/types.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/HeaderWithBackButton/types.ts b/src/components/HeaderWithBackButton/types.ts
index a8800c74beb9..77de72a6dae5 100644
--- a/src/components/HeaderWithBackButton/types.ts
+++ b/src/components/HeaderWithBackButton/types.ts
@@ -20,6 +20,7 @@ type ThreeDotsMenuItem = {
     /** A callback triggered when the item is selected */
     onSelected: () => void;
 
+    /** Whether the item is hidden */
     isHidden?: boolean;
 };
 

From 25a696432f49022d1eacfbb0c6e71e2282467d0c Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Wed, 29 May 2024 23:03:29 +0200
Subject: [PATCH 14/15] Refactor types for ActionBar

---
 src/components/PromotedActionsBar.tsx | 11 +++++------
 src/pages/ReportDetailsPage.tsx       |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/components/PromotedActionsBar.tsx b/src/components/PromotedActionsBar.tsx
index 1c8bbb72ff8e..59a91abe7290 100644
--- a/src/components/PromotedActionsBar.tsx
+++ b/src/components/PromotedActionsBar.tsx
@@ -12,20 +12,19 @@ type PromotedAction = {
     key: string;
 } & ThreeDotsMenuItem;
 
-type ReportPromotedPinAction = (report: OnyxReport) => PromotedAction;
-type ReportPromotedShareAction = (report: OnyxReport, participants: number[]) => PromotedAction;
+type ReportPromotedAction<T> = (params: T) => PromotedAction;
 
 type PromotedActionsType = {
-    pin: ReportPromotedPinAction;
-    share: ReportPromotedShareAction;
+    pin: ReportPromotedAction<{report: OnyxReport}>;
+    share: ReportPromotedAction<{report: OnyxReport; participants: number[]}>;
 };
 
 const PromotedActions = {
-    pin: (report) => ({
+    pin: ({report}) => ({
         key: 'pin',
         ...HeaderUtils.getPinMenuItem(report),
     }),
-    share: (report, participants) => ({
+    share: ({report, participants}) => ({
         key: 'share',
         ...HeaderUtils.getShareMenuItem(report, participants),
     }),
diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index 676e4e84d54a..16b8632b2190 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -365,7 +365,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                             />
                         </OfflineWithFeedback>
                     )}
-                    <PromotedActionsBar promotedActions={[PromotedActions.pin(report), PromotedActions.share(report, participants)]} />
+                    <PromotedActionsBar promotedActions={[PromotedActions.pin({report}), PromotedActions.share({report, participants})]} />
                     {menuItems.map((item) => {
                         const brickRoadIndicator =
                             ReportUtils.hasReportNameError(report) && item.key === CONST.REPORT_DETAILS_MENU_ITEM.SETTINGS ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined;

From 19c22bfa5fc155e6ca52351fef9723e7ab3d2284 Mon Sep 17 00:00:00 2001
From: Yauheni <HorbachZhenja@yandex.by>
Date: Thu, 30 May 2024 23:39:16 +0200
Subject: [PATCH 15/15] Fix comments

---
 src/components/HeaderWithBackButton/types.ts |  3 --
 src/components/PromotedActionsBar.tsx        | 47 ++++++++------------
 src/libs/HeaderUtils.ts                      |  6 +--
 src/pages/ReportDetailsPage.tsx              |  4 +-
 4 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/src/components/HeaderWithBackButton/types.ts b/src/components/HeaderWithBackButton/types.ts
index 77de72a6dae5..6b08dd74dc8b 100644
--- a/src/components/HeaderWithBackButton/types.ts
+++ b/src/components/HeaderWithBackButton/types.ts
@@ -19,9 +19,6 @@ type ThreeDotsMenuItem = {
 
     /** A callback triggered when the item is selected */
     onSelected: () => void;
-
-    /** Whether the item is hidden */
-    isHidden?: boolean;
 };
 
 type HeaderWithBackButtonProps = Partial<ChildrenProps> & {
diff --git a/src/components/PromotedActionsBar.tsx b/src/components/PromotedActionsBar.tsx
index 59a91abe7290..a5f52d3f7e99 100644
--- a/src/components/PromotedActionsBar.tsx
+++ b/src/components/PromotedActionsBar.tsx
@@ -12,21 +12,16 @@ type PromotedAction = {
     key: string;
 } & ThreeDotsMenuItem;
 
-type ReportPromotedAction<T> = (params: T) => PromotedAction;
-
-type PromotedActionsType = {
-    pin: ReportPromotedAction<{report: OnyxReport}>;
-    share: ReportPromotedAction<{report: OnyxReport; participants: number[]}>;
-};
+type PromotedActionsType = Record<'pin' | 'share', (report: OnyxReport) => PromotedAction>;
 
 const PromotedActions = {
-    pin: ({report}) => ({
+    pin: (report) => ({
         key: 'pin',
         ...HeaderUtils.getPinMenuItem(report),
     }),
-    share: ({report, participants}) => ({
+    share: (report) => ({
         key: 'share',
-        ...HeaderUtils.getShareMenuItem(report, participants),
+        ...HeaderUtils.getShareMenuItem(report),
     }),
 } satisfies PromotedActionsType;
 
@@ -48,26 +43,20 @@ function PromotedActionsBar({promotedActions, containerStyle}: PromotedActionsBa
 
     return (
         <View style={[styles.flexRow, styles.ph5, styles.mb5, styles.gap2, styles.mw100, styles.w100, styles.justifyContentCenter, containerStyle]}>
-            {promotedActions.map(({key, onSelected, ...props}) => {
-                if (props.isHidden) {
-                    return null;
-                }
-
-                return (
-                    <View
-                        style={[styles.flex1, styles.mw50]}
-                        key={key}
-                    >
-                        <Button
-                            onPress={onSelected}
-                            iconFill={theme.icon}
-                            medium
-                            // eslint-disable-next-line react/jsx-props-no-spreading
-                            {...props}
-                        />
-                    </View>
-                );
-            })}
+            {promotedActions.map(({key, onSelected, ...props}) => (
+                <View
+                    style={[styles.flex1, styles.mw50]}
+                    key={key}
+                >
+                    <Button
+                        onPress={onSelected}
+                        iconFill={theme.icon}
+                        medium
+                        // eslint-disable-next-line react/jsx-props-no-spreading
+                        {...props}
+                    />
+                </View>
+            ))}
         </View>
     );
 }
diff --git a/src/libs/HeaderUtils.ts b/src/libs/HeaderUtils.ts
index cfd221fdd357..03c582d6b16b 100644
--- a/src/libs/HeaderUtils.ts
+++ b/src/libs/HeaderUtils.ts
@@ -6,7 +6,6 @@ import * as Report from './actions/Report';
 import * as Session from './actions/Session';
 import * as Localize from './Localize';
 import Navigation from './Navigation/Navigation';
-import * as ReportUtils from './ReportUtils';
 
 function getPinMenuItem(report: OnyxReport): ThreeDotsMenuItem {
     const isPinned = !!report.isPinned;
@@ -18,14 +17,11 @@ function getPinMenuItem(report: OnyxReport): ThreeDotsMenuItem {
     };
 }
 
-function getShareMenuItem(report: OnyxReport, participants: number[]): ThreeDotsMenuItem {
-    const isGroupDMChat = ReportUtils.isDM(report) && participants.length > 1;
-
+function getShareMenuItem(report: OnyxReport): ThreeDotsMenuItem {
     return {
         icon: Expensicons.QrCode,
         text: Localize.translateLocal('common.share'),
         onSelected: () => Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS_SHARE_CODE.getRoute(report?.reportID ?? '')),
-        isHidden: isGroupDMChat,
     };
 }
 
diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index 16b8632b2190..d2437ce45d2b 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -103,6 +103,8 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
         return !pendingMember || pendingMember.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? accountID : [];
     });
 
+    const isGroupDMChat = useMemo(() => ReportUtils.isDM(report) && participants.length > 1, [report, participants.length]);
+
     const isPrivateNotesFetchTriggered = report?.isLoadingPrivateNotes !== undefined;
 
     const isSelfDM = useMemo(() => ReportUtils.isSelfDM(report), [report]);
@@ -365,7 +367,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                             />
                         </OfflineWithFeedback>
                     )}
-                    <PromotedActionsBar promotedActions={[PromotedActions.pin({report}), PromotedActions.share({report, participants})]} />
+                    <PromotedActionsBar promotedActions={[PromotedActions.pin(report), ...(isGroupDMChat ? [] : [PromotedActions.share(report)])]} />
                     {menuItems.map((item) => {
                         const brickRoadIndicator =
                             ReportUtils.hasReportNameError(report) && item.key === CONST.REPORT_DETAILS_MENU_ITEM.SETTINGS ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined;