diff --git a/lib/api/resources.ts b/lib/api/resources.ts index ee7fb7c1bd..0af00fc438 100644 --- a/lib/api/resources.ts +++ b/lib/api/resources.ts @@ -59,7 +59,7 @@ import type { TTxsFilters } from 'types/api/txsFilters'; import type { TxStateChanges } from 'types/api/txStateChanges'; import type { VisualizedContract } from 'types/api/visualization'; import type { WithdrawalsResponse, WithdrawalsCounters } from 'types/api/withdrawals'; -import type { ZkEvmL2TxnBatch, ZkEvmL2TxnBatchesItem, ZkEvmL2TxnBatchesResponse } from 'types/api/zkEvml2TxnBatches'; +import type { ZkEvmL2TxnBatch, ZkEvmL2TxnBatchesItem, ZkEvmL2TxnBatchesResponse, ZkEvmL2TxnBatchTxs } from 'types/api/zkEvml2TxnBatches'; import type { ArrayElement } from 'types/utils'; import config from 'configs/app'; @@ -506,6 +506,7 @@ export const RESOURCES = { zkevm_l2_txn_batch_txs: { path: 'api/v2/transactions/zkevm-batch/:number', pathParams: [ 'number' as const ], + filterFields: [], }, // CONFIGS @@ -671,7 +672,7 @@ Q extends 'l2_txn_batches_count' ? number : Q extends 'zkevm_l2_txn_batches' ? ZkEvmL2TxnBatchesResponse : Q extends 'zkevm_l2_txn_batches_count' ? number : Q extends 'zkevm_l2_txn_batch' ? ZkEvmL2TxnBatch : -Q extends 'zkevm_l2_txn_batch_txs' ? { items: Array } : +Q extends 'zkevm_l2_txn_batch_txs' ? ZkEvmL2TxnBatchTxs : Q extends 'config_backend_version' ? BackendVersionConfig : never; /* eslint-enable @typescript-eslint/indent */ diff --git a/playwright/utils/configs.ts b/playwright/utils/configs.ts index 8f2b9a05ac..e8a295803a 100644 --- a/playwright/utils/configs.ts +++ b/playwright/utils/configs.ts @@ -28,6 +28,7 @@ export const featureEnvs = { name: 'NEXT_PUBLIC_BRIDGED_TOKENS_BRIDGES', value: '[{"type":"omni","title":"OmniBridge","short_title":"OMNI"},{"type":"amb","title":"Arbitrary Message Bridge","short_title":"AMB"}]', }, + ], zkRollup: [ { name: 'NEXT_PUBLIC_IS_ZKEVM_L2_NETWORK', value: 'true' }, { name: 'NEXT_PUBLIC_L1_BASE_URL', value: 'https://localhost:3101' }, diff --git a/types/api/zkEvml2TxnBatches.ts b/types/api/zkEvml2TxnBatches.ts index 1482fd8683..ae32f5fc16 100644 --- a/types/api/zkEvml2TxnBatches.ts +++ b/types/api/zkEvml2TxnBatches.ts @@ -1,3 +1,5 @@ +import type { Transaction } from './transaction'; + export type ZkEvmL2TxnBatchesItem = { number: number; verify_tx_hash: string | null; @@ -28,3 +30,9 @@ export type ZkEvmL2TxnBatch = { transactions: Array; verify_tx_hash: string; } + +export type ZkEvmL2TxnBatchTxs = { + items: Array; + // API responce doesn't have next_page_params option, but we need to add it to the type for consistency + next_page_params: null; +} diff --git a/ui/pages/ZkEvmL2TxnBatch.tsx b/ui/pages/ZkEvmL2TxnBatch.tsx index 03183da813..a3ef471f56 100644 --- a/ui/pages/ZkEvmL2TxnBatch.tsx +++ b/ui/pages/ZkEvmL2TxnBatch.tsx @@ -37,7 +37,7 @@ const ZkEvmL2TxnBatch = () => { options: { enabled: Boolean(!batchQuery.isPlaceholderData && batchQuery.data?.number && tab === 'txs'), // there is no pagination in zkevm_l2_txn_batch_txs - placeholderData: generateListStub<'block_txs'>(TX_ZKEVM_L2, 50, { next_page_params: null }), + placeholderData: generateListStub<'zkevm_l2_txn_batch_txs'>(TX_ZKEVM_L2, 50, { next_page_params: null }), }, }); diff --git a/ui/pages/__screenshots__/Token.pw.tsx_default_bridged-token-1.png b/ui/pages/__screenshots__/Token.pw.tsx_default_bridged-token-1.png index c65a292d52..6a5ec3c730 100644 Binary files a/ui/pages/__screenshots__/Token.pw.tsx_default_bridged-token-1.png and b/ui/pages/__screenshots__/Token.pw.tsx_default_bridged-token-1.png differ diff --git a/ui/pages/__screenshots__/Token.pw.tsx_default_mobile-with-verified-info-1.png b/ui/pages/__screenshots__/Token.pw.tsx_default_mobile-with-verified-info-1.png index f12a0c52de..f7e74f6a9a 100644 Binary files a/ui/pages/__screenshots__/Token.pw.tsx_default_mobile-with-verified-info-1.png and b/ui/pages/__screenshots__/Token.pw.tsx_default_mobile-with-verified-info-1.png differ diff --git a/ui/pages/__screenshots__/Token.pw.tsx_default_with-verified-info-1.png b/ui/pages/__screenshots__/Token.pw.tsx_default_with-verified-info-1.png index 32e8e0c8d3..67ba782277 100644 Binary files a/ui/pages/__screenshots__/Token.pw.tsx_default_with-verified-info-1.png and b/ui/pages/__screenshots__/Token.pw.tsx_default_with-verified-info-1.png differ diff --git a/ui/tx/TxDetails.tsx b/ui/tx/TxDetails.tsx index 03d8c1f68b..6eec0407d4 100644 --- a/ui/tx/TxDetails.tsx +++ b/ui/tx/TxDetails.tsx @@ -19,6 +19,8 @@ import { scroller, Element } from 'react-scroll'; import { ZKEVM_L2_TX_STATUSES } from 'types/api/transaction'; +import { route } from 'nextjs-routes'; + import config from 'configs/app'; import clockIcon from 'icons/clock.svg'; import flameIcon from 'icons/flame.svg'; @@ -333,7 +335,7 @@ const TxDetails = () => { ) } - { (data.zkevm_batch_number || data.zkevm_verify_hash) && divider } + { (data.zkevm_batch_number || data.zkevm_verify_hash) && }