fix move check to report uitls

Expensify · Jul 2, 2024 · b9a6938 · b9a6938
1 parent a3f5a30
commit b9a6938
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
@@ -1866,6 +1866,8 @@ function getOptions(
             isInFocusMode: false,
             excludeEmptyChats: false,
             includeSelfDM,
+            login: option.login,
+            includeDomainEmail,
         });
     });
 
@@ -1915,10 +1917,6 @@ function getOptions(
             return;
         }
 
-        if (Str.isDomainEmail(option.login ?? '') && !includeDomainEmail) {
-            return;
-        }
-
         if (isThread && !includeThreads) {
             return;
         }
@@ -2194,7 +2192,6 @@ function getFilteredOptions(
     policyReportFieldOptions: string[] = [],
     recentlyUsedPolicyReportFieldOptions: string[] = [],
     includeInvoiceRooms = false,
-    includeDomainEmail = false,
 ) {
     return getOptions(
         {reports, personalDetails},
@@ -2222,7 +2219,6 @@ function getFilteredOptions(
             policyReportFieldOptions,
             recentlyUsedPolicyReportFieldOptions,
             includeInvoiceRooms,
-            includeDomainEmail,
         },
     );
 }

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -5383,6 +5383,8 @@ function shouldReportBeInOptionList({
     excludeEmptyChats,
     doesReportHaveViolations,
     includeSelfDM = false,
+    login,
+    includeDomainEmail = false,
 }: {
     report: OnyxEntry<Report>;
     currentReportId: string;
@@ -5392,6 +5394,8 @@ function shouldReportBeInOptionList({
     excludeEmptyChats: boolean;
     doesReportHaveViolations: boolean;
     includeSelfDM?: boolean;
+    login?: string;
+    includeDomainEmail?: boolean;
 }) {
     const isInDefaultMode = !isInFocusMode;
     // Exclude reports that have no data because there wouldn't be anything to show in the option item.
@@ -5495,6 +5499,11 @@ function shouldReportBeInOptionList({
     if (isSelfDM(report)) {
         return includeSelfDM;
     }
+
+    if (Str.isDomainEmail(login ?? '') && !includeDomainEmail) {
+        return false;
+    }
+
     const parentReportAction = ReportActionsUtils.getParentReportAction(report);
 
     // Hide chat threads where the parent message is pending removal