From e7247816d0e69477d7a753f89f19563247684892 Mon Sep 17 00:00:00 2001 From: Hans Date: Mon, 31 Jul 2023 12:15:54 +0700 Subject: [PATCH 1/2] block user from archived room setting --- src/libs/ReportUtils.js | 2 +- src/pages/ReportParticipantsPage.js | 2 +- src/pages/settings/Report/WriteCapabilityPage.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js index 0e8c14f5cd50..edbad90fe3db 100644 --- a/src/libs/ReportUtils.js +++ b/src/libs/ReportUtils.js @@ -2745,7 +2745,7 @@ function getPolicy(policyID) { * @returns {Boolean} */ function shouldDisableSettings(report) { - return !isPolicyExpenseChat(report) && !isChatRoom(report) && !isChatThread(report); + return !isPolicyExpenseChat(report) && !isChatRoom(report) && !isChatThread(report) || isArchivedRoom(report); } /** diff --git a/src/pages/ReportParticipantsPage.js b/src/pages/ReportParticipantsPage.js index 86a841c2cd27..abcd4601de39 100755 --- a/src/pages/ReportParticipantsPage.js +++ b/src/pages/ReportParticipantsPage.js @@ -91,7 +91,7 @@ function ReportParticipantsPage(props) { return ( {({safeAreaPaddingBottomStyle}) => ( - + From ae0a51608f5d2096089930d7dc86a11b948524f0 Mon Sep 17 00:00:00 2001 From: Hans Date: Mon, 31 Jul 2023 13:14:09 +0700 Subject: [PATCH 2/2] update case for title --- src/libs/ReportUtils.js | 2 +- src/pages/settings/Report/NotificationPreferencePage.js | 2 +- src/pages/settings/Report/ReportSettingsPage.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js index edbad90fe3db..0e8c14f5cd50 100644 --- a/src/libs/ReportUtils.js +++ b/src/libs/ReportUtils.js @@ -2745,7 +2745,7 @@ function getPolicy(policyID) { * @returns {Boolean} */ function shouldDisableSettings(report) { - return !isPolicyExpenseChat(report) && !isChatRoom(report) && !isChatThread(report) || isArchivedRoom(report); + return !isPolicyExpenseChat(report) && !isChatRoom(report) && !isChatThread(report); } /** diff --git a/src/pages/settings/Report/NotificationPreferencePage.js b/src/pages/settings/Report/NotificationPreferencePage.js index a32245b10518..9765cf1ae0b4 100644 --- a/src/pages/settings/Report/NotificationPreferencePage.js +++ b/src/pages/settings/Report/NotificationPreferencePage.js @@ -25,7 +25,7 @@ const propTypes = { const greenCheckmark = {src: Expensicons.Checkmark, color: themeColors.success}; function NotificationPreferencePage(props) { - const shouldDisableNotificationPreferences = ReportUtils.shouldDisableSettings(props.report); + const shouldDisableNotificationPreferences = ReportUtils.shouldDisableSettings(props.report) || ReportUtils.isArchivedRoom(props.report); const notificationPreferenceOptions = _.map(props.translate('notificationPreferencesPage.notificationPreferences'), (preference, key) => ({ value: key, text: preference, diff --git a/src/pages/settings/Report/ReportSettingsPage.js b/src/pages/settings/Report/ReportSettingsPage.js index 975402dd5a61..b21c4b971dca 100644 --- a/src/pages/settings/Report/ReportSettingsPage.js +++ b/src/pages/settings/Report/ReportSettingsPage.js @@ -63,7 +63,7 @@ function ReportSettingsPage(props) { const shouldDisableWelcomeMessage = ReportUtils.isArchivedRoom(report) || !ReportUtils.isChatRoom(report) || _.isEmpty(linkedWorkspace) || linkedWorkspace.role !== CONST.POLICY.ROLE.ADMIN; - const shouldDisableSettings = _.isEmpty(report) || ReportUtils.shouldDisableSettings(report); + const shouldDisableSettings = _.isEmpty(report) || ReportUtils.shouldDisableSettings(report) || ReportUtils.isArchivedRoom(report); const shouldShowRoomName = !ReportUtils.isPolicyExpenseChat(report) && !ReportUtils.isChatThread(report); const notificationPreference = translate(`notificationPreferencesPage.notificationPreferences.${report.notificationPreference}`); const writeCapability = ReportUtils.isAdminRoom(report) ? CONST.REPORT.WRITE_CAPABILITIES.ADMINS : report.writeCapability || CONST.REPORT.WRITE_CAPABILITIES.ALL;