diff --git a/packages/desktop-client/src/components/common/Menu.tsx b/packages/desktop-client/src/components/common/Menu.tsx index 687a033ae38..2ca704d64c4 100644 --- a/packages/desktop-client/src/components/common/Menu.tsx +++ b/packages/desktop-client/src/components/common/Menu.tsx @@ -35,7 +35,6 @@ type MenuItem = { style?: CSSProperties; toggle?: boolean; tooltip?: string; - isOn?: boolean; }; type MenuProps = { @@ -167,12 +166,12 @@ export function Menu({ onClick={() => !item.disabled && onMenuSelect && - !item.toggle && + item.toggle === undefined && onMenuSelect(item.name) } > {/* Force it to line up evenly */} - {!item.toggle ? ( + {item.toggle === undefined ? ( <> {item.icon && @@ -196,11 +195,13 @@ export function Menu({ - !item.disabled && item.toggle && onMenuSelect(item.name) + !item.disabled && + item.toggle !== undefined && + onMenuSelect(item.name) } /> diff --git a/packages/desktop-client/src/components/reports/ReportSidebar.jsx b/packages/desktop-client/src/components/reports/ReportSidebar.jsx index 3560fe1d607..2cc32eb5d60 100644 --- a/packages/desktop-client/src/components/reports/ReportSidebar.jsx +++ b/packages/desktop-client/src/components/reports/ReportSidebar.jsx @@ -284,22 +284,19 @@ export function ReportSidebar({ name: 'show-empty-rows', text: 'Show Empty Rows', tooltip: 'Show rows that are zero or blank', - isOn: showEmpty, - toggle: true, + toggle: showEmpty, }, { name: 'show-hidden-categories', text: 'Show Off Budget', tooltip: 'Show off budget accounts and hidden categories', - isOn: showOffBudgetHidden, - toggle: true, + toggle: showOffBudgetHidden, }, { name: 'show-uncategorized', text: 'Show Uncategorized', tooltip: 'Show uncategorized transactions', - isOn: showUncategorized, - toggle: true, + toggle: showUncategorized, }, ]} /> diff --git a/packages/desktop-client/src/components/reports/graphs/adjustTextSize.ts b/packages/desktop-client/src/components/reports/graphs/adjustTextSize.ts index 7c1e292bdc8..00618a41652 100644 --- a/packages/desktop-client/src/components/reports/graphs/adjustTextSize.ts +++ b/packages/desktop-client/src/components/reports/graphs/adjustTextSize.ts @@ -6,7 +6,7 @@ export const adjustTextSize = ( let source; switch (type) { case 'variable': - source = variableLookup.find(({ value }) => values > value).arr; + source = variableLookup.find(({ value }) => values >= value).arr; break; case 'donut': source = donutLookup;