From 215f02c0298eb7ed62f9bce3d55abb5732ea7f86 Mon Sep 17 00:00:00 2001
From: Rocio Perez-Cano <rocio@expensify.com>
Date: Thu, 15 Jun 2023 11:14:27 -0400
Subject: [PATCH 1/4] Fix condition for welcome messages

---
 src/pages/settings/Report/ReportSettingsPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/settings/Report/ReportSettingsPage.js b/src/pages/settings/Report/ReportSettingsPage.js
index 229986d6d761..575d7b68927b 100644
--- a/src/pages/settings/Report/ReportSettingsPage.js
+++ b/src/pages/settings/Report/ReportSettingsPage.js
@@ -96,7 +96,7 @@ class ReportSettingsPage extends Component {
         const linkedWorkspace = _.find(this.props.policies, (policy) => policy && policy.id === this.props.report.policyID);
         const shouldDisableRename = this.shouldDisableRename(linkedWorkspace) || ReportUtils.isThread(this.props.report);
         const notificationPreference = this.props.translate(`notificationPreferencesPage.notificationPreferences.${this.props.report.notificationPreference}`);
-        const shouldDisableWelcomeMessage = this.shouldDisableRename(linkedWorkspace);
+        const shouldDisableWelcomeMessage = this.shouldDisableWelcomeMessage(linkedWorkspace);
         const writeCapability = this.props.report.writeCapability || CONST.REPORT.WRITE_CAPABILITIES.ALL;
         const writeCapabilityText = this.props.translate(`writeCapabilityPage.writeCapability.${writeCapability}`);
         const shouldAllowWriteCapabilityEditing = lodashGet(linkedWorkspace, 'role', '') === CONST.POLICY.ROLE.ADMIN;

From d22a0025b23be373258d6e8f0ebaad60dd9646a0 Mon Sep 17 00:00:00 2001
From: Rocio Perez-Cano <rocio@expensify.com>
Date: Thu, 15 Jun 2023 11:58:14 -0400
Subject: [PATCH 2/4] Improve condition

---
 src/pages/settings/Report/ReportSettingsPage.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/settings/Report/ReportSettingsPage.js b/src/pages/settings/Report/ReportSettingsPage.js
index 575d7b68927b..8b9d66a3056e 100644
--- a/src/pages/settings/Report/ReportSettingsPage.js
+++ b/src/pages/settings/Report/ReportSettingsPage.js
@@ -24,6 +24,7 @@ import MenuItemWithTopDescription from '../../../components/MenuItemWithTopDescr
 import ROUTES from '../../../ROUTES';
 import * as Expensicons from '../../../components/Icon/Expensicons';
 import MenuItem from '../../../components/MenuItem';
+import {isChatRoom} from "../../../libs/ReportUtils";
 
 const propTypes = {
     /** Route params */
@@ -88,7 +89,7 @@ class ReportSettingsPage extends Component {
      * @returns {Boolean}
      */
     shouldDisableWelcomeMessage(linkedWorkspace) {
-        return !ReportUtils.isArchivedRoom(this.props.report) && !_.isEmpty(linkedWorkspace) && Policy.isPolicyOwner(linkedWorkspace) && linkedWorkspace.role === CONST.POLICY.ROLE.ADMIN;
+        return ReportUtils.isArchivedRoom(this.props.report) || !ReportUtils.isChatRoom(this.props.report) || (!_.isEmpty(linkedWorkspace) && linkedWorkspace.role !== CONST.POLICY.ROLE.ADMIN);
     }
 
     render() {

From aabb2de0541ea27a12b63ad44310960917033d85 Mon Sep 17 00:00:00 2001
From: Rocio Perez-Cano <rocio@expensify.com>
Date: Thu, 15 Jun 2023 12:32:26 -0400
Subject: [PATCH 3/4] Remove automatic import

---
 src/pages/settings/Report/ReportSettingsPage.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/settings/Report/ReportSettingsPage.js b/src/pages/settings/Report/ReportSettingsPage.js
index 8b9d66a3056e..e48040faa337 100644
--- a/src/pages/settings/Report/ReportSettingsPage.js
+++ b/src/pages/settings/Report/ReportSettingsPage.js
@@ -24,7 +24,6 @@ import MenuItemWithTopDescription from '../../../components/MenuItemWithTopDescr
 import ROUTES from '../../../ROUTES';
 import * as Expensicons from '../../../components/Icon/Expensicons';
 import MenuItem from '../../../components/MenuItem';
-import {isChatRoom} from "../../../libs/ReportUtils";
 
 const propTypes = {
     /** Route params */

From ab7b4a23ae9f4ab6bf65d51d767df2263c42cd89 Mon Sep 17 00:00:00 2001
From: Rocio Perez-Cano <rocio@expensify.com>
Date: Thu, 15 Jun 2023 13:10:36 -0400
Subject: [PATCH 4/4] Prettier

---
 src/pages/settings/Report/ReportSettingsPage.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/settings/Report/ReportSettingsPage.js b/src/pages/settings/Report/ReportSettingsPage.js
index e48040faa337..ad57de80aaaa 100644
--- a/src/pages/settings/Report/ReportSettingsPage.js
+++ b/src/pages/settings/Report/ReportSettingsPage.js
@@ -88,7 +88,9 @@ class ReportSettingsPage extends Component {
      * @returns {Boolean}
      */
     shouldDisableWelcomeMessage(linkedWorkspace) {
-        return ReportUtils.isArchivedRoom(this.props.report) || !ReportUtils.isChatRoom(this.props.report) || (!_.isEmpty(linkedWorkspace) && linkedWorkspace.role !== CONST.POLICY.ROLE.ADMIN);
+        return (
+            ReportUtils.isArchivedRoom(this.props.report) || !ReportUtils.isChatRoom(this.props.report) || (!_.isEmpty(linkedWorkspace) && linkedWorkspace.role !== CONST.POLICY.ROLE.ADMIN)
+        );
     }
 
     render() {