From 1c76058f8d982447e7847090427788e5666b60d8 Mon Sep 17 00:00:00 2001 From: Hau Nguyen Van Date: Thu, 14 Mar 2024 16:17:54 +0700 Subject: [PATCH] fix est apr --- .../DetailDisplay/DetailDisplay.js | 10 ++-- .../ValidatorTable/ValidatorTable.js | 50 +++++++++---------- src/components/common/Delegate/Delegate.js | 42 ++++++++-------- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/components/Dashboard/DashboardContent/DetailDisplay/DetailDisplay.js b/src/components/Dashboard/DashboardContent/DetailDisplay/DetailDisplay.js index 17f4a444..3e4937e7 100644 --- a/src/components/Dashboard/DashboardContent/DetailDisplay/DetailDisplay.js +++ b/src/components/Dashboard/DashboardContent/DetailDisplay/DetailDisplay.js @@ -1,14 +1,14 @@ import * as React from "react"; import cn from "classnames/bind"; -import {formatNumber} from "src/lib/scripts"; -import {useFetch, useTimer} from "src/hooks"; +import { formatNumber } from "src/lib/scripts"; +import { useFetch, useTimer } from "src/hooks"; import consts from "src/constants/consts"; import moment from "moment"; -import {setAgoTime} from "src/lib/scripts"; +import { setAgoTime } from "src/lib/scripts"; // component import Skeleton from "react-skeleton-loader"; // redux -import {useSelector} from "react-redux"; +import { useSelector } from "react-redux"; // svgs import down_rd from "src/assets/common/arrow_down.svg"; import up_gr from "src/assets/common/arrow_up.svg"; @@ -28,7 +28,7 @@ export default function(props) {
{data !== null ? setAgoTime(data?.timestamp) : ""}
-
Average Blocktime (All)
+
Average Block time (All)
{data !== null ? data?.block_time?.toFixed(2) : ""}
seconds
diff --git a/src/components/ValidatorList/ValidatorTable/ValidatorTable.js b/src/components/ValidatorList/ValidatorTable/ValidatorTable.js index e2beb0fd..6666740e 100644 --- a/src/components/ValidatorList/ValidatorTable/ValidatorTable.js +++ b/src/components/ValidatorList/ValidatorTable/ValidatorTable.js @@ -1,23 +1,23 @@ // @ts-nocheck /* eslint-disable react-hooks/exhaustive-deps */ -import React, {useState, memo, useMemo} from "react"; -import {NavLink} from "react-router-dom"; -import {Tooltip} from "antd"; -import {QuestionCircleOutlined} from "@ant-design/icons"; +import React, { useState, memo, useMemo } from "react"; +import { NavLink } from "react-router-dom"; +import { Tooltip } from "antd"; +import { QuestionCircleOutlined } from "@ant-design/icons"; import classNames from "classnames/bind"; -import {_} from "src/lib/scripts"; -import {tableThemes} from "src/constants/tableThemes"; -import {sortDirections} from "src/constants/sortDirections"; +import { _ } from "src/lib/scripts"; +import { tableThemes } from "src/constants/tableThemes"; +import { sortDirections } from "src/constants/sortDirections"; import consts from "src/constants/consts"; -import {formatPercentage, formatInteger, formatOrai} from "src/helpers/helper"; -import {compareTwoValues} from "src/helpers/compare"; +import { formatPercentage, formatInteger, formatOrai } from "src/helpers/helper"; +import { compareTwoValues } from "src/helpers/compare"; import Delegate from "src/components/common/Delegate"; import ThemedTable from "src/components/common/ThemedTable"; import sortNoneIcon from "src/assets/common/sort_none_ic.svg"; import sortAscIcon from "src/assets/common/sort_asc_ic.svg"; import sortDescIcon from "src/assets/common/sort_desc_ic.svg"; -import {logoBrand} from "src/constants/logoBrand"; -import {Progress} from "antd"; +import { logoBrand } from "src/constants/logoBrand"; +import { Progress } from "antd"; import styles from "./ValidatorTable.module.scss"; import "./style.css"; @@ -51,8 +51,8 @@ const getCumulativeShareCell = (previousValue, currentValue, totalValue) => { return ( <> -
-
+
+
{totalPercent} %
); @@ -66,7 +66,7 @@ const toggleDirection = direction => { } }; -const ValidatorTable = memo(({data = []}) => { +const ValidatorTable = memo(({ data = [] }) => { const [sortField, setSortField] = useState(sortFields.SELFBONDED); const [sortDirection, setSortDirection] = useState(sortDirections.DESC); const [canSort, setCanSort] = useState(false); @@ -128,7 +128,7 @@ const ValidatorTable = memo(({data = []}) => {
Self Bonded @@ -194,15 +194,15 @@ const ValidatorTable = memo(({data = []}) => { delegateHeaderCell, ]; const headerCellStyles = [ - {width: "5.4%"}, // Rank - {width: "17.7%"}, // Validator - {width: "11.8%"}, // Voting Power - {width: "13.1%"}, // Self Bonded - {width: "12.3%"}, // Cumulative Share - {width: "9%"}, // Uptime - {width: "11.7%"}, // Commission - {width: "9%"}, // EstAPRCell - {width: "10%"}, // Delegate + { width: "5.4%" }, // Rank + { width: "17.7%" }, // Validator + { width: "11.8%" }, // Voting Power + { width: "13.1%" }, // Self Bonded + { width: "12.3%" }, // Cumulative Share + { width: "9%" }, // Uptime + { width: "11.7%" }, // Commission + { width: "9%" }, // EstAPRCell + { width: "10%" }, // Delegate ]; return { headerCells, @@ -298,7 +298,7 @@ const ValidatorTable = memo(({data = []}) => {
{item?.commission_rate ? formatPercentage(item.commission_rate, 2) + "%" : "-"}
); - const estAPR = item?.apr.toFixed(2); + const estAPR = ((item?.apr || 0) * 1.05).toFixed(2); const estAPRnDataCell =
{estAPR} %
; diff --git a/src/components/common/Delegate/Delegate.js b/src/components/common/Delegate/Delegate.js index d52b3375..68a6e5e9 100644 --- a/src/components/common/Delegate/Delegate.js +++ b/src/components/common/Delegate/Delegate.js @@ -1,33 +1,33 @@ // @ts-nocheck -import React, {memo, useState, useEffect} from "react"; +import React, { memo, useState, useEffect } from "react"; import cn from "classnames/bind"; -import {Tooltip} from "antd"; -import {QuestionCircleOutlined} from "@ant-design/icons"; -import {useForm, FormProvider} from "react-hook-form"; -import {withStyles} from "@material-ui/core/styles"; -import {useSelector} from "react-redux"; +import { Tooltip } from "antd"; +import { QuestionCircleOutlined } from "@ant-design/icons"; +import { useForm, FormProvider } from "react-hook-form"; +import { withStyles } from "@material-ui/core/styles"; +import { useSelector } from "react-redux"; import Dialog from "@material-ui/core/Dialog"; import MuiDialogContent from "@material-ui/core/DialogContent"; import MuiDialogActions from "@material-ui/core/DialogActions"; -import {Divider, Input, Spin} from "antd"; +import { Divider, Input, Spin } from "antd"; import * as yup from "yup"; -import {yupResolver} from "@hookform/resolvers/yup"; +import { yupResolver } from "@hookform/resolvers/yup"; import _ from "lodash"; import BigNumber from "bignumber.js"; -import {InputNumberOrai} from "src/components/common/form-controls"; +import { InputNumberOrai } from "src/components/common/form-controls"; import LoadingOverlay from "src/components/common/LoadingOverlay"; -import {Fee, Gas} from "src/components/common/Fee"; -import {ReactComponent as ExchangeIconGrey} from "src/assets/icons/exchange-grey.svg"; +import { Fee, Gas } from "src/components/common/Fee"; +import { ReactComponent as ExchangeIconGrey } from "src/assets/icons/exchange-grey.svg"; import consts from "src/constants/consts"; -import {useFetch, useHistory} from "src/hooks"; +import { useFetch, useHistory } from "src/hooks"; import styles from "./Delegate.module.scss"; import "./Delegate.css"; -import {formatOrai, formatPercentage , amountCoinDecimal} from "src/helpers/helper"; -import {walletStation} from "src/lib/walletStation"; -import {handleTransactionResponse} from "src/helpers/transaction"; -import {notification} from "antd"; -import {handleErrorMessage} from "../../../lib/scripts"; +import { formatOrai, formatPercentage, amountCoinDecimal } from "src/helpers/helper"; +import { walletStation } from "src/lib/walletStation"; +import { handleTransactionResponse } from "src/helpers/transaction"; +import { notification } from "antd"; +import { handleErrorMessage } from "../../../lib/scripts"; const cx = cn.bind(styles); @@ -283,7 +283,7 @@ const Delegate = memo(({ a, openButtonText = "Delegate for this validator", oper } if (id === 2) { - const {amount, monthlyORAI, yearlyORAI} = rewardCalculator; + const { amount, monthlyORAI, yearlyORAI } = rewardCalculator; return ( <> @@ -292,7 +292,7 @@ const Delegate = memo(({ a, openButtonText = "Delegate for this validator", oper
Amount (ORAI)
{" "} - $ {formatUSD(amount)} + $ {formatUSD(amount || 0)}
@@ -334,9 +334,9 @@ const Delegate = memo(({ a, openButtonText = "Delegate for this validator", oper
- {TABS.map(({id, name}, index) => { + {TABS.map(({ id, name }, index) => { return ( - );