better name

react-openapi/api/client.ts

@@ -7,28 +7,6 @@ import { createApiClient } from "../../react-auth";
 let _api: AxiosInstance | null = null;
 let _auth: AxiosInstance | null = null;
 
-function withParamsSerializer(instance: AxiosInstance): AxiosInstance {
-  instance.defaults.paramsSerializer = {
-    serialize: (params) => {
-      const searchParams = new URLSearchParams();
-
-      Object.entries(params).forEach(([key, value]) => {
-        if (Array.isArray(value)) {
-          value.forEach((v) => {
-            searchParams.append(key, String(v)); // NO []
-          });
-        } else if (value !== undefined && value !== null) {
-          searchParams.append(key, String(value));
-        }
-      });
-
-      return searchParams.toString();
-    },
-  };
-
-  return instance;
-}
-
 export const api = {
   get: (...args: Parameters<AxiosInstance["get"]>) => {
     if (!_api) throw new Error("API client not initialized");
@@ -60,6 +38,6 @@ export const auth = {
 };
 
 export function initializeApiClients(baseUrl: string, authBaseUrl: string) {
-  _api = withParamsSerializer(createApiClient(baseUrl));
-  _auth = withParamsSerializer(createApiClient(authBaseUrl));
+  _api = createApiClient(baseUrl);
+  _auth = createApiClient(authBaseUrl);
 }

src/Dashboard.tsx

@@ -8,22 +8,11 @@ import {
 
 import ConfigurableDashboard from "./components/Dashboard";
 import { configuration } from "./dashboard-config";
-import {
-  useReport,
-  prepareReport,
-} from "./features/report";
+import { useDashboardData } from "./features/dashboard";
 
 export default function Dashboard() {
-  const report = useReport({
-    periods: ["weekly", "monthly", "full"],
-    rolling: true,
-    include_transactions: true,
-    group_by: ["tags"],
-  })
-
-  const isLoading = report.isLoading;
-  const error = report.error;
-
+  const [mode, setMode] = React.useState<"expense" | "income">("expense");
+  const { data, latest, isLoading, error } = useDashboardData(mode);
 
   if (isLoading) {
     return (
@@ -41,15 +30,16 @@ export default function Dashboard() {
     );
   }
 
-  if (!report) {
+  if (!data) {
     return null;
   }
 
-  const data = prepareReport(report.data?.data);
   return (
     <ConfigurableDashboard
       config={configuration}
       data={data}
+      latest={latest}
+      onModeChange={(newMode) => setMode(newMode)}
     />
   );
 }

src/components/Dashboard/Dashboard.models.ts

@@ -1,16 +1,11 @@
 import * as React from "react";
-import {
-  ReportData
-} from "../../features/report";
 
 export type DashboardMode = "expense" | "income";
-export type DashboardPeriodType = "rolling" | "calendar";
-export type DashboardSelectedPeriodId = string | null;
+export type DashboardPeriod = "rolling" | "calendar";
 
 export interface DashboardState {
   mode: DashboardMode;
-  periodType: DashboardPeriodType;
-  selectedPeriodId: DashboardSelectedPeriodId;
+  period: DashboardPeriod;
   comparison: boolean;
 }
 
@@ -19,6 +14,7 @@ export interface DashboardSection {
   title?: string;
   summary?: string;
   component: React.ComponentType<any>;
+  dataKey?: string;
   settings?: Record<string, any>;
   isList?: boolean;
   style?: {
@@ -27,25 +23,21 @@ export interface DashboardSection {
   };
 }
 
-export interface ColorDefinition {
-  primary: string;
-  background?: string;
-  text?: string;
-}
-
-export interface ThemeAwarePalette {
-  light: ColorDefinition;
-  dark: ColorDefinition;
-}
-
 export interface DashboardConfig {
   sections: DashboardSection[];
   style?: {
-    palette?: Record<DashboardMode, ThemeAwarePalette>;
+    palette: Record<DashboardMode, {
+      primary: string;
+      light: string;
+      dark: string;
+      text: string;
+    }>;
   };
 }
 
 export interface DashboardProps {
   config: DashboardConfig;
-  data: ReportData;
+  data: any; // Aggregated data from features
+  latest: any[]; // Latest items from features
+  onModeChange?: (mode: DashboardMode) => void;
 }

src/components/Dashboard/Dashboard.tsx

@@ -5,45 +5,15 @@ import { DashboardProps, DashboardState } from "./Dashboard.models";
 export default function Dashboard(props: DashboardProps) {
   const [state, setState] = React.useState<DashboardState>({
     mode: "expense",
-    periodType: "rolling",
-    selectedPeriodId: null,
+    period: "rolling",
     comparison: false,
   });
 
-  const toggleMode = () => {
-    setState(prev => ({
-      ...prev,
-      mode: prev.mode === "expense" ? "income" : "expense",
-    }));
-  };
-
-  const togglePeriodType = () => {
-    setState(prev => ({
-      ...prev,
-      periodType: prev.periodType === "rolling" ? "calendar" : "rolling",
-    }));
-  };
-
-  const toggleComparison = () => {
-    setState(prev => ({
-      ...prev,
-      comparison: !prev.comparison,
-    }));
-  };
-
-  const setSelectedPeriodId = (selectedPeriodId: typeof state.selectedPeriodId) => {
-    setState(prev => ({ ...prev, selectedPeriodId }));
-  };
-
   return (
     <DashboardView
       {...props}
       state={state}
       setState={setState}
-      toggleMode={toggleMode}
-      togglePeriodType={togglePeriodType}
-      toggleComparison={toggleComparison}
-      setSelectedPeriodId={setSelectedPeriodId}
     />
   );
 }

src/components/Dashboard/Dashboard.view.tsx

@@ -7,53 +7,30 @@ import {
   ToggleButton,
   ToggleButtonGroup
 } from "@mui/material";
-import { useTheme, alpha } from "@mui/material/styles";
 import { DashboardProps, DashboardState } from "./Dashboard.models";
 
 interface ViewProps extends DashboardProps {
   state: DashboardState;
   setState: React.Dispatch<React.SetStateAction<DashboardState>>;
-  toggleMode: () => void;
-  togglePeriodType: () => void;
-  setSelectedPeriodId: (id: string | null) => void;
-  toggleComparison: () => void;
 }
 
 export default function DashboardView({
   config,
   data,
+  latest,
   state,
   setState,
-  toggleMode,
-  togglePeriodType,
-  toggleComparison,
-  setSelectedPeriodId,
+  onModeChange
 }: ViewProps) {
-  const theme = useTheme();
-  const themeMode = theme.palette.mode;
-  const { mode, periodType, comparison, selectedPeriodId } = state;
+  const { mode, period, comparison } = state;
+  const colors = config.style?.palette[mode] || { primary: '#000', light: '#fff' };
 
-  // Resolve colors with fallbacks
-  const colors = React.useMemo(() => {
-    const palette = config.style?.palette?.[mode];
-    const modeColors = palette ? palette[themeMode] : null;
-
-    if (modeColors) {
-      return {
-        primary: modeColors.primary,
-        light: modeColors.background || alpha(modeColors.primary, 0.1),
-        text: modeColors.text || (themeMode === 'light' ? theme.palette.text.primary : '#fff')
-      };
+  const handleModeChange = (_: any, newMode: any) => {
+    if (newMode && onModeChange) {
+      onModeChange(newMode);
+      setState(prev => ({ ...prev, mode: newMode }));
     }
-
-    // Fallback to standard theme colors
-    const themeColor = mode === 'expense' ? theme.palette.error : theme.palette.success;
-    return {
-      primary: themeColor.main,
-      light: alpha(themeColor.main, themeMode === 'light' ? 0.08 : 0.15),
-      text: themeColor.main
-    };
-  }, [config.style?.palette, mode, themeMode, theme.palette]);
+  };
 
   return (
     <Container
@@ -62,15 +39,14 @@ export default function DashboardView({
         mb: 4,
         background: `linear-gradient(180deg, ${colors.light} 0%, transparent 100%)`,
         borderRadius: 4,
-        p: 2,
-        transition: 'background 0.3s ease'
+        p: 2
       }}
     >
       <Box sx={{ display: "flex", justifyContent: "center", mb: 3 }}>
         <ToggleButtonGroup
           value={mode}
           exclusive
-          onChange={toggleMode}
+          onChange={handleModeChange}
           sx={{
             borderRadius: 3,
             overflow: "hidden",
@@ -105,26 +81,45 @@ export default function DashboardView({
                 </Box>
               )}
 
-              <Component
-                {...section.settings}
-                header={section.title}
-                summary={section.summary}
-                reportData={data}
-                title={section.title}
-                accentColor={colors.primary}
-                colorScheme={colors}
-
-                // State management
-                mode={mode}
-
-                periodType={periodType}
-                comparison={comparison}
-                selectedPeriodId={selectedPeriodId}
-
-                togglePeriodType={togglePeriodType}
-                toggleComparison={toggleComparison}
-                setSelectedPeriodId={setSelectedPeriodId}
-              />
+              {section.isList ? (
+                <Box>
+                  {section.title && (
+                    <Box sx={{ mb: 2 }}>
+                      <Typography variant="h6" fontWeight={700}>
+                        {section.title}
+                      </Typography>
+                    </Box>
+                  )}
+                  <Grid container spacing={2}>
+                    {(data[section.dataKey || ""] || []).map((item: any, idx: number) => (
+                      <Grid key={idx} size={{ xs: 12, sm: 6, md: 2.4 }}>
+                        <Component
+                          {...section.settings}
+                          header={item.payeeName || item.name}
+                          progressAmount={item.amount}
+                          totalAmount={data.totalAmount}
+                          colorTheme={mode === "expense" ? "error" : "success"}
+                        />
+                      </Grid>
+                    ))}
+                  </Grid>
+                </Box>
+              ) : (
+                <Component
+                  {...section.settings}
+                  header={section.title}
+                  summary={section.summary}
+                  data={section.dataKey ? data[section.dataKey] : data.chartData}
+                  items={section.dataKey === 'latest' ? latest : (data[section.dataKey || ''] || [])}
+                  title={section.title}
+                  accentColor={colors.primary}
+                  colorScheme={colors}
+                  period={period}
+                  onPeriodChange={(p: any) => setState(prev => ({ ...prev, period: p }))}
+                  comparison={comparison}
+                  setComparison={(c: any) => setState(prev => ({ ...prev, comparison: c }))}
+                />
+              )}
             </Grid>
           );
         })}

src/components/HistoryChart/HistoryChart.models.ts

@@ -1,13 +1,5 @@
-import {
-  DashboardMode,
-  DashboardPeriodType,
-  DashboardSelectedPeriodId
-} from "../Dashboard";
-import { ReportData } from "../../features/report";
-
 export interface _ChartDataPoint {
   id: string;
-  label: string;
   amount: number;
   highlighted?: boolean;
 }
@@ -16,25 +8,30 @@ export interface ChartDataPoint extends _ChartDataPoint {
   compare?: _ChartDataPoint;
 }
 
+export interface ChartData {
+  daily?: ChartDataPoint[];
+  weekly?: Record<string, ChartDataPoint[]>;
+  monthly?: Record<string, ChartDataPoint[]>;
+}
+
+export interface AggregatedDashboardData {
+  chartData: ChartData;
+  totalAmount: number;
+  topPayees: Array<{ payeeName: string; amount: number }>;
+}
+
 export interface HistoryChartProps {
   header: string;
   summary?: string;
   tabs: string[];
-
-  reportData: ReportData;
-
+  data: ChartData;
+  period: "rolling" | "calendar";
+  onPeriodChange: (p: "rolling" | "calendar") => void;
+  comparison: boolean;
+  setComparison: (v: boolean) => void;
   colorScheme: {
     primary: string;
     light: string;
     text: string;
   };
-
-  mode: DashboardMode;
-  periodType: DashboardPeriodType;
-  selectedPeriodId: DashboardSelectedPeriodId;
-  comparison: boolean;
-
-  togglePeriodType: () => void;
-  setSelectedPeriodId: (id: string | null) => void;
-  toggleComparison: () => void;
 }

src/components/HistoryChart/HistoryChart.tsx

@@ -1,200 +1,48 @@
 import * as React from "react";
-import { HistoryChartProps, ChartDataPoint } from "./HistoryChart.models";
+import { ChartDataPoint, HistoryChartProps, ChartData } from "./HistoryChart.models";
 import HistoryChartView from "./HistoryChart.view";
-import { ReportPeriod } from "../../features/report";
-
-type DecoratedPeriod = ReportPeriod & {
-  id: string;
-  label: string;
-};
-
-const TAB_TO_KEY: Record<string, "weekly" | "monthly" | "yearly" | "fyly" | "full"> = {
-  Weekly: "weekly",
-  Monthly: "monthly",
-  Yearly: "yearly",
-  'Financial Year': "fyly",
-  'All Time': "full"
-};
-
-function getAmount(p: ReportPeriod, mode: "expense" | "income") {
-  return mode === "expense" ? p.expenses.sum : p.incomes.sum;
-}
-
-function mergeMetric(a: any, b: any) {
-  const sum = a.sum + b.sum;
-  const count = a.count + b.count;
-
-  return {
-    ...a,
-    sum,
-    count,
-    average: count > 0 ? sum / count : 0,
-    transactions: a.transactions || b.transactions
-      ? [
-          ...(a.transactions || []),
-          ...(b.transactions || [])
-        ]
-      : undefined
-  };
-}
-
-function mergeBuckets(
-  buckets: any[],
-  key: "weekly" | "monthly" | "yearly" | "fyly" | "full"
-): DecoratedPeriod[] {
-  const map = new Map<string, DecoratedPeriod>();
-
-  for (const bucket of buckets) {
-    const periods = (bucket.periods[key] || []) as DecoratedPeriod[];
-
-    for (const p of periods) {
-      const existing = map.get(p.id);
-
-      if (!existing) {
-        map.set(p.id, {
-          ...p,
-          expenses: { ...p.expenses },
-          incomes: { ...p.incomes }
-        });
-      } else {
-        map.set(p.id, {
-          ...existing,
-          expenses: mergeMetric(existing.expenses, p.expenses),
-          incomes: mergeMetric(existing.incomes, p.incomes)
-        });
-      }
-    }
-  }
-
-  return Array.from(map.values()).sort(
-    (a, b) => new Date(a.start).getTime() - new Date(b.start).getTime()
-  );
-}
-
-function attachComparison(
-  points: ChartDataPoint[],
-  key: "weekly" | "monthly" | "yearly" | "fyly" | "full"
-): ChartDataPoint[] {
-  const getCompareIndex = (i: number) => {
-    if (key === "weekly") return i - 4;
-    if (key === "monthly") return i - 12;
-    if (key === "yearly") return i - 1;
-    if (key === "fyly") return i - 1;
-    return -1;
-  };
-
-  return points.map((p, i) => {
-    const ci = getCompareIndex(i);
-
-    return {
-      ...p,
-      compare:
-        ci >= 0 && points[ci]
-          ? {
-              id: points[ci].id,
-              label: points[ci].label,
-              amount: points[ci].amount
-            }
-          : undefined
-    };
-  });
-}
-
-function buildChartData(
-  reportData: HistoryChartProps["reportData"],
-  key: "weekly" | "monthly" | "yearly" | "fyly" | "full",
-  mode: "expense" | "income",
-  comparison: boolean
-): ChartDataPoint[] {
-  const merged = mergeBuckets(reportData.buckets, key);
-  console.log("Merged periods:", merged);
-
-  let points: ChartDataPoint[] = merged.map((p) => ({
-    id: p.id,
-    label: p.label,
-    amount: getAmount(p, mode)
-  }));
-
-  if (comparison) {
-    points = attachComparison(points, key);
-  }
-
-  return points;
-}
 
 export default function HistoryChart(props: HistoryChartProps) {
-  const {
-    tabs,
-    reportData,
-    mode,
-    periodType,
-    comparison,
-    selectedPeriodId,
-    setSelectedPeriodId
-  } = props;
+  const { tabs, data, period, comparison } = props;
 
   const [activeTab, setActiveTab] = React.useState<string>(tabs[0] || "");
   const [startIndex, setStartIndex] = React.useState(0);
 
-  const activeDataKey = TAB_TO_KEY[activeTab];
+  const activeDataKey = activeTab.toLowerCase() as keyof ChartData;
 
-  const currentData = React.useMemo(() => {
-    return buildChartData(reportData, activeDataKey, mode, comparison);
-  }, [reportData, activeDataKey, mode, comparison]);
+  let rawData: ChartDataPoint[] = [];
+
+  if (activeDataKey === "daily") {
+    rawData = data.daily || [];
+  } else {
+    const section = data[activeDataKey];
+    rawData = section?.[period] || [];
+  }
+
+  const currentData = rawData;
 
   const maxAmount =
     currentData.length > 0
       ? Math.max(
           ...currentData.flatMap((d) =>
-            comparison
-              ? [d.amount, ...(d.compare ? [d.compare.amount] : [])]
-              : [d.amount]
+            comparison ? [d.amount, d.compare?.amount ?? 0] : [d.amount]
           ),
           1
         )
       : 1;
 
-  const visibleCountMap = {
-    weekly: 6,
-    monthly: 4,
-    yearly: 4,
-    fyly: 4,
-    full: 4,
-  };
-
-  const visibleCount = visibleCountMap[activeDataKey] ?? 4;
+  const visibleCountMap = { daily: 7, weekly: 6, monthly: 4 };
+  const visibleCount = visibleCountMap[activeDataKey];
 
   const total = currentData.length;
 
-  const clampedStartIndex = Math.min(
-    startIndex,
-    Math.max(total - visibleCount, 0)
-  );
-
-  React.useEffect(() => {
-    if (startIndex !== clampedStartIndex) {
-      setStartIndex(clampedStartIndex);
-    }
-  }, [startIndex, clampedStartIndex]);
+  const clampedStartIndex = Math.min(startIndex, Math.max(total - visibleCount, 0));
 
   const visibleData = currentData.slice(
     clampedStartIndex,
     clampedStartIndex + visibleCount
   );
 
-  React.useEffect(() => {
-    setSelectedPeriodId(null);
-  }, [activeTab, periodType]);
-
-  React.useEffect(() => {
-    if (
-      selectedPeriodId &&
-      !visibleData.some((p) => p.id === selectedPeriodId)
-    ) {
-      setSelectedPeriodId(null);
-    }
-  }, [visibleData, selectedPeriodId]);
-
   return (
     <HistoryChartView
       {...props}
@@ -204,7 +52,7 @@ export default function HistoryChart(props: HistoryChartProps) {
       visibleData={visibleData}
       maxAmount={maxAmount}
       visibleCount={visibleCount}
-      startIndex={clampedStartIndex}
+      startIndex={startIndex}
       setStartIndex={setStartIndex}
       activeDataKey={activeDataKey}
     />

src/components/HistoryChart/HistoryChart.utils.ts

@@ -25,3 +25,19 @@ export const formatDisplay = (
 
   return `₹ ${formatShort(base)} (${sign}${formatShort(Math.abs(diff))})`;
 };
+
+export const formatLabel = (label: string, type: string) => {
+  if (type === "monthly") return label;
+
+  if (type === "weekly") {
+    const parts = label.split(" - ");
+    if (parts.length === 2) {
+      const [start, end] = parts;
+      const startDay = start.split(" ")[0];
+      const [endDay, month] = end.split(" ");
+      return `${startDay}–${endDay} ${month}`;
+    }
+  }
+
+  return label;
+};

src/components/HistoryChart/HistoryChart.view.tsx

@@ -6,7 +6,6 @@ import {
   ToggleButton,
   Paper
 } from "@mui/material";
-import { useTheme, alpha } from "@mui/material/styles";
 import IconButton from "@mui/material/IconButton";
 import ChevronLeftIcon from "@mui/icons-material/ChevronLeft";
 import ChevronRightIcon from "@mui/icons-material/ChevronRight";
@@ -14,7 +13,7 @@ import {
   ChartDataPoint,
   HistoryChartProps,
 } from "./HistoryChart.models";
-import { formatDisplay } from "./HistoryChart.utils";
+import { formatDisplay, formatLabel } from "./HistoryChart.utils";
 
 interface ViewProps extends HistoryChartProps {
   activeTab: string;
@@ -33,17 +32,11 @@ export default function HistoryChartView(props: ViewProps) {
     header,
     summary,
     tabs,
-    colorScheme,
-
-    mode,
-    periodType,
-    selectedPeriodId,
+    period,
+    onPeriodChange,
     comparison,
-
-    togglePeriodType,
-    setSelectedPeriodId,
-    toggleComparison,
-
+    setComparison,
+    colorScheme,
     activeTab,
     setActiveTab,
     currentData,
@@ -55,46 +48,34 @@ export default function HistoryChartView(props: ViewProps) {
     activeDataKey,
   } = props;
 
-  const theme = useTheme();
-  const isDark = theme.palette.mode === "dark";
-
-  const total = currentData.length;
-  const maxStartIndex = Math.max(total - visibleCount, 0);
-  const clampedStartIndex = Math.min(startIndex, maxStartIndex);
-
   const handleTabChange = (_: React.MouseEvent<HTMLElement>, newTab: string | null) => {
     if (newTab !== null) setActiveTab(newTab);
   };
 
-  const canGoLeft = clampedStartIndex > 0;
-  const canGoRight = clampedStartIndex < maxStartIndex;
+  const canGoLeft = startIndex > 0;
+  const canGoRight = startIndex + visibleCount < currentData.length;
 
   const handlePrev = () => {
-    if (!canGoLeft) return;
-    setStartIndex((prev) => Math.max(prev - visibleCount, 0));
+    if (canGoLeft) setStartIndex((prev) => prev - visibleCount);
   };
 
   const handleNext = () => {
-    if (!canGoRight) return;
-    setStartIndex((prev) => {
-      const next = prev + visibleCount;
-      return Math.min(next, maxStartIndex);
-    });
+    if (canGoRight) setStartIndex((prev) => prev + visibleCount);
   };
 
   return (
     <Paper
       sx={{
-        p: { xs: 2.5, sm: 4 },
+        p: { xs: 2, sm: 4 },
         borderRadius: 4,
         width: "100%",
         boxShadow: "none",
         border: "1px solid",
         borderColor: "divider",
-        bgcolor: isDark ? "background.paper" : colorScheme.light,
+        bgcolor: colorScheme.light,
       }}
     >
-      <Typography variant="h6" fontWeight={700} gutterBottom>
+      <Typography variant="h6" fontWeight={700} gutterBottom color={colorScheme.text}>
         {header}
       </Typography>
 
@@ -112,17 +93,35 @@ export default function HistoryChartView(props: ViewProps) {
         ))}
       </ToggleButtonGroup>
 
-      <Box sx={{ display: "flex", justifyContent: "space-between", mb: 3 }}>
-        <ToggleButtonGroup value={periodType} exclusive onChange={togglePeriodType} size="small">
+      <Box sx={{ display: "flex", alignItems: "center", justifyContent: "space-between", mb: 3 }}>
+        <ToggleButtonGroup value={period} exclusive onChange={(_, v) => v && onPeriodChange(v)} size="small">
           <ToggleButton value="rolling">Rolling</ToggleButton>
-          <ToggleButton value="calendar">Calendar</ToggleButton>
+          <ToggleButton value="calendar" disabled={activeDataKey === "daily"}>
+            Calendar
+          </ToggleButton>
         </ToggleButtonGroup>
 
         <ToggleButton
           value="compare"
           selected={comparison}
-          onChange={toggleComparison}
+          onChange={() => setComparison(!comparison)}
           size="small"
+          sx={{
+            textTransform: "none",
+            borderRadius: 2,
+            px: 2,
+            color: "text.secondary",
+            border: "1px solid",
+            borderColor: "divider",
+            "&.Mui-selected": {
+              color: "white",
+              bgcolor: "success.main",
+              borderColor: "success.main"
+            },
+            "&.Mui-selected:hover": {
+              bgcolor: "success.dark"
+            }
+          }}
         >
           Compare
         </ToggleButton>
@@ -131,7 +130,19 @@ export default function HistoryChartView(props: ViewProps) {
       {currentData.length > 0 ? (
         <Box sx={{ position: "relative", mt: 4 }}>
           {canGoLeft && (
-            <IconButton onClick={handlePrev} size="small" sx={{ position: "absolute", left: 0, top: "50%" }}>
+            <IconButton
+              onClick={handlePrev}
+              size="small"
+              sx={{
+                position: "absolute",
+                left: 0,
+                top: "50%",
+                transform: "translateY(-50%)",
+                zIndex: 2,
+                bgcolor: "background.paper",
+                boxShadow: 1
+              }}
+            >
               <ChevronLeftIcon fontSize="small" />
             </IconButton>
           )}
@@ -142,67 +153,77 @@ export default function HistoryChartView(props: ViewProps) {
               const compareHeight = comparison
                 ? ((point.compare?.amount ?? 0) / maxAmount) * 100
                 : 0;
-
-              const isSelected = selectedPeriodId === point.id;
-              const display = formatDisplay(point, activeDataKey, comparison);
+              const labelHeight = Math.max(currentHeight, compareHeight);
 
               return (
-                <Box
-                  key={point.id}
-                  onClick={() =>
-                    setSelectedPeriodId(isSelected ? null : point.id)
-                  }
-                  sx={{
-                    flex: 1,
-                    display: "flex",
-                    flexDirection: "column",
-                    alignItems: "center",
-                    cursor: "pointer",
-                    height: "100%"
-                  }}
-                >
-                  <Box sx={{ display: "flex", alignItems: "flex-end", gap: 1, height: "100%" }}>
+                <Box key={point.id} sx={{ flex: 1, display: "flex", flexDirection: "column", alignItems: "center", justifyContent: "flex-end", height: "100%" }}>
+                  <Box sx={{ display: "flex", alignItems: "flex-end", gap: comparison ? 0.5 : 0, height: "100%", position: "relative" }}>
+                    <Typography
+                      variant="caption"
+                      sx={{
+                        position: "absolute",
+                        bottom: `${labelHeight}%`,
+                        left: "50%",
+                        transform: "translate(-50%, -6px)",
+                        fontSize: "0.65rem",
+                        whiteSpace: "nowrap",
+                        pointerEvents: "none"
+                      }}
+                    >
+                      {formatDisplay(point, activeTab.toLowerCase(), comparison)}
+                    </Typography>
+
                     {comparison && (
-                      <Box
-                        sx={{
-                          width: 8,
-                          height: `${compareHeight}%`,
-                          bgcolor: alpha(colorScheme.primary, 0.4),
-                          borderRadius: "4px 4px 0 0"
-                        }}
-                      />
+                      <Box sx={{ width: 6, height: `${compareHeight}%`, bgcolor: `${colorScheme.primary}55`, borderRadius: 2 }} />
                     )}
 
+                    <Box sx={{ width: 4 }} />
+
                     <Box
                       sx={{
-                        width: 12,
+                        width: 10,
                         height: `${currentHeight}%`,
-                        bgcolor: isSelected ? "warning.main" : colorScheme.primary,
-                        borderRadius: "4px 4px 0 0"
+                        bgcolor: point.highlighted ? colorScheme.primary : `${colorScheme.primary}99`,
+                        borderRadius: 2
                       }}
                     />
                   </Box>
 
-                  <Typography variant="caption">
-                    {point.label}
-                  </Typography>
-
-                  {comparison && point.compare && (
-                    <Typography variant="caption" color="text.secondary">
-                      {point.compare.label}
+                  <Box sx={{ mt: 1, textAlign: "center", display: "flex", flexDirection: "column", alignItems: "center", lineHeight: 1.1 }}>
+                    <Typography variant="caption" sx={{ fontSize: "0.7rem", opacity: 0.7 }}>
+                      {formatLabel(point.id, activeDataKey)}
                     </Typography>
-                  )}
 
-                  <Typography variant="caption">
-                    {display}
-                  </Typography>
+                    <Typography
+                      variant="caption"
+                      sx={{
+                        fontSize: "0.65rem",
+                        color: "grey.400",
+                        visibility: comparison && point.compare && activeDataKey !== "daily" ? "visible" : "hidden"
+                      }}
+                    >
+                      {point.compare ? formatLabel(point.compare.id, activeDataKey) : "placeholder"}
+                    </Typography>
+                  </Box>
                 </Box>
               );
             })}
           </Box>
 
           {canGoRight && (
-            <IconButton onClick={handleNext} size="small" sx={{ position: "absolute", right: 0, top: "50%" }}>
+            <IconButton
+              onClick={handleNext}
+              size="small"
+              sx={{
+                position: "absolute",
+                right: 0,
+                top: "50%",
+                transform: "translateY(-50%)",
+                zIndex: 2,
+                bgcolor: "background.paper",
+                boxShadow: 1
+              }}
+            >
               <ChevronRightIcon fontSize="small" />
             </IconButton>
           )}

src/components/ProgressCard/ProgressCard.view.tsx

@@ -7,7 +7,6 @@ import {
   Divider,
   linearProgressClasses
 } from "@mui/material";
-import { useTheme, alpha } from "@mui/material/styles";
 import { ProgressCardProps } from "./ProgressCard.models";
 
 interface ViewProps extends ProgressCardProps {
@@ -24,9 +23,6 @@ export default function ProgressCardView({
   formattedTotal,
   compact = false,
 }: ViewProps) {
-  const theme = useTheme();
-  const isDark = theme.palette.mode === "dark";
-
   return (
     <Paper
       elevation={compact ? 2 : 4}
@@ -34,13 +30,10 @@ export default function ProgressCardView({
         width: "100%",
         p: compact ? { xs: 2.5, md: 3 } : { xs: 3, md: 4 },
         borderRadius: compact ? 3 : 4,
-        background: (theme) => {
-          const baseColor = theme.palette[colorTheme]?.main || theme.palette.primary.main;
-          const lightColor = theme.palette[colorTheme]?.light || theme.palette.primary.light;
-          return isDark
-            ? `linear-gradient(135deg, ${alpha(baseColor, 0.9)} 0%, ${alpha(baseColor, 0.3)} 100%)`
-            : `linear-gradient(135deg, ${baseColor} 0%, ${lightColor} 100%)`;
-        },
+        background: (theme) =>
+          colorTheme === "info"
+            ? "linear-gradient(135deg, #0284c7 0%, #06b6d4 100%)"
+            : `linear-gradient(135deg, ${theme.palette[colorTheme].main} 0%, ${theme.palette[colorTheme].light} 100%)`,
         color: "#fff",
         display: "flex",
         flexDirection: "column",
@@ -48,12 +41,11 @@ export default function ProgressCardView({
         justifyContent: "center",
         position: "relative",
         overflow: "hidden",
-        border: isDark ? "1px solid rgba(255,255,255,0.1)" : "none",
         boxShadow: (theme) =>
           `0 ${compact ? 6 : 12}px ${compact ? 12 : 24}px -10px ${
-            isDark
-              ? "rgba(0,0,0,0.5)"
-              : theme.palette[colorTheme]?.main || theme.palette.primary.main
+            theme.palette.mode === "dark"
+              ? "#000"
+              : theme.palette[colorTheme].main
           }`,
       }}
     >
@@ -61,14 +53,13 @@ export default function ProgressCardView({
         variant={compact ? "body2" : "subtitle1"} 
         fontWeight={700} 
         sx={{ 
-          opacity: 0.95, 
+          opacity: 0.9, 
           mb: compact ? 1.5 : 2, 
           width: '100%', 
           overflow: 'hidden', 
           textOverflow: 'ellipsis', 
           whiteSpace: 'nowrap',
-          letterSpacing: 0.5,
-          textShadow: isDark ? '0 1px 2px rgba(0,0,0,0.3)' : 'none'
+          letterSpacing: 0.5
         }}
       >
         {header}
@@ -78,7 +69,7 @@ export default function ProgressCardView({
         <Typography
           variant={compact ? "h5" : "h3"}
           fontWeight={900}
-          sx={{ mb: 0.5, lineHeight: 1.2, textShadow: isDark ? '0 2px 4px rgba(0,0,0,0.3)' : 'none' }}
+          sx={{ mb: 0.5, lineHeight: 1.2 }}
         >
           {formattedProgress}
         </Typography>
@@ -86,7 +77,7 @@ export default function ProgressCardView({
         <Divider
           sx={{
             my: 1,
-            borderColor: "rgba(255,255,255,0.25)",
+            borderColor: "rgba(255,255,255,0.4)",
             width: "100%",
           }}
         />
@@ -94,13 +85,12 @@ export default function ProgressCardView({
         <Typography
           variant={compact ? "caption" : "body2"}
           sx={{
-            opacity: 0.85,
-            fontWeight: 500,
-            display: "block",
-            color: "rgba(255,255,255,0.9)"
+            opacity: 0.8,
+            fontWeight: 400,
+            display: "block"
           }}
         >
-          of {formattedTotal}
+          {formattedTotal}
         </Typography>
       </Box>
 
@@ -112,12 +102,11 @@ export default function ProgressCardView({
             height: compact ? 6 : 10,
             borderRadius: 5,
             [`&.${linearProgressClasses.colorPrimary}`]: {
-              backgroundColor: "rgba(0, 0, 0, 0.25)",
+              backgroundColor: "rgba(0, 0, 0, 0.2)",
             },
             [`& .${linearProgressClasses.bar}`]: {
               borderRadius: 5,
               backgroundColor: "#fff",
-              boxShadow: '0 0 8px rgba(255,255,255,0.4)'
             },
           }}
         />

src/components/ProgressCard/TopTags.tsx

@@ -1,109 +0,0 @@
-import * as React from "react";
-import { Box } from "@mui/material";
-import { ReportData, ReportPeriod } from "../../features/report";
-import ProgressCard from "./ProgressCard";
-
-type Props = {
-  reportData: ReportData;
-  mode: "expense" | "income";
-  selectedPeriodId?: string | null;
-  compact?: boolean;
-};
-
-type DecoratedPeriod = ReportPeriod & {
-  id: string;
-  label: string;
-};
-
-function getAmount(p: ReportPeriod, mode: "expense" | "income") {
-  return mode === "expense" ? p.expenses.sum : p.incomes.sum;
-}
-
-function findPeriod(
-  periods: DecoratedPeriod[],
-  selectedPeriodId?: string | null
-) {
-  if (!periods.length) return null;
-
-  if (selectedPeriodId) {
-    const match = periods.find((p) => p.id === selectedPeriodId);
-    if (match) return match;
-  }
-
-  // fallback → latest
-  return periods.reduce((latest, p) =>
-    new Date(p.start).getTime() > new Date(latest.start).getTime()
-      ? p
-      : latest
-  );
-}
-
-export default function TopTags({
-  reportData,
-  mode,
-  selectedPeriodId,
-  compact = true
-}: Props) {
-  const { items, total } = React.useMemo(() => {
-    const tagMap = new Map<string, number>();
-
-    for (const bucket of reportData.buckets) {
-      const tags = bucket.group_key.tags;
-      if (!tags || tags.length === 0) continue;
-
-      // Prefer FULL if available
-      const fullPeriods = (bucket.periods.full || []) as DecoratedPeriod[];
-
-      const periodsToUse =
-        selectedPeriodId
-          ? Object.values(bucket.periods).flat() as DecoratedPeriod[]
-          : fullPeriods;
-
-      const period = findPeriod(periodsToUse, selectedPeriodId);
-      if (!period) continue;
-
-      const amount = getAmount(period, mode);
-
-      for (const tag of tags) {
-        tagMap.set(tag, (tagMap.get(tag) || 0) + amount);
-      }
-    }
-
-    const arr = Array.from(tagMap.entries()).map(([tag, amount]) => ({
-      tag,
-      amount
-    }));
-
-    arr.sort((a, b) => b.amount - a.amount);
-
-    const top = arr.slice(0, 4);
-    const total = top.reduce((sum, t) => sum + t.amount, 0);
-
-    return { items: top, total };
-  }, [reportData, mode, selectedPeriodId]);
-
-  return (
-    <Box
-      sx={{
-        display: "grid",
-        gridTemplateColumns: {
-          xs: "1fr",
-          sm: "repeat(2, 1fr)",
-          md: "repeat(4, 1fr)"
-        },
-        gap: 2
-      }}
-    >
-      {items.map((item) => (
-        <ProgressCard
-          key={item.tag}
-          header={item.tag}
-          progressAmount={item.amount}
-          totalAmount={total}
-          compact={compact}
-          colorTheme={mode === "expense" ? "error" : "success"}
-        />
-      ))}
-    </Box>
-  );
-}

src/dashboard-config.ts

@@ -1,7 +1,7 @@
 import HistoryChart from "./components/HistoryChart";
+import ProgressCard from "./components/ProgressCard";
 import LatestItems from "./components/LatestItems";
 import { DashboardConfig } from "./components/Dashboard";
-import TopTags from "./components/ProgressCard/TopTags";
 
 export const configuration: DashboardConfig = {
   sections: [
@@ -10,9 +10,9 @@ export const configuration: DashboardConfig = {
       title: "Breakdown",
       summary: "Interactive chronological tracking",
       component: HistoryChart,
+      dataKey: "chartData",
       settings: {
-        tabs: ["Weekly", "Monthly"],
-        // tabs: ["Weekly", "Monthly", "Yearly", "Financial Year", "All Time"],
+        tabs: ["Daily", "Weekly", "Monthly"],
       },
       style: {
         size: 12,
@@ -21,7 +21,9 @@ export const configuration: DashboardConfig = {
     {
       id: "top-payees",
       title: 'Top Payees',
-      component: TopTags,
+      component: ProgressCard,
+      dataKey: "topPayees",
+      isList: true,
       settings: {
         compact: true,
       },
@@ -29,41 +31,29 @@ export const configuration: DashboardConfig = {
         size: 12,
       },
     },
-    // {
-    //   id: "latest",
-    //   title: 'Recent Transactions',
-    //   component: LatestItems,
-    //   dataKey: "latest",
-    //   style: {
-    //     size: 12,
-    //   },
-    // },
+    {
+      id: "latest",
+      title: 'Recent Transactions',
+      component: LatestItems,
+      dataKey: "latest",
+      style: {
+        size: 12,
+      },
+    },
   ],
   style: {
     palette: {
       expense: {
-        light: {
-          primary: "#d32f2f",
-          background: "#fdecea",
-          text: "#b71c1c"
-        },
-        dark: {
-          primary: "#f44336",
-          background: "rgba(244, 67, 54, 0.15)",
-          text: "#ffcdd2"
-        }
+        primary: "#d32f2f",
+        light: "#fdecea",
+        dark: "#9a0007",
+        text: "#b71c1c"
       },
       income: {
-        light: {
-          primary: "#2e7d32",
-          background: "#e8f5e9",
-          text: "#1b5e20"
-        },
-        dark: {
-          primary: "#4caf50",
-          background: "rgba(76, 175, 80, 0.15)",
-          text: "#c8e6c9"
-        }
+        primary: "#2e7d32",
+        light: "#e8f5e9",
+        dark: "#1b5e20",
+        text: "#1b5e20"
       }
     }
   }

src/features/dashboard/dashboard.mapper.ts

@@ -0,0 +1,40 @@
+import * as React from "react";
+import MonetizationOnIcon from "@mui/icons-material/MonetizationOn";
+import { LatestItem } from "../../components/LatestItems";
+
+const DEFAULT_ICON = React.createElement(MonetizationOnIcon, {
+  sx: { color: "#388e3c" }
+});
+
+export function mapToLatestItems(
+  items: any[],
+  type: "expense" | "income"
+): LatestItem[] {
+  const isValid = (amt: number) =>
+    type === "expense" ? amt < 0 : amt > 0;
+
+  return items
+    .filter((item: any) => isValid(Number(item.amount) || 0))
+    .slice(0, 5)
+    .map((exp: any, index: number) => {
+      const time = new Date(
+        exp.occurred_at || exp.created_at || Date.now()
+      ).getTime();
+
+      const diffDays = Math.floor(
+        Math.abs(Date.now() - time) / (1000 * 60 * 60 * 24)
+      );
+
+      return {
+        id: exp.id || index,
+        icon: DEFAULT_ICON,
+        iconBgColor:
+          type === "expense" ? "#ffebee" : "#e8f5e9",
+        title: exp.payee?.name || exp.payee || "Unknown Payee",
+        subtitle:
+          exp.category?.name || exp.account?.name || "Transaction",
+        amount: `Rs ${Math.abs(exp.amount || 0)}`,
+        timeAgo: diffDays === 0 ? "Today" : `${diffDays} days ago`
+      };
+    });
+}

src/features/dashboard/index.ts

@@ -0,0 +1,3 @@
+export {
+  useDashboardData
+} from './useDashboardData'

src/features/dashboard/useDashboardData.ts

@@ -0,0 +1,52 @@
+import { useResourceByName } from "../../../react-openapi";
+import { mapToLatestItems } from "./dashboard.mapper";
+import { mapReportToDashboard } from "../report/report.mapper";
+
+export function useDashboardData(type: "expense" | "income") {
+  const { useList: useExpenseList } = useResourceByName("expenses");
+  const { useList: useReportList } = useResourceByName("reports");
+
+  // Fetch latest transactions
+  const latestQuery = useExpenseList({ 
+    limit: 100,
+    sort: "-occurred_at" 
+  });
+
+  // Fetch reports for aggregation
+  const weeklyReport = useReportList({ period: "weekly", rolling: true });
+  const monthlyReport = useReportList({ period: "monthly", rolling: true });
+  const payeeReport = useReportList({ period: "weekly", rolling: true, group_by: "payee" });
+
+  const isLoading = 
+    latestQuery.isLoading || 
+    weeklyReport.isLoading || 
+    monthlyReport.isLoading ||
+    payeeReport.isLoading;
+
+  const error = 
+    latestQuery.error || 
+    weeklyReport.error || 
+    monthlyReport.error ||
+    payeeReport.error;
+
+  const latest = latestQuery.data?.data 
+    ? mapToLatestItems(latestQuery.data.data, type) 
+    : [];
+
+  const aggregatedData = 
+    weeklyReport.data?.data && monthlyReport.data?.data && payeeReport.data?.data
+    ? mapReportToDashboard(
+        (weeklyReport.data.data as any).buckets, 
+        (monthlyReport.data.data as any).buckets, 
+        (payeeReport.data.data as any).buckets,
+        type
+      )
+    : null;
+
+  return {
+    data: aggregatedData,
+    latest: latest,
+    isLoading,
+    error,
+  };
+}

src/features/report/index.ts

@@ -1,11 +1,3 @@
 export {
   useReport
 } from './useReport'
-export type {
-  Transaction,
-  ReportData,
-  ReportPeriod,
-} from './report.models'
-export {
-  prepareReport
-} from './report.utils'

src/features/report/report.mapper.ts

@@ -0,0 +1,100 @@
+import {
+  AggregatedDashboardData,
+  ChartData,
+  ChartDataPoint,
+} from "../../components/HistoryChart";
+
+type ReportBucket = any;
+
+const sumBucket = (bucket: ReportBucket, flow: "expenses" | "incomes") =>
+  bucket.groups.reduce(
+    (acc: number, g: any) => acc + (g?.[flow]?.sum || 0),
+    0
+  );
+
+const toLabel = (start: string, end: string, type: "weekly" | "monthly") => {
+  const s = new Date(start);
+  const e = new Date(end);
+
+  if (type === "monthly") {
+    return s.toLocaleString("default", { month: "short" });
+  }
+
+  return `${s.getDate()}–${e.getDate()} ${e.toLocaleString("default", {
+    month: "short",
+  })}`;
+};
+
+const toPoints = (
+  buckets: ReportBucket[],
+  type: "weekly" | "monthly",
+  flow: "expenses" | "incomes"
+): ChartDataPoint[] => {
+  return buckets.map((b, i) => {
+    const amount = sumBucket(b, flow);
+    const prev = buckets[i - 1];
+
+    return {
+      id: toLabel(b.start, b.end, type),
+      amount,
+      compare: prev
+        ? {
+            id: toLabel(prev.start, prev.end, type),
+            amount: sumBucket(prev, flow),
+          }
+        : undefined,
+    };
+  });
+};
+
+export function mapReportToDashboard(
+  weekly: ReportBucket[],
+  monthly: ReportBucket[],
+  payeeBuckets: ReportBucket[],
+  type: "expense" | "income"
+): AggregatedDashboardData {
+  const flow = type === "expense" ? "expenses" : "incomes";
+
+  const chartData: ChartData = {
+    daily: [],
+
+    weekly: {
+      rolling: toPoints(weekly, "weekly", flow),
+      calendar: toPoints(weekly, "weekly", flow),
+    },
+
+    monthly: {
+      rolling: toPoints(monthly, "monthly", flow),
+      calendar: toPoints(monthly, "monthly", flow),
+    },
+  };
+
+  const totalAmount = weekly.reduce(
+    (acc, b) => acc + sumBucket(b, flow),
+    0
+  );
+
+  const payeeMap: Record<string, number> = {};
+
+  const sourceForPayees = (payeeBuckets && payeeBuckets.length > 0) ? payeeBuckets : weekly;
+
+  for (const b of sourceForPayees) {
+    for (const g of b.groups) {
+      const key = g.group_key || "Unknown";
+      const amt = g?.[flow]?.sum || 0;
+      payeeMap[key] = (payeeMap[key] || 0) + amt;
+    }
+  }
+
+  const topPayees = Object.entries(payeeMap)
+    // .filter(([name]) => name !== "Unknown")
+    .map(([payeeName, amount]) => ({ payeeName, amount }))
+    .sort((a, b) => b.amount - a.amount)
+    .slice(0, 5);
+
+  return {
+    chartData,
+    totalAmount,
+    topPayees,
+  };
+}

src/features/report/report.models.ts

@@ -1,90 +0,0 @@
-export interface Payor {
-  name: string;
-}
-
-export interface Payee {
-  name: string;
-}
-
-export interface Account {
-  name: string;
-  number: string;
-}
-
-export interface Tag {
-  name: string;
-  icon: string;
-  description: string;
-}
-
-export interface Transaction {
-  payor: Payor;
-  payee: Payee;
-  amount: number;
-  account: Account;
-  tags: Tag[];
-  occurred_at: Date;
-}
-
-// -----------------------------
-// Metrics
-// -----------------------------
-
-export interface ReportMetric {
-  sum: number;
-  count: number;
-  average: number;
-  transactions?: Transaction[];
-}
-
-// -----------------------------
-// Period
-// -----------------------------
-
-export interface ReportPeriod {
-  start: Date;
-  end: Date;
-
-  expenses: ReportMetric;
-  incomes: ReportMetric;
-}
-
-// -----------------------------
-// Group (bucket)
-// -----------------------------
-
-export type GroupKey = {
-  payee?: string[];
-  tags?: string[];
-  flow?: string[];
-};
-
-export interface ReportBucket {
-  group_key: GroupKey;
-
-  periods: {
-    weekly?: ReportPeriod[];
-    monthly?: ReportPeriod[];
-    yearly?: ReportPeriod[];
-    fyly?: ReportPeriod[];
-    full?: ReportPeriod[];
-  };
-}
-
-// -----------------------------
-// Final Report
-// -----------------------------
-
-export interface ReportData {
-  periods: ("weekly" | "monthly" | "yearly" | "fyly" | "full")[];
-
-  rolling: boolean;
-  report_date?: string;
-
-  group_by: ("payee" | "tags")[];
-
-  ignore_self: boolean;
-  include_transactions: boolean;
-
-  buckets: ReportBucket[];
-}

src/features/report/report.utils.ts

@@ -1,134 +0,0 @@
-import {
-  ReportData,
-  ReportPeriod
-} from "./report.models";
-
-/* ---------- ID BUILDING ---------- */
-
-function formatDate(d: Date): string {
-  const y = d.getUTCFullYear();
-  const m = String(d.getUTCMonth() + 1).padStart(2, "0");
-  const day = String(d.getUTCDate()).padStart(2, "0");
-  return `${y}-${m}-${day}`;
-}
-
-function buildPeriodId(
-  type: "weekly" | "monthly" | "yearly" | "fyly" | "full",
-  start: Date,
-  end: Date
-): string {
-  const s = formatDate(start);
-  const e = formatDate(end);
-
-  switch (type) {
-    case "weekly":
-      return `W:${s}_${e}`;
-    case "monthly":
-      return `M:${s}_${e}`;
-    case "yearly":
-      return `Y:${s}_${e}`;
-    case "fyly":
-      return `FY:${s}_${e}`;
-    case "full":
-      return `FULL:${s}_${e}`;
-    default:
-      return `${s}_${e}`;
-  }
-}
-
-/* ---------- LABEL BUILDING ---------- */
-
-const dayFmt = new Intl.DateTimeFormat("en-GB", {
-  day: "numeric",
-  month: "short",
-  timeZone: "UTC",
-});
-
-const monthDayFmt = new Intl.DateTimeFormat("en-GB", {
-  month: "short",
-  day: "numeric",
-  timeZone: "UTC",
-});
-
-const monthFmt = new Intl.DateTimeFormat("en-GB", {
-  month: "short",
-  timeZone: "UTC",
-});
-
-const yearFmt = new Intl.DateTimeFormat("en-GB", {
-  year: "numeric",
-  timeZone: "UTC",
-});
-
-function sameMonth(a: Date, b: Date) {
-  return (
-    a.getUTCFullYear() === b.getUTCFullYear() &&
-    a.getUTCMonth() === b.getUTCMonth()
-  );
-}
-
-function buildLabel(
-  type: "weekly" | "monthly" | "yearly" | "fyly" | "full",
-  start: Date,
-  end: Date
-): string {
-  switch (type) {
-    case "weekly":
-      if (sameMonth(start, end)) {
-        const sDay = start.getUTCDate();
-        const eDay = end.getUTCDate();
-        const m = monthFmt.format(start);
-        return `${sDay} ${m} - ${eDay} ${m}`;
-      }
-      return `${dayFmt.format(start)} - ${dayFmt.format(end)}`;
-
-    case "monthly":
-      return `${monthFmt.format(start)} ${yearFmt.format(start)}`;
-
-    case "yearly":
-      return yearFmt.format(start);
-
-    case "fyly": {
-      const startY = start.getUTCFullYear();
-      const endY = end.getUTCFullYear();
-      return `FY ${startY}–${String(endY).slice(-2)}`;
-    }
-
-    default:
-      return `${monthDayFmt.format(start)} - ${monthDayFmt.format(end)}`;
-  }
-}
-
-/* ---------- MAIN ---------- */
-
-function decoratePeriods(
-  type: "weekly" | "monthly" | "yearly" | "fyly" | "full",
-  periods: ReportPeriod[]
-): (ReportPeriod & { id: string; label: string })[] {
-  return periods.map((p) => ({
-    ...p,
-    id: buildPeriodId(type, new Date(p.start + "Z"), new Date(p.end + "Z")),
-    label: buildLabel(type, new Date(p.start + "Z"), new Date(p.end + "Z")),
-  }));
-}
-
-export function prepareReport(reportData: ReportData): ReportData {
-  return {
-    ...reportData,
-    buckets: reportData.buckets.map((bucket) => {
-      const newPeriods: typeof bucket.periods = {};
-
-      for (const type of reportData.periods) {
-        const arr = bucket.periods[type];
-        if (arr) {
-          newPeriods[type] = decoratePeriods(type, arr);
-        }
-      }
-
-      return {
-        ...bucket,
-        periods: newPeriods,
-      };
-    }),
-  };
-}

src/features/report/useReport.ts

@@ -1,20 +1,14 @@
 import { useResourceByName } from "../../../react-openapi";
 
 export interface ReportParams {
-  periods?: ("weekly" | "monthly" | "yearly" | "fyly" | "full")[];
+  period: "weekly" | "monthly" | "yearly" | "fyly";
   rolling?: boolean;
   report_date?: string;
-  group_by?: ("payee" | "tags")[];
+  group_by?: ("flow" | "payee" | "tags")[];
   ignore_self?: boolean;
-  include_transactions?: boolean;
 }
 
 export function useReport(params: ReportParams) {
   const { useList } = useResourceByName("reports");
-
-  return useList({
-    ...params,
-    periods: params.periods,
-    group_by: params.group_by,
-  });
+  return useList(params);
 }