diff --git a/src/views/Governance/Components/Status.tsx b/src/views/Governance/Components/Status.tsx index b30e30c10..a28bc7efa 100644 --- a/src/views/Governance/Components/Status.tsx +++ b/src/views/Governance/Components/Status.tsx @@ -1,4 +1,4 @@ -import { Box, Typography } from "@mui/material"; +import { Box, Tooltip, Typography } from "@mui/material"; import { Paper } from "@olympusdao/component-library"; import { useGetCanceledTime } from "src/views/Governance/hooks/useGetCanceledTime"; import { useGetExecutedTime } from "src/views/Governance/hooks/useGetExecutedTime"; @@ -29,19 +29,23 @@ export const Status = ({ proposalId }: { proposalId: number }) => { {proposal?.createdAtBlock?.toLocaleString()} Published Onchain -
- {proposalDetails?.startDate?.toLocaleString()} - Voting Period Starts -
- {(proposalDetails?.endDate || placeholderEndDate) && ( +
- - {proposalDetails.endDate - ? proposalDetails?.endDate?.toLocaleString() - : placeholderEndDate?.toLocaleString()} - - Voting Period Ends + {proposalDetails?.startDate?.toLocaleString()} + Voting Period Starts
+
+ {(proposalDetails?.endDate || placeholderEndDate) && ( + +
+ + {proposalDetails.endDate + ? proposalDetails?.endDate?.toLocaleString() + : placeholderEndDate?.toLocaleString()} + + Voting Period Ends +
+
)} {proposalDetails?.status === "Queued" && ( <> diff --git a/src/views/Governance/hooks/useGetProposalDetails.tsx b/src/views/Governance/hooks/useGetProposalDetails.tsx index b9fcaee7b..c4f61cd32 100644 --- a/src/views/Governance/hooks/useGetProposalDetails.tsx +++ b/src/views/Governance/hooks/useGetProposalDetails.tsx @@ -15,8 +15,8 @@ export const useGetProposalDetails = ({ proposalId }: { proposalId: number }) => const blockTime = await archiveProvider.getBlock("latest"); const endDateBlockTimestamp = await archiveProvider.getBlock(Number(proposalDetails.endBlock)); const startDateBlockTimestamp = await archiveProvider.getBlock(Number(proposalDetails.startBlock)); - const startDate = getDateFromBlock(Number(proposalDetails.startBlock), blockTime.number, 15, blockTime.timestamp); - const endDate = getDateFromBlock(Number(proposalDetails.endBlock), blockTime.number, 15, blockTime.timestamp); + const startDate = getDateFromBlock(Number(proposalDetails.startBlock), blockTime.number, 12, blockTime.timestamp); + const endDate = getDateFromBlock(Number(proposalDetails.endBlock), blockTime.number, 12, blockTime.timestamp); return { id: proposalDetails.id.toNumber(),