Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions govtool/frontend/src/components/molecules/VotesSubmitted.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ export const VotesSubmitted = ({
dRepAbstainVotes + (networkTotalStake?.alwaysAbstainVotingPower ?? 0);

// TODO: Move this logic to backend

// DRep votes
const dRepYesVotesPercentage = totalStakeControlledByDReps
? (dRepYesVotes / totalStakeControlledByDReps) * 100
: undefined;
Expand All @@ -108,33 +110,45 @@ export const VotesSubmitted = ({
const dRepNotVotedVotesPercentage =
100 - (dRepYesVotesPercentage ?? 0) - (dRepNoVotesPercentage ?? 0);

// SPO/Pool votes
const poolYesVotesPercentage =
typeof poolYesVotes === "number" &&
typeof networkTotalStake?.totalStakeControlledBySPOs === "number" &&
networkTotalStake.totalStakeControlledBySPOs > 0
? (poolYesVotes / networkTotalStake.totalStakeControlledBySPOs) * 100
: undefined;

const poolNoVotesPercentage =
typeof poolNoVotes === "number" &&
typeof networkTotalStake?.totalStakeControlledBySPOs === "number" &&
networkTotalStake.totalStakeControlledBySPOs > 0
? (poolNoVotes / networkTotalStake.totalStakeControlledBySPOs) * 100
: undefined;

const poolNotVotedVotes =
typeof networkTotalStake?.totalStakeControlledBySPOs === "number"
? networkTotalStake.totalStakeControlledBySPOs -
(poolYesVotes + poolNoVotes + poolAbstainVotes)
: undefined;

const poolNotVotedVotesPercentage =
100 -
(typeof poolYesVotesPercentage === "number" ? poolYesVotesPercentage : 0) -
(typeof poolNoVotesPercentage === "number" ? poolNoVotesPercentage : 0);

// Constitutional Commission votes
const ccYesVotesPercentage = noOfCommitteeMembers
? (ccYesVotes / noOfCommitteeMembers) * 100
: undefined;
const ccNoVotesPercentage = noOfCommitteeMembers

const ccNoVotesPercentage = noOfCommitteeMembers
? (ccNoVotes / noOfCommitteeMembers) * 100
: undefined;
const ccNotVotedVotes =

const ccNotVotedVotes =
noOfCommitteeMembers - ccYesVotes - ccNoVotes - ccAbstainVotes;
const ccNotVotedVotesPercentage =

const ccNotVotedVotesPercentage =
100 - (ccYesVotesPercentage ?? 0) - (ccNoVotesPercentage ?? 0);

return (
Expand Down Expand Up @@ -209,6 +223,7 @@ export const VotesSubmitted = ({
noVotesPercentage={poolNoVotesPercentage}
abstainVotes={poolAbstainVotes}
notVotedVotes={poolNotVotedVotes}
notVotedPercentage={poolNotVotedVotesPercentage}
threshold={
(() => {
const votingThresholdKey = getGovActionVotingThresholdKey({
Expand Down