Merge branch 'main' into @chrispader/update-vision-camera-for-android-16kb-memory-page-size-compat

Author: chrispader

package.json

@@ -46,7 +46,7 @@
     "test:debug": "TZ=utc NODE_OPTIONS='--inspect-brk --experimental-vm-modules' jest --runInBand",
     "perf-test": "NODE_OPTIONS=--experimental-vm-modules npx reassure",
     "typecheck": "NODE_OPTIONS=--max_old_space_size=8192 tsc",
-    "lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=327 --cache --cache-location=node_modules/.cache/eslint",
+    "lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=320 --cache --cache-location=node_modules/.cache/eslint",
     "lint-changed": "NODE_OPTIONS=--max_old_space_size=8192 ./scripts/lintChanged.sh",
     "lint-watch": "npx eslint-watch --watch --changed",
     "shellcheck": "./scripts/shellCheck.sh",

src/libs/ReportUtils.ts

@@ -9818,6 +9818,10 @@ function canLeaveChat(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, isRe
         return true;
     }
 
+    if (isMoneyRequestReport(report) && currentUserAccountID !== report?.managerID && currentUserAccountID !== report?.ownerAccountID && !isPolicyAdminPolicyUtils(policy)) {
+        return true;
+    }
+
     if (isPublicRoom(report) && isAnonymousUserSession()) {
         return false;
     }

src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx

