From 110070aa12e0152a6625678636e76b976d445983 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sun, 21 Mar 2021 22:19:55 +0100
Subject: [PATCH] Adjust society vote outputs (#4894)

---
 packages/page-society/src/Overview/Member.tsx  | 8 ++++++--
 packages/page-society/src/Overview/Members.tsx | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/page-society/src/Overview/Member.tsx b/packages/page-society/src/Overview/Member.tsx
index 28dc1e52d8..d274d44627 100644
--- a/packages/page-society/src/Overview/Member.tsx
+++ b/packages/page-society/src/Overview/Member.tsx
@@ -70,6 +70,11 @@ function Member ({ bestNumber, className = '', value: { accountId, isCandidateVo
     [bestNumber, payouts]
   );
 
+  const votedOn = useMemo(
+    () => [isCandidateVoter && t('Candidate'), isDefenderVoter && t('Defender')].filter((s): s is string => !!s),
+    [isCandidateVoter, isDefenderVoter, t]
+  );
+
   return (
     <tr className={className}>
       <td className='address'>
@@ -127,8 +132,7 @@ function Member ({ bestNumber, className = '', value: { accountId, isCandidateVo
           />
         )}
       </td>
-      <td>{isDefenderVoter && t<string>('defender')}</td>
-      <td>{isCandidateVoter && t<string>('candidate')}</td>
+      <td className='together'>{votedOn.join(', ')}</td>
       <td className='number'>{formatNumber(strikes)}</td>
       <td className='button start'>
         <DesignKusama accountId={accountId} />
diff --git a/packages/page-society/src/Overview/Members.tsx b/packages/page-society/src/Overview/Members.tsx
index d9cd3770e4..65fc9a48d6 100644
--- a/packages/page-society/src/Overview/Members.tsx
+++ b/packages/page-society/src/Overview/Members.tsx
@@ -22,7 +22,7 @@ function Members ({ className = '', mapMembers }: Props): React.ReactElement<Pro
 
   const headerRef = useRef([
     [t('members'), 'start', 3],
-    [t('round voting'), 'start', 2],
+    [t('voted on'), 'start'],
     [t('strikes')],
     []
   ]);