Skip to content

F
frontend
Commit 2a5f61d8 authored by adadachao's avatar adadachao
Browse files
Options

mainnet up (excluding .env.base changes)

parent bf94f641
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 50 deletions
ui/blocks/BlocksTable.tsx
View file @ 2a5f61d8
...@@ -53,15 +53,19 @@ const BlocksTable = ({ data, isLoading, top, page, showSocketInfo, socketInfoNum ...@@ -53,15 +53,19 @@ const BlocksTable = ({ data, isLoading, top, page, showSocketInfo, socketInfoNum
<TimeFormatToggle/> <TimeFormatToggle/>
</TableColumnHeader> </TableColumnHeader>
<TableColumnHeader width="120px">Size, bytes</TableColumnHeader> <TableColumnHeader width="120px">Size, bytes</TableColumnHeader>
{ !config.UI.views.block.hiddenFields?.miner && ( {
<TableColumnHeader width={ `${ VALIDATOR_COL_WEIGHT / widthBase * 100 }%` } minW="160px"> // !config.UI.views.block.hiddenFields?.miner && (
{ capitalize(getNetworkValidatorTitle()) } // <TableColumnHeader width={ `${ VALIDATOR_COL_WEIGHT / widthBase * 100 }%` } minW="160px">
</TableColumnHeader> // { capitalize(getNetworkValidatorTitle()) }
) } // </TableColumnHeader>
// )
}
<TableColumnHeader width="64px" isNumeric>Txn</TableColumnHeader> <TableColumnHeader width="64px" isNumeric>Txn</TableColumnHeader>
<TableColumnHeader width={ `${ GAS_COL_WEIGHT / widthBase * 100 }%` }>Gas used</TableColumnHeader> <TableColumnHeader width={ `${ GAS_COL_WEIGHT / widthBase * 100 }%` }>Gas used</TableColumnHeader>
{ !isRollup && !config.UI.views.block.hiddenFields?.total_reward && {
<TableColumnHeader width={ `${ REWARD_COL_WEIGHT / widthBase * 100 }%` }>Reward { currencyUnits.ether }</TableColumnHeader> } // !isRollup && !config.UI.views.block.hiddenFields?.total_reward &&
// <TableColumnHeader width={ `${ REWARD_COL_WEIGHT / widthBase * 100 }%` }>Reward { currencyUnits.ether }</TableColumnHeader>
}
{ !isRollup && !config.UI.views.block.hiddenFields?.burnt_fees && { !isRollup && !config.UI.views.block.hiddenFields?.burnt_fees &&
<TableColumnHeader width={ `${ FEES_COL_WEIGHT / widthBase * 100 }%` }>Burnt fees { currencyUnits.ether }</TableColumnHeader> } <TableColumnHeader width={ `${ FEES_COL_WEIGHT / widthBase * 100 }%` }>Burnt fees { currencyUnits.ether }</TableColumnHeader> }
{ !isRollup && !config.UI.views.block.hiddenFields?.base_fee && { !isRollup && !config.UI.views.block.hiddenFields?.base_fee &&
......
ui/blocks/BlocksTableItem.tsx
View file @ 2a5f61d8
...@@ -7,14 +7,14 @@ import type { Block } from 'types/api/block'; ...@@ -7,14 +7,14 @@ import type { Block } from 'types/api/block';
import { route } from 'nextjs-routes'; import { route } from 'nextjs-routes';
import config from 'configs/app'; import config from 'configs/app';
import getBlockTotalReward from 'lib/block/getBlockTotalReward'; // import getBlockTotalReward from 'lib/block/getBlockTotalReward';
import { Link } from 'toolkit/chakra/link'; import { Link } from 'toolkit/chakra/link';
import { Skeleton } from 'toolkit/chakra/skeleton'; import { Skeleton } from 'toolkit/chakra/skeleton';
import { TableCell, TableRow } from 'toolkit/chakra/table'; import { TableCell, TableRow } from 'toolkit/chakra/table';
import { Tooltip } from 'toolkit/chakra/tooltip'; import { Tooltip } from 'toolkit/chakra/tooltip';
import { WEI } from 'toolkit/utils/consts'; import { WEI } from 'toolkit/utils/consts';
import BlockGasUsed from 'ui/shared/block/BlockGasUsed'; import BlockGasUsed from 'ui/shared/block/BlockGasUsed';
import AddressEntity from 'ui/shared/entities/address/AddressEntity'; // import AddressEntity from 'ui/shared/entities/address/AddressEntity';
import BlockEntity from 'ui/shared/entities/block/BlockEntity'; import BlockEntity from 'ui/shared/entities/block/BlockEntity';
import IconSvg from 'ui/shared/IconSvg'; import IconSvg from 'ui/shared/IconSvg';
import TimeWithTooltip from 'ui/shared/time/TimeWithTooltip'; import TimeWithTooltip from 'ui/shared/time/TimeWithTooltip';
...@@ -32,7 +32,7 @@ interface Props { ...@@ -32,7 +32,7 @@ interface Props {
const isRollup = config.features.rollup.isEnabled; const isRollup = config.features.rollup.isEnabled;
const BlocksTableItem = ({ data, isLoading, enableTimeIncrement, animation }: Props) => { const BlocksTableItem = ({ data, isLoading, enableTimeIncrement, animation }: Props) => {
const totalReward = getBlockTotalReward(data); // const totalReward = getBlockTotalReward(data);
const burntFees = BigNumber(data.burnt_fees || 0); const burntFees = BigNumber(data.burnt_fees || 0);
const txFees = BigNumber(data.transaction_fees || 0); const txFees = BigNumber(data.transaction_fees || 0);
const baseFeeValue = getBaseFeeValue(data.base_fee_per_gas); const baseFeeValue = getBaseFeeValue(data.base_fee_per_gas);
...@@ -72,16 +72,18 @@ const BlocksTableItem = ({ data, isLoading, enableTimeIncrement, animation }: Pr ...@@ -72,16 +72,18 @@ const BlocksTableItem = ({ data, isLoading, enableTimeIncrement, animation }: Pr
{ data.size.toLocaleString() } { data.size.toLocaleString() }
</Skeleton> </Skeleton>
</TableCell> </TableCell>
{ !config.UI.views.block.hiddenFields?.miner && ( {
<TableCell > // !config.UI.views.block.hiddenFields?.miner && (
<AddressEntity // <TableCell >
address={ data.miner } // <AddressEntity
isLoading={ isLoading } // address={ data.miner }
truncation="constant" // isLoading={ isLoading }
maxW="min-content" // truncation="constant"
/> // maxW="min-content"
</TableCell> // />
) } // </TableCell>
// )
}
<TableCell isNumeric > <TableCell isNumeric >
{ data.transactions_count > 0 ? ( { data.transactions_count > 0 ? (
<Skeleton loading={ isLoading } display="inline-block"> <Skeleton loading={ isLoading } display="inline-block">
...@@ -105,13 +107,15 @@ const BlocksTableItem = ({ data, isLoading, enableTimeIncrement, animation }: Pr ...@@ -105,13 +107,15 @@ const BlocksTableItem = ({ data, isLoading, enableTimeIncrement, animation }: Pr
/> />
</Flex> </Flex>
</TableCell> </TableCell>
{ !isRollup && !config.UI.views.block.hiddenFields?.total_reward && ( {
<TableCell > // !isRollup && !config.UI.views.block.hiddenFields?.total_reward && (
<Skeleton loading={ isLoading } display="inline-block"> // <TableCell >
{ totalReward.toFixed(8) } // <Skeleton loading={ isLoading } display="inline-block">
</Skeleton> // { totalReward.toFixed(8) }
</TableCell> // </Skeleton>
) } // </TableCell>
// )
}
{ !isRollup && !config.UI.views.block.hiddenFields?.burnt_fees && ( { !isRollup && !config.UI.views.block.hiddenFields?.burnt_fees && (
<TableCell > <TableCell >
<Flex alignItems="center" columnGap={ 2 }> <Flex alignItems="center" columnGap={ 2 }>
......
ui/home/LatestBlocksItem.tsx
View file @ 2a5f61d8
...@@ -3,12 +3,12 @@ import React from 'react'; ...@@ -3,12 +3,12 @@ import React from 'react';
import type { Block } from 'types/api/block'; import type { Block } from 'types/api/block';
import config from 'configs/app'; // import config from 'configs/app';
import getBlockTotalReward from 'lib/block/getBlockTotalReward'; // import getBlockTotalReward from 'lib/block/getBlockTotalReward';
import getNetworkValidatorTitle from 'lib/networks/getNetworkValidatorTitle'; // import getNetworkValidatorTitle from 'lib/networks/getNetworkValidatorTitle';
import { Skeleton } from 'toolkit/chakra/skeleton'; import { Skeleton } from 'toolkit/chakra/skeleton';
import { Tooltip } from 'toolkit/chakra/tooltip'; import { Tooltip } from 'toolkit/chakra/tooltip';
import AddressEntity from 'ui/shared/entities/address/AddressEntity'; // import AddressEntity from 'ui/shared/entities/address/AddressEntity';
import BlockEntity from 'ui/shared/entities/block/BlockEntity'; import BlockEntity from 'ui/shared/entities/block/BlockEntity';
import IconSvg from 'ui/shared/IconSvg'; import IconSvg from 'ui/shared/IconSvg';
import TimeWithTooltip from 'ui/shared/time/TimeWithTooltip'; import TimeWithTooltip from 'ui/shared/time/TimeWithTooltip';
...@@ -20,7 +20,7 @@ type Props = { ...@@ -20,7 +20,7 @@ type Props = {
}; };
const LatestBlocksItem = ({ block, isLoading, animation }: Props) => { const LatestBlocksItem = ({ block, isLoading, animation }: Props) => {
const totalReward = getBlockTotalReward(block); // const totalReward = getBlockTotalReward(block);
return ( return (
<Box <Box
animation={ animation } animation={ animation }
...@@ -59,25 +59,29 @@ const LatestBlocksItem = ({ block, isLoading, animation }: Props) => { ...@@ -59,25 +59,29 @@ const LatestBlocksItem = ({ block, isLoading, animation }: Props) => {
<Skeleton loading={ isLoading }>Txn</Skeleton> <Skeleton loading={ isLoading }>Txn</Skeleton>
<Skeleton loading={ isLoading } color="text.secondary"><span>{ block.transactions_count }</span></Skeleton> <Skeleton loading={ isLoading } color="text.secondary"><span>{ block.transactions_count }</span></Skeleton>
{ !config.features.rollup.isEnabled && !config.UI.views.block.hiddenFields?.total_reward && ( {
<> // !config.features.rollup.isEnabled && !config.UI.views.block.hiddenFields?.total_reward && (
<Skeleton loading={ isLoading }>Reward</Skeleton> // <>
<Skeleton loading={ isLoading } color="text.secondary"><span>{ totalReward.dp(10).toFixed() }</span></Skeleton> // <Skeleton loading={ isLoading }>Reward</Skeleton>
</> // <Skeleton loading={ isLoading } color="text.secondary"><span>{ totalReward.dp(10).toFixed() }</span></Skeleton>
) } // </>
// )
}
{ !config.features.rollup.isEnabled && !config.UI.views.block.hiddenFields?.miner && ( {
<> // !config.features.rollup.isEnabled && !config.UI.views.block.hiddenFields?.miner && (
<Skeleton loading={ isLoading } textTransform="capitalize">{ getNetworkValidatorTitle() }</Skeleton> // <>
<AddressEntity // <Skeleton loading={ isLoading } textTransform="capitalize">{ getNetworkValidatorTitle() }</Skeleton>
address={ block.miner } // <AddressEntity
isLoading={ isLoading } // address={ block.miner }
noIcon // isLoading={ isLoading }
noCopy // noIcon
truncation="constant" // noCopy
/> // truncation="constant"
</> // />
) } // </>
// )
}
</Grid> </Grid>
</Box> </Box>
); );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment