From 567f0ab5144fb15ef663b119a92c34f2ee355be4 Mon Sep 17 00:00:00 2001
From: Joystream Stats <dev@joystreamstats.live>
Date: Mon, 24 Oct 2022 23:44:54 +0000
Subject: [PATCH] Display whitelisted members for closed proposal discussions
 (#3236)

---
 .../components/ProposalDiscussions.tsx        | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/ui/src/proposals/components/ProposalDiscussions.tsx b/packages/ui/src/proposals/components/ProposalDiscussions.tsx
index e7911e3c26..021485c201 100644
--- a/packages/ui/src/proposals/components/ProposalDiscussions.tsx
+++ b/packages/ui/src/proposals/components/ProposalDiscussions.tsx
@@ -30,11 +30,11 @@ export const ProposalDiscussions = ({ thread, proposalId }: Props) => {
   const { active, members } = useMyMemberships()
 
   const initialPost = query.get('post')
-  const isAbleToPost =
-    thread.mode === 'open' ||
-    (thread.mode === 'closed' && active && (thread.whitelistIds?.includes(active.id) || active.isCouncilMember))
-  const isInWhitelist = thread.mode === 'closed' && members.find((member) => thread.whitelistIds?.includes(member.id))
-  const hasCouncilMembership = thread.mode === 'closed' && members.find((member) => member.isCouncilMember)
+  const isClosed = thread.mode === 'closed'
+  const isAbleToPost = !isClosed || (active && (thread.whitelistIds?.includes(active.id) || active.isCouncilMember))
+  const whitelistedMember = isClosed ? members.find((member) => thread.whitelistIds?.includes(member.id)) : null
+  const hasCouncilMembership = isClosed && members.find((member) => member.isCouncilMember)
+  const whitelistedMembers = thread.whitelistIds?.map((id) => members.find((m) => m.id === id)?.handle || id) || []
   const [replyTo, setReplyTo] = useState<ForumPost | undefined>()
 
   const newPostRef = useRef<HTMLDivElement>(null)
@@ -84,13 +84,16 @@ export const ProposalDiscussions = ({ thread, proposalId }: Props) => {
       return <TextBig>Please select your council membership to post in this thread.</TextBig>
     }
 
-    if (isInWhitelist) {
-      return <TextBig>Please select a whitelisted membership to post in this thread.</TextBig>
+    if (whitelistedMember) {
+      return <TextBig>Please select your {whitelistedMember.handle} memberships to post in this thread.</TextBig>
     }
 
     return (
       <TextBig>
-        The discussion of this proposal is closed; only members whitelisted by the proposer can comment on it.
+        The discussion of this proposal is limited to following whitelisted members:
+        {whitelistedMembers.map((m) => (
+          <div>{m}</div>
+        ))}
       </TextBig>
     )
   }