A local-first personal finance app
[Bugfix] Remove menu from income group on mobile view (#2570)
shall0pass6fce10aea0de
diff --git a/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsx b/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsxindex 26546d3c36..daf67d511e 100644--- a/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsx@@ -196,63 +196,67 @@ function AdditionalCategoryGroupMenu({ group, onDelete, onToggleVisibility }) {return (<View>- <Button- type="bare"- aria-label="Menu"- onClick={() => {- setMenuOpen(true);- }}- >- <SvgDotsHorizontalTriple- width={17}- height={17}- style={{ color: 'currentColor' }}- />- {menuOpen && (- <Tooltip- position="bottom-left"- style={{ padding: 0 }}- onClose={() => {- setMenuOpen(false);- }}- >- <Menu- style={{- ...styles.mediumText,- color: theme.formLabelText,+ {!group.is_income && (+ <Button+ type="bare"+ aria-label="Menu"+ onClick={() => {+ setMenuOpen(true);+ }}+ >+ <SvgDotsHorizontalTriple+ width={17}+ height={17}+ style={{ color: 'currentColor' }}+ />+ {menuOpen && (+ <Tooltip+ position="bottom-left"+ style={{ padding: 0 }}+ onClose={() => {+ setMenuOpen(false);}}- getItemStyle={() => itemStyle}- items={- [- {- name: 'toggleVisibility',- text: group.hidden ? 'Show' : 'Hide',- icon: group.hidden ? SvgViewShow : SvgViewHide,- iconSize: 16,- },- ...(!group.is_income && [- Menu.line,+ >+ <Menu+ style={{+ ...styles.mediumText,+ color: theme.formLabelText,+ }}+ getItemStyle={() => itemStyle}+ items={+ [{- name: 'delete',- text: 'Delete',- icon: SvgTrash,- iconSize: 15,+ name: 'toggleVisibility',+ text: group.hidden ? 'Show' : 'Hide',+ icon: group.hidden ? SvgViewShow : SvgViewHide,+ iconSize: 16,},- ]),- ].filter(i => i != null) as ComponentProps<typeof Menu>['items']- }- onMenuSelect={itemName => {- setMenuOpen(false);- if (itemName === 'delete') {- onDelete();- } else if (itemName === 'toggleVisibility') {- onToggleVisibility();+ ...(!group.is_income && [+ Menu.line,+ {+ name: 'delete',+ text: 'Delete',+ icon: SvgTrash,+ iconSize: 15,+ },+ ]),+ ].filter(i => i != null) as ComponentProps<+ typeof Menu+ >['items']}- }}- />- </Tooltip>- )}- </Button>+ onMenuSelect={itemName => {+ setMenuOpen(false);+ if (itemName === 'delete') {+ onDelete();+ } else if (itemName === 'toggleVisibility') {+ onToggleVisibility();+ }+ }}+ />+ </Tooltip>+ )}+ </Button>+ )}</View>);}diff --git a/upcoming-release-notes/2570.md b/upcoming-release-notes/2570.mdnew file mode 100644index 0000000000..b3ed0059c0--- /dev/null+++ b/upcoming-release-notes/2570.md@@ -0,0 +1,6 @@+---+category: Bugfix+authors: [shall0pass]+---++Mobile: Remove menu item for income category group, which resulted in crash.