mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-10-18 13:35:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'upstream-main' into develop
Some checks failed
Bundler Audit / security (push) Has been cancelled
Details
Ruby Testing / build (test) (push) Has been cancelled
Details
Haml Linting / lint (push) Has been cancelled
Details
Check i18n / check-i18n (push) Has been cancelled
Details
CodeQL / Analyze (javascript) (push) Has been cancelled
Details
CodeQL / Analyze (ruby) (push) Has been cancelled
Details
Crowdin / Upload translations / upload-translations (push) Has been cancelled
Details
Check formatting / lint (push) Has been cancelled
Details
CSS Linting / lint (push) Has been cancelled
Details
JavaScript Linting / lint (push) Has been cancelled
Details
Ruby Linting / lint (push) Has been cancelled
Details
JavaScript Testing / test (push) Has been cancelled
Details
Historical data migration test / test (14-alpine) (push) Has been cancelled
Details
Historical data migration test / test (15-alpine) (push) Has been cancelled
Details
Ruby Testing / build (production) (push) Has been cancelled
Details
Ruby Testing / test (.ruby-version) (push) Has been cancelled
Details
Ruby Testing / test (3.1) (push) Has been cancelled
Details
Ruby Testing / test (3.2) (push) Has been cancelled
Details
Ruby Testing / Libvips tests (.ruby-version) (push) Has been cancelled
Details
Ruby Testing / Libvips tests (3.1) (push) Has been cancelled
Details
Ruby Testing / Libvips tests (3.2) (push) Has been cancelled
Details
Ruby Testing / End to End testing (.ruby-version) (push) Has been cancelled
Details
Ruby Testing / End to End testing (3.1) (push) Has been cancelled
Details
Ruby Testing / End to End testing (3.2) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (3.1, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Details
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Has been cancelled
Details

Browse source
This commit is contained in:
Jeremy Kescher 2024-10-12 08:52:17 +02:00
parent d364a1b0a7 888e6a3439
commit 38e2f1de16
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 (