Merge remote-tracking branch 'parent/main' into upstream-20240326

2024-03-26 09:08:20 +09:00 · 2024-03-26 09:08:20 +09:00 · 6c9b221cb2
commit 6c9b221cb2
parent 95ab1f729c 0cea7a623b
263 changed files with 4628 additions and 1518 deletions
--- a/app/javascript/mastodon/features/notifications/containers/filter_bar_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/filter_bar_container.js
@ -5,7 +5,7 @@ import FilterBar from '../components/filter_bar';

 const makeMapStateToProps = state => ({
  selectedFilter: state.getIn(['settings', 'notifications', 'quickFilter', 'active']),
-  advancedMode: false,
+  advancedMode: state.getIn(['settings', 'notifications', 'quickFilter', 'advanced']),
 });

 const mapDispatchToProps = (dispatch) => ({