From 069829bd1fe0b68f894a8adb1c1a8c2ff0fead8b Mon Sep 17 00:00:00 2001
From: Robert Dyer <rdyer@unl.edu>
Date: Wed, 10 Apr 2024 17:12:11 -0500
Subject: [PATCH 1/9] Dim categories hidden by their groups

---
 .../src/components/budget/BudgetCategories.jsx        |  4 ++++
 .../src/components/budget/ExpenseCategory.tsx         | 10 ++++++++--
 .../src/components/budget/SidebarCategory.tsx         | 11 ++++++++---
 upcoming-release-notes/2582.md                        |  6 ++++++
 4 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 upcoming-release-notes/2582.md

diff --git a/packages/desktop-client/src/components/budget/BudgetCategories.jsx b/packages/desktop-client/src/components/budget/BudgetCategories.jsx
index fd708f3824f..42f03aad66f 100644
--- a/packages/desktop-client/src/components/budget/BudgetCategories.jsx
+++ b/packages/desktop-client/src/components/budget/BudgetCategories.jsx
@@ -177,6 +177,8 @@ export const BudgetCategories = memo(
       }
     }
 
+    let catGroup = null;
+
     return (
       <View
         style={{
@@ -228,6 +230,7 @@ export const BudgetCategories = memo(
               break;
 
             case 'expense-group':
+              catGroup = item.value;
               content = (
                 <ExpenseGroup
                   group={item.value}
@@ -250,6 +253,7 @@ export const BudgetCategories = memo(
               content = (
                 <ExpenseCategory
                   cat={item.value}
+                  catGroup={catGroup}
                   editingCell={editingCell}
                   MonthComponent={dataComponents.ExpenseCategoryComponent}
                   dragState={dragState}
diff --git a/packages/desktop-client/src/components/budget/ExpenseCategory.tsx b/packages/desktop-client/src/components/budget/ExpenseCategory.tsx
index 16a5fa61d2c..8e10cd0a05b 100644
--- a/packages/desktop-client/src/components/budget/ExpenseCategory.tsx
+++ b/packages/desktop-client/src/components/budget/ExpenseCategory.tsx
@@ -1,7 +1,10 @@
 // @ts-strict-ignore
 import React, { type ComponentProps } from 'react';
 
-import { type CategoryEntity } from 'loot-core/src/types/models';
+import {
+  type CategoryGroupEntity,
+  type CategoryEntity,
+} from 'loot-core/src/types/models';
 
 import { theme } from '../../style';
 import { View } from '../common/View';
@@ -20,6 +23,7 @@ import { SidebarCategory } from './SidebarCategory';
 
 type ExpenseCategoryProps = {
   cat: CategoryEntity;
+  catGroup?: CategoryGroupEntity;
   editingCell: { id: string; cell: string } | null;
   dragState: DragState<CategoryEntity>;
   MonthComponent: ComponentProps<typeof RenderMonths>['component'];
@@ -35,6 +39,7 @@ type ExpenseCategoryProps = {
 
 export function ExpenseCategory({
   cat,
+  catGroup,
   editingCell,
   dragState,
   MonthComponent,
@@ -72,7 +77,7 @@ export function ExpenseCategory({
       collapsed={true}
       style={{
         backgroundColor: theme.tableBackground,
-        opacity: cat.hidden ? 0.5 : undefined,
+        opacity: cat.hidden || catGroup?.hidden ? 0.5 : undefined,
       }}
     >
       <DropHighlight pos={dropPos} offset={{ top: 1 }} />
@@ -81,6 +86,7 @@ export function ExpenseCategory({
         <SidebarCategory
           innerRef={dragRef}
           category={cat}
+          catGroup={catGroup}
           dragPreview={dragging && dragState.preview}
           dragging={dragging && !dragState.preview}
           editing={
diff --git a/packages/desktop-client/src/components/budget/SidebarCategory.tsx b/packages/desktop-client/src/components/budget/SidebarCategory.tsx
index 8ca35fde6b9..1be642eddbf 100644
--- a/packages/desktop-client/src/components/budget/SidebarCategory.tsx
+++ b/packages/desktop-client/src/components/budget/SidebarCategory.tsx
@@ -1,7 +1,10 @@
 // @ts-strict-ignore
 import React, { type CSSProperties, type Ref, useState } from 'react';
 
-import { type CategoryEntity } from 'loot-core/src/types/models';
+import {
+  type CategoryGroupEntity,
+  type CategoryEntity,
+} from 'loot-core/src/types/models';
 
 import { SvgCheveronDown } from '../../icons/v1';
 import { theme } from '../../style';
@@ -15,6 +18,7 @@ import { Tooltip } from '../tooltips';
 type SidebarCategoryProps = {
   innerRef: Ref<HTMLDivElement>;
   category: CategoryEntity;
+  catGroup?: CategoryGroupEntity;
   dragPreview?: boolean;
   dragging?: boolean;
   editing: boolean;
@@ -30,6 +34,7 @@ type SidebarCategoryProps = {
 export function SidebarCategory({
   innerRef,
   category,
+  catGroup,
   dragPreview,
   dragging,
   editing,
@@ -50,7 +55,7 @@ export function SidebarCategory({
         alignItems: 'center',
         userSelect: 'none',
         WebkitUserSelect: 'none',
-        opacity: category.hidden ? 0.33 : undefined,
+        opacity: category.hidden || catGroup?.hidden ? 0.33 : undefined,
       }}
     >
       <div
@@ -99,7 +104,7 @@ export function SidebarCategory({
                 setMenuOpen(false);
               }}
               items={[
-                {
+                !catGroup?.hidden && {
                   name: 'toggle-visibility',
                   text: category.hidden ? 'Show' : 'Hide',
                 },
diff --git a/upcoming-release-notes/2582.md b/upcoming-release-notes/2582.md
new file mode 100644
index 00000000000..f532a25656b
--- /dev/null
+++ b/upcoming-release-notes/2582.md
@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [psybers]
+---
+
+Dim categories in the budget view if hidden by their category group.

From a92c3d1624cc3cc8f173e4641a0f2ed87390ee48 Mon Sep 17 00:00:00 2001
From: Robert Dyer <rdyer@unl.edu>
Date: Wed, 10 Apr 2024 20:11:20 -0500
Subject: [PATCH 2/9] Dim hidden cats on mobile view

---
 .../src/components/mobile/budget/BudgetTable.jsx              | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx b/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx
index 9e1f43d21bf..5b8798d439c 100644
--- a/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx
+++ b/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx
@@ -227,6 +227,7 @@ function ExpenseCategoryPreview({ name, pending, style }) {
 const ExpenseCategory = memo(function ExpenseCategory({
   type,
   category,
+  isHidden,
   goal,
   budgeted,
   spent,
@@ -322,7 +323,7 @@ const ExpenseCategory = memo(function ExpenseCategory({
         backgroundColor: 'transparent',
         borderBottomWidth: 0,
         borderTopWidth: index > 0 ? 1 : 0,
-        opacity: !!category.hidden ? 0.5 : undefined,
+        opacity: isHidden ? 0.5 : undefined,
         ...style,
       }}
       data-testid="row"
@@ -894,6 +895,7 @@ const ExpenseGroup = memo(function ExpenseGroup({
               show3Cols={show3Cols}
               type={type}
               category={category}
+              isHidden={!!category.hidden || group.hidden}
               goal={
                 type === 'report'
                   ? reportBudget.catGoal(category.id)

From fd9ac3b100b60e891f8b2c19d7de084c2b210fa7 Mon Sep 17 00:00:00 2001
From: Robert Dyer <rdyer@unl.edu>
Date: Wed, 10 Apr 2024 20:18:21 -0500
Subject: [PATCH 3/9] Do not show hide/show menu on mobile for categories in
 hidden groups

---
 packages/desktop-client/src/components/Modals.tsx          | 1 +
 .../desktop-client/src/components/mobile/budget/index.tsx  | 2 ++
 .../src/components/modals/CategoryMenuModal.tsx            | 7 +++++--
 packages/loot-core/src/client/state-types/modals.d.ts      | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/desktop-client/src/components/Modals.tsx b/packages/desktop-client/src/components/Modals.tsx
index 2953f58e4a0..4857ab609ce 100644
--- a/packages/desktop-client/src/components/Modals.tsx
+++ b/packages/desktop-client/src/components/Modals.tsx
@@ -429,6 +429,7 @@ export function Modals() {
               key={name}
               modalProps={modalProps}
               categoryId={options.categoryId}
+              isHidden={options.isHidden}
               onSave={options.onSave}
               onEditNotes={options.onEditNotes}
               onDelete={options.onDelete}
diff --git a/packages/desktop-client/src/components/mobile/budget/index.tsx b/packages/desktop-client/src/components/mobile/budget/index.tsx
index 4374b724633..10cc4e4d9f3 100644
--- a/packages/desktop-client/src/components/mobile/budget/index.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/index.tsx
@@ -343,9 +343,11 @@ function BudgetInner(props: BudgetInnerProps) {
 
   const onEditCategory = id => {
     const category = categories.find(c => c.id === id);
+    const categoryGroup = categoryGroups.find(g => g.id === category.cat_group);
     dispatch(
       pushModal('category-menu', {
         categoryId: category.id,
+        isHidden: categoryGroup?.hidden,
         onSave: onSaveCategory,
         onEditNotes: onEditCategoryNotes,
         onDelete: onDeleteCategory,
diff --git a/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx b/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx
index b88d52a0abf..314b28503d4 100644
--- a/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx
@@ -23,6 +23,7 @@ import { Tooltip } from '../tooltips';
 type CategoryMenuModalProps = {
   modalProps: CommonModalProps;
   categoryId: string;
+  isHidden?: boolean;
   onSave: (category: CategoryEntity) => void;
   onEditNotes: (id: string) => void;
   onDelete: (categoryId: string) => void;
@@ -32,6 +33,7 @@ type CategoryMenuModalProps = {
 export function CategoryMenuModal({
   modalProps,
   categoryId,
+  isHidden,
   onSave,
   onEditNotes,
   onDelete,
@@ -102,6 +104,7 @@ export function CategoryMenuModal({
       leftHeaderContent={
         <AdditionalCategoryMenu
           category={category}
+          isHidden={isHidden}
           onDelete={_onDelete}
           onToggleVisibility={_onToggleVisibility}
         />
@@ -152,7 +155,7 @@ export function CategoryMenuModal({
   );
 }
 
-function AdditionalCategoryMenu({ category, onDelete, onToggleVisibility }) {
+function AdditionalCategoryMenu({ category, isHidden, onDelete, onToggleVisibility }) {
   const [menuOpen, setMenuOpen] = useState(false);
   const itemStyle: CSSProperties = {
     ...styles.mediumText,
@@ -184,7 +187,7 @@ function AdditionalCategoryMenu({ category, onDelete, onToggleVisibility }) {
             <Menu
               getItemStyle={() => itemStyle}
               items={[
-                {
+                !isHidden && {
                   name: 'toggleVisibility',
                   text: category.hidden ? 'Show' : 'Hide',
                   icon: category.hidden ? SvgViewShow : SvgViewHide,
diff --git a/packages/loot-core/src/client/state-types/modals.d.ts b/packages/loot-core/src/client/state-types/modals.d.ts
index 4d4f45f8de2..8c2824a3ae1 100644
--- a/packages/loot-core/src/client/state-types/modals.d.ts
+++ b/packages/loot-core/src/client/state-types/modals.d.ts
@@ -143,6 +143,7 @@ type FinanceModals = {
   };
   'category-menu': {
     categoryId: string;
+    isHidden: boolean;
     onSave: (category: CategoryEntity) => void;
     onEditNotes: (id: string) => void;
     onDelete: (categoryId: string) => void;

From 42407832d9a6d2cb5c26fea767d014059ebe63ac Mon Sep 17 00:00:00 2001
From: Robert Dyer <rdyer@unl.edu>
Date: Wed, 10 Apr 2024 20:51:27 -0500
Subject: [PATCH 4/9] Rename catGroup to categoryGroup

---
 .../src/components/budget/BudgetCategories.jsx            | 6 +++---
 .../src/components/budget/ExpenseCategory.tsx             | 8 ++++----
 .../src/components/budget/SidebarCategory.tsx             | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/desktop-client/src/components/budget/BudgetCategories.jsx b/packages/desktop-client/src/components/budget/BudgetCategories.jsx
index 42f03aad66f..3393358834b 100644
--- a/packages/desktop-client/src/components/budget/BudgetCategories.jsx
+++ b/packages/desktop-client/src/components/budget/BudgetCategories.jsx
@@ -177,7 +177,7 @@ export const BudgetCategories = memo(
       }
     }
 
-    let catGroup = null;
+    let categoryGroup = null;
 
     return (
       <View
@@ -230,7 +230,7 @@ export const BudgetCategories = memo(
               break;
 
             case 'expense-group':
-              catGroup = item.value;
+              categoryGroup = item.value;
               content = (
                 <ExpenseGroup
                   group={item.value}
@@ -253,7 +253,7 @@ export const BudgetCategories = memo(
               content = (
                 <ExpenseCategory
                   cat={item.value}
-                  catGroup={catGroup}
+                  categoryGroup={categoryGroup}
                   editingCell={editingCell}
                   MonthComponent={dataComponents.ExpenseCategoryComponent}
                   dragState={dragState}
diff --git a/packages/desktop-client/src/components/budget/ExpenseCategory.tsx b/packages/desktop-client/src/components/budget/ExpenseCategory.tsx
index 8e10cd0a05b..5007b81c8d1 100644
--- a/packages/desktop-client/src/components/budget/ExpenseCategory.tsx
+++ b/packages/desktop-client/src/components/budget/ExpenseCategory.tsx
@@ -23,7 +23,7 @@ import { SidebarCategory } from './SidebarCategory';
 
 type ExpenseCategoryProps = {
   cat: CategoryEntity;
-  catGroup?: CategoryGroupEntity;
+  categoryGroup?: CategoryGroupEntity;
   editingCell: { id: string; cell: string } | null;
   dragState: DragState<CategoryEntity>;
   MonthComponent: ComponentProps<typeof RenderMonths>['component'];
@@ -39,7 +39,7 @@ type ExpenseCategoryProps = {
 
 export function ExpenseCategory({
   cat,
-  catGroup,
+  categoryGroup,
   editingCell,
   dragState,
   MonthComponent,
@@ -77,7 +77,7 @@ export function ExpenseCategory({
       collapsed={true}
       style={{
         backgroundColor: theme.tableBackground,
-        opacity: cat.hidden || catGroup?.hidden ? 0.5 : undefined,
+        opacity: cat.hidden || categoryGroup?.hidden ? 0.5 : undefined,
       }}
     >
       <DropHighlight pos={dropPos} offset={{ top: 1 }} />
@@ -86,7 +86,7 @@ export function ExpenseCategory({
         <SidebarCategory
           innerRef={dragRef}
           category={cat}
-          catGroup={catGroup}
+          categoryGroup={categoryGroup}
           dragPreview={dragging && dragState.preview}
           dragging={dragging && !dragState.preview}
           editing={
diff --git a/packages/desktop-client/src/components/budget/SidebarCategory.tsx b/packages/desktop-client/src/components/budget/SidebarCategory.tsx
index 1be642eddbf..f62255cf911 100644
--- a/packages/desktop-client/src/components/budget/SidebarCategory.tsx
+++ b/packages/desktop-client/src/components/budget/SidebarCategory.tsx
@@ -18,7 +18,7 @@ import { Tooltip } from '../tooltips';
 type SidebarCategoryProps = {
   innerRef: Ref<HTMLDivElement>;
   category: CategoryEntity;
-  catGroup?: CategoryGroupEntity;
+  categoryGroup?: CategoryGroupEntity;
   dragPreview?: boolean;
   dragging?: boolean;
   editing: boolean;
@@ -34,7 +34,7 @@ type SidebarCategoryProps = {
 export function SidebarCategory({
   innerRef,
   category,
-  catGroup,
+  categoryGroup,
   dragPreview,
   dragging,
   editing,
@@ -55,7 +55,7 @@ export function SidebarCategory({
         alignItems: 'center',
         userSelect: 'none',
         WebkitUserSelect: 'none',
-        opacity: category.hidden || catGroup?.hidden ? 0.33 : undefined,
+        opacity: category.hidden || categoryGroup?.hidden ? 0.33 : undefined,
       }}
     >
       <div
@@ -104,7 +104,7 @@ export function SidebarCategory({
                 setMenuOpen(false);
               }}
               items={[
-                !catGroup?.hidden && {
+                !categoryGroup?.hidden && {
                   name: 'toggle-visibility',
                   text: category.hidden ? 'Show' : 'Hide',
                 },

From b259cade5ec06eddc378f88a1eb0c5ea5ac7d91a Mon Sep 17 00:00:00 2001
From: Robert Dyer <rdyer@unl.edu>
Date: Wed, 10 Apr 2024 20:52:27 -0500
Subject: [PATCH 5/9] Fix lint issue

---
 .../src/components/modals/CategoryMenuModal.tsx            | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx b/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx
index 314b28503d4..13df9839ccd 100644
--- a/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx
@@ -155,7 +155,12 @@ export function CategoryMenuModal({
   );
 }
 
-function AdditionalCategoryMenu({ category, isHidden, onDelete, onToggleVisibility }) {
+function AdditionalCategoryMenu({
+  category,
+  isHidden,
+  onDelete,
+  onToggleVisibility,
+}) {
   const [menuOpen, setMenuOpen] = useState(false);
   const itemStyle: CSSProperties = {
     ...styles.mediumText,

From 0486fe3d6051ecaff31afcd49b6857a1438bedb0 Mon Sep 17 00:00:00 2001
From: Robert Dyer <rdyer@unl.edu>
Date: Thu, 11 Apr 2024 20:34:59 -0500
Subject: [PATCH 6/9] Hide menu line

---
 .../desktop-client/src/components/modals/CategoryMenuModal.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx b/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx
index 13df9839ccd..e88c377a5fa 100644
--- a/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx
@@ -198,7 +198,7 @@ function AdditionalCategoryMenu({
                   icon: category.hidden ? SvgViewShow : SvgViewHide,
                   iconSize: 16,
                 },
-                Menu.line,
+                !isHidden && Menu.line,
                 {
                   name: 'delete',
                   text: 'Delete',

From f85174ca2682ba3901ef6ef482999837124edbe3 Mon Sep 17 00:00:00 2001
From: Robert Dyer <rdyer@unl.edu>
Date: Fri, 12 Apr 2024 10:47:37 -0500
Subject: [PATCH 7/9] Pass in categoryGroup instead of isHidden

---
 packages/desktop-client/src/components/Modals.tsx   |  2 +-
 .../src/components/mobile/budget/index.tsx          |  2 +-
 .../src/components/modals/CategoryMenuModal.tsx     | 13 +++++++------
 .../loot-core/src/client/state-types/modals.d.ts    |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/desktop-client/src/components/Modals.tsx b/packages/desktop-client/src/components/Modals.tsx
index 4857ab609ce..95e0713602f 100644
--- a/packages/desktop-client/src/components/Modals.tsx
+++ b/packages/desktop-client/src/components/Modals.tsx
@@ -429,7 +429,7 @@ export function Modals() {
               key={name}
               modalProps={modalProps}
               categoryId={options.categoryId}
-              isHidden={options.isHidden}
+              categoryGroup={options.categoryGroup}
               onSave={options.onSave}
               onEditNotes={options.onEditNotes}
               onDelete={options.onDelete}
diff --git a/packages/desktop-client/src/components/mobile/budget/index.tsx b/packages/desktop-client/src/components/mobile/budget/index.tsx
index 10cc4e4d9f3..06a5808a68e 100644
--- a/packages/desktop-client/src/components/mobile/budget/index.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/index.tsx
@@ -347,7 +347,7 @@ function BudgetInner(props: BudgetInnerProps) {
     dispatch(
       pushModal('category-menu', {
         categoryId: category.id,
-        isHidden: categoryGroup?.hidden,
+        categoryGroup: categoryGroup,
         onSave: onSaveCategory,
         onEditNotes: onEditCategoryNotes,
         onDelete: onDeleteCategory,
diff --git a/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx b/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx
index e88c377a5fa..50c4bf8f2a5 100644
--- a/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx
@@ -4,6 +4,7 @@ import React, { useState } from 'react';
 import { useLiveQuery } from 'loot-core/src/client/query-hooks';
 import { q } from 'loot-core/src/shared/query';
 import {
+  CategoryGroupEntity,
   type CategoryEntity,
   type NoteEntity,
 } from 'loot-core/src/types/models';
@@ -23,7 +24,7 @@ import { Tooltip } from '../tooltips';
 type CategoryMenuModalProps = {
   modalProps: CommonModalProps;
   categoryId: string;
-  isHidden?: boolean;
+  categoryGroup?: CategoryGroupEntity;
   onSave: (category: CategoryEntity) => void;
   onEditNotes: (id: string) => void;
   onDelete: (categoryId: string) => void;
@@ -33,7 +34,7 @@ type CategoryMenuModalProps = {
 export function CategoryMenuModal({
   modalProps,
   categoryId,
-  isHidden,
+  categoryGroup,
   onSave,
   onEditNotes,
   onDelete,
@@ -104,7 +105,7 @@ export function CategoryMenuModal({
       leftHeaderContent={
         <AdditionalCategoryMenu
           category={category}
-          isHidden={isHidden}
+          categoryGroup={categoryGroup}
           onDelete={_onDelete}
           onToggleVisibility={_onToggleVisibility}
         />
@@ -157,7 +158,7 @@ export function CategoryMenuModal({
 
 function AdditionalCategoryMenu({
   category,
-  isHidden,
+  categoryGroup,
   onDelete,
   onToggleVisibility,
 }) {
@@ -192,13 +193,13 @@ function AdditionalCategoryMenu({
             <Menu
               getItemStyle={() => itemStyle}
               items={[
-                !isHidden && {
+                !categoryGroup?.hidden && {
                   name: 'toggleVisibility',
                   text: category.hidden ? 'Show' : 'Hide',
                   icon: category.hidden ? SvgViewShow : SvgViewHide,
                   iconSize: 16,
                 },
-                !isHidden && Menu.line,
+                !categoryGroup?.hidden && Menu.line,
                 {
                   name: 'delete',
                   text: 'Delete',
diff --git a/packages/loot-core/src/client/state-types/modals.d.ts b/packages/loot-core/src/client/state-types/modals.d.ts
index 8c2824a3ae1..eef5b20f807 100644
--- a/packages/loot-core/src/client/state-types/modals.d.ts
+++ b/packages/loot-core/src/client/state-types/modals.d.ts
@@ -143,7 +143,7 @@ type FinanceModals = {
   };
   'category-menu': {
     categoryId: string;
-    isHidden: boolean;
+    categoryGroup?: CategoryGroupEntity;
     onSave: (category: CategoryEntity) => void;
     onEditNotes: (id: string) => void;
     onDelete: (categoryId: string) => void;

From 72147bcbe1775103988ff17c85257eda3b7ca138 Mon Sep 17 00:00:00 2001
From: Robert Dyer <rdyer@unl.edu>
Date: Fri, 12 Apr 2024 10:51:38 -0500
Subject: [PATCH 8/9] avoid need for extra local

---
 .../src/components/budget/BudgetCategories.jsx              | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/desktop-client/src/components/budget/BudgetCategories.jsx b/packages/desktop-client/src/components/budget/BudgetCategories.jsx
index 3393358834b..e3fcb3b52be 100644
--- a/packages/desktop-client/src/components/budget/BudgetCategories.jsx
+++ b/packages/desktop-client/src/components/budget/BudgetCategories.jsx
@@ -66,6 +66,7 @@ export const BudgetCategories = memo(
               cat => ({
                 type: 'expense-category',
                 value: cat,
+                group: group,
               }),
             ),
           ];
@@ -177,8 +178,6 @@ export const BudgetCategories = memo(
       }
     }
 
-    let categoryGroup = null;
-
     return (
       <View
         style={{
@@ -230,7 +229,6 @@ export const BudgetCategories = memo(
               break;
 
             case 'expense-group':
-              categoryGroup = item.value;
               content = (
                 <ExpenseGroup
                   group={item.value}
@@ -253,7 +251,7 @@ export const BudgetCategories = memo(
               content = (
                 <ExpenseCategory
                   cat={item.value}
-                  categoryGroup={categoryGroup}
+                  categoryGroup={item.group}
                   editingCell={editingCell}
                   MonthComponent={dataComponents.ExpenseCategoryComponent}
                   dragState={dragState}

From 3b4355068f178f034f6729d8d6c43975bb8f93c9 Mon Sep 17 00:00:00 2001
From: Robert Dyer <rdyer@unl.edu>
Date: Fri, 12 Apr 2024 10:53:43 -0500
Subject: [PATCH 9/9] fix lint issues

---
 .../desktop-client/src/components/budget/BudgetCategories.jsx   | 2 +-
 packages/desktop-client/src/components/mobile/budget/index.tsx  | 2 +-
 .../desktop-client/src/components/modals/CategoryMenuModal.tsx  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/desktop-client/src/components/budget/BudgetCategories.jsx b/packages/desktop-client/src/components/budget/BudgetCategories.jsx
index e3fcb3b52be..962697d9a9c 100644
--- a/packages/desktop-client/src/components/budget/BudgetCategories.jsx
+++ b/packages/desktop-client/src/components/budget/BudgetCategories.jsx
@@ -66,7 +66,7 @@ export const BudgetCategories = memo(
               cat => ({
                 type: 'expense-category',
                 value: cat,
-                group: group,
+                group,
               }),
             ),
           ];
diff --git a/packages/desktop-client/src/components/mobile/budget/index.tsx b/packages/desktop-client/src/components/mobile/budget/index.tsx
index 06a5808a68e..d3c2bd2a788 100644
--- a/packages/desktop-client/src/components/mobile/budget/index.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/index.tsx
@@ -347,7 +347,7 @@ function BudgetInner(props: BudgetInnerProps) {
     dispatch(
       pushModal('category-menu', {
         categoryId: category.id,
-        categoryGroup: categoryGroup,
+        categoryGroup,
         onSave: onSaveCategory,
         onEditNotes: onEditCategoryNotes,
         onDelete: onDeleteCategory,
diff --git a/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx b/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx
index 50c4bf8f2a5..75ffcaa1ec4 100644
--- a/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx
@@ -4,7 +4,7 @@ import React, { useState } from 'react';
 import { useLiveQuery } from 'loot-core/src/client/query-hooks';
 import { q } from 'loot-core/src/shared/query';
 import {
-  CategoryGroupEntity,
+  type CategoryGroupEntity,
   type CategoryEntity,
   type NoteEntity,
 } from 'loot-core/src/types/models';