From 4d953d58a1c755e44539a8fa0af325461b5da68f Mon Sep 17 00:00:00 2001
From: James Grugett <jahooma@gmail.com>
Date: Wed, 10 Aug 2022 12:27:59 -0500
Subject: [PATCH] Move group chat back into a tab

---
 web/pages/group/[...slugs]/index.tsx | 30 +++++++++++++---------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/web/pages/group/[...slugs]/index.tsx b/web/pages/group/[...slugs]/index.tsx
index 8e7ec19d..b9c8c277 100644
--- a/web/pages/group/[...slugs]/index.tsx
+++ b/web/pages/group/[...slugs]/index.tsx
@@ -16,7 +16,7 @@ import { Row } from 'web/components/layout/row'
 import { UserLink } from 'web/components/user-page'
 import { firebaseLogin, getUser, User } from 'web/lib/firebase/users'
 import { Col } from 'web/components/layout/col'
-import { usePrivateUser, useUser } from 'web/hooks/use-user'
+import { useUser } from 'web/hooks/use-user'
 import { listMembers, useGroup, useMembers } from 'web/hooks/use-group'
 import { useRouter } from 'next/router'
 import { scoreCreators, scoreTraders } from 'common/scoring'
@@ -30,7 +30,6 @@ import { fromPropz, usePropz } from 'web/hooks/use-propz'
 import { Tabs } from 'web/components/layout/tabs'
 import { CreateQuestionButton } from 'web/components/create-question-button'
 import React, { useState } from 'react'
-import { GroupChatInBubble } from 'web/components/groups/group-chat'
 import { LoadingIndicator } from 'web/components/loading-indicator'
 import { Modal } from 'web/components/layout/modal'
 import { getSavedSort } from 'web/hooks/use-sort-and-query-params'
@@ -51,6 +50,7 @@ import { useSaveReferral } from 'web/hooks/use-save-referral'
 import { Button } from 'web/components/button'
 import { listAllCommentsOnGroup } from 'web/lib/firebase/comments'
 import { Comment } from 'common/comment'
+import { GroupChat } from 'web/components/groups/group-chat'
 
 export const getStaticProps = fromPropz(getStaticPropz)
 export async function getStaticPropz(props: { params: { slugs: string[] } }) {
@@ -157,16 +157,12 @@ export default function GroupPage(props: {
   const messages = useCommentsOnGroup(group?.id) ?? props.messages
 
   const user = useUser()
-  const privateUser = usePrivateUser(user?.id)
 
   useSaveReferral(user, {
     defaultReferrerUsername: creator.username,
     groupId: group?.id,
   })
 
-  const chatDisabled = !group || group.chatDisabled
-  const showChatBubble = !chatDisabled
-
   if (group === null || !groupSubpages.includes(page) || slugs[2]) {
     return <Custom404 />
   }
@@ -211,12 +207,21 @@ export default function GroupPage(props: {
     />
   )
 
+  const chatTab = (
+    <GroupChat messages={messages} group={group} user={user} tips={tips} />
+  )
+
   const tabs = [
     {
       title: 'Markets',
       content: questionsTab,
       href: groupPath(group.slug, 'markets'),
     },
+    {
+      title: 'Chat',
+      content: chatTab,
+      href: groupPath(group.slug, 'chat'),
+    },
     {
       title: 'Leaderboards',
       content: leaderboard,
@@ -229,7 +234,9 @@ export default function GroupPage(props: {
     },
   ]
 
-  const tabIndex = tabs.map((t) => t.title).indexOf(page ?? GROUP_CHAT_SLUG)
+  const tabIndex = tabs
+    .map((t) => t.title.toLowerCase())
+    .indexOf(page ?? 'markets')
 
   return (
     <Page>
@@ -265,15 +272,6 @@ export default function GroupPage(props: {
         defaultIndex={tabIndex > 0 ? tabIndex : 0}
         tabs={tabs}
       />
-      {showChatBubble && (
-        <GroupChatInBubble
-          group={group}
-          user={user}
-          privateUser={privateUser}
-          tips={tips}
-          messages={messages}
-        />
-      )}
     </Page>
   )
 }