Merge pull request Expensify#63680 from Expensify/tgolen-remove-rnvps-13

Remove a call to getReportNameValuePairs when checking if a chat room description can be edited

Author: marcochavezf

src/libs/OptionsListUtils.ts

@@ -104,7 +104,6 @@ import {
     getRejectedReportMessage,
     getReportLastMessage,
     getReportName,
-    getReportNameValuePairs,
     getReportNotificationPreference,
     getReportOrDraftReport,
     getReportParticipantsTitle,
@@ -1482,10 +1481,7 @@ function getValidReports(reports: OptionList['reports'], config: GetValidReports
             includeSelfDM,
             login: option.login,
             includeDomainEmail,
-
-            // This will get removed as part of https://github.com/Expensify/App/issues/59961
-            // eslint-disable-next-line deprecation/deprecation
-            isReportArchived: isArchivedReport(getReportNameValuePairs(report?.reportID)),
+            isReportArchived: !!option.private_isArchived,
         });
 
         if (!shouldBeInOptionList) {

src/libs/ReportUtils.ts

@@ -8967,12 +8967,10 @@ function getRoom(type: ValueOf<typeof CONST.REPORT.CHAT_TYPE>, policyID: string)
 /**
  *  We only want policy members who are members of the report to be able to modify the report description, but not in thread chat.
  */
-function canEditReportDescription(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>): boolean {
+function canEditReportDescription(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, isReportArchived = false): boolean {
     return (
         !isMoneyRequestReport(report) &&
-        // This will get removed as part of https://github.com/Expensify/App/issues/59961
-        // eslint-disable-next-line deprecation/deprecation
-        !isArchivedReport(getReportNameValuePairs(report?.reportID)) &&
+        !isReportArchived &&
         isChatRoom(report) &&
         !isChatThread(report) &&
         !isEmpty(policy) &&

src/pages/RoomDescriptionPage.tsx

@@ -13,6 +13,7 @@ import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 import useLocalize from '@hooks/useLocalize';
+import useReportIsArchived from '@hooks/useReportIsArchived';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
@@ -47,6 +48,7 @@ function RoomDescriptionPage({report, policies}: RoomDescriptionPageProps) {
     const focusTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
     const {translate} = useLocalize();
     const policy = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`];
+    const reportIsArchived = useReportIsArchived(report?.reportID);
 
     const handleReportDescriptionChange = useCallback((value: string) => {
         setDescription(value);
@@ -94,7 +96,7 @@ function RoomDescriptionPage({report, policies}: RoomDescriptionPageProps) {
         }, []),
     );
 
-    const canEdit = canEditReportDescription(report, policy);
+    const canEdit = canEditReportDescription(report, policy, reportIsArchived);
     return (
         <ScreenWrapper
             shouldEnableMaxHeight

tests/unit/ReportUtilsTest.ts

@@ -21,6 +21,7 @@ import {
     canAddTransaction,
     canDeleteReportAction,
     canDeleteTransaction,
+    canEditReportDescription,
     canEditWriteCapability,
     canHoldUnholdReportAction,
     findLastAccessedReport,
@@ -3083,4 +3084,41 @@ describe('ReportUtils', () => {
             expect(result).toBe(null);
         });
     });
+
+    describe('canEditReportDescription', () => {
+        it('should return true for a non-archived policy room', async () => {
+            // Given a non-archived policy room
+            const report: Report = {
+                ...createRandomReport(40001),
+                chatType: CONST.REPORT.CHAT_TYPE.POLICY_ROOM,
+                participants: buildParticipantsFromAccountIDs([currentUserAccountID, 1]),
+            };
+            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`, report);
+
+            // When it's checked if the description can be edited
+            const {result: isReportArchived} = renderHook(() => useReportIsArchived(report?.reportID));
+            const result = canEditReportDescription(report, policy, isReportArchived.current);
+
+            // Then it can be edited
+            expect(result).toBeTruthy();
+        });
+
+        it('should return false for an archived policy room', async () => {
+            // Given an archived policy room
+            const report: Report = {
+                ...createRandomReport(40002),
+                chatType: CONST.REPORT.CHAT_TYPE.POLICY_ROOM,
+                participants: buildParticipantsFromAccountIDs([currentUserAccountID, 1]),
+            };
+            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`, report);
+            await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report.reportID}`, {private_isArchived: DateUtils.getDBTime()});
+
+            // When it's checked if the description can be edited
+            const {result: isReportArchived} = renderHook(() => useReportIsArchived(report?.reportID));
+            const result = canEditReportDescription(report, policy, isReportArchived.current);
+
+            // Then it cannot be edited
+            expect(result).toBeFalsy();
+        });
+    });
 });