merge fixes

actualbudget · Jan 7, 2024 · 382d462 · 382d462
1 parent 22c6719
commit 382d462
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/packages/desktop-client/src/components/reports/reports/CustomReport.jsx b/packages/desktop-client/src/components/reports/reports/CustomReport.jsx
@@ -27,8 +27,8 @@ import { ReportOptions } from '../ReportOptions';
 import { ReportSidebar } from '../ReportSidebar';
 import { ReportSummary } from '../ReportSummary';
 import { ReportTopbar } from '../ReportTopbar';
-import { createSpreadsheet as defaultSpreadsheet } from '../spreadsheets/default-spreadsheet';
-import { createGroupedSpreadsheet as groupedSpreadsheet } from '../spreadsheets/grouped-spreadsheet';
+import { createCustomSpreadsheet } from '../spreadsheets/custom-spreadsheet';
+import { createGroupedSpreadsheet } from '../spreadsheets/grouped-spreadsheet';
 import { useReport } from '../useReport';
 import { fromDateRepr } from '../util';
 
@@ -114,7 +114,7 @@ export function CustomReport() {
   const accounts = useCachedAccounts();
 
   const getGroupData = useMemo(() => {
-    return groupedSpreadsheet({
+    return createGroupedSpreadsheet({
       startDate,
       endDate,
       categories,
@@ -140,7 +140,7 @@ export function CustomReport() {
 
   const getGraphData = useMemo(() => {
     setDataCheck(false);
-    return defaultSpreadsheet({
+    return createCustomSpreadsheet({
       startDate,
       endDate,
       categories,

diff --git a/packages/desktop-client/src/components/reports/reports/CustomReportCard.jsx b/packages/desktop-client/src/components/reports/reports/CustomReportCard.jsx
@@ -10,7 +10,7 @@ import { DateRange } from '../DateRange';
 import { BarGraph } from '../graphs/BarGraph';
 import { LoadingIndicator } from '../LoadingIndicator';
 import { ReportCard } from '../ReportCard';
-import { defaultSpreadsheet } from '../spreadsheets/default-spreadsheet';
+import { createCustomSpreadsheet } from '../spreadsheets/custom-spreadsheet';
 import { useReport } from '../useReport';
 
 export function CustomReportCard() {
@@ -21,7 +21,7 @@ export function CustomReportCard() {
   const groupBy = 'Category';
 
   const getGraphData = useMemo(() => {
-    return defaultSpreadsheet({
+    return createCustomSpreadsheet({
       startDate,
       endDate,
       groupBy,

diff --git a/...ports/spreadsheets/default-spreadsheet.ts → ...eports/spreadsheets/custom-spreadsheet.ts b/...ports/spreadsheets/default-spreadsheet.ts → ...eports/spreadsheets/custom-spreadsheet.ts
@@ -19,7 +19,7 @@ import { filterHiddenItems } from './filterHiddenItems';
 import { makeQuery } from './makeQuery';
 import { recalculate } from './recalculate';
 
-export type createSpreadsheetProps = {
+export type createCustomSpreadsheetProps = {
   startDate: string;
   endDate: string;
   categories: { list: CategoryEntity[]; grouped: CategoryGroupEntity[] };
@@ -37,7 +37,7 @@ export type createSpreadsheetProps = {
   graphType: string;
 };
 
-export function createSpreadsheet({
+export function createCustomSpreadsheet({
   startDate,
   endDate,
   categories,
@@ -53,7 +53,7 @@ export function createSpreadsheet({
   accounts,
   setDataCheck,
   graphType,
-}: createSpreadsheetProps) {
+}: createCustomSpreadsheetProps) {
   const [categoryList, categoryGroup] = categoryLists(
     showOffBudgetHidden,
     showUncategorized,

diff --git a/packages/desktop-client/src/components/reports/spreadsheets/grouped-spreadsheet.ts b/packages/desktop-client/src/components/reports/spreadsheets/grouped-spreadsheet.ts
@@ -5,7 +5,7 @@ import { integerToAmount } from 'loot-core/src/shared/util';
 
 import { categoryLists } from '../ReportOptions';
 
-import { type createSpreadsheetProps } from './default-spreadsheet';
+import { type createCustomSpreadsheetProps } from './custom-spreadsheet';
 import { filterHiddenItems } from './filterHiddenItems';
 import { makeQuery } from './makeQuery';
 import { recalculate } from './recalculate';
@@ -21,7 +21,7 @@ export function createGroupedSpreadsheet({
   showOffBudgetHidden,
   showUncategorized,
   balanceTypeOp,
-}: createSpreadsheetProps) {
+}: createCustomSpreadsheetProps) {
   const [categoryList, categoryGroup] = categoryLists(
     showOffBudgetHidden,
     showUncategorized,