diff --git a/src/components/ReportWelcomeText.js b/src/components/ReportWelcomeText.js
index 9fc446df31e3..80c26b5d6b3f 100644
--- a/src/components/ReportWelcomeText.js
+++ b/src/components/ReportWelcomeText.js
@@ -65,7 +65,6 @@ function ReportWelcomeText(props) {
const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(props.report);
const isChatRoom = ReportUtils.isChatRoom(props.report);
const isDefault = !(isChatRoom || isPolicyExpenseChat);
- const isAdminsOnlyPostingRoom = ReportUtils.isAdminsOnlyPostingRoom(props.report);
const participantAccountIDs = lodashGet(props.report, 'participantAccountIDs', []);
const isMultipleParticipant = participantAccountIDs.length > 1;
const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips(
@@ -100,19 +99,16 @@ function ReportWelcomeText(props) {
{isChatRoom && (
<>
{roomWelcomeMessage.phrase1}
- {/* for rooms in which only admins can post we dont need room name and phrase two */}
- {(!isAdminsOnlyPostingRoom || isUserPolicyAdmin) && (
- <>
- Navigation.navigate(ROUTES.getReportDetailsRoute(props.report.reportID))}
- suppressHighlighting
- >
- {ReportUtils.getReportName(props.report)}
-
- {roomWelcomeMessage.phrase2}
- >
+ {roomWelcomeMessage.showReportName && (
+ Navigation.navigate(ROUTES.getReportDetailsRoute(props.report.reportID))}
+ suppressHighlighting
+ >
+ {ReportUtils.getReportName(props.report)}
+
)}
+ {roomWelcomeMessage.phrase2 !== undefined && {roomWelcomeMessage.phrase2}}
>
)}
{isDefault && (
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 99dd31ab99aa..f40003382121 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -766,7 +766,7 @@ function canDeleteReportAction(reportAction, reportID) {
*/
function getRoomWelcomeMessage(report, isUserPolicyAdmin) {
- const welcomeMessage = {};
+ const welcomeMessage = {showReportName: true};
const workspaceName = getPolicyName(report);
if (isArchivedRoom(report)) {
@@ -780,6 +780,7 @@ function getRoomWelcomeMessage(report, isUserPolicyAdmin) {
welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAdminRoomPartTwo');
} else if (isAdminsOnlyPostingRoom(report) && !isUserPolicyAdmin) {
welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAdminOnlyPostingRoom');
+ welcomeMessage.showReportName = false;
} else if (isAnnounceRoom(report)) {
welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAnnounceRoomPartOne', {workspaceName});
welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAnnounceRoomPartTwo', {workspaceName});