From 40d792638162bd2d0b2cd0cbc49d225376391f61 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Fri, 24 Jan 2020 14:40:52 +0100
Subject: [PATCH] Remove old votes from council (#2193)

---
 packages/app-council/src/Overview/Vote.tsx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/app-council/src/Overview/Vote.tsx b/packages/app-council/src/Overview/Vote.tsx
index a7b962a2f4..1df5402f83 100644
--- a/packages/app-council/src/Overview/Vote.tsx
+++ b/packages/app-council/src/Overview/Vote.tsx
@@ -120,7 +120,17 @@ class Vote extends TxModal<Props, State> {
       (api.query.electionsPhragmen || api.query.elections)
         .votesOf<[AccountId[]] & Codec>(accountId)
         .then(([existingVotes]): void => {
-          this.setState({ votes: existingVotes.map((accountId): string => accountId.toString()) });
+          const { electionsInfo: { candidates, members, runnersUp } } = this.props;
+          const available = members
+            .map(([accountId]): string => accountId.toString())
+            .concat(runnersUp.map(([accountId]): string => accountId.toString()))
+            .concat(candidates.map((accountId): string => accountId.toString()));
+
+          this.setState({
+            votes: existingVotes
+              .map((accountId): string => accountId.toString())
+              .filter((accountId): boolean => available.includes(accountId))
+          });
         });
     }
   }