From bb5a14fff98dec807788ef5cadce85fe32b7a950 Mon Sep 17 00:00:00 2001 From: Arjun Patel Date: Sat, 5 Feb 2022 21:05:27 -0800 Subject: [PATCH] tlkdr placing --- .../components/MainTabsOrPages/ViewConvo.tsx | 21 ++++++++++++++++--- .../UserDetails/MasterAvatarGroup.tsx | 9 +++++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/packages/web/components/MainTabsOrPages/ViewConvo.tsx b/packages/web/components/MainTabsOrPages/ViewConvo.tsx index dbbac30..0169ef0 100644 --- a/packages/web/components/MainTabsOrPages/ViewConvo.tsx +++ b/packages/web/components/MainTabsOrPages/ViewConvo.tsx @@ -23,6 +23,7 @@ import { useRouter } from "next/router"; import Conversation from "@nirvana/common/models/conversation"; import { useAuth } from "../../contexts/authContext"; import { QueryRoutes, Routes } from "@nirvana/common/helpers/routes"; +import { MasterAvatarGroupWithUserFetch } from "../UserDetails/MasterAvatarGroup"; const testDrawerItems: { linkType: LinkType; @@ -149,7 +150,7 @@ export default function ViewConvo(props: { conversationId: string }) { {convo?.name} @@ -159,8 +160,22 @@ export default function ViewConvo(props: { conversationId: string }) { - - {convo?.activeMembers.length} members + {convo?.tldr && ( + + tldr: {convo?.tldr} + + )} + + + + + {convo?.activeMembers.length} members + diff --git a/packages/web/components/UserDetails/MasterAvatarGroup.tsx b/packages/web/components/UserDetails/MasterAvatarGroup.tsx index 8eef53f..a3a13e7 100644 --- a/packages/web/components/UserDetails/MasterAvatarGroup.tsx +++ b/packages/web/components/UserDetails/MasterAvatarGroup.tsx @@ -4,12 +4,15 @@ import { useRecoilValue, useRecoilState } from "recoil"; import { allRelevantContactsAtom } from "../../recoil/main"; import { userService } from "@nirvana/common/services"; import { Avatar } from "antd"; +import { UserAvatarSizes } from "./UserAvatar"; const AVATAR_SHAPE = "circle"; export default function MasterAvatarGroup(props: { listOfUsers: User[]; showCurrUser?: boolean; + size?: UserAvatarSizes; + maxUserCount?: number; }) { const { currUser } = useAuth(); @@ -66,8 +69,8 @@ export default function MasterAvatarGroup(props: { return ( ))}