diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-05-03 12:05:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-03 12:05:24 +0200 |
commit | 58ac5ae643dc57ffd20017c54e7be523deaef156 (patch) | |
tree | 491e4afab8ab269096f6f68a3dfab08433954cda /app/javascript/flavours/glitch/features/direct_timeline/index.js | |
parent | cb9a919ff28294a2f1cf3642a165ad433cbf856b (diff) | |
parent | fa22b8ed229f93de1236a74d4df4a0b5fa57dddd (diff) |
Merge pull request #1761 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/direct_timeline/index.js')
-rw-r--r-- | app/javascript/flavours/glitch/features/direct_timeline/index.js | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/app/javascript/flavours/glitch/features/direct_timeline/index.js b/app/javascript/flavours/glitch/features/direct_timeline/index.js index 7741c6922..75ca19d17 100644 --- a/app/javascript/flavours/glitch/features/direct_timeline/index.js +++ b/app/javascript/flavours/glitch/features/direct_timeline/index.js @@ -10,7 +10,6 @@ import { addColumn, removeColumn, moveColumn } from 'flavours/glitch/actions/col import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import ColumnSettingsContainer from './containers/column_settings_container'; import { connectDirectStream } from 'flavours/glitch/actions/streaming'; -import { changeSetting } from 'flavours/glitch/actions/settings'; import ConversationsListContainer from './containers/conversations_list_container'; const messages = defineMessages({ @@ -99,14 +98,6 @@ class DirectTimeline extends React.PureComponent { this.props.dispatch(expandConversations({ maxId })); } - handleTimelineClick = () => { - this.props.dispatch(changeSetting(['direct', 'conversations'], false)); - } - - handleConversationsClick = () => { - this.props.dispatch(changeSetting(['direct', 'conversations'], true)); - } - render () { const { intl, hasUnread, columnId, multiColumn, conversationsMode } = this.props; const pinned = !!columnId; @@ -119,6 +110,7 @@ class DirectTimeline extends React.PureComponent { scrollKey={`direct_timeline-${columnId}`} timelineId='direct' onLoadMore={this.handleLoadMore} + prepend={<div className='follow_requests-unlocked_explanation'><span><FormattedMessage id='compose_form.encryption_warning' defaultMessage='Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.' /> <a href='/terms' target='_blank'><FormattedMessage id='compose_form.direct_message_warning_learn_more' defaultMessage='Learn more' /></a></span></div>} emptyMessage={<FormattedMessage id='empty_column.direct' defaultMessage="You don't have any direct messages yet. When you send or receive one, it will show up here." />} /> ); @@ -129,6 +121,7 @@ class DirectTimeline extends React.PureComponent { scrollKey={`direct_timeline-${columnId}`} timelineId='direct' onLoadMore={this.handleLoadMoreTimeline} + prepend={<div className='follow_requests-unlocked_explanation'><span><FormattedMessage id='compose_form.encryption_warning' defaultMessage='Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.' /> <a href='/terms' target='_blank'><FormattedMessage id='compose_form.direct_message_warning_learn_more' defaultMessage='Learn more' /></a></span></div>} emptyMessage={<FormattedMessage id='empty_column.direct' defaultMessage="You don't have any direct messages yet. When you send or receive one, it will show up here." />} /> ); @@ -149,27 +142,6 @@ class DirectTimeline extends React.PureComponent { <ColumnSettingsContainer /> </ColumnHeader> - <div className='notification__filter-bar'> - <button - className={conversationsMode ? 'active' : ''} - onClick={this.handleConversationsClick} - > - <FormattedMessage - id='direct.conversations_mode' - defaultMessage='Conversations' - /> - </button> - <button - className={conversationsMode ? '' : 'active'} - onClick={this.handleTimelineClick} - > - <FormattedMessage - id='direct.timeline_mode' - defaultMessage='Timeline' - /> - </button> - </div> - {contents} </Column> ); |