fix: payloads format data

bgd-labs · Dec 26, 2023 · cde45c4 · cde45c4 · github-actions · Dec 26, 2023
1 parent cab5617
commit cde45c4
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/proposals/utils/formatPayloadData.ts b/src/proposals/utils/formatPayloadData.ts
@@ -24,19 +24,16 @@ export function formatPayloadData({
   withoutProposalData?: boolean;
 }) {
   const now = dayjs().unix();
-  const isProposalNotExecuted = withoutProposalData
-    ? true
-    : !isProposalExecuted;
 
   const isPayloadOnInitialState =
     payload.queuedAt <= 0 &&
-    isProposalNotExecuted &&
+    (withoutProposalData ? true : !isProposalExecuted) &&
     payload.cancelledAt <= 0 &&
     payload.state !== PayloadState.Expired;
 
   const isPayloadTimeLocked =
     payload.queuedAt <= 0 &&
-    isProposalNotExecuted &&
+    (withoutProposalData ? true : isProposalExecuted) &&
     payload.cancelledAt <= 0 &&
     payload.state !== PayloadState.Expired;
 
@@ -46,7 +43,7 @@ export function formatPayloadData({
       : payload.queuedAt + payload.delay;
 
   const isPayloadReadyForExecution =
-    !isProposalNotExecuted &&
+    (withoutProposalData ? true : isProposalExecuted) &&
     payload.queuedAt > 0 &&
     now > payload.queuedAt + payload.delay &&
     payload.cancelledAt <= 0 &&