diff --git a/lib/metadata/templates/title.ts b/lib/metadata/templates/title.ts index 9d7c20bb27..b026975bc0 100644 --- a/lib/metadata/templates/title.ts +++ b/lib/metadata/templates/title.ts @@ -40,8 +40,8 @@ const TEMPLATE_MAP: Record = { '/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%', diff --git a/lib/mixpanel/getPageType.ts b/lib/mixpanel/getPageType.ts index e46c155f41..8570aa1ac7 100644 --- a/lib/mixpanel/getPageType.ts +++ b/lib/mixpanel/getPageType.ts @@ -38,8 +38,8 @@ export const PAGE_TYPE_DICT: Record = { '/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', diff --git a/ui/pages/ArbitrumL2TxnBatch.tsx b/ui/pages/ArbitrumL2TxnBatch.tsx index 617a9ba95b..6684df430f 100644 --- a/ui/pages/ArbitrumL2TxnBatch.tsx +++ b/ui/pages/ArbitrumL2TxnBatch.tsx @@ -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 = () => { <> { batchQuery.isPlaceholderData ? diff --git a/ui/pages/ArbitrumL2TxnBatches.tsx b/ui/pages/ArbitrumL2TxnBatches.tsx index fe813dbc53..42e9785d5e 100644 --- a/ui/pages/ArbitrumL2TxnBatches.tsx +++ b/ui/pages/ArbitrumL2TxnBatches.tsx @@ -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 ( - Tx batch (L2 block) + Txn batch #{ data.items[0].number } to #{ data.items[data.items.length - 1].number } (total of { countersQuery.data?.toLocaleString() } batches) @@ -72,11 +71,11 @@ const ArbitrumL2TxnBatches = () => { return ( <> - + diff --git a/ui/pages/OptimisticL2TxnBatch.tsx b/ui/pages/OptimisticL2TxnBatch.tsx index 2c6065896e..0fc369a716 100644 --- a/ui/pages/OptimisticL2TxnBatch.tsx +++ b/ui/pages/OptimisticL2TxnBatch.tsx @@ -106,7 +106,7 @@ const OptimisticL2TxnBatch = () => { } return { - label: 'Back to tx batches list', + label: 'Back to txn batches list', url: appProps.referrer, }; }, [ appProps.referrer ]); diff --git a/ui/pages/OptimisticL2TxnBatches.tsx b/ui/pages/OptimisticL2TxnBatches.tsx index fde77f6ad4..28820cf487 100644 --- a/ui/pages/OptimisticL2TxnBatches.tsx +++ b/ui/pages/OptimisticL2TxnBatches.tsx @@ -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 ( - Tx batch (L2 block) + Txn batch #{ data.items[0].internal_id } to #{ data.items[data.items.length - 1].internal_id } (total of { countersQuery.data?.toLocaleString() } batches) @@ -72,11 +71,11 @@ const OptimisticL2TxnBatches = () => { return ( <> - + diff --git a/ui/pages/ZkEvmL2TxnBatch.tsx b/ui/pages/ZkEvmL2TxnBatch.tsx index 48301dd891..2aebba8d91 100644 --- a/ui/pages/ZkEvmL2TxnBatch.tsx +++ b/ui/pages/ZkEvmL2TxnBatch.tsx @@ -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 = () => { <> { batchQuery.isPlaceholderData ? : ( diff --git a/ui/pages/ZkEvmL2TxnBatches.tsx b/ui/pages/ZkEvmL2TxnBatches.tsx index bbdf3f56e7..ab2b79d3e0 100644 --- a/ui/pages/ZkEvmL2TxnBatches.tsx +++ b/ui/pages/ZkEvmL2TxnBatches.tsx @@ -59,7 +59,7 @@ const ZkEvmL2TxnBatches = () => { return ( - Tx batch + Txn batch #{ data.items[0].number } to #{ data.items[data.items.length - 1].number } (total of { countersQuery.data?.toLocaleString() } batches) @@ -71,11 +71,11 @@ const ZkEvmL2TxnBatches = () => { return ( <> - + diff --git a/ui/pages/ZkSyncL2TxnBatch.tsx b/ui/pages/ZkSyncL2TxnBatch.tsx index de64ebd580..53021ad50a 100644 --- a/ui/pages/ZkSyncL2TxnBatch.tsx +++ b/ui/pages/ZkSyncL2TxnBatch.tsx @@ -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 = () => { <> { batchQuery.isPlaceholderData ? diff --git a/ui/pages/ZkSyncL2TxnBatches.tsx b/ui/pages/ZkSyncL2TxnBatches.tsx index f8a5d5c67a..bd0164fb50 100644 --- a/ui/pages/ZkSyncL2TxnBatches.tsx +++ b/ui/pages/ZkSyncL2TxnBatches.tsx @@ -59,7 +59,7 @@ const ZkSyncL2TxnBatches = () => { return ( - Tx batch + Txn batch #{ data.items[0].number } to #{ data.items[data.items.length - 1].number } (total of { countersQuery.data?.toLocaleString() } batches) @@ -71,11 +71,11 @@ const ZkSyncL2TxnBatches = () => { return ( <> - + diff --git a/ui/pages/__screenshots__/ArbitrumL2TxnBatch.pw.tsx_default_base-view-1.png b/ui/pages/__screenshots__/ArbitrumL2TxnBatch.pw.tsx_default_base-view-1.png index c28ffdd039..04b4f044a0 100644 Binary files a/ui/pages/__screenshots__/ArbitrumL2TxnBatch.pw.tsx_default_base-view-1.png and b/ui/pages/__screenshots__/ArbitrumL2TxnBatch.pw.tsx_default_base-view-1.png differ diff --git a/ui/pages/__screenshots__/ArbitrumL2TxnBatch.pw.tsx_default_mobile-base-view-1.png b/ui/pages/__screenshots__/ArbitrumL2TxnBatch.pw.tsx_default_mobile-base-view-1.png index 2d9f331c62..465e6c6bd2 100644 Binary files a/ui/pages/__screenshots__/ArbitrumL2TxnBatch.pw.tsx_default_mobile-base-view-1.png and b/ui/pages/__screenshots__/ArbitrumL2TxnBatch.pw.tsx_default_mobile-base-view-1.png differ diff --git a/ui/pages/__screenshots__/ArbitrumL2TxnBatch.pw.tsx_default_mobile-with-anytrust-DA-1.png b/ui/pages/__screenshots__/ArbitrumL2TxnBatch.pw.tsx_default_mobile-with-anytrust-DA-1.png index dd091c54ab..4da0be61d6 100644 Binary files a/ui/pages/__screenshots__/ArbitrumL2TxnBatch.pw.tsx_default_mobile-with-anytrust-DA-1.png and b/ui/pages/__screenshots__/ArbitrumL2TxnBatch.pw.tsx_default_mobile-with-anytrust-DA-1.png differ diff --git a/ui/pages/__screenshots__/ArbitrumL2TxnBatch.pw.tsx_default_with-anytrust-DA-1.png b/ui/pages/__screenshots__/ArbitrumL2TxnBatch.pw.tsx_default_with-anytrust-DA-1.png index fd9ce91cc3..3fe8b9ef84 100644 Binary files a/ui/pages/__screenshots__/ArbitrumL2TxnBatch.pw.tsx_default_with-anytrust-DA-1.png and b/ui/pages/__screenshots__/ArbitrumL2TxnBatch.pw.tsx_default_with-anytrust-DA-1.png differ diff --git a/ui/pages/__screenshots__/ArbitrumL2TxnBatches.pw.tsx_default_base-view-mobile-1.png b/ui/pages/__screenshots__/ArbitrumL2TxnBatches.pw.tsx_default_base-view-mobile-1.png index a3764dbb79..ba5c69d736 100644 Binary files a/ui/pages/__screenshots__/ArbitrumL2TxnBatches.pw.tsx_default_base-view-mobile-1.png and b/ui/pages/__screenshots__/ArbitrumL2TxnBatches.pw.tsx_default_base-view-mobile-1.png differ diff --git a/ui/pages/__screenshots__/ArbitrumL2TxnBatches.pw.tsx_mobile_base-view-mobile-1.png b/ui/pages/__screenshots__/ArbitrumL2TxnBatches.pw.tsx_mobile_base-view-mobile-1.png index c16e131b6c..c5695285f3 100644 Binary files a/ui/pages/__screenshots__/ArbitrumL2TxnBatches.pw.tsx_mobile_base-view-mobile-1.png and b/ui/pages/__screenshots__/ArbitrumL2TxnBatches.pw.tsx_mobile_base-view-mobile-1.png differ diff --git a/ui/pages/__screenshots__/OptimisticL2TxnBatches.pw.tsx_default_base-view-mobile-1.png b/ui/pages/__screenshots__/OptimisticL2TxnBatches.pw.tsx_default_base-view-mobile-1.png index 5381c92bac..3073c9a6a4 100644 Binary files a/ui/pages/__screenshots__/OptimisticL2TxnBatches.pw.tsx_default_base-view-mobile-1.png and b/ui/pages/__screenshots__/OptimisticL2TxnBatches.pw.tsx_default_base-view-mobile-1.png differ diff --git a/ui/pages/__screenshots__/OptimisticL2TxnBatches.pw.tsx_mobile_base-view-mobile-1.png b/ui/pages/__screenshots__/OptimisticL2TxnBatches.pw.tsx_mobile_base-view-mobile-1.png index c162c41362..476d50b696 100644 Binary files a/ui/pages/__screenshots__/OptimisticL2TxnBatches.pw.tsx_mobile_base-view-mobile-1.png and b/ui/pages/__screenshots__/OptimisticL2TxnBatches.pw.tsx_mobile_base-view-mobile-1.png differ diff --git a/ui/pages/__screenshots__/ZkEvmL2TxnBatch.pw.tsx_default_base-view-1.png b/ui/pages/__screenshots__/ZkEvmL2TxnBatch.pw.tsx_default_base-view-1.png index 8b4f2f7096..68b0d3c645 100644 Binary files a/ui/pages/__screenshots__/ZkEvmL2TxnBatch.pw.tsx_default_base-view-1.png and b/ui/pages/__screenshots__/ZkEvmL2TxnBatch.pw.tsx_default_base-view-1.png differ diff --git a/ui/pages/__screenshots__/ZkEvmL2TxnBatch.pw.tsx_default_mobile-base-view-1.png b/ui/pages/__screenshots__/ZkEvmL2TxnBatch.pw.tsx_default_mobile-base-view-1.png index 43c33a1a23..dc6f0df158 100644 Binary files a/ui/pages/__screenshots__/ZkEvmL2TxnBatch.pw.tsx_default_mobile-base-view-1.png and b/ui/pages/__screenshots__/ZkEvmL2TxnBatch.pw.tsx_default_mobile-base-view-1.png differ diff --git a/ui/pages/__screenshots__/ZkEvmL2TxnBatches.pw.tsx_default_base-view-mobile-1.png b/ui/pages/__screenshots__/ZkEvmL2TxnBatches.pw.tsx_default_base-view-mobile-1.png index 309206414b..f8d369dbf1 100644 Binary files a/ui/pages/__screenshots__/ZkEvmL2TxnBatches.pw.tsx_default_base-view-mobile-1.png and b/ui/pages/__screenshots__/ZkEvmL2TxnBatches.pw.tsx_default_base-view-mobile-1.png differ diff --git a/ui/pages/__screenshots__/ZkEvmL2TxnBatches.pw.tsx_mobile_base-view-mobile-1.png b/ui/pages/__screenshots__/ZkEvmL2TxnBatches.pw.tsx_mobile_base-view-mobile-1.png index 6631df508b..5c36df6f99 100644 Binary files a/ui/pages/__screenshots__/ZkEvmL2TxnBatches.pw.tsx_mobile_base-view-mobile-1.png and b/ui/pages/__screenshots__/ZkEvmL2TxnBatches.pw.tsx_mobile_base-view-mobile-1.png differ diff --git a/ui/pages/__screenshots__/ZkSyncL2TxnBatch.pw.tsx_default_base-view-1.png b/ui/pages/__screenshots__/ZkSyncL2TxnBatch.pw.tsx_default_base-view-1.png index 97495d63f8..9ec3fd8db4 100644 Binary files a/ui/pages/__screenshots__/ZkSyncL2TxnBatch.pw.tsx_default_base-view-1.png and b/ui/pages/__screenshots__/ZkSyncL2TxnBatch.pw.tsx_default_base-view-1.png differ diff --git a/ui/pages/__screenshots__/ZkSyncL2TxnBatch.pw.tsx_default_mobile-base-view-1.png b/ui/pages/__screenshots__/ZkSyncL2TxnBatch.pw.tsx_default_mobile-base-view-1.png index d46344e6fd..535de63dc0 100644 Binary files a/ui/pages/__screenshots__/ZkSyncL2TxnBatch.pw.tsx_default_mobile-base-view-1.png and b/ui/pages/__screenshots__/ZkSyncL2TxnBatch.pw.tsx_default_mobile-base-view-1.png differ diff --git a/ui/pages/__screenshots__/ZkSyncL2TxnBatches.pw.tsx_default_base-view-mobile-1.png b/ui/pages/__screenshots__/ZkSyncL2TxnBatches.pw.tsx_default_base-view-mobile-1.png index 585c859cbc..9f4765b7f3 100644 Binary files a/ui/pages/__screenshots__/ZkSyncL2TxnBatches.pw.tsx_default_base-view-mobile-1.png and b/ui/pages/__screenshots__/ZkSyncL2TxnBatches.pw.tsx_default_base-view-mobile-1.png differ diff --git a/ui/pages/__screenshots__/ZkSyncL2TxnBatches.pw.tsx_mobile_base-view-mobile-1.png b/ui/pages/__screenshots__/ZkSyncL2TxnBatches.pw.tsx_mobile_base-view-mobile-1.png index 486be5b14d..47b1c4ff09 100644 Binary files a/ui/pages/__screenshots__/ZkSyncL2TxnBatches.pw.tsx_mobile_base-view-mobile-1.png and b/ui/pages/__screenshots__/ZkSyncL2TxnBatches.pw.tsx_mobile_base-view-mobile-1.png differ diff --git a/ui/tx/details/TxInfo.tsx b/ui/tx/details/TxInfo.tsx index db2e14d08e..7dbabaf726 100644 --- a/ui/tx/details/TxInfo.tsx +++ b/ui/tx/details/TxInfo.tsx @@ -306,7 +306,7 @@ const TxInfo = ({ data, isLoading, socketStatus }: Props) => { hint="Batch index for this transaction" isLoading={ isLoading } > - Tx batch + Txn batch { 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 @@ -86,8 +86,8 @@ const ArbitrumL2TxnBatchDetails = ({ query }: Props) => { diff --git a/ui/txnBatches/optimisticL2/OptimisticL2TxnBatchBlobCelestia.tsx b/ui/txnBatches/optimisticL2/OptimisticL2TxnBatchBlobCelestia.tsx index 102160536b..5eb46361bf 100644 --- a/ui/txnBatches/optimisticL2/OptimisticL2TxnBatchBlobCelestia.tsx +++ b/ui/txnBatches/optimisticL2/OptimisticL2TxnBatchBlobCelestia.tsx @@ -47,7 +47,7 @@ const OptimisticL2TxnBatchBlobCelestia = ({ blobs, isLoading }: Props) => { Blob page - Hight + Height { blob.height } diff --git a/ui/txnBatches/optimisticL2/OptimisticL2TxnBatchDetails.tsx b/ui/txnBatches/optimisticL2/OptimisticL2TxnBatchDetails.tsx index bd28c75a2e..6d5120f5ac 100644 --- a/ui/txnBatches/optimisticL2/OptimisticL2TxnBatchDetails.tsx +++ b/ui/txnBatches/optimisticL2/OptimisticL2TxnBatchDetails.tsx @@ -75,8 +75,8 @@ const OptimisticL2TxnBatchDetails = ({ query }: Props) => { diff --git a/ui/txnBatches/optimisticL2/OptimisticL2TxnBatchesListItem.tsx b/ui/txnBatches/optimisticL2/OptimisticL2TxnBatchesListItem.tsx index 8c6ffcc654..8fe492e150 100644 --- a/ui/txnBatches/optimisticL2/OptimisticL2TxnBatchesListItem.tsx +++ b/ui/txnBatches/optimisticL2/OptimisticL2TxnBatchesListItem.tsx @@ -68,7 +68,7 @@ const OptimisticL2TxnBatchesListItem = ({ item, isLoading }: Props) => { - L2 blocks + Txn { - Tx batch number + Txn batch number @@ -73,8 +73,8 @@ const ZkEvmL2TxnBatchDetails = ({ query }: Props) => { diff --git a/ui/txnBatches/zkSyncL2/ZkSyncL2TxnBatchDetails.tsx b/ui/txnBatches/zkSyncL2/ZkSyncL2TxnBatchDetails.tsx index b51499834d..e17bcbc55a 100644 --- a/ui/txnBatches/zkSyncL2/ZkSyncL2TxnBatchDetails.tsx +++ b/ui/txnBatches/zkSyncL2/ZkSyncL2TxnBatchDetails.tsx @@ -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 @@ -89,8 +89,8 @@ const ZkSyncL2TxnBatchDetails = ({ query }: Props) => {