diff --git a/web-app/src/modules/core/routes/CommunityWallets/CommunityWallets.tsx b/web-app/src/modules/core/routes/CommunityWallets/CommunityWallets.tsx index ef269e5..073b44b 100644 --- a/web-app/src/modules/core/routes/CommunityWallets/CommunityWallets.tsx +++ b/web-app/src/modules/core/routes/CommunityWallets/CommunityWallets.tsx @@ -35,7 +35,8 @@ const CommunityWallets: FC = () => {
Edit this page @@ -46,7 +47,7 @@ const CommunityWallets: FC = () => { - - diff --git a/web-app/src/modules/core/routes/Stats/Stats.tsx b/web-app/src/modules/core/routes/Stats/Stats.tsx index 4c56e95..4e22df1 100644 --- a/web-app/src/modules/core/routes/Stats/Stats.tsx +++ b/web-app/src/modules/core/routes/Stats/Stats.tsx @@ -233,7 +233,7 @@ const Coinstats = () => {
-

Top 100 Liquid accounts

+

Top 100 Liquid Accounts

@@ -248,7 +248,7 @@ const Coinstats = () => {
@@ -281,7 +281,7 @@ const Coinstats = () => { {account.address} - - - ))} @@ -189,7 +187,7 @@ const Validators: FC = () => { ); } - + console.log('error', error); if (error) { @@ -200,8 +198,7 @@ const Validators: FC = () => { ); } - - return null + return null; }; export default Validators; diff --git a/web-app/src/modules/ui/CommunityWalletsTable/CommunityWalletRow.tsx b/web-app/src/modules/ui/CommunityWalletsTable/CommunityWalletRow.tsx index 76fa602..2329c3a 100644 --- a/web-app/src/modules/ui/CommunityWalletsTable/CommunityWalletRow.tsx +++ b/web-app/src/modules/ui/CommunityWalletsTable/CommunityWalletRow.tsx @@ -3,8 +3,7 @@ import { FC } from 'react'; import { ICommunityWalletInfo } from '../../interface/CommunityWallets.interface'; import AccountAddress from '../AccountAddress'; import { IAccountInfo } from '../../interface/Account.interface'; -import LibraAmount from '../LibraAmount'; -import Decimal from 'decimal.js'; +import Money from '../Money'; interface Props { communityWalletInfo: ICommunityWalletInfo; @@ -30,15 +29,15 @@ const CommunityWalletRow: FC = ({ communityWalletInfo }) => { return ( - - ); diff --git a/web-app/src/modules/ui/Layout/Footer/Footer.tsx b/web-app/src/modules/ui/Layout/Footer/Footer.tsx index 6391f6e..0d297f5 100644 --- a/web-app/src/modules/ui/Layout/Footer/Footer.tsx +++ b/web-app/src/modules/ui/Layout/Footer/Footer.tsx @@ -8,7 +8,7 @@ const CI_COMMIT_SHA: string = import.meta.env.VITE_CI_COMMIT_SHA; const Footer: React.FC = () => { return (
+ Wallet @@ -55,7 +56,7 @@ const CommunityWallets: FC = () => { Description + Balance
Liquid Balance + {account.unlockedBalance} diff --git a/web-app/src/modules/core/routes/Validators/Validators.tsx b/web-app/src/modules/core/routes/Validators/Validators.tsx index cabff6f..2bed3bb 100644 --- a/web-app/src/modules/core/routes/Validators/Validators.tsx +++ b/web-app/src/modules/core/routes/Validators/Validators.tsx @@ -1,11 +1,10 @@ -import { FC } from "react"; -import { gql, useQuery } from "@apollo/client"; -import _ from "lodash"; -import Page from "../../../ui/Page"; -import AccountAddress from "../../../ui/AccountAddress"; -import clsx from "clsx"; -import { LIBRA_SIGN } from "../../../../contants"; -import { CheckIcon, XMarkIcon } from "@heroicons/react/20/solid"; +import { FC } from 'react'; +import { gql, useQuery } from '@apollo/client'; +import Page from '../../../ui/Page'; +import AccountAddress from '../../../ui/AccountAddress'; +import Money from '../../../ui/Money'; +import clsx from 'clsx'; +import { CheckIcon, XMarkIcon } from '@heroicons/react/20/solid'; const GET_VALIDATORS = gql` query GetValidators { @@ -71,26 +70,22 @@ const Validators: FC = () => { } if (data) { - const validatorSet = data.validators.filter((it) => it.inSet) + const validatorSet = data.validators.filter((it) => it.inSet); const eligible = data.validators.length - validatorSet.length; return ( -
+
-
-
-
- Validator Set -
+
+
+
Validator Set
{validatorSet.length}
-
-
- Eligible -
+
+
Eligible
{eligible}
@@ -105,8 +100,8 @@ const Validators: FC = () => {
@@ -140,14 +135,14 @@ const Validators: FC = () => {
+ {validator.inSet ? ( ) : ( @@ -155,7 +150,7 @@ const Validators: FC = () => { )} - {validator.votingPower.toLocaleString()} + {Number(validator.votingPower).toLocaleString()} {validator.grade.compliant ? ( @@ -165,18 +160,21 @@ const Validators: FC = () => { )} {`${validator.grade.proposedBlocks.toLocaleString()} / ${validator.grade.failedBlocks.toLocaleString()}`} + {validator.vouches.length.toLocaleString()} {`${validator.currentBid.currentBid.toLocaleString()} (${validator.currentBid.expirationEpoch.toLocaleString()})`} - {`${LIBRA_SIGN} ${validator.account.balance.toLocaleString()}`} + {Number(validator.account.balance)} - {validator.account.slowWallet && - `${LIBRA_SIGN} ${validator.account.slowWallet.unlocked.toLocaleString()}`} + {validator.account.slowWallet ? ( + {Number(validator.account.slowWallet.unlocked)} + ) : ( + '' + )}
+ {communityWalletInfo.name} {communityWalletInfo.description} - {data.account.balance && {new Decimal(data.account.balance)}} + + {data.account.balance && {Number(data.account.balance)}}