Merge pull request #1680 from blockscout/tom2drum/issue-1674

Handle undefined timestamp for zkEVM batch
blockscout · Mar 7, 2024 · d423fb8 · d423fb8
2 parents a5a4211 + b3f5a0b
commit d423fb8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/types/api/zkEvmL2.ts b/types/api/zkEvmL2.ts
@@ -5,7 +5,7 @@ export type ZkEvmL2TxnBatchesItem = {
   verify_tx_hash: string | null;
   sequence_tx_hash: string | null;
   status: string;
-  timestamp: string;
+  timestamp: string | null;
   tx_count: number;
 }
 
@@ -26,7 +26,7 @@ export type ZkEvmL2TxnBatch = {
   sequence_tx_hash: string;
   state_root: string;
   status: typeof ZKEVM_L2_TX_BATCH_STATUSES[number];
-  timestamp: string;
+  timestamp: string | null;
   transactions: Array<string>;
   verify_tx_hash: string;
 }

diff --git a/ui/txnBatches/zkEvmL2/ZkEvmL2TxnBatchDetails.tsx b/ui/txnBatches/zkEvmL2/ZkEvmL2TxnBatchDetails.tsx
@@ -86,7 +86,7 @@ const ZkEvmL2TxnBatchDetails = ({ query }: Props) => {
         title="Timestamp"
         isLoading={ isPlaceholderData }
       >
-        <DetailsTimestamp timestamp={ data.timestamp } isLoading={ isPlaceholderData }/>
+        { data.timestamp ? <DetailsTimestamp timestamp={ data.timestamp } isLoading={ isPlaceholderData }/> : 'Undefined' }
       </DetailsInfoItem>
       <DetailsInfoItem
         title="Verify tx hash"
@@ -98,7 +98,7 @@ const ZkEvmL2TxnBatchDetails = ({ query }: Props) => {
             hash={ data.verify_tx_hash }
             maxW="100%"
           />
-        ) : <Text>pending</Text> }
+        ) : <Text>Pending</Text> }
       </DetailsInfoItem>
       <DetailsInfoItem
         title="Transactions"

diff --git a/ui/txnBatches/zkEvmL2/ZkEvmTxnBatchesListItem.tsx b/ui/txnBatches/zkEvmL2/ZkEvmTxnBatchesListItem.tsx
@@ -18,7 +18,7 @@ const rollupFeature = config.features.rollup;
 type Props = { item: ZkEvmL2TxnBatchesItem; isLoading?: boolean };
 
 const ZkEvmTxnBatchesListItem = ({ item, isLoading }: Props) => {
-  const timeAgo = dayjs(item.timestamp).fromNow();
+  const timeAgo = item.timestamp ? dayjs(item.timestamp).fromNow() : 'Undefined';
 
   if (!rollupFeature.isEnabled || rollupFeature.type !== 'zkEvm') {
     return null;

diff --git a/ui/txnBatches/zkEvmL2/ZkEvmTxnBatchesTableItem.tsx b/ui/txnBatches/zkEvmL2/ZkEvmTxnBatchesTableItem.tsx
@@ -17,7 +17,7 @@ const rollupFeature = config.features.rollup;
 type Props = { item: ZkEvmL2TxnBatchesItem; isLoading?: boolean };
 
 const TxnBatchesTableItem = ({ item, isLoading }: Props) => {
-  const timeAgo = dayjs(item.timestamp).fromNow();
+  const timeAgo = item.timestamp ? dayjs(item.timestamp).fromNow() : 'Undefined';
 
   if (!rollupFeature.isEnabled || rollupFeature.type !== 'zkEvm') {
     return null;