Merge pull request #846 from alleslabs/fix/cfe-397-voting-result-status

fix: voting period status badge
alleslabs · Mar 26, 2024 · 72da043 · 72da043
2 parents 867cbc9 + 95723bf
commit 72da043
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -118,6 +118,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Bug fixes
 
+- [#846](https://github.com/alleslabs/celatone-frontend/pull/846) Fix voting period status badge
 - [#838](https://github.com/alleslabs/celatone-frontend/pull/838) Fix validator list sorting on priority
 - [#839](https://github.com/alleslabs/celatone-frontend/pull/839) Disable contract delegations on non-gov chains
 - [#827](https://github.com/alleslabs/celatone-frontend/pull/827) Fix misc bugs - proposal msgs accordion, IBC tag, mobile tooltip

diff --git a/src/lib/pages/proposal-details/components/VoteThresholdBadge.tsx b/src/lib/pages/proposal-details/components/VoteThresholdBadge.tsx
@@ -30,7 +30,7 @@ export const VoteThresholdBadge = ({
   ) : (
     <ProgressBadge
       state={PeriodState.COMPLETE}
-      text="Quorum Reached"
+      text="Ended"
       bgColor="gray.700"
     />
   );

diff --git a/...proposal-details/components/proposal-overview/proposal-period-overview/VotingOverview.tsx b/...proposal-details/components/proposal-overview/proposal-period-overview/VotingOverview.tsx
@@ -75,7 +75,7 @@ const VotingOverviewBody = ({
           })
         }
       >
-        View Full Vote Details
+        View Full Voting Details
       </Button>
     </>
   );

diff --git a/src/lib/pages/proposal-details/components/proposal-stepper/utils.ts b/src/lib/pages/proposal-details/components/proposal-stepper/utils.ts
@@ -39,5 +39,5 @@ export const getProgressBadgeProps = (
   if (proposalData.status === ProposalStatus.VOTING_PERIOD)
     return { state: PeriodState.ONGOING, text: "In Progress" };
 
-  return { state: PeriodState.COMPLETE, text: "Vote Ended" };
+  return { state: PeriodState.COMPLETE, text: "Ended" };
 };
diff --git a/src/lib/pages/proposal-details/components/vote-details/voting-period/VotingQuorum.tsx b/src/lib/pages/proposal-details/components/vote-details/voting-period/VotingQuorum.tsx
@@ -49,7 +49,7 @@ export const VotingQuorum = ({
         ) : (
           <>
             <Heading as="h6" variant="h6" textColor="text.main">
-              Vote Participations
+              Voting Participations
             </Heading>
             <VoteQuorumBadge
               status={proposalData.status}

diff --git a/src/lib/pages/proposal-details/components/vote-details/voting-period/VotingThreshold.tsx b/src/lib/pages/proposal-details/components/vote-details/voting-period/VotingThreshold.tsx
@@ -54,7 +54,7 @@ export const VotingThreshold = ({
         <>
           <Flex gap={2} align="center">
             <Heading as="h6" variant="h6" textColor="text.main">
-              Vote Participations
+              Voting Results
             </Heading>
             <VoteThresholdBadge
               status={proposalData.status}

diff --git a/src/lib/pages/proposal-details/components/vote-details/voting-period/index.tsx b/src/lib/pages/proposal-details/components/vote-details/voting-period/index.tsx
@@ -106,11 +106,11 @@ export const VotingPeriod = ({ proposalData, ...props }: VoteDetailsProps) => {
         transition="all 0.25s ease-in-out"
         gap={4}
       >
-        {/* Vote Participations */}
+        {/* Voting Participations */}
         <ContentContainer transparent={isMobile}>
           <VotingQuorum proposalData={proposalData} {...props} />
         </ContentContainer>
-        {/* Vote Results */}
+        {/* Voting Results */}
         <ContentContainer transparent={isMobile}>
           <VotingThreshold proposalData={proposalData} {...props} />
         </ContentContainer>

diff --git a/src/lib/pages/proposal-details/index.tsx b/src/lib/pages/proposal-details/index.tsx
@@ -66,7 +66,7 @@ const ProposalDetailsBody = ({ id, tab }: ProposalDetailsQueryParams) => {
             Proposal Overview
           </CustomTab>
           <CustomTab onClick={handleTabChange(TabIndex.Vote)}>
-            Vote Details
+            Voting Details
           </CustomTab>
         </TabList>
         <TabPanels>