Merge branch 'fix-2556' into improve-forum-performance

pioneer/packages/joy-utils/src/transport/proposals.ts

@@ -187,10 +187,14 @@ export default class ProposalsTransport extends BaseTransport {
   }
 
   async voteByProposalAndMember (proposalId: ProposalId, voterId: MemberId): Promise<VoteKind | null> {
-    const vote = (await this.proposalsEngine.voteExistsByProposalByVoter(proposalId, voterId)) as VoteKind;
-    const hasVoted = (await this.api.query.proposalsEngine.voteExistsByProposalByVoter.size(proposalId, voterId)).toNumber();
+    const votesEntries = await this.api.query.proposalsEngine.voteExistsByProposalByVoter.entries(proposalId);
+    const voteEntry = votesEntries.find((voteEntry) => {
+      const memberId = voteEntry[0].args[1] as MemberId;
 
-    return hasVoted ? vote : null;
+      return memberId.eq(voterId);
+    });
+
+    return voteEntry ? voteEntry[1] as VoteKind : null;
   }
 
   async votes (proposalId: ProposalId): Promise<ProposalVotes> {