Skip to content

A local-first personal finance app

Remove duplication of CrossoverData type (#6928)

Jonathon Jongsmacdaf06abeead
diff --git a/packages/desktop-client/src/components/reports/reports/Crossover.tsx b/packages/desktop-client/src/components/reports/reports/Crossover.tsx
index 7192e6e0cc..42102e56bf 100644
--- a/packages/desktop-client/src/components/reports/reports/Crossover.tsx
+++ b/packages/desktop-client/src/components/reports/reports/Crossover.tsx
@@ -41,6 +41,7 @@ import { Header } from '@desktop-client/components/reports/Header';
import { LoadingIndicator } from '@desktop-client/components/reports/LoadingIndicator';
import { calculateTimeRange } from '@desktop-client/components/reports/reportRanges';
import { createCrossoverSpreadsheet } from '@desktop-client/components/reports/spreadsheets/crossover-spreadsheet';
+import type { CrossoverData } from '@desktop-client/components/reports/spreadsheets/crossover-spreadsheet';
import { useReport } from '@desktop-client/components/reports/useReport';
import { useAccounts } from '@desktop-client/hooks/useAccounts';
import { useCategories } from '@desktop-client/hooks/useCategories';
@@ -52,30 +53,6 @@ import { useWidget } from '@desktop-client/hooks/useWidget';
import { addNotification } from '@desktop-client/notifications/notificationsSlice';
import { useDispatch } from '@desktop-client/redux';
-// Type for the return value of the recalculate function
-type CrossoverData = {
- graphData: {
- data: Array<{
- x: string;
- investmentIncome: number;
- expenses: number;
- nestEgg: number;
- adjustedExpenses?: number;
- isProjection?: boolean;
- }>;
- start: string;
- end: string;
- crossoverXLabel: string | null;
- };
- lastKnownBalance: number;
- lastKnownMonthlyIncome: number;
- lastKnownMonthlyExpenses: number;
- historicalReturn: number | null;
- yearsToRetire: number | null;
- targetMonthlyIncome: number | null;
- targetNestEgg: number | null;
-};
-
export const defaultTimeFrame = {
start: monthUtils.subMonths(monthUtils.currentMonth(), 120),
end: monthUtils.subMonths(monthUtils.currentMonth(), 1),
diff --git a/packages/desktop-client/src/components/reports/reports/CrossoverCard.tsx b/packages/desktop-client/src/components/reports/reports/CrossoverCard.tsx
index f5789b06f6..ea0d51755d 100644
--- a/packages/desktop-client/src/components/reports/reports/CrossoverCard.tsx
+++ b/packages/desktop-client/src/components/reports/reports/CrossoverCard.tsx
@@ -18,35 +18,12 @@ import { ReportCard } from '@desktop-client/components/reports/ReportCard';
import { ReportCardName } from '@desktop-client/components/reports/ReportCardName';
import { calculateTimeRange } from '@desktop-client/components/reports/reportRanges';
import { createCrossoverSpreadsheet } from '@desktop-client/components/reports/spreadsheets/crossover-spreadsheet';
+import type { CrossoverData } from '@desktop-client/components/reports/spreadsheets/crossover-spreadsheet';
import { useReport } from '@desktop-client/components/reports/useReport';
import { useWidgetCopyMenu } from '@desktop-client/components/reports/useWidgetCopyMenu';
import { useFormat } from '@desktop-client/hooks/useFormat';
import { useLocale } from '@desktop-client/hooks/useLocale';
-// Type for the return value of the recalculate function
-type CrossoverData = {
- graphData: {
- data: Array<{
- x: string;
- investmentIncome: number;
- expenses: number;
- nestEgg: number;
- adjustedExpenses?: number;
- isProjection?: boolean;
- }>;
- start: string;
- end: string;
- crossoverXLabel: string | null;
- };
- lastKnownBalance: number;
- lastKnownMonthlyIncome: number;
- lastKnownMonthlyExpenses: number;
- historicalReturn: number | null;
- yearsToRetire: number | null;
- targetMonthlyIncome: number | null;
- targetNestEgg: number | null;
-};
-
type CrossoverCardProps = {
widgetId: string;
isEditing?: boolean;
diff --git a/packages/desktop-client/src/components/reports/spreadsheets/crossover-spreadsheet.ts b/packages/desktop-client/src/components/reports/spreadsheets/crossover-spreadsheet.ts
index 0bd035d885..9186889eda 100644
--- a/packages/desktop-client/src/components/reports/spreadsheets/crossover-spreadsheet.ts
+++ b/packages/desktop-client/src/components/reports/spreadsheets/crossover-spreadsheet.ts
@@ -49,6 +49,30 @@ function calculateHampelFilteredMedian(expenses: number[]): number {
return calculateMedian(filteredExpenses);
}
+// Type for the return value of the recalculate function
+export type CrossoverData = {
+ graphData: {
+ data: Array<{
+ x: string;
+ investmentIncome: number;
+ expenses: number;
+ nestEgg: number;
+ adjustedExpenses?: number;
+ isProjection?: boolean;
+ }>;
+ start: string;
+ end: string;
+ crossoverXLabel: string | null;
+ };
+ lastKnownBalance: number;
+ lastKnownMonthlyIncome: number;
+ lastKnownMonthlyExpenses: number;
+ historicalReturn: number | null;
+ yearsToRetire: number | null;
+ targetMonthlyIncome: number | null;
+ targetNestEgg: number | null;
+};
+
export type CrossoverParams = {
start: string;
end: string;
diff --git a/upcoming-release-notes/6928.md b/upcoming-release-notes/6928.md
new file mode 100644
index 0000000000..2efc2cb1cc
--- /dev/null
+++ b/upcoming-release-notes/6928.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [jonner]
+---
+
+Remove duplicate type definition for CrossoverData