From 1aeac463d5883d0cf0356fc8a5ff7ba3f0114943 Mon Sep 17 00:00:00 2001
From: isstuev <isstuev@gmail.com>
Date: Mon, 2 Dec 2024 09:49:58 +0100
Subject: [PATCH] review fix

---
 ui/tx/details/TxInfo.tsx           | 133 +------------------------
 ui/tx/details/TxInfoScrollFees.tsx | 151 +++++++++++++++++++++++++++++
 2 files changed, 154 insertions(+), 130 deletions(-)
 create mode 100644 ui/tx/details/TxInfoScrollFees.tsx

diff --git a/ui/tx/details/TxInfo.tsx b/ui/tx/details/TxInfo.tsx
index b207d7121a..af430c281e 100644
--- a/ui/tx/details/TxInfo.tsx
+++ b/ui/tx/details/TxInfo.tsx
@@ -64,6 +64,8 @@ import TxAllowedPeekers from 'ui/tx/TxAllowedPeekers';
 import TxSocketAlert from 'ui/tx/TxSocketAlert';
 import ZkSyncL2TxnBatchHashesInfo from 'ui/txnBatches/zkSyncL2/ZkSyncL2TxnBatchHashesInfo';
 
+import TxInfoScrollFees from './TxInfoScrollFees';
+
 const rollupFeature = config.features.rollup;
 
 interface Props {
@@ -789,136 +791,7 @@ const TxInfo = ({ data, isLoading, socketStatus }: Props) => {
           ) }
         </>
       ) }
-
-      { data.scroll?.l1_fee !== undefined && (
-        <>
-          <DetailsInfoItem.Label
-
-            hint="L1 fee that pays for rollup costs."
-            isLoading={ isLoading }
-          >
-            L1 data fee
-          </DetailsInfoItem.Label>
-          <DetailsInfoItem.Value>
-            <CurrencyValue
-              value={ data.scroll?.l1_fee }
-              currency={ currencyUnits.ether }
-              exchangeRate={ data.exchange_rate }
-              flexWrap="wrap"
-            />
-          </DetailsInfoItem.Value>
-        </>
-      ) }
-
-      { data.scroll?.l2_fee !== undefined && (
-        <>
-          <DetailsInfoItem.Label
-            hint="L2 execution fee"
-            isLoading={ isLoading }
-          >
-            Execution fee
-          </DetailsInfoItem.Label>
-          <DetailsInfoItem.Value>
-            <CurrencyValue
-              value={ data.scroll?.l2_fee.value }
-              currency={ currencyUnits.ether }
-              exchangeRate={ data.exchange_rate }
-              flexWrap="wrap"
-            />
-          </DetailsInfoItem.Value>
-        </>
-      ) }
-
-      { data.scroll?.l1_fee_commit_scalar !== undefined && (
-        <>
-          <DetailsInfoItem.Label
-            hint="Commitment scalar"
-            isLoading={ isLoading }
-          >
-            L1 commit scalar
-          </DetailsInfoItem.Label>
-          <DetailsInfoItem.Value>
-            <CurrencyValue
-              value={ data.scroll?.l1_fee_commit_scalar }
-              currency={ currencyUnits.ether }
-              exchangeRate={ data.exchange_rate }
-              flexWrap="wrap"
-            />
-          </DetailsInfoItem.Value>
-        </>
-      ) }
-
-      { data.scroll?.l1_fee_overhead !== undefined && (
-        <>
-          <DetailsInfoItem.Label
-            hint="Additional gas overhead of a data commitment transaction"
-            isLoading={ isLoading }
-          >
-            L1 Fee Overhead
-          </DetailsInfoItem.Label>
-          <DetailsInfoItem.Value>
-            <Skeleton isLoaded={ !isLoading }>
-              <CurrencyValue
-                value={ data.scroll?.l1_fee_overhead }
-                currency={ currencyUnits.ether }
-                exchangeRate={ data.exchange_rate }
-                flexWrap="wrap"
-              />
-            </Skeleton>
-          </DetailsInfoItem.Value>
-        </>
-      ) }
-      { (data.scroll?.l1_base_fee !== undefined || data.scroll?.l1_fee_scalar !== undefined) && (
-        <>
-          <DetailsInfoItem.Label
-            hint="L1 gas fees"
-            isLoading={ isLoading }
-          >
-            L1 gas fees
-          </DetailsInfoItem.Label>
-          <DetailsInfoItem.Value>
-            { data.scroll?.l1_base_fee !== undefined && (
-              <Skeleton isLoaded={ !isLoading }>
-                <Text as="span" fontWeight="500">Base: </Text>
-                <Text fontWeight="600" as="span">{ BigNumber(data.scroll?.l1_base_fee || 0).dividedBy(WEI_IN_GWEI).toFixed() }</Text>
-              </Skeleton>
-            ) }
-            { data.scroll?.l1_fee_scalar !== undefined && (
-              <Skeleton isLoaded={ !isLoading }>
-                <TextSeparator/>
-                <Text as="span" fontWeight="500">Scalar: </Text>
-                <Text fontWeight="600" as="span">{ BigNumber(data.scroll?.l1_fee_scalar || 0).dividedBy(WEI_IN_GWEI).toFixed() }</Text>
-              </Skeleton>
-            ) }
-          </DetailsInfoItem.Value>
-        </>
-      ) }
-
-      { (data.scroll?.l1_blob_base_fee !== undefined || data.scroll?.l1_fee_blob_scalar !== undefined) && (
-        <>
-          <DetailsInfoItem.Label
-            hint="L1 blob fees"
-            isLoading={ isLoading }
-          >
-            L1 blob fees
-          </DetailsInfoItem.Label>
-          <DetailsInfoItem.Value>
-            { data.scroll?.l1_blob_base_fee !== undefined && (
-              <Skeleton isLoaded={ !isLoading }>
-                <Text as="span" fontWeight="500">Base: </Text>
-                <Text fontWeight="600" as="span">{ BigNumber(data.scroll?.l1_blob_base_fee || 0).dividedBy(WEI_IN_GWEI).toFixed() }</Text>
-              </Skeleton>
-            ) }
-            { data.scroll?.l1_fee_blob_scalar !== undefined && (
-              <Skeleton isLoaded={ !isLoading }>
-                <TextSeparator/>
-                <Text as="span" fontWeight="500">Scalar: </Text>
-                <Text fontWeight="600" as="span">{ BigNumber(data.scroll?.l1_fee_blob_scalar || 0).dividedBy(WEI_IN_GWEI).toFixed() }</Text>
-              </Skeleton>
-            ) }
-          </DetailsInfoItem.Value>
-        </>
-      ) }
+      <TxInfoScrollFees data={ data } isLoading={ isLoading }/>
 
       <GridItem colSpan={{ base: undefined, lg: 2 }}>
         <Element name="TxInfo__cutLink">
