Fix type error

actualbudget · Dec 13, 2023 · 71a0f29 · 71a0f29
1 parent 1c48c44
commit 71a0f29
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/packages/desktop-client/src/components/reports/ReportOptions.tsx b/packages/desktop-client/src/components/reports/ReportOptions.tsx
@@ -63,18 +63,21 @@ export type QueryDataEntity = {
   amount: number;
 };
 
-export type UncategorizedEntity = CategoryEntity & {
+export type UncategorizedEntity = Pick<
+  CategoryEntity,
+  'name' | 'id' | 'hidden'
+> & {
   /*
     When looking at uncategorized and hidden transactions we
     need a way to group them. To do this we give them a unique
     uncategorized_id. We also need a way to filter the
     transctions from our query. For this we use the 3 variables
     below.
   */
-  uncategorized_id: string;
-  is_off_budget: boolean;
-  is_transfer: boolean;
-  has_category: boolean;
+  uncategorized_id?: string;
+  is_off_budget?: boolean;
+  is_transfer?: boolean;
+  has_category?: boolean;
 };
 
 const uncategorizedCategory: UncategorizedEntity = {
@@ -105,7 +108,10 @@ const offBudgetCategory: UncategorizedEntity = {
   has_category: true,
 };
 
-type UncategorizedGroupEntity = CategoryGroupEntity & {
+type UncategorizedGroupEntity = Pick<
+  CategoryGroupEntity,
+  'name' | 'id' | 'hidden'
+> & {
   categories?: UncategorizedEntity[];
 };
 

diff --git a/packages/desktop-client/src/components/reports/spreadsheets/grouped-spreadsheet.ts b/packages/desktop-client/src/components/reports/spreadsheets/grouped-spreadsheet.ts
@@ -85,7 +85,7 @@ function createGroupedSpreadsheet({
           let groupedAssets = 0;
           let groupedDebts = 0;
 
-          group.categories.map(item => {
+          group.categories.forEach(item => {
             const monthAssets = filterHiddenItems(item, assets)
               .filter(
                 asset => asset.date === month && asset.category === item.id,
@@ -99,8 +99,6 @@ function createGroupedSpreadsheet({
               )
               .reduce((a, v) => (a = a + v.amount), 0);
             groupedDebts += monthDebts;
-
-            return null;
           });
 
           totalAssets += groupedAssets;