Merge pull request #849 from alleslabs/fix/validator-list-bug

Fix/validator list bug
alleslabs · Mar 27, 2024 · cb49700 · cb49700
2 parents ec87e29 + 5594245
commit cb49700
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 122 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -119,6 +119,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Bug fixes
 
+- [#849](https://github.com/alleslabs/celatone-frontend/pull/849) Fix validator list empty state and voting percent dividers
 - [#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

diff --git a/src/config/chain/initia.ts b/src/config/chain/initia.ts
@@ -27,7 +27,7 @@ export const INITIA_CHAIN_CONFIGS: ChainConfigs = {
         enabled: true,
         moduleMaxFileSize: 1_048_576,
         decodeApi: INITIA_DECODER,
-        verify: "https://compiler.mahalo-1.initia.xyz/contracts/verify",
+        verify: "https://compiler.mahalo-2.initia.xyz/contracts/verify",
       },
       pool: {
         enabled: false,

diff --git a/src/lib/pages/validator-details/components/validator-top/ValidatorStats.tsx b/src/lib/pages/validator-details/components/validator-top/ValidatorStats.tsx
@@ -6,7 +6,7 @@ import {
   useValidatorStakingProvisions,
 } from "lib/services/validatorService";
 import type { Option, ValidatorAddr } from "lib/types";
-import { formatPrettyPercent } from "lib/utils";
+import { divWithDefault, formatPrettyPercent } from "lib/utils";
 
 const StatWithLabel = ({
   label,
@@ -49,15 +49,17 @@ export const ValidatorStats = ({
   singleStakingDenom,
 }: ValidatorStatsProps) => {
   const { data: stakingProvisions, isLoading: isStakingProvisionsLoading } =
-    useValidatorStakingProvisions();
+    useValidatorStakingProvisions(!!singleStakingDenom);
   const { data: delegations, isLoading: isDelegationsLoading } =
     useValidatorDelegators(validatorAddress);
 
   const estimatedApr = stakingProvisions
     ? formatPrettyPercent(
-        stakingProvisions.stakingProvisions
-          .div(totalVotingPower.mul(1 - commissionRate))
-          .toNumber(),
+        divWithDefault(
+          stakingProvisions.stakingProvisions,
+          totalVotingPower.mul(1 - commissionRate),
+          0
+        ).toNumber(),
         2,
         true
       )

diff --git a/src/lib/pages/validators/components/ActiveFilter.tsx b/src/lib/pages/validators/components/ActiveFilter.tsx
@@ -1,5 +1,6 @@
 import { Flex, Text } from "@chakra-ui/react";
 import { Select } from "chakra-react-select";
+import { isUndefined } from "lodash";
 import { useMemo } from "react";
 
 import type { Option } from "lib/types";
@@ -12,7 +13,7 @@ interface ActiveFilterProps {
 }
 
 const getOptionLabel = (label: string, count: Option<number>) =>
-  label + (count ? ` (${count})` : "");
+  label + (!isUndefined(count) ? ` (${count})` : "");
 
 export const ActiveFilter = ({
   isActive,
@@ -32,7 +33,7 @@ export const ActiveFilter = ({
   );
 
   return (
-    <Flex direction="column" gap={1} minW={{ base: "full", md: "240px" }}>
+    <Flex direction="column" gap={1} minW={{ base: "full", md: "280px" }}>
       <Text variant="body3" color="text.dark" pl={{ base: 1, md: 3 }}>
         Show only
       </Text>

diff --git a/src/lib/pages/validators/components/validators-table/ValidatorsTableBody.tsx b/src/lib/pages/validators/components/validators-table/ValidatorsTableBody.tsx
diff --git a/src/lib/pages/validators/components/validators-table/index.tsx b/src/lib/pages/validators/components/validators-table/index.tsx
@@ -1,13 +1,20 @@
 import { TableContainer } from "@chakra-ui/react";
+import { Fragment } from "react";
 
-import type { ValidatorOrder } from "../../types";
-import { useMobile } from "lib/app-provider";
+import { ValidatorOrder } from "../../types";
+import { useCelatoneApp, useMobile } from "lib/app-provider";
+import { Loading } from "lib/components/Loading";
+import { EmptyState, ErrorFetching } from "lib/components/state";
 import { MobileTableContainer } from "lib/components/table";
+import { useAssetInfos } from "lib/services/assetService";
 import type { ValidatorsResponse } from "lib/services/validator";
 import type { Option } from "lib/types";
+import { coinToTokenWithValue } from "lib/utils";
 
-import { ValidatorsTableBody } from "./ValidatorsTableBody";
+import { ValidatorsPercentDivider } from "./ValidatorsPercentDivider";
 import { ValidatorsTableHeader } from "./ValidatorsTableHeader";
+import { ValidatorsTableMobileCard } from "./ValidatorsTableMobileCard";
+import { ValidatorsTableRow } from "./ValidatorsTableRow";
 
 interface ValidatorsTableProps {
   data: Option<ValidatorsResponse>;
@@ -31,19 +38,44 @@ export const ValidatorsTable = ({
   scrollComponentId,
 }: ValidatorsTableProps) => {
   const isMobile = useMobile();
+  const {
+    chainConfig: {
+      extra: { singleStakingDenom },
+    },
+  } = useCelatoneApp();
+  const { data: assetInfos } = useAssetInfos({ withPrices: false });
+
+  if (isLoading) return <Loading />;
+  if (!data) return <ErrorFetching dataName="validators" />;
+  if (!data.total)
+    return (
+      <EmptyState
+        imageVariant="empty"
+        message={`This network does not have any ${isActive ? "active" : "inactive"} validators.`}
+        withBorder
+      />
+    );
+
+  const displayDividers = order === ValidatorOrder.VotingPower && isDesc;
+  const denomToken = singleStakingDenom
+    ? coinToTokenWithValue(singleStakingDenom, "0", assetInfos)
+    : undefined;
+
   const templateColumns = `${isActive ? "64px " : ""}3fr 2fr 110px 110px`;
   return (
     <>
       {isMobile ? (
         <MobileTableContainer>
-          <ValidatorsTableBody
-            templateColumns={templateColumns}
-            data={data}
-            isLoading={isLoading}
-            isActive={isActive}
-            order={order}
-            isDesc={isDesc}
-          />
+          {data.items.map((validator) => (
+            <ValidatorsTableMobileCard
+              key={validator.validatorAddress}
+              isActive={isActive}
+              validator={validator}
+              totalVotingPower={data.metadata.totalVotingPower}
+              minCommissionRate={data.metadata.minCommissionRate}
+              denomToken={denomToken}
+            />
+          ))}
         </MobileTableContainer>
       ) : (
         <TableContainer>
@@ -56,14 +88,30 @@ export const ValidatorsTable = ({
             isDesc={isDesc}
             setIsDesc={setIsDesc}
           />
-          <ValidatorsTableBody
-            templateColumns={templateColumns}
-            data={data}
-            isLoading={isLoading}
-            isActive={isActive}
-            order={order}
-            isDesc={isDesc}
-          />
+          {data.items.map((validator) => (
+            <Fragment key={validator.validatorAddress}>
+              <ValidatorsTableRow
+                templateColumns={templateColumns}
+                isActive={isActive}
+                validator={validator}
+                totalVotingPower={data.metadata.totalVotingPower}
+                minCommissionRate={data.metadata.minCommissionRate}
+                denomToken={denomToken}
+              />
+              {displayDividers &&
+                (validator.rank === data.metadata.percent33Rank ||
+                  validator.rank === data.metadata.percent66Rank) && (
+                  <ValidatorsPercentDivider
+                    rank={validator.rank}
+                    label={
+                      validator.rank === data.metadata.percent66Rank
+                        ? "66%"
+                        : "33%"
+                    }
+                  />
+                )}
+            </Fragment>
+          ))}
         </TableContainer>
       )}
     </>

diff --git a/src/lib/services/validatorService.ts b/src/lib/services/validatorService.ts
@@ -127,13 +127,14 @@ export const useValidators = (
   );
 };
 
-export const useValidatorStakingProvisions = () => {
+export const useValidatorStakingProvisions = (enabled: boolean) => {
   const endpoint = useBaseApiRoute("validators");
 
   return useQuery<StakingProvisionsResponse>(
     [CELATONE_QUERY_KEYS.VALIDATOR_STAKING_PROVISIONS, endpoint],
     async () => getValidatorStakingProvisions(endpoint),
     {
+      enabled,
       retry: 1,
     }
   );