adjustments

actualbudget · Jan 13, 2024 · fb5ed9f · fb5ed9f
1 parent 65ec3fa
commit fb5ed9f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git 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<T extends MenuItem = MenuItem> = {
@@ -167,12 +166,12 @@ export function Menu<T extends MenuItem>({
             onClick={() =>
               !item.disabled &&
               onMenuSelect &&
-              !item.toggle &&
+              item.toggle === undefined &&
               onMenuSelect(item.name)
             }
           >
             {/* Force it to line up evenly */}
-            {!item.toggle ? (
+            {item.toggle === undefined ? (
               <>
                 <Text style={{ lineHeight: 0 }}>
                   {item.icon &&
@@ -196,11 +195,13 @@ export function Menu<T extends MenuItem>({
                 <View style={{ flex: 1 }} />
                 <Toggle
                   id={item.name}
-                  checked={item.isOn}
+                  checked={item.toggle}
                   onColor={theme.pageTextPositive}
                   style={{ marginLeft: 5, ...item.style }}
                   onChange={() =>
-                    !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
@@ -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
@@ -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;