fix: your counted votes & your maximum votes (#3384)

iotaledger · Jun 3, 2022 · 8ece643 · 8ece643
1 parent 24a7f46
commit 8ece643
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/packages/shared/lib/participation/governance.ts b/packages/shared/lib/participation/governance.ts
@@ -32,11 +32,23 @@ export const calculateVotesByMilestones = (
  *
  * @returns {number}
  */
-export const calculateVotesByTrackedParticipation = (trackedParticipation: TrackedParticipation | null): number => {
-    if (trackedParticipation) {
-        return Object.values(trackedParticipation)?.reduce(
+export const calculateVotesByTrackedParticipation = (
+    trackedParticipation: TrackedParticipation | null,
+    eventStartMilestoneIndex: number,
+    eventEndMilestoneIndex: number
+): number => {
+    const countableTrackedParticipation = trackedParticipation?.filter(
+        ({ endMilestoneIndex }) => endMilestoneIndex === 0 || endMilestoneIndex > eventStartMilestoneIndex
+    )
+    if (countableTrackedParticipation?.length > 0) {
+        return Object.values(countableTrackedParticipation)?.reduce(
             (acc, val) =>
-                acc + calculateVotesByMilestones(val?.startMilestoneIndex, val?.endMilestoneIndex, val?.amount),
+                acc +
+                calculateVotesByMilestones(
+                    Math.min(Math.max(eventStartMilestoneIndex, val?.startMilestoneIndex), eventEndMilestoneIndex),
+                    val?.endMilestoneIndex,
+                    val?.amount
+                ),
             0
         )
     }

diff --git a/packages/shared/routes/dashboard/governance/views/GovernanceEventStats.svelte b/packages/shared/routes/dashboard/governance/views/GovernanceEventStats.svelte
@@ -27,16 +27,20 @@
 
     $: progress = getProgressByMilestone(event?.information?.milestoneIndexEnd)
     $: accountVotes = calculateVotesByTrackedParticipation(
-        $selectedAccountParticipationOverview?.trackedParticipations?.[event?.eventId]
+        $selectedAccountParticipationOverview?.trackedParticipations?.[event?.eventId],
+        event?.information?.milestoneIndexStart,
+        event?.information?.milestoneIndexEnd
     )
     $: maximumVotes =
         calculateVotesByTrackedParticipation(
             $selectedAccountParticipationOverview?.trackedParticipations?.[event?.eventId]?.filter(
                 (item) => item.messageId !== $currentTreasuryParticipation?.messageId
-            )
+            ),
+            event?.information?.milestoneIndexStart,
+            event?.information?.milestoneIndexEnd
         ) +
         calculateVotesByMilestones(
-            $currentTreasuryParticipation?.startMilestoneIndex,
+            Math.max(event?.information?.milestoneIndexStart, $currentTreasuryParticipation?.startMilestoneIndex),
             event?.information?.milestoneIndexEnd,
             $currentTreasuryParticipation?.amount
         )