Commit b9a6938 1 parent a3f5a30 commit b9a6938 Copy full SHA for b9a6938
File tree 2 files changed +11
-6
lines changed
2 files changed +11
-6
lines changed Original file line number Diff line number Diff line change @@ -1866,6 +1866,8 @@ function getOptions(
1866
1866
isInFocusMode : false ,
1867
1867
excludeEmptyChats : false ,
1868
1868
includeSelfDM,
1869
+ login : option . login ,
1870
+ includeDomainEmail,
1869
1871
} ) ;
1870
1872
} ) ;
1871
1873
@@ -1915,10 +1917,6 @@ function getOptions(
1915
1917
return ;
1916
1918
}
1917
1919
1918
- if ( Str . isDomainEmail ( option . login ?? '' ) && ! includeDomainEmail ) {
1919
- return ;
1920
- }
1921
-
1922
1920
if ( isThread && ! includeThreads ) {
1923
1921
return ;
1924
1922
}
@@ -2194,7 +2192,6 @@ function getFilteredOptions(
2194
2192
policyReportFieldOptions : string [ ] = [ ] ,
2195
2193
recentlyUsedPolicyReportFieldOptions : string [ ] = [ ] ,
2196
2194
includeInvoiceRooms = false ,
2197
- includeDomainEmail = false ,
2198
2195
) {
2199
2196
return getOptions (
2200
2197
{ reports, personalDetails} ,
@@ -2222,7 +2219,6 @@ function getFilteredOptions(
2222
2219
policyReportFieldOptions,
2223
2220
recentlyUsedPolicyReportFieldOptions,
2224
2221
includeInvoiceRooms,
2225
- includeDomainEmail,
2226
2222
} ,
2227
2223
) ;
2228
2224
}
Original file line number Diff line number Diff line change @@ -5383,6 +5383,8 @@ function shouldReportBeInOptionList({
5383
5383
excludeEmptyChats,
5384
5384
doesReportHaveViolations,
5385
5385
includeSelfDM = false ,
5386
+ login,
5387
+ includeDomainEmail = false ,
5386
5388
} : {
5387
5389
report : OnyxEntry < Report > ;
5388
5390
currentReportId : string ;
@@ -5392,6 +5394,8 @@ function shouldReportBeInOptionList({
5392
5394
excludeEmptyChats : boolean ;
5393
5395
doesReportHaveViolations : boolean ;
5394
5396
includeSelfDM ?: boolean ;
5397
+ login ?: string ;
5398
+ includeDomainEmail ?: boolean ;
5395
5399
} ) {
5396
5400
const isInDefaultMode = ! isInFocusMode ;
5397
5401
// Exclude reports that have no data because there wouldn't be anything to show in the option item.
@@ -5495,6 +5499,11 @@ function shouldReportBeInOptionList({
5495
5499
if ( isSelfDM ( report ) ) {
5496
5500
return includeSelfDM ;
5497
5501
}
5502
+
5503
+ if ( Str . isDomainEmail ( login ?? '' ) && ! includeDomainEmail ) {
5504
+ return false ;
5505
+ }
5506
+
5498
5507
const parentReportAction = ReportActionsUtils . getParentReportAction ( report ) ;
5499
5508
5500
5509
// Hide chat threads where the parent message is pending removal
You can’t perform that action at this time.
0 commit comments