diff --git a/apps/token/src/routes/governance/propose/new-market/propose-new-market.tsx b/apps/token/src/routes/governance/propose/new-market/propose-new-market.tsx index 865bf28ae..032c91385 100644 --- a/apps/token/src/routes/governance/propose/new-market/propose-new-market.tsx +++ b/apps/token/src/routes/governance/propose/new-market/propose-new-market.tsx @@ -167,7 +167,7 @@ export const ProposeNewMarket = () => { }, }, })} - labelOverride={'Terms.changes.newMarket (JSON format)'} + labelOverride={'Terms.newMarket (JSON format)'} errorMessage={errors?.proposalTerms?.message} /> diff --git a/libs/governance/src/utils/get-closing-timestamp.ts b/libs/governance/src/utils/get-closing-timestamp.ts index 614b4f12e..b8bb45e4a 100644 --- a/libs/governance/src/utils/get-closing-timestamp.ts +++ b/libs/governance/src/utils/get-closing-timestamp.ts @@ -1,11 +1,10 @@ import { addHours, addMinutes, getTime } from 'date-fns'; -export const getClosingTimestamp = (proposalVoteDeadline: number) => { - return Math.floor( +export const getClosingTimestamp = (proposalVoteDeadline: number) => + Math.floor( getTime( proposalVoteDeadline === 1 ? addHours(addMinutes(new Date(Date.now()), 2), proposalVoteDeadline) : addHours(new Date(Date.now()), proposalVoteDeadline) ) / 1000 ); -}; diff --git a/libs/governance/src/utils/get-enactment-timestamp.ts b/libs/governance/src/utils/get-enactment-timestamp.ts index e31a37978..d606ab9fd 100644 --- a/libs/governance/src/utils/get-enactment-timestamp.ts +++ b/libs/governance/src/utils/get-enactment-timestamp.ts @@ -1,10 +1,15 @@ -import { addHours, getTime } from 'date-fns'; +import { addHours, fromUnixTime, getTime } from 'date-fns'; import { getClosingTimestamp } from './get-closing-timestamp'; export const getEnactmentTimestamp = ( proposalVoteDeadline: number, enactmentDeadline: number ) => - getTime( - addHours(getClosingTimestamp(proposalVoteDeadline), enactmentDeadline) - ); + Math.floor( + getTime( + addHours( + new Date(fromUnixTime(getClosingTimestamp(proposalVoteDeadline))), + enactmentDeadline + ) + ) + ) / 1000; diff --git a/libs/governance/src/utils/get-validation-timestamp.ts b/libs/governance/src/utils/get-validation-timestamp.ts index c8f7dae1e..ef9f1aa01 100644 --- a/libs/governance/src/utils/get-validation-timestamp.ts +++ b/libs/governance/src/utils/get-validation-timestamp.ts @@ -1,7 +1,7 @@ import { addHours, addMinutes, getTime } from 'date-fns'; -export const getValidationTimestamp = (proposalValidationDeadline: number) => { - return Math.floor( +export const getValidationTimestamp = (proposalValidationDeadline: number) => + Math.floor( getTime( proposalValidationDeadline === 0 ? addHours( @@ -11,4 +11,3 @@ export const getValidationTimestamp = (proposalValidationDeadline: number) => { : addHours(new Date(Date.now()), proposalValidationDeadline) ) / 1000 ); -};