Skip to content

F
frontend
Commit 6095da71 authored by tom goriunov's avatar tom goriunov Committed by GitHub
Browse files
Options

L2 batches changes (#2313) 

Fixes #2266
parent d701d044
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 39 deletions
lib/metadata/templates/title.ts
View file @ 6095da71
......@@ -40,8 +40,8 @@ const TEMPLATE_MAP: Record<Route['pathname'], string> = {
'/deposits': '%network_name% deposits (L1 > L2)',
'/output-roots': '%network_name% output roots',
'/dispute-games': '%network_name% dispute games',
'/batches': '%network_name% tx batches (L2 blocks)',
'/batches/[number]': '%network_name% L2 tx batch %number%',
'/batches': '%network_name% txn batches',
'/batches/[number]': '%network_name% L2 txn batch %number%',
'/blobs/[hash]': '%network_name% blob %hash% details',
'/ops': 'User operations on %network_name% - %network_name% explorer',
'/op/[hash]': '%network_name% user operation %hash%',
......
lib/mixpanel/getPageType.ts
View file @ 6095da71
......@@ -38,8 +38,8 @@ export const PAGE_TYPE_DICT: Record<Route['pathname'], string> = {
'/deposits': 'Deposits (L1 > L2)',
'/output-roots': 'Output roots',
'/dispute-games': 'Dispute games',
'/batches': 'Tx batches (L2 blocks)',
'/batches/[number]': 'L2 tx batch details',
'/batches': 'Txn batches',
'/batches/[number]': 'L2 txn batch details',
'/blobs/[hash]': 'Blob details',
'/ops': 'User operations',
'/op/[hash]': 'User operation details',
......
ui/pages/ArbitrumL2TxnBatch.tsx
View file @ 6095da71
......@@ -108,7 +108,7 @@ const ArbitrumL2TxnBatch = () => {
}
return {
label: 'Back to tx batches list',
label: 'Back to txn batches list',
url: appProps.referrer,
};
}, [ appProps.referrer ]);
......@@ -117,7 +117,7 @@ const ArbitrumL2TxnBatch = () => {
<>
<TextAd mb={ 6 }/>
<PageTitle
title={ `Tx batch #${ number }` }
title={ `Txn batch #${ number }` }
backLink={ backLink }
/>
{ batchQuery.isPlaceholderData ?
......
ui/pages/ArbitrumL2TxnBatches.tsx
View file @ 6095da71
......@@ -2,7 +2,6 @@ import { Hide, Show, Skeleton, Text } from '@chakra-ui/react';
import React from 'react';
import useApiQuery from 'lib/api/useApiQuery';
import { nbsp } from 'lib/html-entities';
import { ARBITRUM_L2_TXN_BATCHES_ITEM } from 'stubs/arbitrumL2';
import { generateListStub } from 'stubs/utils';
import { ACTION_BAR_HEIGHT_DESKTOP } from 'ui/shared/ActionBar';
......@@ -60,7 +59,7 @@ const ArbitrumL2TxnBatches = () => {
return (
<Skeleton isLoaded={ !countersQuery.isPlaceholderData && !isPlaceholderData } display="flex" flexWrap="wrap">
Tx batch (L2 block)
Txn batch
<Text fontWeight={ 600 } whiteSpace="pre"> #{ data.items[0].number } </Text>to
<Text fontWeight={ 600 } whiteSpace="pre"> #{ data.items[data.items.length - 1].number } </Text>
(total of { countersQuery.data?.toLocaleString() } batches)
......@@ -72,11 +71,11 @@ const ArbitrumL2TxnBatches = () => {
return (
<>
<PageTitle title={ `Tx batches (L2${ nbsp }blocks)` } withTextAd/>
<PageTitle title="Txn batches" withTextAd/>
<DataListDisplay
isError={ isError }
items={ data?.items }
emptyText="There are no tx batches."
emptyText="There are no txn batches."
content={ content }
actionBar={ actionBar }
/>
......
ui/pages/OptimisticL2TxnBatch.tsx
View file @ 6095da71
......@@ -106,7 +106,7 @@ const OptimisticL2TxnBatch = () => {
}
return {
label: 'Back to tx batches list',
label: 'Back to txn batches list',
url: appProps.referrer,
};
}, [ appProps.referrer ]);
......
ui/pages/OptimisticL2TxnBatches.tsx
View file @ 6095da71
......@@ -2,7 +2,6 @@ import { Hide, Show, Skeleton, Text } from '@chakra-ui/react';
import React from 'react';
import useApiQuery from 'lib/api/useApiQuery';
import { nbsp } from 'lib/html-entities';
import { L2_TXN_BATCHES_ITEM } from 'stubs/L2';
import { generateListStub } from 'stubs/utils';
import { ACTION_BAR_HEIGHT_DESKTOP } from 'ui/shared/ActionBar';
......@@ -60,7 +59,7 @@ const OptimisticL2TxnBatches = () => {
return (
<Skeleton isLoaded={ !countersQuery.isPlaceholderData && !isPlaceholderData } display="flex" flexWrap="wrap">
Tx batch (L2 block)
Txn batch
<Text fontWeight={ 600 } whiteSpace="pre"> #{ data.items[0].internal_id } </Text>to
<Text fontWeight={ 600 } whiteSpace="pre"> #{ data.items[data.items.length - 1].internal_id } </Text>
(total of { countersQuery.data?.toLocaleString() } batches)
......@@ -72,11 +71,11 @@ const OptimisticL2TxnBatches = () => {
return (
<>
<PageTitle title={ `Tx batches (L2${ nbsp }blocks)` } withTextAd/>
<PageTitle title="Txn batches" withTextAd/>
<DataListDisplay
isError={ isError }
items={ data?.items }
emptyText="There are no tx batches."
emptyText="There are no txn batches."
content={ content }
actionBar={ actionBar }
/>
......
ui/pages/ZkEvmL2TxnBatch.tsx
View file @ 6095da71
......@@ -59,7 +59,7 @@ const ZkEvmL2TxnBatch = () => {
}
return {
label: 'Back to tx batches list',
label: 'Back to txn batches list',
url: appProps.referrer,
};
}, [ appProps.referrer ]);
......@@ -68,7 +68,7 @@ const ZkEvmL2TxnBatch = () => {
<>
<TextAd mb={ 6 }/>
<PageTitle
title={ `Tx batch #${ number }` }
title={ `Txn batch #${ number }` }
backLink={ backLink }
/>
{ batchQuery.isPlaceholderData ? <TabsSkeleton tabs={ tabs }/> : (
......
ui/pages/ZkEvmL2TxnBatches.tsx
View file @ 6095da71
......@@ -59,7 +59,7 @@ const ZkEvmL2TxnBatches = () => {
return (
<Skeleton isLoaded={ !countersQuery.isPlaceholderData && !isPlaceholderData } display="flex" flexWrap="wrap">
Tx batch
Txn batch
<Text fontWeight={ 600 } whiteSpace="pre"> #{ data.items[0].number } </Text>to
<Text fontWeight={ 600 } whiteSpace="pre"> #{ data.items[data.items.length - 1].number } </Text>
(total of { countersQuery.data?.toLocaleString() } batches)
......@@ -71,11 +71,11 @@ const ZkEvmL2TxnBatches = () => {
return (
<>
<PageTitle title="Tx batches" withTextAd/>
<PageTitle title="Txn batches" withTextAd/>
<DataListDisplay
isError={ isError }
items={ data?.items }
emptyText="There are no tx batches."
emptyText="There are no txn batches."
content={ content }
actionBar={ actionBar }
/>
......
ui/pages/ZkSyncL2TxnBatch.tsx
View file @ 6095da71
......@@ -80,7 +80,7 @@ const ZkSyncL2TxnBatch = () => {
}
return {
label: 'Back to tx batches list',
label: 'Back to txn batches list',
url: appProps.referrer,
};
}, [ appProps.referrer ]);
......@@ -89,7 +89,7 @@ const ZkSyncL2TxnBatch = () => {
<>
<TextAd mb={ 6 }/>
<PageTitle
title={ `Tx batch #${ number }` }
title={ `Txn batch #${ number }` }
backLink={ backLink }
/>
{ batchQuery.isPlaceholderData ?
......
ui/pages/ZkSyncL2TxnBatches.tsx
View file @ 6095da71
......@@ -59,7 +59,7 @@ const ZkSyncL2TxnBatches = () => {
return (
<Skeleton isLoaded={ !countersQuery.isPlaceholderData && !isPlaceholderData } display="flex" flexWrap="wrap">
Tx batch
Txn batch
<Text fontWeight={ 600 } whiteSpace="pre"> #{ data.items[0].number } </Text>to
<Text fontWeight={ 600 } whiteSpace="pre"> #{ data.items[data.items.length - 1].number } </Text>
(total of { countersQuery.data?.toLocaleString() } batches)
......@@ -71,11 +71,11 @@ const ZkSyncL2TxnBatches = () => {
return (
<>
<PageTitle title="Tx batches" withTextAd/>
<PageTitle title="Txn batches" withTextAd/>
<DataListDisplay
isError={ isError }
items={ data?.items }
emptyText="There are no tx batches."
emptyText="There are no txn batches."
content={ content }
actionBar={ actionBar }
/>
......
ui/tx/details/TxInfo.tsx
View file @ 6095da71
......@@ -306,7 +306,7 @@ const TxInfo = ({ data, isLoading, socketStatus }: Props) => {
hint="Batch index for this transaction"
isLoading={ isLoading }
>
Tx batch
Txn batch
</DetailsInfoItem.Label>
<DetailsInfoItem.Value>
<BatchEntityL2
......
ui/txnBatches/arbitrumL2/ArbitrumL2TxnBatchDetails.tsx
View file @ 6095da71
......@@ -77,7 +77,7 @@ const ArbitrumL2TxnBatchDetails = ({ query }: Props) => {
isLoading={ isPlaceholderData }
hint="Batch number indicates the length of batches produced by grouping L2 blocks to be proven on L1"
>
Tx batch number
Txn batch number
</DetailsInfoItem.Label>
<DetailsInfoItem.Value>
<Skeleton isLoaded={ !isPlaceholderData }>
......@@ -86,8 +86,8 @@ const ArbitrumL2TxnBatchDetails = ({ query }: Props) => {
<PrevNext
ml={ 6 }
onClick={ handlePrevNextClick }
prevLabel="View previous tx batch"
nextLabel="View next tx batch"
prevLabel="View previous txn batch"
nextLabel="View next txn batch"
isPrevDisabled={ data.number === 0 }
isLoading={ isPlaceholderData }
/>
......
ui/txnBatches/optimisticL2/OptimisticL2TxnBatchBlobCelestia.tsx
View file @ 6095da71
......@@ -47,7 +47,7 @@ const OptimisticL2TxnBatchBlobCelestia = ({ blobs, isLoading }: Props) => {
<Icon as={ celeniumIcon } boxSize={ 5 }/>
<LinkExternal href={ getCeleniumUrl(blob) }>Blob page</LinkExternal>
</GridItem>
<GridItem fontWeight={ 600 }>Hight</GridItem>
<GridItem fontWeight={ 600 }>Height</GridItem>
<GridItem colSpan={ 2 }>
{ blob.height }
</GridItem>
......
ui/txnBatches/optimisticL2/OptimisticL2TxnBatchDetails.tsx
View file @ 6095da71
......@@ -75,8 +75,8 @@ const OptimisticL2TxnBatchDetails = ({ query }: Props) => {
<PrevNext
ml={ 6 }
onClick={ handlePrevNextClick }
prevLabel="View previous tx batch"
nextLabel="View next tx batch"
prevLabel="View previous txn batch"
nextLabel="View next txn batch"
isPrevDisabled={ data.internal_id === 0 }
isLoading={ isPlaceholderData }
/>
......
ui/txnBatches/optimisticL2/OptimisticL2TxnBatchesListItem.tsx
View file @ 6095da71
......@@ -68,7 +68,7 @@ const OptimisticL2TxnBatchesListItem = ({ item, isLoading }: Props) => {
</LinkInternal>
</ListItemMobileGrid.Value>
<ListItemMobileGrid.Label isLoading={ isLoading }>L2 blocks</ListItemMobileGrid.Label>
<ListItemMobileGrid.Label isLoading={ isLoading }>Txn</ListItemMobileGrid.Label>
<ListItemMobileGrid.Value>
<LinkInternal
href={ route({ pathname: '/batches/[number]', query: { number: item.internal_id.toString(), tab: 'txs' } }) }
......
ui/txnBatches/zkEvmL2/ZkEvmL2TxnBatchDetails.tsx
View file @ 6095da71
......@@ -64,7 +64,7 @@ const ZkEvmL2TxnBatchDetails = ({ query }: Props) => {
<DetailsInfoItem.Label
isLoading={ isPlaceholderData }
>
Tx batch number
Txn batch number
</DetailsInfoItem.Label>
<DetailsInfoItem.Value>
<Skeleton isLoaded={ !isPlaceholderData }>
......@@ -73,8 +73,8 @@ const ZkEvmL2TxnBatchDetails = ({ query }: Props) => {
<PrevNext
ml={ 6 }
onClick={ handlePrevNextClick }
prevLabel="View previous tx batch"
nextLabel="View next tx batch"
prevLabel="View previous txn batch"
nextLabel="View next txn batch"
isPrevDisabled={ data.number === 0 }
isLoading={ isPlaceholderData }
/>
......
ui/txnBatches/zkSyncL2/ZkSyncL2TxnBatchDetails.tsx
View file @ 6095da71
......@@ -80,7 +80,7 @@ const ZkSyncL2TxnBatchDetails = ({ query }: Props) => {
hint="Batch number indicates the length of batches produced by grouping L2 blocks to be proven on Ethereum."
isLoading={ isPlaceholderData }
>
Tx batch number
Txn batch number
</DetailsInfoItem.Label>
<DetailsInfoItem.Value>
<Skeleton isLoaded={ !isPlaceholderData }>
......@@ -89,8 +89,8 @@ const ZkSyncL2TxnBatchDetails = ({ query }: Props) => {
<PrevNext
ml={ 6 }
onClick={ handlePrevNextClick }
prevLabel="View previous tx batch"
nextLabel="View next tx batch"
prevLabel="View previous txn batch"
nextLabel="View next txn batch"
isPrevDisabled={ data.number === 0 }
isLoading={ isPlaceholderData }
/>
......
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