Use raw blocks in table instead of conversion from date

WRadoslaw · Nov 3, 2023 · 9fe22c2 · 9fe22c2
1 parent d7adf7c
commit 9fe22c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/packages/atlas/src/components/TablePaymentsHistory/TablePaymentsHistory.tsx b/packages/atlas/src/components/TablePaymentsHistory/TablePaymentsHistory.tsx
@@ -9,7 +9,6 @@ import { Text } from '@/components/Text'
 import { TextButton } from '@/components/_buttons/Button'
 import { DialogModal } from '@/components/_overlays/DialogModal'
 import { absoluteRoutes } from '@/config/routes'
-import { useBlockTimeEstimation } from '@/hooks/useBlockTimeEstimation'
 import { getMemberAvatar } from '@/providers/assets/assets.helpers'
 import { SentryLogger } from '@/utils/logs'
 import { shortenString } from '@/utils/misc'
@@ -54,7 +53,7 @@ export const TablePaymentsHistory: FC<TablePaymentsHistoryProps> = ({ data, isLo
   const mappedData: TableProps['data'] = useMemo(
     () =>
       data.map((data) => ({
-        date: <Date date={data.date} />,
+        date: <Date date={data.date} block={data.block} />,
         type: <Type type={data.type} />,
         amount: <TokenAmount tokenAmount={data.amount} />,
         sender: <Sender sender={data.sender} />,
@@ -145,15 +144,14 @@ const Sender = ({ sender }: { sender: PaymentHistory['sender'] }) => {
   }
 }
 
-const Date = ({ date }: { date: Date }) => {
-  const { convertMsTimestampToBlock } = useBlockTimeEstimation()
+const Date = ({ date, block }: { date: Date; block: number }) => {
   return (
     <>
       <Text as="p" variant="t200-strong">
         {formatDateTime(date)}
       </Text>
       <Text as="p" variant="t100" margin={{ top: 1 }} color="colorText">
-        {formatNumber(convertMsTimestampToBlock(date.getTime()) || 0)} block
+        {formatNumber(block || 0)} block
       </Text>
     </>
   )

diff --git a/...s/atlas/src/views/studio/MyPaymentsView/PaymentsTransactions/PaymentTransactions.utils.ts b/...s/atlas/src/views/studio/MyPaymentsView/PaymentsTransactions/PaymentTransactions.utils.ts
@@ -108,7 +108,7 @@ export const mapEventToPaymentHistory =
     const eventData = { ...event.data, nftPlatformFeePercentage }
     return {
       type: getType(eventData),
-      block: inBlock + 1,
+      block: inBlock,
       amount: getAmount(eventData),
       date: new Date(timestamp),
       description: getDescription(eventData) || '-',