show timestamps in the local timezone (#212)

RegionX-Labs · Aug 10, 2024 · d2d5146 · d2d5146
1 parent 1660930
commit d2d5146
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 15 deletions.
diff --git a/src/components/Tables/PurchaseHistoryTable/index.tsx b/src/components/Tables/PurchaseHistoryTable/index.tsx
@@ -114,10 +114,7 @@ export const PurchaseHistoryTable = ({ data }: PurchaseHistoryTableProps) => {
                   </StyledTableCell>
                   <StyledTableCell align='center'>{type}</StyledTableCell>
                   <StyledTableCell align='center'>
-                    {timeAgo.format(
-                      new Date(timestamp).getTime(),
-                      'round-minute'
-                    )}
+                    {timeAgo.format(timestamp, 'round-minute')}
                   </StyledTableCell>
                 </StyledTableRow>
               )

diff --git a/src/components/Tables/TxHistoryTable/index.tsx b/src/components/Tables/TxHistoryTable/index.tsx
@@ -89,10 +89,7 @@ export const TxHistoryTable = ({ data }: TxHistoryTableProps) => {
                     )}
                   </StyledTableCell>
                   <StyledTableCell align='center'>
-                    {timeAgo.format(
-                      new Date(timestamp).getTime(),
-                      'round-minute'
-                    )}
+                    {timeAgo.format(timestamp, 'round-minute')}
                   </StyledTableCell>
                 </StyledTableRow>
               )

diff --git a/src/hooks/accountExtrinsics.ts b/src/hooks/accountExtrinsics.ts
@@ -56,7 +56,7 @@ export const useAccountExtrinsics = (
                   extrinsicId: item.id,
                   module: item.module,
                   call: item.call,
-                  timestamp: item.timestamp,
+                  timestamp: new Date(`${item.timestamp}Z`),
                   success: item.success,
                 } as AccountTxHistoryItem)
             )

diff --git a/src/hooks/sale/purchaseHistory.ts b/src/hooks/sale/purchaseHistory.ts
@@ -59,7 +59,7 @@ export const usePurchaseHistory = (
                   address: account,
                   core,
                   extrinsicId: `${height}-${extrinsicId}`,
-                  timestamp,
+                  timestamp: new Date(`${timestamp}Z`),
                   price: parseInt(price),
                   type: purchaseType,
                 } as PurchaseHistoryItem)

diff --git a/src/hooks/sale/saleDetails.ts b/src/hooks/sale/saleDetails.ts
@@ -54,7 +54,7 @@ export const useSaleDetails = (network: NetworkType, saleCycle: number) => {
                   address: account,
                   core,
                   extrinsicId: `${height}-${extrinsicId}`,
-                  timestamp,
+                  timestamp: new Date(`${timestamp}Z`),
                   price: parseInt(price),
                   type: purchaseType,
                 } as PurchaseHistoryItem)

diff --git a/src/hooks/sale/salesHistory.ts b/src/hooks/sale/salesHistory.ts
@@ -53,8 +53,8 @@ export const useSalesHistory = (network: NetworkType) => {
                   regionEnd,
                   startBlock: height,
                   endBlock: saleEnd,
-                  startTimestamp: Date.parse(timestamp),
-                  endTimestamp: Date.parse(tsSaleEnd),
+                  startTimestamp: Date.parse(`${timestamp}Z`),
+                  endTimestamp: Date.parse(`${tsSaleEnd}Z`),
                   startPrice,
                   endPrice,
                 } as SalesHistoryItem)

diff --git a/src/models/extrinsics/index.ts b/src/models/extrinsics/index.ts
@@ -15,6 +15,6 @@ export type AccountTxHistoryItem = {
   extrinsicId: string;
   module: string;
   call: string;
-  timestamp: string;
+  timestamp: Date;
   success: boolean;
 };
diff --git a/src/models/regions/sale.ts b/src/models/regions/sale.ts
@@ -106,7 +106,7 @@ export type PurchaseHistoryItem = {
   address: string;
   core: number;
   extrinsicId: string;
-  timestamp: string;
+  timestamp: Date;
   price: number;
   type: string;
 };