Revert changes to progress bar, fix displaying voting results

decentdao · Oct 18, 2023 · 2a8b947 · 2a8b947
1 parent b9c27cf
commit 2a8b947
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 16 deletions.
diff --git a/src/components/Proposals/SnapshotProposalDetails/SnapshotProposalVoteItem.tsx b/src/components/Proposals/SnapshotProposalDetails/SnapshotProposalVoteItem.tsx
@@ -54,7 +54,9 @@ export default function SnapshotProposalVoteItem({ proposal, vote }: ISnapshotPr
           </Flex>
         ) : (
           <StatusBox>
-            <Text textStyle="text-sm-mono-semibold">{vote.choice as string}</Text>
+            <Text textStyle="text-sm-mono-semibold">
+              {proposal.choices[(vote.choice as number) - 1]}
+            </Text>
           </StatusBox>
         )}
       </GridItem>

diff --git a/src/components/Proposals/SnapshotProposalDetails/SnapshotProposalVotes.tsx b/src/components/Proposals/SnapshotProposalDetails/SnapshotProposalVotes.tsx
@@ -51,7 +51,7 @@ export default function SnapshotProposalVotes({ proposal }: ISnapshotProposalVot
                 <VotesPercentage
                   key={choice}
                   label={choice}
-                  percentage={Number(choicePercentageFromTotal.toFixed(2))}
+                  percentage={Number(choicePercentageFromTotal.toFixed(1))}
                 >
                   <Text>
                     {proposal.privacy === 'shutter' &&

diff --git a/src/components/ui/utils/ProgressBar.tsx b/src/components/ui/utils/ProgressBar.tsx
@@ -31,7 +31,7 @@ export default function ProgressBar({
           height="100%"
           position="absolute"
           top="0"
-          left={value > 50 ? `calc(${Math.min(value - 5, 90)}% - 20px)` : `${value / 2}%`}
+          left={value > 50 ? `calc(${Math.min(value - 5, 90)}% - 20px)` : value / 2}
         >
           {valueLabel || Math.min(value, 100)}
           {unit}

diff --git a/src/hooks/DAO/loaders/snapshot/useSnapshotProposal.ts b/src/hooks/DAO/loaders/snapshot/useSnapshotProposal.ts
@@ -110,12 +110,21 @@ export default function useSnapshotProposal(proposal: FractalProposal | null | u
 
       const { choices, type, privacy } = proposalQueryResult;
 
-      Object.keys(choices).forEach(choice => {
-        votesBreakdown[choice] = {
-          votes: [],
-          total: 0,
-        };
-      });
+      if (type === 'weighted') {
+        Object.keys(choices).forEach((choice: string) => {
+          votesBreakdown[choice] = {
+            votes: [],
+            total: 0,
+          };
+        });
+      } else {
+        choices.forEach((choice: string) => {
+          votesBreakdown[choice] = {
+            votes: [],
+            total: 0,
+          };
+        });
+      }
 
       const isShielded = privacy === 'shutter';
       const isClosed = snapshotProposal.state === FractalProposalState.CLOSED;
@@ -141,16 +150,17 @@ export default function useSnapshotProposal(proposal: FractalProposal | null | u
               }
             });
           } else {
-            const voteChoice = vote.choice as string;
-            const existingChoiceType = votesBreakdown[voteChoice];
+            const voteChoice = vote.choice as number;
+            const choiceKey = choices[voteChoice - 1];
+            const existingChoiceType = votesBreakdown[choiceKey];
 
             if (existingChoiceType) {
-              votesBreakdown[voteChoice] = {
+              votesBreakdown[choiceKey] = {
                 total: existingChoiceType.total + getVoteWeight(vote),
                 votes: [...existingChoiceType.votes, vote],
               };
             } else {
-              votesBreakdown[voteChoice] = {
+              votesBreakdown[choiceKey] = {
                 total: getVoteWeight(vote),
                 votes: [vote],
               };

diff --git a/src/hooks/DAO/proposal/useCastVote.ts b/src/hooks/DAO/proposal/useCastVote.ts
@@ -101,7 +101,7 @@ const useCastVote = ({
   );
 
   const castSnapshotVote = useCallback(
-    async (choice: string) => {
+    async (choice: number) => {
       if (signer && signer?.provider && address && daoSnapshotURL && extendedSnapshotProposal) {
         let toastId;
         try {
@@ -114,7 +114,7 @@ const useCastVote = ({
           });
           if (extendedSnapshotProposal.privacy === 'shutter') {
             const encryptedChoice = await encryptWithShutter(
-              choice,
+              JSON.stringify(choice),
               extendedSnapshotProposal.proposalId
             );
             await client.vote(signer.provider as ethers.providers.Web3Provider, address, {

diff --git a/src/types/daoProposal.ts b/src/types/daoProposal.ts
@@ -73,7 +73,7 @@ export interface SnapshotVote {
   votingWeightByStrategy: number[];
   votingState: string;
   created: number;
-  choice: string | SnapshotWeightedVotingChoice;
+  choice: number | SnapshotWeightedVotingChoice;
 }
 
 export interface SnapshotVoteBreakdown {