From 4a11d9216ce5a7b0c346f681ee98c9448383fbfd Mon Sep 17 00:00:00 2001
From: eshark9312 <eshark9312@outlook.com>
Date: Mon, 24 Jul 2023 07:57:42 -0500
Subject: [PATCH] fix some code to make it clear

---
 .../src/validators/components/statistics/Era.tsx   |  3 +--
 .../validators/components/statistics/Rewards.tsx   |  5 ++---
 .../src/validators/hooks/useStakingStatistics.tsx  | 14 ++++++++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/ui/src/validators/components/statistics/Era.tsx b/packages/ui/src/validators/components/statistics/Era.tsx
index 148c82822f..7bf00f9155 100644
--- a/packages/ui/src/validators/components/statistics/Era.tsx
+++ b/packages/ui/src/validators/components/statistics/Era.tsx
@@ -22,8 +22,7 @@ interface EraProps {
 
 export const Era = ({ eraStartedOn, eraDuration, now, eraRewardPoints }: EraProps) => {
   const { nextReward, percentage } = useMemo(() => {
-    const nextReward =
-      eraDuration && now && eraStartedOn ? Number(eraDuration) - (now.toNumber() - Number(eraStartedOn)) : undefined
+    const nextReward = now && eraStartedOn && eraDuration - Number(now) - Number(eraStartedOn)
     const totalDuration = Number(eraDuration)
     const percentage = nextReward ? Math.floor(100 - (nextReward / totalDuration) * 100) : 0
     return {
diff --git a/packages/ui/src/validators/components/statistics/Rewards.tsx b/packages/ui/src/validators/components/statistics/Rewards.tsx
index 488df6769a..7e66d5b6dc 100644
--- a/packages/ui/src/validators/components/statistics/Rewards.tsx
+++ b/packages/ui/src/validators/components/statistics/Rewards.tsx
@@ -4,13 +4,12 @@ import React from 'react'
 import { StatisticItem, StatisticItemSpacedContent, StatisticLabel } from '@/common/components/statistics'
 import { TokenValue } from '@/common/components/typography'
 
-interface RewardsProps{
-  totalRewards: BN | undefined,
+interface RewardsProps {
+  totalRewards: BN | undefined
   lastRewards: BN | undefined
 }
 
 export const Rewards = ({ totalRewards, lastRewards }: RewardsProps) => {
-
   return (
     <StatisticItem
       title="Rewards"
diff --git a/packages/ui/src/validators/hooks/useStakingStatistics.tsx b/packages/ui/src/validators/hooks/useStakingStatistics.tsx
index 2c293822ea..d25aaf81b5 100644
--- a/packages/ui/src/validators/hooks/useStakingStatistics.tsx
+++ b/packages/ui/src/validators/hooks/useStakingStatistics.tsx
@@ -21,11 +21,17 @@ export const useStakingStatistics = () => {
 
   const now = useObservable(() => api?.query.timestamp.now(), [api?.isConnected])
   const totalIssuance = useObservable(() => api?.query.balances.totalIssuance(), [api?.isConnected])
-  const currentStaking = useObservable(() => activeEra ? api?.query.staking.erasTotalStake(activeEra.eraIndex):undefined, [activeEra, api?.isConnected])
+  const currentStaking = useObservable(
+    () => activeEra && api?.query.staking.erasTotalStake(activeEra.eraIndex),
+    [activeEra, api?.isConnected]
+  )
   const activeValidators = useObservable(() => api?.query.session.validators(), [api?.isConnected])
   const stakers = useObservable(() => {
     if (activeValidators && api)
-      return  activeEra ? combineLatest(activeValidators.map((address) => api.query.staking.erasStakers(activeEra.eraIndex, address))): undefined
+      return (
+        activeEra &&
+        combineLatest(activeValidators.map((address) => api.query.staking.erasStakers(activeEra.eraIndex, address)))
+      )
   }, [api?.isConnected, activeValidators, activeEra])
   const acitveNominators = useMemo(() => {
     const nominators = stakers?.map((validator) => validator.others.map((nominator) => nominator.who.toString()))
@@ -35,7 +41,7 @@ export const useStakingStatistics = () => {
   const allValidatorsCount = useObservable(() => api?.query.staking.counterForValidators(), [api?.isConnected])
   const allNominatorsCount = useObservable(() => api?.query.staking.counterForNominators(), [api?.isConnected])
   const lastValidatorRewards = useObservable(
-    () => activeEra ? api?.query.staking.erasValidatorReward(activeEra.eraIndex.subn(1)) :undefined,
+    () => activeEra && api?.query.staking.erasValidatorReward(activeEra.eraIndex.subn(1)),
     [activeEra, api?.isConnected]
   )
   const totalRewards = useObservable(() => api?.derive.staking.erasRewards(), [api?.isConnected])
@@ -44,7 +50,7 @@ export const useStakingStatistics = () => {
     [currentStaking, totalIssuance]
   )
   const eraRewardPoints = useObservable(
-    () => activeEra ? api?.query.staking.erasRewardPoints(activeEra.eraIndex): undefined,
+    () => activeEra && api?.query.staking.erasRewardPoints(activeEra.eraIndex),
     [activeEra, api?.isConnected]
   )
   return {