From: mayaeh <mayaeh@marimo-net.org>
Date: Mon, 8 Oct 2018 12:43:38 +0000 (+0900)
Subject: Fixed error occurrence when pinning the DM column. (#8922)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=770e33749759e46444106098dd8295f3bac5bd52;p=mastodon.git

Fixed error occurrence when pinning the DM column. (#8922)
---

diff --git a/app/javascript/mastodon/features/direct_timeline/index.js b/app/javascript/mastodon/features/direct_timeline/index.js
index 4c8485690..41ec73d98 100644
--- a/app/javascript/mastodon/features/direct_timeline/index.js
+++ b/app/javascript/mastodon/features/direct_timeline/index.js
@@ -5,7 +5,7 @@ import Column from '../../components/column';
 import ColumnHeader from '../../components/column_header';
 import { expandConversations } from '../../actions/conversations';
 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import { connectDirectStream } from '../../actions/streaming';
 import ConversationsListContainer from './containers/conversations_list_container';
 
@@ -84,7 +84,14 @@ class DirectTimeline extends React.PureComponent {
           multiColumn={multiColumn}
         />
 
-        <ConversationsListContainer shouldUpdateScroll={shouldUpdateScroll} />
+        <ConversationsListContainer
+          trackScroll={!pinned}
+          scrollKey={`direct_timeline-${columnId}`}
+          timelineId='direct'
+          onLoadMore={this.handleLoadMore}
+          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." />}
+          shouldUpdateScroll={shouldUpdateScroll}
+        />
       </Column>
     );
   }