merge fixes

actualbudget · Feb 5, 2024 · af2a03c · af2a03c
1 parent a0ca289
commit af2a03c
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 29 deletions.
diff --git a/packages/desktop-client/src/components/reports/Overview.jsx b/packages/desktop-client/src/components/reports/Overview.jsx
@@ -10,7 +10,7 @@ import { View } from '../common/View';
 import { CashFlowCard } from './reports/CashFlowCard';
 import { CategorySpendingCard } from './reports/CategorySpendingCard';
 import { CustomReportCard } from './reports/CustomReportCard';
-import {CustomReportListCards} from './reports/CustomReportListCards';
+import { CustomReportListCards } from './reports/CustomReportListCards';
 import { NetWorthCard } from './reports/NetWorthCard';
 import { SankeyCard } from './reports/SankeyCard';
 
@@ -22,12 +22,15 @@ export function Overview() {
   const sankeyFeatureFlag = useFeatureFlag('sankeyReport');
 
   const customReportsFeatureFlag = useFeatureFlag('customReports');
-  
+
   const featureCount =
-  3 -
-  categorySpendingReportFeatureFlag ? 1 : 0 -
-  sankeyFeatureFlag ? 1 : 0 -
-  customReportsFeatureFlag ? 1 : 0;
+    3 - categorySpendingReportFeatureFlag
+      ? 1
+      : 0 - sankeyFeatureFlag
+        ? 1
+        : 0 - customReportsFeatureFlag
+          ? 1
+          : 0;
 
   const accounts = useSelector(state => state.queries.accounts);
   return (

diff --git a/packages/desktop-client/src/components/reports/graphs/AreaGraph.tsx b/packages/desktop-client/src/components/reports/graphs/AreaGraph.tsx
@@ -184,25 +184,27 @@ export function AreaGraph({
                 data={data.monthData}
                 margin={{ top: 0, right: labelsMargin, left: 0, bottom: 0 }}
               >
-                {!compact && ( //flag
-                  <>
-                    <CartesianGrid strokeDasharray="3 3" vertical={false} />
-                    <XAxis
-                      dataKey="date"
-                      tick={{ fill: theme.pageText }}
-                      tickLine={{ stroke: theme.pageText }}
-                    />
-                    <YAxis
-                      dataKey={balanceTypeOp}
-                      domain={[
-                        viewLabels ? labelsMin : 'auto',
-                        viewLabels ? labelsMax : 'auto',
-                      ]}
-                      tickFormatter={tickFormatter}
-                      tick={{ fill: theme.pageText }}
-                      tickLine={{ stroke: theme.pageText }}
-                    />
-                  </>
+                {compact ? null : (
+                  <CartesianGrid strokeDasharray="3 3" vertical={false} />
+                )}
+                {compact ? null : (
+                  <XAxis
+                    dataKey="date"
+                    tick={{ fill: theme.pageText }}
+                    tickLine={{ stroke: theme.pageText }}
+                  />
+                )}
+                {compact ? null : (
+                  <YAxis
+                    dataKey={balanceTypeOp}
+                    domain={[
+                      viewLabels ? labelsMin : 'auto',
+                      viewLabels ? labelsMax : 'auto',
+                    ]}
+                    tickFormatter={tickFormatter}
+                    tick={{ fill: theme.pageText }}
+                    tickLine={{ stroke: theme.pageText }}
+                  />
                 )}
                 <Tooltip
                   content={<CustomTooltip balanceTypeOp={balanceTypeOp} />}
@@ -234,7 +236,7 @@ export function AreaGraph({
                   fill="url(#splitColor)"
                   fillOpacity={1}
                 >
-                  {viewLabels && !compact && (
+                  {viewLabels && (
                     <LabelList
                       dataKey={balanceTypeOp}
                       content={e => customLabel(e, width, lastLabel)}

diff --git a/packages/desktop-client/src/hooks/useFilters.ts b/packages/desktop-client/src/hooks/useFilters.ts
@@ -7,7 +7,6 @@ export function useFilters<T>(initialFilters: T[] = []) {
   const [saved, setSaved] = useState<T[]>(null);
 
   const onApply = useCallback(
-    //flag
     newFilter => {
       if (newFilter === null) {
         setFilters([]);

diff --git a/packages/loot-core/src/client/data-hooks/reports.ts b/packages/loot-core/src/client/data-hooks/reports.ts
@@ -22,7 +22,7 @@ function toJS(rows: CustomReportData[]) {
 export function useReports() {
   const reports = toJS(useLiveQuery(() => q('reports').select('*'), []) || []);
 
-  /** Sort reports by alphabetical order */
+  // Sort reports by alphabetical order
   function sort(reports) {
     return reports.sort((a, b) =>
       a.name.trim().localeCompare(b.name.trim(), { ignorePunctuation: true }),
@@ -42,7 +42,7 @@ export function useReports(): CustomReportEntity[] {
     useLiveQuery(() => q('transaction_filters').select('*'), []) || [],
   );
 
-  /** Sort reports by alphabetical order */
+  // Sort reports by alphabetical order
   function sort(reports: CustomReportEntity[]) {
     return reports.sort((a, b) =>
       a.name && b.name