From 6f97ac35b13661197e1102f6a6dc01567c7dc78e Mon Sep 17 00:00:00 2001
From: 16601314215 <A啊314>
Date: Tue, 24 Sep 2024 03:11:06 +0800
Subject: [PATCH] update validator power

---
 .../hero/components/online_voting_power/hooks.ts | 16 ++++++++--------
 .../components/validator_overview/index.tsx      |  2 +-
 .../components/voting_power/index.tsx            |  4 ++--
 .../ui/src/screens/validator_details/hooks.ts    |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/ui/src/screens/home/components/hero/components/online_voting_power/hooks.ts b/packages/ui/src/screens/home/components/hero/components/online_voting_power/hooks.ts
index 5f78bd2..8aca9ed 100644
--- a/packages/ui/src/screens/home/components/hero/components/online_voting_power/hooks.ts
+++ b/packages/ui/src/screens/home/components/hero/components/online_voting_power/hooks.ts
@@ -20,14 +20,14 @@ const initialState: OnlineVotingPowerState = {
 };
 
 const formatOnlineVotingPower = (data: OnlineVotingPowerQuery) => {
-  // const votingPower = data?.validatorVotingPowerAggregate?.aggregate?.sum?.votingPower ?? 0;
-  const votingPower =
-    numeral(
-      formatToken(
-        data?.validatorVotingPowerAggregate?.aggregate?.sum?.votingPower ?? 0,
-        votingPowerTokenUnit
-      ).value
-    ).value() ?? 0;
+  const votingPower = data?.validatorVotingPowerAggregate?.aggregate?.sum?.votingPower ?? 0;
+  // const votingPower =
+  //   numeral(
+  //     formatToken(
+  //       data?.validatorVotingPowerAggregate?.aggregate?.sum?.votingPower ?? 0,
+  //       votingPowerTokenUnit
+  //     ).value
+  //   ).value() ?? 0;
   const bonded = data?.stakingPool?.[0]?.bonded ?? 0;
   const activeValidators = data?.activeTotal?.aggregate?.count ?? 0;
   return {
diff --git a/packages/ui/src/screens/validator_details/components/validator_overview/index.tsx b/packages/ui/src/screens/validator_details/components/validator_overview/index.tsx
index 1d9ebb9..5c70817 100644
--- a/packages/ui/src/screens/validator_details/components/validator_overview/index.tsx
+++ b/packages/ui/src/screens/validator_details/components/validator_overview/index.tsx
@@ -59,7 +59,7 @@ const ValidatorOverview: FC<ValidatorOverviewProps> = ({ status, overview, class
       ),
       value: (
         <Typography variant="body1" className="value">
-          {`${numeral((status.commission / 100000000) * 100).format('0.00')}%`}
+          {`${numeral(status.commission * 100).format('0.00')}%`}
         </Typography>
       ),
     },
diff --git a/packages/ui/src/screens/validator_details/components/voting_power/index.tsx b/packages/ui/src/screens/validator_details/components/voting_power/index.tsx
index b61eb09..d965a95 100644
--- a/packages/ui/src/screens/validator_details/components/voting_power/index.tsx
+++ b/packages/ui/src/screens/validator_details/components/voting_power/index.tsx
@@ -23,13 +23,13 @@ const VotingPower: FC<VotingPowerProps> = ({ className, data, status }) => {
 
   const { chainName } = chainConfig();
 
-  const votingPower = status === 3 ? numeral(data.self / 100000000).format('0,0') : '0';
+  const votingPower = status === 3 ? numeral(data.self).format('0,0') : '0';
   const votingPowerPercent =
     // eslint-disable-next-line no-nested-ternary
     status === 3
       ? chainName === 'wormhole'
         ? numeral((Number(votingPower) / state.activeValidators) * 100)
-        : numeral((data.self / 100000000 / (numeral(data.overall.value).value() ?? 0)) * 100)
+        : numeral((data.self / (numeral(data.overall.value).value() ?? 0)) * 100)
       : numeral(0);
 
   const { classes, cx } = useStyles({
diff --git a/packages/ui/src/screens/validator_details/hooks.ts b/packages/ui/src/screens/validator_details/hooks.ts
index 8eebca9..e93d4ef 100644
--- a/packages/ui/src/screens/validator_details/hooks.ts
+++ b/packages/ui/src/screens/validator_details/hooks.ts
@@ -76,7 +76,7 @@ const formatStatus = (data: ValidatorDetailsQuery) => {
     status: data.validator[0]?.validatorStatuses?.[0]?.status ?? 3,
     jailed: data.validator[0]?.validatorStatuses?.[0]?.jailed ?? false,
     tombstoned: data.validator[0]?.validatorSigningInfos?.[0]?.tombstoned ?? false,
-    commission: (data.validator[0]?.validatorCommissions?.[0]?.commission ?? 0) / 10000000000,
+    commission: (data.validator[0]?.validatorCommissions?.[0]?.commission ?? 0),
     condition,
     missedBlockCounter,
     signedBlockWindow,