Merge branch 'main' into bugfix/page-blank

eclipse-tractusx · Jan 4, 2024 · 8fcc09f · 8fcc09f
2 parents 3f639d7 + dfdb7bf
commit 8fcc09f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/components/ContractsTable.tsx b/src/components/ContractsTable.tsx
@@ -82,7 +82,7 @@ function ContractsTable({ type, title, subtitle }: IContractsTable) {
       field: 'assetId',
       flex: 1,
       headerName: t('content.contractHistory.columns.assetId'),
-      valueGetter: ({ row }) => row.contractAgreementInfo,
+      valueGetter: ({ row }) => row?.contractAgreementInfo?.assetId,
       valueFormatter: ({ value }) => value?.assetId,
       renderCell: ({ row }) => (
         <Tooltips tooltipPlacement="top-start" tooltipArrow={false} tooltipText={row?.contractAgreementInfo?.assetId}>
@@ -111,7 +111,7 @@ function ContractsTable({ type, title, subtitle }: IContractsTable) {
       headerName: t('content.contractHistory.columns.contractSigningDate'),
       sortingOrder: ['asc', 'desc'],
       sortComparator: (v1, v2, param1: GridValidRowModel, param2: GridValidRowModel) => param2.id - param1.id,
-      valueGetter: ({ row }) => row.contractAgreementInfo,
+      valueGetter: ({ row }) => convertEpochToDate(row.contractAgreementInfo?.contractSigningDate),
       valueFormatter: ({ value }) => convertEpochToDate(value?.contractSigningDate),
       renderCell: ({ row }) =>
         row.contractAgreementInfo?.contractSigningDate ? (

diff --git a/src/helpers/RouteHelper.tsx b/src/helpers/RouteHelper.tsx
@@ -16,6 +16,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
+
 import { ReactElement } from 'react';
 
 import About from '../pages/About';