From 92dbc4805e16c90cf99c6dbaea9c57d4bfb7499f Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde@tlon.io>
Date: Tue, 3 Mar 2020 21:02:45 -0500
Subject: [PATCH] chat: pull room contacts from associated group

---
 pkg/interface/chat/src/js/components/root.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkg/interface/chat/src/js/components/root.js b/pkg/interface/chat/src/js/components/root.js
index 7efe908346..71b12597ab 100644
--- a/pkg/interface/chat/src/js/components/root.js
+++ b/pkg/interface/chat/src/js/components/root.js
@@ -45,12 +45,13 @@ export class Root extends Component {
       state.invites['/chat'] : {};
 
     let contacts = !!state.contacts ? state.contacts : {};
+    let associations = !!state.associations ? state.associations : new Map;
 
     const renderChannelSidebar = (props, station) => (
       <Sidebar
         inbox={state.inbox}
         messagePreviews={messagePreviews}
-        associations={state.associations || new Map}
+        associations={associations}
         contacts={contacts}
         invites={invites}
         unreads={unreads}
@@ -152,8 +153,14 @@ export class Root extends Component {
                 envelopes: []
               };
 
-              let roomContacts = (station in contacts)
-                ? contacts[station] : {};
+              let roomContacts = {};
+              let associatedGroup = ((associations.has(station)) &&
+              (associations.get(station)["group-path"]))
+                ? associations.get(station)["group-path"] : "";
+
+              if ((associations.has(station)) && (associatedGroup in contacts)) {
+                roomContacts = contacts[associatedGroup]
+              }
 
               let group = state.groups[station] || new Set([]);
               let popout = props.match.url.includes("/popout/");
@@ -240,9 +247,8 @@ export class Root extends Component {
 
               let popout = props.match.url.includes("/popout/");
 
-              let association = ((state.associations) &&
-              (state.associations.has(station)))
-                ? state.associations.get(station) : {};
+              let association = (associations.has(station))
+                ? associations.get(station) : {};
 
               return (
                 <Skeleton