Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[After #778] Feat/voting period overview veto #779

Merged
merged 2 commits into from
Feb 13, 2024
Merged

[After #778] Feat/voting period overview veto #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c99c2ce
feat: voting overview veto alert
songwongtp Feb 12, 2024
7213f76
Merge branch 'feat/voting-period-overview' into feat/voting-period-ov…
songwongtp Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Features

- [#779](https://github.com/alleslabs/celatone-frontend/pull/779) Proposal period overview voting - no with veto alert
- [#778](https://github.com/alleslabs/celatone-frontend/pull/778) Proposal period overview voting
- [#775](https://github.com/alleslabs/celatone-frontend/pull/775) Proposal period overview deposit
- [#777](https://github.com/alleslabs/celatone-frontend/pull/777) Proposal votes table including filter and search functionality
Expand Down
150 changes: 112 additions & 38 deletions ...details/components/proposal-overview/proposal-period-overview/VotingOverviewThreshold.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { CustomIcon } from "lib/components/icon";
import { StatusChip } from "lib/components/table";
import {
extractParams,
formatPrettyPercent,
getVoteResult,
normalizeVotesInfo,
} from "lib/pages/proposal-details/utils";
Expand All @@ -16,6 +17,7 @@ import {
type ProposalParams,
type ProposalVotesInfo,
} from "lib/types";
import { divWithDefault } from "lib/utils";

interface VotingOverviewThresholdProps {
proposalData: ProposalData;
Expand All @@ -32,7 +34,8 @@ export const VotingOverviewThreshold = ({
params,
proposalData.isExpedited
);
const { totalVotes } = normalizeVotesInfo(votesInfo);
const { noWithVeto, totalVotes } = normalizeVotesInfo(votesInfo);
const noWithVetoRatio = divWithDefault(noWithVeto, totalVotes, 0);

const { result, resultColor } = getVoteResult(
threshold,
Expand All @@ -41,46 +44,117 @@ export const VotingOverviewThreshold = ({
);

return (
<Flex
direction="column"
gap={4}
pt={4}
borderTop="1px solid"
borderTopColor="gray.700"
>
{(proposalData.status === ProposalStatus.VOTING_PERIOD ||
totalVotes.gte(quorum)) && (
<Flex gap={2} alignItems="center">
<VoteThresholdBadge status={proposalData.status} isCompact />
{proposalData.status === ProposalStatus.VOTING_PERIOD ? (
<Text variant="body1" color="text.main">
Current Voting Result
</Text>
) : (
<Flex gap={2} alignItems="center">
<>
<Flex
direction="column"
gap={4}
pt={4}
borderTop="1px solid"
borderTopColor="gray.700"
>
{(proposalData.status === ProposalStatus.VOTING_PERIOD ||
totalVotes.gte(quorum)) && (
<Flex gap={2} alignItems="center">
<VoteThresholdBadge status={proposalData.status} isCompact />
{proposalData.status === ProposalStatus.VOTING_PERIOD ? (
<Text variant="body1" color="text.main">
Final Vote Result:
Current Voting Result
</Text>
{proposalData.status === ProposalStatus.FAILED ? (
<StatusChip status={ProposalStatus.FAILED} />
) : (
<>
<CustomIcon
name="circle"
boxSize="14px"
color={resultColor}
/>
<Text variant="body2" color="text.main" fontWeight={700}>
{result}
</Text>
</>
)}
</Flex>
)}
) : (
<Flex gap={2} alignItems="center">
<Text variant="body1" color="text.main">
Final Vote Result:
</Text>
{proposalData.status === ProposalStatus.FAILED ? (
<StatusChip status={ProposalStatus.FAILED} />
) : (
<>
<CustomIcon
name="circle"
boxSize="14px"
color={resultColor}
/>
<Text variant="body2" color="text.main" fontWeight={700}>
{result}
</Text>
</>
)}
</Flex>
)}
</Flex>
)}
<VoteThresholdBar
threshold={threshold}
votesInfo={votesInfo}
isCompact
/>
<VpPercentThreshold votesInfo={votesInfo} isCompact />
</Flex>
{noWithVetoRatio.gte(vetoThreshold) && (
<Flex
gap={3}
p="12px 16px"
bgColor="warning.background"
border="1px solid var(--chakra-colors-warning-dark)"
borderRadius="8px"
alignItems="center"
>
<CustomIcon
boxSize={4}
name="alert-circle-solid"
color="warning.main"
/>
<Text variant="body2" color="warning.main">
{proposalData.status === ProposalStatus.VOTING_PERIOD ? (
<>
Currently, the &ldquo;No with veto&rdquo; vote proportion
constitutes{" "}
<span
style={{
fontWeight: 700,
}}
>
{formatPrettyPercent(noWithVetoRatio.toNumber())}{" "}
</span>
of the total votes, including &ldquo;Abstain&rdquo;, which
exceeds the{" "}
<span
style={{
fontWeight: 700,
}}
>
{formatPrettyPercent(vetoThreshold)} threshold
</span>
. If the proposal concludes with this voting outcome, it will be
regardless of &ldquo;Yes&rdquo; votes.
</>
) : (
<>
Due to the &ldquo;No with veto&rdquo; vote proportion
constitutes{" "}
<span
style={{
fontWeight: 700,
}}
>
{formatPrettyPercent(noWithVetoRatio.toNumber())}{" "}
</span>
of the total votes including &ldquo;Abstain&rdquo;, which
exceeds the{" "}
<span
style={{
fontWeight: 700,
}}
>
{formatPrettyPercent(vetoThreshold)} threshold
</span>
, the proposal is rejected regardless of &ldquo;Yes&rdquo;
votes.
</>
)}
</Text>
</Flex>
)}
<VoteThresholdBar threshold={threshold} votesInfo={votesInfo} isCompact />
<VpPercentThreshold votesInfo={votesInfo} isCompact />
</Flex>
</>
);
};