Skip to content

A local-first personal finance app

[Mobile] Fix hidden category groups not being hidden (#4880)

Joel Jeremy Marquez97b99d1f16f3
diff --git a/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx b/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx
index efee57d8c5..c8124add43 100644
--- a/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx
+++ b/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx
@@ -22,7 +22,6 @@ import { Text } from '@actual-app/components/text';
import { theme } from '@actual-app/components/theme';
import { View } from '@actual-app/components/view';
import { AutoTextSize } from 'auto-text-size';
-import memoizeOne from 'memoize-one';
import { pushModal } from 'loot-core/client/modals/modalsSlice';
import {
@@ -232,7 +231,7 @@ function Saved({ projected, onPress, show3Columns }) {
function BudgetGroups({
categoryGroups,
- onEditGroup,
+ onEditCategoryGroup,
onEditCategory,
month,
onBudgetAction,
@@ -240,14 +239,16 @@ function BudgetGroups({
show3Columns,
showHiddenCategories,
}) {
- const separateGroups = memoizeOne(groups => {
+ const { incomeGroup, expenseGroups } = useMemo(() => {
+ const categoryGroupsToDisplay = categoryGroups.filter(
+ group => !group.hidden || showHiddenCategories,
+ );
return {
- incomeGroup: groups.find(group => group.is_income),
- expenseGroups: groups.filter(group => !group.is_income),
+ incomeGroup: categoryGroupsToDisplay.find(group => group.is_income),
+ expenseGroups: categoryGroupsToDisplay.filter(group => !group.is_income),
};
- });
+ }, [categoryGroups, showHiddenCategories]);
- const { incomeGroup, expenseGroups } = separateGroups(categoryGroups);
const [collapsedGroupIds = [], setCollapsedGroupIdsPref] =
useLocalPref('budget.collapsed');
@@ -275,10 +276,10 @@ function BudgetGroups({
style={{ flex: '1 0 auto', overflowY: 'auto', paddingBottom: 15 }}
>
<ExpenseGroupList
- groups={expenseGroups}
+ categoryGroups={expenseGroups}
showBudgetedColumn={showBudgetedColumn}
month={month}
- onEditGroup={onEditGroup}
+ onEditCategoryGroup={onEditCategoryGroup}
onEditCategory={onEditCategory}
onBudgetAction={onBudgetAction}
show3Columns={show3Columns}
@@ -289,10 +290,10 @@ function BudgetGroups({
{incomeGroup && (
<IncomeGroup
- group={incomeGroup}
+ categoryGroup={incomeGroup}
month={month}
showHiddenCategories={showHiddenCategories}
- onEditGroup={onEditGroup}
+ onEditCategoryGroup={onEditCategoryGroup}
onEditCategory={onEditCategory}
onBudgetAction={onBudgetAction}
isCollapsed={isCollapsed}
@@ -313,7 +314,7 @@ export function BudgetTable({
onShowBudgetSummary,
onBudgetAction,
onRefresh,
- onEditGroup,
+ onEditCategoryGroup,
onEditCategory,
onOpenBudgetPageMenu,
onOpenBudgetMonthMenu,
@@ -409,7 +410,7 @@ export function BudgetTable({
show3Columns={show3Columns}
showHiddenCategories={showHiddenCategories}
month={month}
- onEditGroup={onEditGroup}
+ onEditCategoryGroup={onEditCategoryGroup}
onEditCategory={onEditCategory}
onBudgetAction={onBudgetAction}
/>
diff --git a/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryList.tsx b/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryList.tsx
index e09d6449aa..d42003abf6 100644
--- a/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryList.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryList.tsx
@@ -16,7 +16,7 @@ import { useDispatch } from '../../../redux';
import { ExpenseCategoryListItem } from './ExpenseCategoryListItem';
type ExpenseCategoryListProps = {
- group: CategoryGroupEntity;
+ categoryGroup: CategoryGroupEntity;
categories: CategoryEntity[];
shouldHideCategory: (category: CategoryEntity) => boolean;
month: string;
@@ -27,7 +27,7 @@ type ExpenseCategoryListProps = {
};
export function ExpenseCategoryList({
- group,
+ categoryGroup,
categories,
month,
onEditCategory,
@@ -120,8 +120,8 @@ export function ExpenseCategoryList({
return (
<GridList
- aria-label={t('{{groupName}} expense group categories', {
- groupName: group.name,
+ aria-label={t('{{categoryGroupName}} expense group categories', {
+ categoryGroupName: categoryGroup.name,
})}
items={categories}
dragAndDropHooks={dragAndDropHooks}
@@ -139,7 +139,7 @@ export function ExpenseCategoryList({
key={category.id}
value={category}
month={month}
- onEdit={onEditCategory}
+ onEditCategory={onEditCategory}
onBudgetAction={onBudgetAction}
isHidden={shouldHideCategory(category)}
show3Columns={show3Columns}
diff --git a/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryListItem.tsx b/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryListItem.tsx
index aa8e7cd612..698d62c52b 100644
--- a/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryListItem.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryListItem.tsx
@@ -37,13 +37,13 @@ import { getColumnWidth, PILL_STYLE, ROW_HEIGHT } from './BudgetTable';
type ExpenseCategoryNameProps = {
category: CategoryEntity;
- onEdit: (id: CategoryEntity['id']) => void;
+ onEditCategory: (id: CategoryEntity['id']) => void;
show3Columns: boolean;
};
function ExpenseCategoryName({
category,
- onEdit,
+ onEditCategory,
show3Columns,
}: ExpenseCategoryNameProps) {
const sidebarColumnWidth = getColumnWidth({
@@ -74,7 +74,7 @@ function ExpenseCategoryName({
style={{
maxWidth: sidebarColumnWidth,
}}
- onPress={() => onEdit?.(category.id)}
+ onPress={() => onEditCategory?.(category.id)}
>
<View
style={{
@@ -337,14 +337,14 @@ type ExpenseCategoryListItemProps = ComponentPropsWithoutRef<
style?: CSSProperties;
show3Columns: boolean;
showBudgetedColumn: boolean;
- onEdit: (id: CategoryEntity['id']) => void;
+ onEditCategory: (id: CategoryEntity['id']) => void;
onBudgetAction: (month: string, action: string, args: unknown) => void;
};
export function ExpenseCategoryListItem({
month,
isHidden,
- onEdit,
+ onEditCategory,
onBudgetAction,
show3Columns,
showBudgetedColumn,
@@ -547,7 +547,7 @@ export function ExpenseCategoryListItem({
>
<ExpenseCategoryName
category={category}
- onEdit={onEdit}
+ onEditCategory={onEditCategory}
show3Columns={show3Columns}
/>
<ExpenseCategoryCells
diff --git a/packages/desktop-client/src/components/mobile/budget/ExpenseGroupList.tsx b/packages/desktop-client/src/components/mobile/budget/ExpenseGroupList.tsx
index 179561f33d..ea8512ab83 100644
--- a/packages/desktop-client/src/components/mobile/budget/ExpenseGroupList.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/ExpenseGroupList.tsx
@@ -19,11 +19,11 @@ import {
} from './ExpenseGroupListItem';
type ExpenseGroupListProps = {
- groups: CategoryGroupEntity[];
+ categoryGroups: CategoryGroupEntity[];
show3Columns: boolean;
showBudgetedColumn: boolean;
month: string;
- onEditGroup: (id: CategoryGroupEntity['id']) => void;
+ onEditCategoryGroup: (id: CategoryGroupEntity['id']) => void;
onEditCategory: (id: CategoryEntity['id']) => void;
onBudgetAction: (month: string, action: string, args: unknown) => void;
showHiddenCategories: boolean;
@@ -32,11 +32,11 @@ type ExpenseGroupListProps = {
};
export function ExpenseGroupList({
- groups,
+ categoryGroups,
show3Columns,
showBudgetedColumn,
month,
- onEditGroup,
+ onEditCategoryGroup,
onEditCategory,
onBudgetAction,
showHiddenCategories,
@@ -71,7 +71,7 @@ export function ExpenseGroupList({
},
renderDragPreview: items => {
const draggedGroupId = items[0]['text/plain'];
- const group = groups.find(c => c.id === draggedGroupId);
+ const group = categoryGroups.find(c => c.id === draggedGroupId);
if (!group) {
throw new Error(
`Internal error: category group with ID ${draggedGroupId} not found.`,
@@ -79,20 +79,21 @@ export function ExpenseGroupList({
}
return (
<ExpenseGroupHeader
- group={group}
+ categoryGroup={group}
month={month}
showBudgetedColumn={showBudgetedColumn}
show3Columns={show3Columns}
- onEdit={() => {}}
+ onEditCategoryGroup={() => {}}
isCollapsed={() => true}
onToggleCollapse={() => {}}
+ isHidden={false}
/>
);
},
onReorder: e => {
const [key] = e.keys;
const groupIdToMove = key as CategoryGroupEntity['id'];
- const groupToMove = groups.find(c => c.id === groupIdToMove);
+ const groupToMove = categoryGroups.find(c => c.id === groupIdToMove);
if (!groupToMove) {
throw new Error(
@@ -110,7 +111,9 @@ export function ExpenseGroupList({
}),
);
} else if (e.target.dropPosition === 'after') {
- const targetGroupIndex = groups.findIndex(c => c.id === targetGroupId);
+ const targetGroupIndex = categoryGroups.findIndex(
+ c => c.id === targetGroupId,
+ );
if (targetGroupIndex === -1) {
throw new Error(
@@ -118,7 +121,7 @@ export function ExpenseGroupList({
);
}
- const nextToTargetCategory = groups[targetGroupIndex + 1];
+ const nextToTargetCategory = categoryGroups[targetGroupIndex + 1];
dispatch(
moveCategoryGroup({
@@ -138,10 +141,10 @@ export function ExpenseGroupList({
return (
<GridList
aria-label={t('Expense category groups')}
- items={groups}
+ items={categoryGroups}
dependencies={[
month,
- onEditGroup,
+ onEditCategoryGroup,
onEditCategory,
onBudgetAction,
show3Columns,
@@ -152,12 +155,12 @@ export function ExpenseGroupList({
]}
dragAndDropHooks={dragAndDropHooks}
>
- {group => (
+ {categoryGroup => (
<ExpenseGroupListItem
- key={group.id}
- value={group}
+ key={categoryGroup.id}
+ value={categoryGroup}
month={month}
- onEditGroup={onEditGroup}
+ onEditCategoryGroup={onEditCategoryGroup}
onEditCategory={onEditCategory}
onBudgetAction={onBudgetAction}
showBudgetedColumn={showBudgetedColumn}
@@ -165,6 +168,7 @@ export function ExpenseGroupList({
showHiddenCategories={showHiddenCategories}
isCollapsed={isCollapsed}
onToggleCollapse={onToggleCollapse}
+ isHidden={!!categoryGroup.hidden}
/>
)}
</GridList>
diff --git a/packages/desktop-client/src/components/mobile/budget/ExpenseGroupListItem.tsx b/packages/desktop-client/src/components/mobile/budget/ExpenseGroupListItem.tsx
index f8bfd58db6..cc5c392af1 100644
--- a/packages/desktop-client/src/components/mobile/budget/ExpenseGroupListItem.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/ExpenseGroupListItem.tsx
@@ -32,17 +32,18 @@ type ExpenseGroupListItemProps = ComponentPropsWithoutRef<
> & {
month: string;
showHiddenCategories: boolean;
- onEditGroup: (id: CategoryGroupEntity['id']) => void;
+ onEditCategoryGroup: (id: CategoryGroupEntity['id']) => void;
onEditCategory: (id: string) => void;
onBudgetAction: (month: string, action: string, args: unknown) => void;
isCollapsed: (id: CategoryGroupEntity['id']) => boolean;
onToggleCollapse: (id: CategoryGroupEntity['id']) => void;
showBudgetedColumn: boolean;
show3Columns: boolean;
+ isHidden: boolean;
};
export function ExpenseGroupListItem({
- onEditGroup,
+ onEditCategoryGroup,
onEditCategory,
month,
onBudgetAction,
@@ -51,33 +52,34 @@ export function ExpenseGroupListItem({
showHiddenCategories,
isCollapsed,
onToggleCollapse,
+ isHidden,
...props
}: ExpenseGroupListItemProps) {
- const { value: group } = props;
+ const { value: categoryGroup } = props;
const categories = useMemo(
() =>
- !group || isCollapsed(group.id)
+ !categoryGroup || isCollapsed(categoryGroup.id)
? []
- : (group.categories?.filter(
+ : (categoryGroup.categories?.filter(
category => !category.hidden || showHiddenCategories,
) ?? []),
- [group, isCollapsed, showHiddenCategories],
+ [categoryGroup, isCollapsed, showHiddenCategories],
);
const shouldHideCategory = useCallback(
(category: CategoryEntity) => {
- return !!(category.hidden || group?.hidden);
+ return !!(category.hidden || categoryGroup?.hidden);
},
- [group?.hidden],
+ [categoryGroup?.hidden],
);
- if (!group) {
+ if (!categoryGroup) {
return null;
}
return (
- <GridListItem textValue={group.name} {...props}>
+ <GridListItem textValue={categoryGroup.name} {...props}>
<Card
style={{
marginTop: 4,
@@ -85,17 +87,18 @@ export function ExpenseGroupListItem({
}}
>
<ExpenseGroupHeader
- group={group}
+ categoryGroup={categoryGroup}
month={month}
showBudgetedColumn={showBudgetedColumn}
show3Columns={show3Columns}
- onEdit={onEditGroup}
+ onEditCategoryGroup={onEditCategoryGroup}
isCollapsed={isCollapsed}
onToggleCollapse={onToggleCollapse}
+ isHidden={isHidden}
/>
<ExpenseCategoryList
- group={group}
+ categoryGroup={categoryGroup}
categories={categories}
month={month}
onEditCategory={onEditCategory}
@@ -110,23 +113,25 @@ export function ExpenseGroupListItem({
}
type ExpenseGroupHeaderProps = {
- group: CategoryGroupEntity;
+ categoryGroup: CategoryGroupEntity;
month: string;
- onEdit: (id: CategoryGroupEntity['id']) => void;
+ onEditCategoryGroup: (id: CategoryGroupEntity['id']) => void;
isCollapsed: (id: CategoryGroupEntity['id']) => boolean;
onToggleCollapse: (id: CategoryGroupEntity['id']) => void;
show3Columns: boolean;
showBudgetedColumn: boolean;
+ isHidden: boolean;
};
export function ExpenseGroupHeader({
- group,
+ categoryGroup,
month,
- onEdit,
+ onEditCategoryGroup,
show3Columns,
showBudgetedColumn,
isCollapsed,
onToggleCollapse,
+ isHidden,
}: ExpenseGroupHeaderProps) {
return (
<View
@@ -139,7 +144,7 @@ export function ExpenseGroupHeader({
justifyContent: 'space-between',
paddingLeft: 5,
paddingRight: 5,
- opacity: !!group.hidden ? 0.5 : undefined,
+ opacity: isHidden ? 0.5 : undefined,
backgroundColor: monthUtils.isCurrentMonth(month)
? theme.budgetHeaderCurrentMonth
: theme.budgetHeaderOtherMonth,
@@ -147,14 +152,14 @@ export function ExpenseGroupHeader({
data-testid="category-group-row"
>
<ExpenseGroupName
- group={group}
- onEdit={onEdit}
+ group={categoryGroup}
+ onEditCategoryGroup={onEditCategoryGroup}
isCollapsed={isCollapsed}
onToggleCollapse={onToggleCollapse}
show3Columns={show3Columns}
/>
<ExpenseGroupCells
- group={group}
+ group={categoryGroup}
show3Columns={show3Columns}
showBudgetedColumn={showBudgetedColumn}
/>
@@ -164,7 +169,7 @@ export function ExpenseGroupHeader({
type ExpenseGroupNameProps = {
group: CategoryGroupEntity;
- onEdit: (id: CategoryGroupEntity['id']) => void;
+ onEditCategoryGroup: (id: CategoryGroupEntity['id']) => void;
isCollapsed: (id: CategoryGroupEntity['id']) => boolean;
onToggleCollapse: (id: CategoryGroupEntity['id']) => void;
show3Columns: boolean;
@@ -172,7 +177,7 @@ type ExpenseGroupNameProps = {
function ExpenseGroupName({
group,
- onEdit,
+ onEditCategoryGroup,
isCollapsed,
onToggleCollapse,
show3Columns,
@@ -229,7 +234,7 @@ function ExpenseGroupName({
style={{
maxWidth: sidebarColumnWidth,
}}
- onPress={() => onEdit(group.id)}
+ onPress={() => onEditCategoryGroup(group.id)}
>
<View
style={{
diff --git a/packages/desktop-client/src/components/mobile/budget/IncomeGroup.tsx b/packages/desktop-client/src/components/mobile/budget/IncomeGroup.tsx
index eb7f4dc11f..26a6fb3a0c 100644
--- a/packages/desktop-client/src/components/mobile/budget/IncomeGroup.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/IncomeGroup.tsx
@@ -26,10 +26,10 @@ import { getColumnWidth, ROW_HEIGHT } from './BudgetTable';
import { IncomeCategoryList } from './IncomeCategoryList';
type IncomeGroupProps = {
- group: CategoryGroupEntity;
+ categoryGroup: CategoryGroupEntity;
month: string;
showHiddenCategories: boolean;
- onEditGroup: (id: CategoryGroupEntity['id']) => void;
+ onEditCategoryGroup: (id: CategoryGroupEntity['id']) => void;
onEditCategory: (id: string) => void;
onBudgetAction: (month: string, action: string, args: unknown) => void;
isCollapsed: (id: CategoryGroupEntity['id']) => boolean;
@@ -37,10 +37,10 @@ type IncomeGroupProps = {
};
export function IncomeGroup({
- group,
+ categoryGroup,
month,
showHiddenCategories,
- onEditGroup,
+ onEditCategoryGroup,
onEditCategory,
onBudgetAction,
isCollapsed,
@@ -52,12 +52,17 @@ export function IncomeGroup({
const categories = useMemo(
() =>
- isCollapsed(group.id)
+ isCollapsed(categoryGroup.id)
? []
- : (group.categories?.filter(
+ : (categoryGroup.categories?.filter(
category => !category.hidden || showHiddenCategories,
) ?? []),
- [group.categories, group.id, isCollapsed, showHiddenCategories],
+ [
+ categoryGroup.categories,
+ categoryGroup.id,
+ isCollapsed,
+ showHiddenCategories,
+ ],
);
return (
@@ -80,9 +85,9 @@ export function IncomeGroup({
<Card style={{ marginTop: 0 }}>
<IncomeGroupHeader
- group={group}
+ group={categoryGroup}
month={month}
- onEdit={onEditGroup}
+ onEdit={onEditCategoryGroup}
isCollapsed={isCollapsed}
onToggleCollapse={onToggleCollapse}
/>
diff --git a/packages/desktop-client/src/components/mobile/budget/index.tsx b/packages/desktop-client/src/components/mobile/budget/index.tsx
index a1b630fd97..fa600ebe9a 100644
--- a/packages/desktop-client/src/components/mobile/budget/index.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/index.tsx
@@ -528,7 +528,7 @@ export function Budget() {
onCurrentMonth={onCurrentMonth}
onBudgetAction={onBudgetAction}
onRefresh={onRefresh}
- onEditGroup={onOpenCategoryGroupMenuModal}
+ onEditCategoryGroup={onOpenCategoryGroupMenuModal}
onEditCategory={onOpenCategoryMenuModal}
onOpenBudgetPageMenu={onOpenBudgetPageMenu}
onOpenBudgetMonthMenu={onOpenBudgetMonthMenu}
diff --git a/upcoming-release-notes/4880.md b/upcoming-release-notes/4880.md
new file mode 100644
index 0000000000..4a2ba84791
--- /dev/null
+++ b/upcoming-release-notes/4880.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [joel-jeremy]
+---
+
+[Mobile] Fix hidden category groups not being hidden