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/direct_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/direct_timeline')
3 files changed, 6 insertions, 4 deletions
diff --git a/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.jsx b/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.jsx index 18c3c7e21..79e98ec6f 100644 --- a/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.jsx +++ b/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.jsx @@ -10,7 +10,6 @@ const messages = defineMessages({ settings: { id: 'home.settings', defaultMessage: 'Column settings' }, }); -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/direct_timeline/components/conversation.jsx b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx index ad2a68ebd..05fd68707 100644 --- a/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx +++ b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx @@ -24,7 +24,6 @@ const messages = defineMessages({ unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' }, }); -export default @injectIntl class Conversation extends ImmutablePureComponent { static contextTypes = { @@ -230,3 +229,5 @@ class Conversation extends ImmutablePureComponent { } } + +export default injectIntl(Conversation); diff --git a/app/javascript/flavours/glitch/features/direct_timeline/index.jsx b/app/javascript/flavours/glitch/features/direct_timeline/index.jsx index afd348988..433574c3e 100644 --- a/app/javascript/flavours/glitch/features/direct_timeline/index.jsx +++ b/app/javascript/flavours/glitch/features/direct_timeline/index.jsx @@ -22,8 +22,6 @@ const mapStateToProps = state => ({ conversationsMode: state.getIn(['settings', 'direct', 'conversations']), }); -export default @connect(mapStateToProps) -@injectIntl class DirectTimeline extends React.PureComponent { static propTypes = { @@ -154,3 +152,5 @@ class DirectTimeline extends React.PureComponent { } } + +export default connect(mapStateToProps)(injectIntl(DirectTimeline)); |