diff --git a/ui/tx/details/TxInfoScrollFees.tsx b/ui/tx/details/TxInfoScrollFees.tsx
new file mode 100644
index 0000000000..72e7c864d6
--- /dev/null
+++ b/ui/tx/details/TxInfoScrollFees.tsx
@@ -0,0 +1,151 @@
+import { Skeleton, Text } from '@chakra-ui/react';
+import BigNumber from 'bignumber.js';
+import React from 'react';
+
+import type { Transaction } from 'types/api/transaction';
+
+import { WEI_IN_GWEI } from 'lib/consts';
+import { currencyUnits } from 'lib/units';
+import CurrencyValue from 'ui/shared/CurrencyValue';
+import * as DetailsInfoItem from 'ui/shared/DetailsInfoItem';
+import TextSeparator from 'ui/shared/TextSeparator';
+
+type Props = {
+  data: Transaction;
+  isLoading: boolean;
+};
+
+export const TxInfoScrollFees = ({ data, isLoading }: Props) => {
+  return (
+    <>
+      { data.scroll?.l1_fee !== undefined && (
+        <>
+          <DetailsInfoItem.Label
+
+            hint="L1 fee that pays for rollup costs."
+            isLoading={ isLoading }
+          >
+            L1 data fee
+          </DetailsInfoItem.Label>
+          <DetailsInfoItem.Value>
+            <CurrencyValue
+              value={ data.scroll?.l1_fee }
+              currency={ currencyUnits.ether }
+              exchangeRate={ data.exchange_rate }
+              flexWrap="wrap"
+            />
+          </DetailsInfoItem.Value>
+        </>
+      ) }
+
+      { data.scroll?.l2_fee !== undefined && (
+        <>
+          <DetailsInfoItem.Label
+            hint="L2 execution fee"
+            isLoading={ isLoading }
+          >
+            Execution fee
+          </DetailsInfoItem.Label>
+          <DetailsInfoItem.Value>
+            <CurrencyValue
+              value={ data.scroll?.l2_fee.value }
+              currency={ currencyUnits.ether }
+              exchangeRate={ data.exchange_rate }
+              flexWrap="wrap"
+            />
+          </DetailsInfoItem.Value>
+        </>
+      ) }
+
+      { data.scroll?.l1_fee_commit_scalar !== undefined && (
+        <>
+          <DetailsInfoItem.Label
+            hint="Commitment scalar"
+            isLoading={ isLoading }
+          >
+            L1 commit scalar
+          </DetailsInfoItem.Label>
+          <DetailsInfoItem.Value>
+            <CurrencyValue
+              value={ data.scroll?.l1_fee_commit_scalar }
+              currency={ currencyUnits.ether }
+              exchangeRate={ data.exchange_rate }
+              flexWrap="wrap"
+            />
+          </DetailsInfoItem.Value>
+        </>
+      ) }
+
+      { data.scroll?.l1_fee_overhead !== undefined && (
+        <>
+          <DetailsInfoItem.Label
+            hint="Additional gas overhead of a data commitment transaction"
+            isLoading={ isLoading }
+          >
+            L1 Fee Overhead
+          </DetailsInfoItem.Label>
+          <DetailsInfoItem.Value>
+            <Skeleton isLoaded={ !isLoading }>
+              <CurrencyValue
+                value={ data.scroll?.l1_fee_overhead }
+                currency={ currencyUnits.ether }
+                exchangeRate={ data.exchange_rate }
+                flexWrap="wrap"
+              />
+            </Skeleton>
+          </DetailsInfoItem.Value>
+        </>
+      ) }
+      { (data.scroll?.l1_base_fee !== undefined || data.scroll?.l1_fee_scalar !== undefined) && (
+        <>
+          <DetailsInfoItem.Label
+            hint="L1 gas fees"
+            isLoading={ isLoading }
+          >
+            L1 gas fees
+          </DetailsInfoItem.Label>
+          <DetailsInfoItem.Value>
+            { data.scroll?.l1_base_fee !== undefined && (
+              <Skeleton isLoaded={ !isLoading }>
+                <Text as="span" fontWeight="500">Base: </Text>
+                <Text fontWeight="600" as="span">{ BigNumber(data.scroll?.l1_base_fee || 0).dividedBy(WEI_IN_GWEI).toFixed() }</Text>
+              </Skeleton>
+            ) }
+            { data.scroll?.l1_fee_scalar !== undefined && (
+              <Skeleton isLoaded={ !isLoading }>
+                <TextSeparator/>
+                <Text as="span" fontWeight="500">Scalar: </Text>
+                <Text fontWeight="600" as="span">{ BigNumber(data.scroll?.l1_fee_scalar || 0).dividedBy(WEI_IN_GWEI).toFixed() }</Text>
+              </Skeleton>
+            ) }
+          </DetailsInfoItem.Value>
+        </>
+      ) }
+      { (data.scroll?.l1_blob_base_fee !== undefined || data.scroll?.l1_fee_blob_scalar !== undefined) && (
+        <>
+          <DetailsInfoItem.Label
+            hint="L1 blob fees"
+            isLoading={ isLoading }
+          >
+            L1 blob fees
+          </DetailsInfoItem.Label>
+          <DetailsInfoItem.Value>
+            { data.scroll?.l1_blob_base_fee !== undefined && (
+              <Skeleton isLoaded={ !isLoading }>
+                <Text as="span" fontWeight="500">Base: </Text>
+                <Text fontWeight="600" as="span">{ BigNumber(data.scroll?.l1_blob_base_fee || 0).dividedBy(WEI_IN_GWEI).toFixed() }</Text>
+              </Skeleton>
+            ) }
+            { data.scroll?.l1_fee_blob_scalar !== undefined && (
+              <Skeleton isLoaded={ !isLoading }>
+                <TextSeparator/>
+                <Text as="span" fontWeight="500">Scalar: </Text>
+                <Text fontWeight="600" as="span">{ BigNumber(data.scroll?.l1_fee_blob_scalar || 0).dividedBy(WEI_IN_GWEI).toFixed() }</Text>
+              </Skeleton>
+            ) }
+          </DetailsInfoItem.Value>
+        </>
+      ) }
+    </>
+  );
+};