Removing nonNull items as they are causing errors when they are null …

pages/api/Schema/reports/financialAccounts/financialEntries/financialEntries.graphql

@@ -19,12 +19,12 @@ type FinancialAccountEntriesResponse {
 
 type FinancialAccountEntry {
   id: ID!
-  amount: String!
-  currency: String!
-  code: String!
-  description: String!
-  entryDate: ISO8601Date!
-  type: String!
+  amount: String
+  currency: String
+  code: String
+  description: String
+  entryDate: ISO8601Date
+  type: String
   category: FinancialAccountCategory!
 }
 

src/components/Reports/FinancialAccountsReport/AccountTransactions/AccountTransactionTable/AccountTransactionTable.tsx

@@ -11,6 +11,7 @@
 import { DataGrid, GridColDef, GridSortModel } from '@mui/x-data-grid';
 import { DateTime } from 'luxon';
 import { useTranslation } from 'react-i18next';
+import { Maybe } from 'src/graphql/types.generated';
 import { useLocale } from 'src/hooks/useLocale';
 import { currencyFormat, dateFormatShort } from 'src/lib/intlFormat';
 import { formatNumber } from '../../AccountSummary/AccountSummaryHelper';
@@ -61,15 +62,15 @@
 
 interface TransactionRow {
   id: string;
-  code: string;
-  description: string;
-  type: string;
+  code?: Maybe<string>;
+  description?: Maybe<string>;
+  type?: Maybe<string>;
   categoryName: string;
   categoryCode: string;
-  currency: string;
-  expenseAmount?: string;
-  incomeAmount?: string;
-  entryDate: DateTime<boolean>;
+  currency?: Maybe<string>;
+  expenseAmount?: Maybe<string>;
+  incomeAmount?: Maybe<string>;
+  entryDate: DateTime<boolean> | string;
 }
 
 const createTransactionRow = (
@@ -85,7 +86,9 @@
     ...amounts,
     categoryName: entry.category.name ?? entry.category.code ?? '',
     categoryCode: entry.category.code ?? '',
-    entryDate: DateTime.fromISO(entry.entryDate),
+    entryDate: entry.entryDate
+      ? DateTime.fromISO(entry.entryDate)
+      : 'No entry date',
   };
 };
 
@@ -186,7 +189,11 @@
   }, [entries, currency, openingBalance, closingBalance, activeFilters]);
 
   const Date: RenderCell = ({ row }) => (
-    <Typography>{dateFormatShort(row.entryDate, locale)}</Typography>
+    <Typography>
+      {typeof row.entryDate === 'string'
+        ? row.entryDate
+        : dateFormatShort(row.entryDate, locale)}
+    </Typography>
   );
   const Category: RenderCell = ({ row }) => (
     <Box>

src/components/Reports/FinancialAccountsReport/AccountTransactions/AccountTransactions.tsx

@@ -120,7 +120,9 @@
     ];
     const convertDataToArray = data.financialAccountEntries.entries.map(
       (entry) => [
-        dateFormatShort(DateTime.fromISO(entry.entryDate), locale),
+        entry.entryDate
+          ? dateFormatShort(DateTime.fromISO(entry.entryDate), locale)
+          : 'No entry date',
         entry.description ?? '',
         entry.category?.name ?? entry.category?.code ?? '',
         entry.type === FinancialAccountEntryTypeEnum.Debit