From 50ccb6d010cc5c4e84d15d595acc2af4222f5c72 Mon Sep 17 00:00:00 2001
From: Mary Kate <mk@marykatefain.com>
Date: Fri, 14 Aug 2020 21:01:22 -0500
Subject: [PATCH] add loading indicator to DMs, fixes #316

---
 .../direct_timeline/components/conversations_list.js   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/direct_timeline/components/conversations_list.js b/app/soapbox/features/direct_timeline/components/conversations_list.js
index 587441685..31822dbba 100644
--- a/app/soapbox/features/direct_timeline/components/conversations_list.js
+++ b/app/soapbox/features/direct_timeline/components/conversations_list.js
@@ -51,10 +51,16 @@ export default class ConversationsList extends ImmutablePureComponent {
   }, 300, { leading: true })
 
   render() {
-    const { conversations, onLoadMore, ...other } = this.props;
+    const { conversations, isLoading, onLoadMore, ...other } = this.props;
 
     return (
-      <ScrollableList {...other} onLoadMore={onLoadMore && this.handleLoadOlder} scrollKey='direct' ref={this.setRef}>
+      <ScrollableList
+        {...other}
+        onLoadMore={onLoadMore && this.handleLoadOlder}
+        scrollKey='direct' ref={this.setRef}
+        isLoading={isLoading}
+        showLoading={isLoading && conversations.size === 0}
+      >
         {conversations.map(item => (
           <ConversationContainer
             key={item.get('id')}