From 4389c635d1174ea94163743f4f1594c40538d9af Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Wed, 2 Sep 2020 11:20:00 +1000
Subject: [PATCH] chat: ensure joined chats are loaded before joining

---
 pkg/interface/src/views/apps/chat/app.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkg/interface/src/views/apps/chat/app.tsx b/pkg/interface/src/views/apps/chat/app.tsx
index 2a3a76175..032211ba5 100644
--- a/pkg/interface/src/views/apps/chat/app.tsx
+++ b/pkg/interface/src/views/apps/chat/app.tsx
@@ -194,6 +194,11 @@ export default class ChatApp extends React.Component<ChatAppProps, {}> {
             render={(props) => {
               let station = `/${props.match.params.ship}/${props.match.params.station}`;
 
+              // ensure we know joined chats
+              if(!chatInitialized) {
+                return null;
+              }
+
             return (
               <Skeleton
                 associations={associations}