@@ -188,7 +188,6 @@ type RowProps = {
188
188
data : {
189
189
active : string [ ] | boolean ;
190
190
} ;
191
- hasLegacyBrowserUpdate : boolean ;
192
191
onToggle : (
193
192
data : RowProps [ 'data' ] ,
194
193
filters : RowState [ 'subfilters' ] ,
@@ -211,8 +210,7 @@ class LegacyBrowserFilterRow extends Component<RowProps, RowState> {
211
210
if ( props . data . active === true ) {
212
211
initialSubfilters = new Set (
213
212
Object . keys ( LEGACY_BROWSER_SUBFILTERS ) . filter (
214
- key =>
215
- LEGACY_BROWSER_SUBFILTERS [ key ] . legacy === ! this . props . hasLegacyBrowserUpdate
213
+ key => ! LEGACY_BROWSER_SUBFILTERS [ key ] . legacy
216
214
)
217
215
) ;
218
216
} else if ( props . data . active === false ) {
@@ -234,8 +232,7 @@ class LegacyBrowserFilterRow extends Component<RowProps, RowState> {
234
232
if ( subfilter === true ) {
235
233
subfilters = new Set (
236
234
Object . keys ( LEGACY_BROWSER_SUBFILTERS ) . filter (
237
- key =>
238
- LEGACY_BROWSER_SUBFILTERS [ key ] . legacy === ! this . props . hasLegacyBrowserUpdate
235
+ key => ! LEGACY_BROWSER_SUBFILTERS [ key ] . legacy
239
236
)
240
237
) ;
241
238
} else if ( subfilter === false ) {
@@ -293,13 +290,10 @@ class LegacyBrowserFilterRow extends Component<RowProps, RowState> {
293
290
< FilterGrid >
294
291
{ Object . keys ( LEGACY_BROWSER_SUBFILTERS )
295
292
. filter ( key => {
296
- if ( this . props . hasLegacyBrowserUpdate ) {
297
- if ( ! LEGACY_BROWSER_SUBFILTERS [ key ] . legacy ) {
298
- return true ;
299
- }
300
- return this . state . subfilters . has ( key ) ;
293
+ if ( ! LEGACY_BROWSER_SUBFILTERS [ key ] . legacy ) {
294
+ return true ;
301
295
}
302
- return LEGACY_BROWSER_SUBFILTERS [ key ] . legacy ;
296
+ return this . state . subfilters . has ( key ) ;
303
297
} )
304
298
. map ( key => {
305
299
const subfilter = LEGACY_BROWSER_SUBFILTERS [ key ] ;
@@ -405,9 +399,6 @@ type Filter = {
405
399
export function ProjectFiltersSettings ( { project, params, features} : Props ) {
406
400
const organization = useOrganization ( ) ;
407
401
const { projectId : projectSlug } = params ;
408
-
409
- const hasLegacyBrowserUpdate = organization . features . includes ( 'legacy-browser-update' ) ;
410
-
411
402
const projectEndpoint = `/projects/${ organization . slug } /${ projectSlug } /` ;
412
403
const filtersEndpoint = `${ projectEndpoint } filters/` ;
413
404
@@ -511,7 +502,6 @@ export function ProjectFiltersSettings({project, params, features}: Props) {
511
502
onToggle = { ( _data , subfilters , event ) =>
512
503
handleLegacyChange ( { onChange, onBlur, event, subfilters} )
513
504
}
514
- hasLegacyBrowserUpdate = { hasLegacyBrowserUpdate }
515
505
/>
516
506
) }
517
507
</ FormField >
0 commit comments