changed method

2 files changed, 5 insertions, 9 deletions

diff --git a/src/components/messages/ChannelPreview.tsx b/src/components/messages/ChannelPreview.tsx
index 8bd3a745..4c3eb9d8 100644
--- a/src/components/messages/ChannelPreview.tsx
+++ b/src/components/messages/ChannelPreview.tsx
@@ -37,6 +37,11 @@ const ChannelPreview: React.FC<
   const online = isOnline(member?.user?.last_active);
   const unread = channel.state.unreadCount > 0;
 
+  // Hide channel if no message was exchanged
+  if (channel.state.messages.length === 0) {
+    return null;
+  }
+
   return (
     <TouchableOpacity
       style={styles.container}
diff --git a/src/screens/chat/ChatScreen.tsx b/src/screens/chat/ChatScreen.tsx
index 3cab3d25..57f2232e 100644
--- a/src/screens/chat/ChatScreen.tsx
+++ b/src/screens/chat/ChatScreen.tsx
@@ -125,15 +125,6 @@ const ChatScreen: React.FC<ChatScreenProps> = () => {
     },
   };
 
-  // Hide channel if no message was exchanged
-  useEffect(() => {
-    return () => {
-      if (channel?.state.messages.length === 0) {
-        channel.hide();
-      }
-    };
-  }, []);
-
   useEffect(() => {
     setTopInset(insets.top + HeaderHeight);
   });