diff --git a/Extension/_locales/en/messages.json b/Extension/_locales/en/messages.json
index 21e2ae49c0..3bcaefc242 100644
--- a/Extension/_locales/en/messages.json
+++ b/Extension/_locales/en/messages.json
@@ -53,12 +53,6 @@
"popup_adguard_for_android": {
"message": "AdGuard for Android"
},
- "options_filters_filter_status_on": {
- "message": "%filterName%: Enabled"
- },
- "options_filters_filter_status_off": {
- "message": "%filterName%: Disabled"
- },
"options_filters_filter_version": {
"message": "version:"
},
diff --git a/Extension/src/pages/options/components/Filters/Filter.tsx b/Extension/src/pages/options/components/Filters/Filter.tsx
index f5ea65d152..4dd1494f92 100644
--- a/Extension/src/pages/options/components/Filters/Filter.tsx
+++ b/Extension/src/pages/options/components/Filters/Filter.tsx
@@ -84,10 +84,10 @@ type FilterParams = {
tagsDetails: TagMetadata[],
},
groupEnabled: boolean,
- isScreenReader: boolean;
+ disabled?: boolean;
};
-const Filter = observer(({ filter, groupEnabled, isScreenReader }: FilterParams) => {
+const Filter = observer(({ filter, groupEnabled, disabled = false }: FilterParams) => {
const { settingsStore, uiStore } = useContext(rootStore);
const [isOpenRemoveFilterModal, setIsOpenRemoveFilterModal] = useState(false);
@@ -106,11 +106,6 @@ const Filter = observer(({ filter, groupEnabled, isScreenReader }: FilterParams)
tagsDetails = [],
} = filter;
- const formattedVersion = version ? `${translator.getMessage('options_filters_filter_version')} ${version}` : '';
- const normalizedLastUpdated = lastUpdateTime ? formatDate(lastUpdateTime) : formatDate(lastCheckTime);
- const formattedLastUpdated = `${translator.getMessage('options_filters_filter_updated')} ${normalizedLastUpdated}`;
- const details = `${formattedVersion} | ${formattedLastUpdated}`;
-
// Trusted tag can be only on custom filters,
const tags = trusted
? [...tagsDetails, {
@@ -245,25 +240,12 @@ const Filter = observer(({ filter, groupEnabled, isScreenReader }: FilterParams)
});
// We add prefix to avoid id collisions with group ids
- const prefixedFilterId = addPrefix(filterId);
- const titleId = `${prefixedFilterId}-title`;
-
- if (!groupEnabled && isScreenReader) {
- const nameWithStatus = enabled
- ? translator.getMessage('options_filters_filter_status_on', { filterName: name })
- : translator.getMessage('options_filters_filter_status_off', { filterName: name });
- const descriptionSuffix = description.endsWith('.') ? '' : '.';
-
- return (
-
- {`${nameWithStatus}. ${description}${descriptionSuffix} ${details}`}
-
- );
- }
+ const prefixedFilterSwitchId = addPrefix(filterId);
+ const prefixedFilterTitleId = `${prefixedFilterSwitchId}-title`;
return (
-
);