@@ -233,7 +233,18 @@ function AttachmentPickerWithMenuItems({
         const moneyRequestOptionsList = temporary_getMoneyRequestOptions(report, policy, reportParticipantIDs ?? []).map((option) => options[option], isReportArchived);
 
         return moneyRequestOptionsList.flat().filter((item, index, self) => index === self.findIndex((t) => t.text === item.text));
-    }, [translate, shouldUseNarrowLayout, report, policy, reportParticipantIDs, selectOption, isDelegateAccessRestricted, showDelegateNoAccessModal, isManualDistanceTrackingEnabled]);
+    }, [
+        translate,
+        shouldUseNarrowLayout,
+        report,
+        policy,
+        reportParticipantIDs,
+        selectOption,
+        isDelegateAccessRestricted,
+        showDelegateNoAccessModal,
+        isManualDistanceTrackingEnabled,
+        isReportArchived,
+    ]);
 
     const createReportOption: PopoverMenuItem[] = useMemo(() => {
         if (!isPolicyExpenseChat(report) || !isPaidGroupPolicy(report) || !isReportOwner(report)) {

src/pages/home/report/ReportActionCompose/ReportActionCompose.tsx

@@ -244,7 +244,7 @@ function ReportActionCompose({
         const parentReport = getParentReport(report);
         const isSettledOrApproved = isSettled(report) || isSettled(parentReport) || isReportApproved({report}) || isReportApproved({report: parentReport});
         return (shouldAddOrReplaceReceipt && !isSettledOrApproved) || !!temporary_getMoneyRequestOptions(report, policy, reportParticipantIDs, isReportArchived).length;
-    }, [shouldAddOrReplaceReceipt, report, policy, reportParticipantIDs]);
+    }, [shouldAddOrReplaceReceipt, report, policy, reportParticipantIDs, isReportArchived]);
 
     // Placeholder to display in the chat input.
     const inputPlaceholder = useMemo(() => {

src/pages/home/sidebar/FloatingActionButtonAndPopover.tsx

@@ -129,8 +129,7 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu, isT
     const [travelSettings] = useOnyx(ONYXKEYS.NVP_TRAVEL_SETTINGS, {canBeMissing: true});
 
     const canSendInvoice = useMemo(() => canSendInvoicePolicyUtils(allPolicies as OnyxCollection<OnyxTypes.Policy>, session?.email), [allPolicies, session?.email]);
-    const isArchivedReport = useReportIsArchived(quickActionReport?.reportID);
-    const isValidReport = !(isEmptyObject(quickActionReport) || isArchivedReport);
+    const isValidReport = !(isEmptyObject(quickActionReport) || isReportArchived);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {canBeMissing: true});
     const [hasSeenTour = false] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {
         selector: hasSeenTourSelector,
@@ -155,16 +154,16 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu, isT
 
     const quickActionAvatars = useMemo(() => {
         if (isValidReport) {
-            const avatars = getIcons(quickActionReport, personalDetails, null, undefined, undefined, undefined, undefined, isArchivedReport);
+            const avatars = getIcons(quickActionReport, personalDetails, null, undefined, undefined, undefined, undefined, isReportArchived);
             return avatars.length <= 1 || isPolicyExpenseChat(quickActionReport) ? avatars : avatars.filter((avatar) => avatar.id !== session?.accountID);
         }
         if (!isEmptyObject(policyChatForActivePolicy)) {
-            return getIcons(policyChatForActivePolicy, personalDetails, null, undefined, undefined, undefined, undefined, isArchivedReport);
+            return getIcons(policyChatForActivePolicy, personalDetails, null, undefined, undefined, undefined, undefined, isReportArchived);
         }
         return [];
         // Policy is needed as a dependency in order to update the shortcut details when the workspace changes
         // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
-    }, [personalDetails, session?.accountID, quickActionReport, quickActionPolicy, policyChatForActivePolicy]);
+    }, [personalDetails, session?.accountID, quickActionReport, quickActionPolicy, policyChatForActivePolicy, isReportArchived, isValidReport]);
 
     const quickActionTitle = useMemo(() => {
         if (isEmptyObject(quickActionReport)) {
@@ -397,6 +396,7 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu, isT
         shouldUseNarrowLayout,
         isDelegateAccessRestricted,
         showDelegateNoAccessModal,
+        isReportArchived,
     ]);
 
     const isTravelEnabled = useMemo(() => {

src/pages/iou/request/MoneyRequestParticipantsSelector.tsx

@@ -462,7 +462,7 @@ function MoneyRequestParticipantsSelector(
     const initiateContactImportAndSetState = useCallback(() => {
         setContactPermissionState(RESULTS.GRANTED);
         InteractionManager.runAfterInteractions(importAndSaveContacts);
-    }, [importAndSaveContacts]);
+    }, [importAndSaveContacts, setContactPermissionState]);
 
     const footerContent = useMemo(() => {
         if (isDismissed && !shouldShowSplitBillErrorMessage && !participants.length) {

tests/unit/ReportUtilsTest.ts

@@ -4550,6 +4550,80 @@ describe('ReportUtils', () => {
 
             expect(canLeaveChat(report, reportPolicy)).toBe(true);
         });
+
+        describe('when the report is a money report', () => {
+            it('should return false for the owner of the report', async () => {
+                const report: Report = {
+                    ...createRandomReport(1),
+                    chatType: undefined,
+                    type: CONST.REPORT.TYPE.IOU,
+                    ownerAccountID: currentUserAccountID,
+                };
+
+                await Onyx.set(ONYXKEYS.SESSION, {email: currentUserEmail, accountID: currentUserAccountID});
+
+                const reportPolicy: Policy = {
+                    ...createRandomPolicy(1),
+                    role: CONST.POLICY.ROLE.USER,
+                };
+
+                expect(canLeaveChat(report, reportPolicy)).toBe(false);
+            });
+
+            it('should return false for the manager of the report', async () => {
+                const report: Report = {
+                    ...createRandomReport(1),
+                    chatType: undefined,
+                    type: CONST.REPORT.TYPE.IOU,
+                    managerID: currentUserAccountID,
+                };
+
+                await Onyx.set(ONYXKEYS.SESSION, {email: currentUserEmail, accountID: currentUserAccountID});
+
+                const reportPolicy: Policy = {
+                    ...createRandomPolicy(1),
+                    role: CONST.POLICY.ROLE.USER,
+                };
+
+                expect(canLeaveChat(report, reportPolicy)).toBe(false);
+            });
+
+            it('should return false for the admin of the policy', async () => {
+                const report: Report = {
+                    ...createRandomReport(1),
+                    chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT,
+                    type: CONST.REPORT.TYPE.EXPENSE,
+                };
+
+                await Onyx.set(ONYXKEYS.SESSION, {email: currentUserEmail, accountID: currentUserAccountID});
+
+                const reportPolicy: Policy = {
+                    ...createRandomPolicy(1),
+                    role: CONST.POLICY.ROLE.ADMIN,
+                };
+
+                expect(canLeaveChat(report, reportPolicy)).toBe(false);
+            });
+
+            it('should return true for the invited user', async () => {
+                const report: Report = {
+                    ...createRandomReport(1),
+                    chatType: undefined,
+                    type: CONST.REPORT.TYPE.IOU,
+                    ownerAccountID: 1,
+                    managerID: 2,
+                };
+
+                await Onyx.set(ONYXKEYS.SESSION, {email: currentUserEmail, accountID: currentUserAccountID});
+
+                const reportPolicy: Policy = {
+                    ...createRandomPolicy(1),
+                    role: CONST.POLICY.ROLE.USER,
+                };
+
+                expect(canLeaveChat(report, reportPolicy)).toBe(true);
+            });
+        });
     });
 
     describe('canJoinChat', () => {