diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-03-27 12:49:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-27 12:49:33 +0200 |
| commit | cbdb25ab0343603165fc89fd28b07c9ca0f2ae6d (patch) | |
| tree | dc8aa1aa2449f54b530df0b251f7d126df0e525f /app/javascript/flavours/glitch/features/public_timeline | |
| parent | 81e85782d1cf595310180c3106ed92682045b5fd (diff) | |
| parent | 8215df76c070f7d400a6091fcb1c0f6ff78474a0 (diff) | |
Merge pull request #2151 from ClearlyClaire/glitch-soc/main
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/public_timeline')
| -rw-r--r-- | app/javascript/flavours/glitch/features/public_timeline/components/column_settings.jsx | 3 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/features/public_timeline/index.jsx | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/features/public_timeline/components/column_settings.jsx b/app/javascript/flavours/glitch/features/public_timeline/components/column_settings.jsx index cfe821cfc..a44d5c784 100644 --- a/app/javascript/flavours/glitch/features/public_timeline/components/column_settings.jsx +++ b/app/javascript/flavours/glitch/features/public_timeline/components/column_settings.jsx @@ -9,7 +9,6 @@ const messages = defineMessages({ filter_regex: { id: 'home.column_settings.filter_regex', defaultMessage: 'Filter out by regular expressions' }, }); -export default @injectIntl class ColumnSettings extends React.PureComponent { static propTypes = { @@ -40,3 +39,5 @@ class ColumnSettings extends React.PureComponent { } } + +export default injectIntl(ColumnSettings); diff --git a/app/javascript/flavours/glitch/features/public_timeline/index.jsx b/app/javascript/flavours/glitch/features/public_timeline/index.jsx index 810643f97..737e5723f 100644 --- a/app/javascript/flavours/glitch/features/public_timeline/index.jsx +++ b/app/javascript/flavours/glitch/features/public_timeline/index.jsx @@ -35,8 +35,6 @@ const mapStateToProps = (state, { columnId }) => { }; }; -export default @connect(mapStateToProps) -@injectIntl class PublicTimeline extends React.PureComponent { static defaultProps = { @@ -166,3 +164,5 @@ class PublicTimeline extends React.PureComponent { } } + +export default connect(mapStateToProps)(injectIntl(PublicTimeline)); |