fix: ensure poll end date is in the future

privacy-scaling-explorations · Sep 5, 2024 · 693ee9e · 693ee9e
1 parent 71071b4
commit 693ee9e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/packages/interface/src/contexts/Maci.tsx b/packages/interface/src/contexts/Maci.tsx
@@ -208,7 +208,10 @@ export const MaciProvider: React.FC<MaciProviderProps> = ({ children }: MaciProv
 
   // memo to calculate the voting end date
   const votingEndsAt = useMemo(
-    () => (pollData ? new Date(Number(pollData.deployTime) * 1000 + Number(pollData.duration) * 1000) : new Date()),
+    () =>
+      pollData && pollData.duration !== 0
+        ? new Date(Number(pollData.deployTime) * 1000 + Number(pollData.duration) * 1000)
+        : config.resultsAt,
     [pollData?.deployTime, pollData?.duration],
   );
 
@@ -397,7 +400,7 @@ export const MaciProvider: React.FC<MaciProviderProps> = ({ children }: MaciProv
           return data;
         })
         .then(async (data) => {
-          if (!data.isMerged || isAfter(votingEndsAt, new Date())) {
+          if (!data.isMerged || isAfter(votingEndsAt!, new Date())) {
             return undefined;
           }