diff options
| author | Reverite <github@reverite.sh> | 2019-09-09 20:01:01 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-09-09 20:01:01 -0700 |
| commit | 849e2bc4ca11892e701835a4696904d78b1ad325 (patch) | |
| tree | b579de6026e032167d7ba837b6f6cb3c7568ea24 /app/javascript/flavours/glitch/features/direct_timeline | |
| parent | 244196cf4a20005865bf0b9a1d99146e61e59ae4 (diff) | |
| parent | 2aa0cdf7e6c44f252ffbcc991a5391c31386058d (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/javascript/flavours/glitch/features/direct_timeline')
| -rw-r--r-- | app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.js | 4 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/features/direct_timeline/index.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.js b/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.js index 5adb44f2c..ce14e2a9d 100644 --- a/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.js +++ b/app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.js @@ -9,8 +9,8 @@ const messages = defineMessages({ settings: { id: 'home.settings', defaultMessage: 'Column settings' }, }); -@injectIntl -export default class ColumnSettings extends React.PureComponent { +export default @injectIntl +class ColumnSettings extends React.PureComponent { static propTypes = { settings: ImmutablePropTypes.map.isRequired, diff --git a/app/javascript/flavours/glitch/features/direct_timeline/index.js b/app/javascript/flavours/glitch/features/direct_timeline/index.js index 6fe8a1ce8..e2c0a439a 100644 --- a/app/javascript/flavours/glitch/features/direct_timeline/index.js +++ b/app/javascript/flavours/glitch/features/direct_timeline/index.js @@ -22,9 +22,9 @@ const mapStateToProps = state => ({ conversationsMode: state.getIn(['settings', 'direct', 'conversations']), }); -@connect(mapStateToProps) +export default @connect(mapStateToProps) @injectIntl -export default class DirectTimeline extends React.PureComponent { +class DirectTimeline extends React.PureComponent { static propTypes = { dispatch: PropTypes.func.isRequired, |