mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-25 19:01:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'upstream-stable/4.3' into stable/4.3

Browse source
This commit is contained in:
Jeremy Kescher 2024-10-12 08:38:43 +02:00
commit 3a69ab2ba8
No known key found for this signature in database
GPG key ID: 80A419A7A613DFA4
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/javascript/flavours/glitch/features/notifications_v2/filter_bar.tsx
View file

@ -15,6 +15,7 @@ import { Icon } from 'flavours/glitch/components/icon';
import { import {
selectSettingsNotificationsQuickFilterActive, selectSettingsNotificationsQuickFilterActive,
selectSettingsNotificationsQuickFilterAdvanced, selectSettingsNotificationsQuickFilterAdvanced,
selectSettingsNotificationsQuickFilterShow,
} from 'flavours/glitch/selectors/settings'; } from 'flavours/glitch/selectors/settings';
import { useAppDispatch, useAppSelector } from 'flavours/glitch/store'; import { useAppDispatch, useAppSelector } from 'flavours/glitch/store';
@ -70,6 +71,11 @@ export const FilterBar: React.FC = () => {
const advancedMode = useAppSelector( const advancedMode = useAppSelector(
selectSettingsNotificationsQuickFilterAdvanced, selectSettingsNotificationsQuickFilterAdvanced,
); );
const useFilterBar = useAppSelector(
selectSettingsNotificationsQuickFilterShow,
);
if (!useFilterBar) return null;
if (advancedMode) if (advancedMode)
return ( return (