fix: add proposalId to voterKey (#140)

* fix: add proposalId to voterKey

* chore: remove unnecessary type casting

Author: smbdy

src/proposals/components/proposal/VotersList.tsx

@@ -236,7 +236,7 @@ export function VotersList({
                 .map((vote) => (
                   <VotersListItem
                     vote={vote}
-                    key={vote.transactionHash}
+                    key={`${vote.transactionHash}-${vote.proposalId}`}
                     activeAddress={
                       representative.address ||
                       activeWallet?.address ||

src/proposals/components/proposal/VotersListLoading.tsx

@@ -46,7 +46,7 @@ export function VotersListLoading({
                   representative.address || activeWallet?.address || zeroAddress
                 }
                 vote={vote}
-                key={vote.transactionHash}
+                key={`${vote.transactionHash}-${vote.proposalId}`}
               />
             ))}
         </Box>

src/proposals/components/proposal/VotersModal.tsx

@@ -148,8 +148,8 @@ function VotersTable({
                 {texts.proposals.votersListVotingPower}
               </Box>
             </ListItem>
-            {voters.map((vote, index) => (
-              <ListItem key={index}>
+            {voters.map((vote) => (
+              <ListItem key={`${vote.transactionHash}-${vote.proposalId}`}>
                 <ListItemAddress vote={vote} />
                 <FormattedNumber value={vote.votingPower} visibleDecimals={3} />
               </ListItem>
@@ -272,7 +272,7 @@ export function VotersModal({
                 </ListItem>
 
                 {voters.map((vote) => (
-                  <ListItem key={vote.transactionHash}>
+                  <ListItem key={`${vote.transactionHash}-${vote.proposalId}`}>
                     <ListItemAddress vote={vote} />
                     <Box
                       sx={{

src/proposals/store/proposalsSelectors.ts

@@ -326,7 +326,7 @@ export const selectConfigByAccessLevel = (
 };
 
 export const selectVotersByProposalId = (
-  voters: Record<`0x${string}`, VotersData>,
+  voters: Record<string, VotersData>,
   id: number,
 ) => {
   const votersLocal = Object.values(voters).filter(

src/proposals/store/proposalsSlice.ts

@@ -146,7 +146,7 @@ export interface IProposalsSlice {
     underlyingAssets: string[],
   ) => Promise<void>;
 
-  voters: Record<Hex, VotersData>;
+  voters: Record<string, VotersData>;
   setVoters: (voters: VotersData[]) => void;
   getVoters: (
     proposalId: number,
@@ -1029,7 +1029,8 @@ export const createProposalsSlice: StoreSlice<
     set((state) =>
       produce(state, (draft) => {
         votersData.forEach((vote) => {
-          draft.voters[vote.transactionHash] = {
+          const voterKey = `${vote.transactionHash}-${vote.proposalId}`;
+          draft.voters[voterKey] = {
             ...vote,
             ensName: ENSDataExists(
               get().ensData,
@@ -1069,7 +1070,8 @@ export const createProposalsSlice: StoreSlice<
     set((state) =>
       produce(state, (draft) => {
         topVotersByProposalIdWithENS.forEach((vote) => {
-          draft.voters[vote.transactionHash] = {
+          const voterKey = `${vote.transactionHash}-${vote.proposalId}`;
+          draft.voters[voterKey] = {
             ...vote,
             ensName: ENSDataExists(
               get().ensData,