use full for fast loading than weekly for payee report

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);
 }

react-openapi/hooks/useResource.ts

@@ -1,4 +1,4 @@
-import { useQuery, useMutation, useQueryClient, keepPreviousData } from "@tanstack/react-query";
+import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
 import { api } from "../api/client";
 import { ResourceConfig } from "../types/config";
 import { ConfigContext } from "../providers/ConfigContext";
@@ -26,7 +26,6 @@ export function useResource<T = any>(config: ResourceConfig | undefined) {
         };
       },
       enabled: !!endpoint,
-      placeholderData: keepPreviousData,
     });
 
   // --- READ ONE ---

src/Dashboard.tsx

@@ -3,81 +3,18 @@ import {
   Box,
   Container,
   CircularProgress,
-  Alert,
-  TextField,
-  Paper,
-  Autocomplete,
-  Button
+  Alert
 } from "@mui/material";
 
 import ConfigurableDashboard from "./components/Dashboard";
-import { DashboardState } from "./components/Dashboard";
 import { configuration } from "./dashboard-config";
-import {
-  useReport,
-  prepareReport,
-} from "./features/report";
+import { useDashboardData } from "./features/dashboard";
 
 export default function Dashboard() {
-  const [flow, setFlow] = React.useState<"outflows" | "inflows">("outflows");
+  const [mode, setMode] = React.useState<"expense" | "income">("expense");
+  const { data, latest, isLoading, error } = useDashboardData(mode);
 
-  const [appliedPayees, setAppliedPayees] = React.useState<string[]>([]);
-  const [appliedTags, setAppliedTags] = React.useState<string[]>([]);
-
-  const [payeeInput, setPayeeInput] = React.useState<string[]>([]);
-  const [tagsInput, setTagsInput] = React.useState<string[]>([]);
-
-  const [loadedPayees, setLoadedPayees] = React.useState<string[]>([]);
-  const [loadedTags, setLoadedTags] = React.useState<string[]>([]);
-
-  const report = useReport({
-    periods: ["daily", "weekly", "monthly", "all"],
-    flow: flow,
-    payee: appliedPayees.length > 0 ? appliedPayees : undefined,
-    tags: appliedTags.length > 0 ? appliedTags : undefined,
-  });
-
-  React.useEffect(() => {
-    if (report.data?.data) {
-      setLoadedPayees(prev => {
-        const pSet = new Set<string>(prev);
-        report.data.data.buckets.forEach((b: any) => {
-          Object.values(b.periods).forEach((periodArray: any) => {
-            periodArray?.forEach((p: any) => {
-              p.metric?.transactions?.forEach((t: any) => {
-                if (t.payee?.name) pSet.add(t.payee.name);
-              });
-            });
-          });
-        });
-        return Array.from(pSet).sort();
-      });
-
-      setLoadedTags(prev => {
-        const tSet = new Set<string>(prev);
-        report.data.data.buckets.forEach((b: any) => {
-          Object.values(b.periods).forEach((periodArray: any) => {
-            periodArray?.forEach((p: any) => {
-              p.metric?.transactions?.forEach((t: any) => {
-                t.tags?.forEach((tag: any) => tSet.add(tag.name || tag));
-              });
-            });
-          });
-        });
-        return Array.from(tSet).sort();
-      });
-    }
-  }, [report.data?.data]);
-
-  const isLoading = report.isLoading;
-  const error = report.error;
-
-  /** Callback for the ConfigurableDashboard's flow toggle */
-  const handleFlowChange = React.useCallback((newState: DashboardState) => {
-    setFlow(newState.flow);
-  }, []);
-
-  if (isLoading && !report.data) {
+  if (isLoading) {
     return (
       <Box sx={{ display: "flex", justifyContent: "center", alignItems: "center", height: "60vh" }}>
         <CircularProgress />
@@ -93,76 +30,16 @@ export default function Dashboard() {
     );
   }
 
-  if (!report.data) {
+  if (!data) {
     return null;
   }
 
-  const data = prepareReport(report.data.data);
   return (
-    <Box>
-      <Container>
-        <Paper 
-          sx={{ 
-            mt: 4, 
-            p: 2, 
-            display: "flex", 
-            flexDirection: { xs: "column", sm: "row" },
-            gap: 2, 
-            alignItems: { xs: "stretch", sm: "flex-end" }, 
-            borderRadius: 4,
-            mb: -2 // pull up to be closer to the dashboard container below
-          }} 
-          elevation={0} 
-          variant="outlined"
-        >
-          <Box sx={{ display: 'flex', flexDirection: 'column', flex: 1, minWidth: { sm: 250 } }}>
-            <Box sx={{ typography: 'caption', mb: 1, color: 'text.secondary' }}>
-              Filter by Payee
-            </Box>
-            <Autocomplete
-              multiple
-              freeSolo
-              options={loadedPayees}
-              value={payeeInput}
-              onChange={(_, val) => setPayeeInput(val as string[])}
-              renderInput={(params) => <TextField {...params} placeholder="Add payees..." />}
-              sx={{ '& .MuiOutlinedInput-root': { height: 'auto', minHeight: '2.5rem', py: 0.5 } }}
-            />
-          </Box>
-          <Box sx={{ display: 'flex', flexDirection: 'column', flex: 1, minWidth: { sm: 250 } }}>
-            <Box sx={{ typography: 'caption', mb: 1, color: 'text.secondary' }}>
-              Filter by Tags
-            </Box>
-            <Autocomplete
-              multiple
-              freeSolo
-              options={loadedTags}
-              value={tagsInput}
-              onChange={(_, val) => setTagsInput(val as string[])}
-              renderInput={(params) => <TextField {...params} placeholder="Add tags..." />}
-              sx={{ '& .MuiOutlinedInput-root': { height: 'auto', minHeight: '2.5rem', py: 0.5 } }}
-            />
-          </Box>
-          <Button 
-            variant="contained" 
-            size="large"
-            onClick={() => {
-              setAppliedPayees(payeeInput);
-              setAppliedTags(tagsInput);
-            }}
-            disabled={isLoading}
-            sx={{ height: 40, borderRadius: 2 }}
-          >
-            Apply
-          </Button>
-        </Paper>
-      </Container>
     <ConfigurableDashboard
       config={configuration}
       data={data}
-        isFetching={report.isFetching}
-        onFlowChange={handleFlowChange}
+      latest={latest}
+      onModeChange={(newMode) => setMode(newMode)}
     />
-    </Box>
   );
 }

src/components/Dashboard/Dashboard.models.ts

@@ -1,18 +1,11 @@
 import * as React from "react";
-import {
-  ReportData,
-  GroupKey,
-} from "../../features/report";
 
-export type DashboardFlow = "outflows" | "inflows";
-export type DashboardPeriodType = "rolling" | "calendar";
-export type DashboardSelectedPeriodId = string | null;
+export type DashboardMode = "expense" | "income";
+export type DashboardPeriod = "rolling" | "calendar";
 
 export interface DashboardState {
-  flow: DashboardFlow;
-  periodType: DashboardPeriodType;
-  selectedPeriodId: DashboardSelectedPeriodId;
-  selectedGroupKey: GroupKey | null;
+  mode: DashboardMode;
+  period: DashboardPeriod;
   comparison: boolean;
 }
 
@@ -21,6 +14,7 @@ export interface DashboardSection {
   title?: string;
   summary?: string;
   component: React.ComponentType<any>;
+  dataKey?: string;
   settings?: Record<string, any>;
   isList?: boolean;
   style?: {
@@ -43,13 +37,13 @@ export interface ThemeAwarePalette {
 export interface DashboardConfig {
   sections: DashboardSection[];
   style?: {
-    palette?: Record<DashboardFlow, ThemeAwarePalette>;
+    palette?: Record<DashboardMode, ThemeAwarePalette>;
   };
 }
 
 export interface DashboardProps {
   config: DashboardConfig;
-  data: ReportData;
-  isFetching?: boolean;
-  onFlowChange?: (state: DashboardState) => void;
+  data: any; // Aggregated data from features
+  latest: any[]; // Latest items from features
+  onModeChange?: (mode: DashboardMode) => void;
 }

src/components/Dashboard/Dashboard.tsx

@@ -4,61 +4,16 @@ import { DashboardProps, DashboardState } from "./Dashboard.models";
 
 export default function Dashboard(props: DashboardProps) {
   const [state, setState] = React.useState<DashboardState>({
-    flow: "outflows",
-    periodType: "rolling",
-    selectedPeriodId: null,
-    selectedGroupKey: null,
+    mode: "expense",
+    period: "rolling",
     comparison: false,
   });
 
-  const toggleFlow = (
-    event: React.MouseEvent<HTMLElement>,
-    newFlow: "outflows" | "inflows" | null
-  ) => {
-    if (newFlow === null) return;
-
-    setState(prev => {
-      if (prev.flow === newFlow) return prev;
-
-      const next = { ...prev, flow: newFlow };
-      props.onFlowChange?.(next);
-
-      return next;
-    });
-  };
-
-  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 }));
-  };
-
-  const setSelectedGroupKey = (groupKey: typeof state.selectedGroupKey) => {
-    setState(prev => ({ ...prev, selectedGroupKey: groupKey }));
-  };
-
   return (
     <DashboardView
       {...props}
       state={state}
       setState={setState}
-      toggleFlow={toggleFlow}
-      togglePeriodType={togglePeriodType}
-      toggleComparison={toggleComparison}
-      setSelectedPeriodId={setSelectedPeriodId}
-      setSelectedGroupKey={setSelectedGroupKey}
     />
   );
 }

src/components/Dashboard/Dashboard.view.tsx

@@ -5,41 +5,31 @@ import {
   Grid,
   Typography,
   ToggleButton,
-  ToggleButtonGroup,
-  Button
+  ToggleButtonGroup
 } from "@mui/material";
 import { useTheme, alpha } from "@mui/material/styles";
-import { GroupKey } from "../../features/report";
 import { DashboardProps, DashboardState } from "./Dashboard.models";
 
 interface ViewProps extends DashboardProps {
   state: DashboardState;
   setState: React.Dispatch<React.SetStateAction<DashboardState>>;
-  toggleFlow: (event: React.MouseEvent<HTMLElement>, newFlow: "outflows" | "inflows" | null) => void;
-  togglePeriodType: () => void;
-  setSelectedPeriodId: (id: string | null) => void;
-  setSelectedGroupKey: (groupKey: GroupKey | null) => void;
-  toggleComparison: () => void;
 }
 
 export default function DashboardView({
   config,
   data,
+  latest,
   state,
   setState,
-  toggleFlow,
-  togglePeriodType,
-  toggleComparison,
-  setSelectedPeriodId,
-  setSelectedGroupKey,
+  onModeChange
 }: ViewProps) {
   const theme = useTheme();
   const themeMode = theme.palette.mode;
-  const { flow, periodType, comparison, selectedPeriodId, selectedGroupKey } = state;
+  const { mode, period, comparison } = state;
 
   // Resolve colors with fallbacks
   const colors = React.useMemo(() => {
-    const palette = config.style?.palette?.[flow];
+    const palette = config.style?.palette?.[mode];
     const modeColors = palette ? palette[themeMode] : null;
 
     if (modeColors) {
@@ -51,13 +41,20 @@ export default function DashboardView({
     }
 
     // Fallback to standard theme colors
-    const themeColor = flow === 'outflows' ? theme.palette.error : theme.palette.success;
+    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, flow, themeMode, theme.palette]);
+  }, [config.style?.palette, mode, themeMode, theme.palette]);
+
+  const handleModeChange = (_: any, newMode: any) => {
+    if (newMode && onModeChange) {
+      onModeChange(newMode);
+      setState(prev => ({ ...prev, mode: newMode }));
+    }
+  };
 
   return (
     <Container
@@ -70,11 +67,11 @@ export default function DashboardView({
         transition: 'background 0.3s ease'
       }}
     >
-      <Box sx={{ display: "flex", flexDirection: "column", alignItems: "center", mb: 3 }}>
+      <Box sx={{ display: "flex", justifyContent: "center", mb: 3 }}>
         <ToggleButtonGroup
-          value={flow}
+          value={mode}
           exclusive
-          onChange={toggleFlow}
+          onChange={handleModeChange}
           sx={{
             borderRadius: 3,
             overflow: "hidden",
@@ -90,19 +87,9 @@ export default function DashboardView({
             },
           }}
         >
-          <ToggleButton value="outflows">Outflows</ToggleButton>
-          <ToggleButton value="inflows">Inflows</ToggleButton>
+          <ToggleButton value="expense">Expenses</ToggleButton>
+          <ToggleButton value="income">Income</ToggleButton>
         </ToggleButtonGroup>
-
-        {selectedGroupKey && Object.keys(selectedGroupKey).length > 0 && (
-          <Button 
-            size="small" 
-            sx={{ mt: 1, textTransform: "none" }}
-            onClick={() => setSelectedGroupKey(null)}
-          >
-            Clear Drill-down
-          </Button>
-        )}
       </Box>
 
       <Grid container spacing={4}>
@@ -111,29 +98,53 @@ export default function DashboardView({
           
           return (
             <Grid key={section.id} size={section.style?.size || 12 as any}>
+              {section.title && !section.isList && (
+                <Box sx={{ mb: 2 }}>
+                  <Typography variant="h6" fontWeight={700}>
+                    {section.title}
+                  </Typography>
+                </Box>
+              )}
+
+              {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}
-                reportData={data}
+                  data={section.dataKey ? data[section.dataKey] : data.chartData}
+                  items={section.dataKey === 'latest' ? latest : (data[section.dataKey || ''] || [])}
                   title={section.title}
                   accentColor={colors.primary}
                   colorScheme={colors}
-
-                // State management
-                flow={flow}
-
-                periodType={periodType}
+                  period={period}
+                  onPeriodChange={(p: any) => setState(prev => ({ ...prev, period: p }))}
                   comparison={comparison}
-                selectedPeriodId={selectedPeriodId}
-                selectedGroupKey={selectedGroupKey}
-
-                togglePeriodType={togglePeriodType}
-                toggleComparison={toggleComparison}
-                setSelectedPeriodId={setSelectedPeriodId}
-                setSelectedGroupKey={setSelectedGroupKey}
-                isFetching={arguments[0].isFetching}
+                  setComparison={(c: any) => setState(prev => ({ ...prev, comparison: c }))}
                 />
+              )}
             </Grid>
           );
         })}

src/components/HistoryChart/HistoryChart.adapter.ts

@@ -1,73 +0,0 @@
-import { ReportData } from "../../features/report";
-import {
-  mergeBucketPeriods,
-  getAmount,
-  PeriodKey,
-} from "../report.helpers";
-import { ChartDataPoint } from "./HistoryChart.models";
-
-// ─── Tab → PeriodKey ─────────────────────────────────────────
-
-const TAB_TO_KEY: Record<string, PeriodKey> = {
-  Daily: "daily",
-  Weekly: "weekly",
-  Monthly: "monthly",
-  "All Time": "all",
-};
-
-export function tabToKey(tab: string): PeriodKey {
-  return TAB_TO_KEY[tab] ?? "all";
-}
-
-// ─── Comparison ──────────────────────────────────────────────
-
-function attachComparison(
-  points: ChartDataPoint[],
-  key: PeriodKey
-): ChartDataPoint[] {
-  const getCompareIndex = (i: number) => {
-    if (key === "daily") return i - 7;
-    if (key === "weekly") return i - 4;
-    if (key === "monthly") return i - 12;
-    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,
-    };
-  });
-}
-
-// ─── Main adapter ────────────────────────────────────────────
-
-export function buildChartData(
-  reportData: ReportData,
-  key: PeriodKey,
-  flow: "outflows" | "inflows",
-  comparison: boolean
-): ChartDataPoint[] {
-  const merged = mergeBucketPeriods(reportData.buckets, key);
-
-  let points: ChartDataPoint[] = merged.map((p) => ({
-    id: p.id,
-    label: p.label,
-    amount: getAmount(p),
-  }));
-
-  if (comparison) {
-    points = attachComparison(points, key);
-  }
-
-  return points;
-}

src/components/HistoryChart/HistoryChart.models.ts

@@ -1,13 +1,5 @@
-import {
-  DashboardFlow,
-  DashboardPeriodType,
-  DashboardSelectedPeriodId
-} from "../Dashboard";
-import { ReportData } from "../../features/report";
-
 export interface _ChartDataPoint {
   id: string;
-  label: string;
   amount: number;
   highlighted?: boolean;
 }
@@ -16,27 +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;
   };
-
-  flow: DashboardFlow;
-  periodType: DashboardPeriodType;
-  selectedPeriodId: DashboardSelectedPeriodId;
-  comparison: boolean;
-
-  togglePeriodType: () => void;
-  setSelectedPeriodId: (id: string | null) => void;
-  toggleComparison: () => void;
-
-  isFetching?: boolean;
 }

src/components/HistoryChart/HistoryChart.tsx

@@ -1,79 +1,48 @@
 import * as React from "react";
-import { HistoryChartProps } from "./HistoryChart.models";
+import { ChartDataPoint, HistoryChartProps, ChartData } from "./HistoryChart.models";
 import HistoryChartView from "./HistoryChart.view";
-import { buildChartData, tabToKey } from "./HistoryChart.adapter";
 
 export default function HistoryChart(props: HistoryChartProps) {
-  const {
-    tabs,
-    reportData,
-    flow,
-    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 = tabToKey(activeTab);
+  const activeDataKey = activeTab.toLowerCase() as keyof ChartData;
 
-  const currentData = React.useMemo(() => {
-    return buildChartData(reportData, activeDataKey, flow, comparison);
-  }, [reportData, activeDataKey, flow, 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 = {
-    daily: 7,
-    weekly: 6,
-    monthly: 4,
-    all: 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]);
-
-  React.useEffect(() => {
-    if (
-      selectedPeriodId &&
-      !visibleData.some((p) => p.id === selectedPeriodId)
-    ) {
-      setSelectedPeriodId(null);
-    }
-  }, [visibleData, selectedPeriodId]);
-
   return (
     <HistoryChartView
       {...props}
@@ -83,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

@@ -14,7 +14,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 +33,11 @@ export default function HistoryChartView(props: ViewProps) {
     header,
     summary,
     tabs,
-    colorScheme,
-
-    flow,
-    periodType,
-    selectedPeriodId,
+    period,
+    onPeriodChange,
     comparison,
-
-    togglePeriodType,
-    setSelectedPeriodId,
-    toggleComparison,
-
+    setComparison,
+    colorScheme,
     activeTab,
     setActiveTab,
     currentData,
@@ -58,28 +52,19 @@ export default function HistoryChartView(props: ViewProps) {
   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 (
@@ -92,12 +77,10 @@ export default function HistoryChartView(props: ViewProps) {
         border: "1px solid",
         borderColor: "divider",
         bgcolor: isDark ? "background.paper" : colorScheme.light,
-        opacity: props.isFetching ? 0.6 : 1,
-        transition: "opacity 0.3s ease",
-        pointerEvents: props.isFetching ? "none" : "auto",
+        transition: 'background-color 0.3s ease, border-color 0.3s ease'
       }}
     >
-      <Typography variant="h6" fontWeight={700} gutterBottom>
+      <Typography variant="h6" fontWeight={700} gutterBottom sx={{ color: isDark ? 'text.primary' : colorScheme.text }}>
         {header}
       </Typography>
 
@@ -115,17 +98,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>
@@ -134,7 +135,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>
           )}
@@ -145,67 +158,78 @@ 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)
-                  }
+                <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 ? 1 : 0.5, height: "100%", position: "relative" }}>
+                    <Typography
+                      variant="caption"
                       sx={{
-                    flex: 1,
-                    display: "flex",
-                    flexDirection: "column",
-                    alignItems: "center",
-                    cursor: "pointer",
-                    height: "100%"
+                        position: "absolute",
+                        bottom: `${labelHeight}%`,
+                        left: "50%",
+                        transform: "translate(-50%, -6px)",
+                        fontSize: "0.65rem",
+                        whiteSpace: "nowrap",
+                        pointerEvents: "none",
+                        color: 'text.secondary',
+                        fontWeight: 600
                       }}
                     >
-                  <Box sx={{ display: "flex", alignItems: "flex-end", gap: 1, height: "100%" }}>
+                      {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: 8, height: `${compareHeight}%`, bgcolor: isDark ? alpha(colorScheme.primary, 0.3) : alpha(colorScheme.primary, 0.4), borderRadius: '4px 4px 0 0' }} />
                     )}
 
                     <Box
                       sx={{
-                        width: 12,
+                        width: comparison ? 10 : 16,
                         height: `${currentHeight}%`,
-                        bgcolor: isSelected ? "warning.main" : colorScheme.primary,
-                        borderRadius: "4px 4px 0 0"
+                        bgcolor: point.highlighted ? colorScheme.primary : isDark ? alpha(colorScheme.primary, 0.8) : alpha(colorScheme.primary, 0.9),
+                        borderRadius: '4px 4px 0 0',
+                        boxShadow: point.highlighted ? `0 0 10px ${alpha(colorScheme.primary, 0.5)}` : 'none'
                       }}
                     />
                   </Box>
 
-                  <Typography variant="caption">
-                    {point.label}
+                  <Box sx={{ mt: 1.5, textAlign: "center", display: "flex", flexDirection: "column", alignItems: "center", lineHeight: 1.1 }}>
+                    <Typography variant="caption" sx={{ fontSize: "0.7rem", opacity: 0.8, color: 'text.primary', fontWeight: 500 }}>
+                      {formatLabel(point.id, activeDataKey)}
                     </Typography>
 
-                  {comparison && point.compare && (
-                    <Typography variant="caption" color="text.secondary">
-                      {point.compare.label}
-                    </Typography>
-                  )}
-
-                  <Typography variant="caption">
-                    {display}
+                    <Typography
+                      variant="caption"
+                      sx={{
+                        fontSize: "0.65rem",
+                        color: "text.disabled",
+                        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/LatestItems/LatestItems.adapter.ts

@@ -1,79 +0,0 @@
-import { ReportData, Transaction, GroupKey } from "../../features/report";
-import {
-  mergeBucketPeriods,
-  periodIdToKey,
-  formatCurrency,
-  filterBuckets,
-} from "../report.helpers";
-import { LatestItem } from "./LatestItems.models";
-
-// ─── Transaction extraction ─────────────────────────────────
-
-function extractTransactions(
-  reportData: ReportData,
-  selectedPeriodId: string | null,
-  selectedGroupKey: GroupKey | null,
-): Transaction[] {
-  // 1. Get raw transactions
-  let rawTxns: Transaction[] = [];
-
-  if (selectedPeriodId) {
-    const key = periodIdToKey(selectedPeriodId);
-    const periods = mergeBucketPeriods(reportData.buckets, key);
-    const selected = periods.find((p) => p.id === selectedPeriodId);
-    rawTxns = selected?.metric.transactions || [];
-  } else {
-    const periods = mergeBucketPeriods(reportData.buckets, "all");
-    if (periods.length > 0) {
-      rawTxns = periods[0].metric.transactions || [];
-    }
-  }
-
-  // 2. Filter by group key
-  if (selectedGroupKey) {
-    rawTxns = rawTxns.filter(txn => {
-      let match = true;
-      if (selectedGroupKey.tags && selectedGroupKey.tags.length > 0) {
-        if (!txn.tags) match = false;
-        else {
-          const txnTags = txn.tags.map(t => typeof t === "string" ? t : t.name);
-          if (!selectedGroupKey.tags.every(selectedTag => txnTags.includes(selectedTag))) match = false;
-        }
-      }
-      if (match && selectedGroupKey.payee && selectedGroupKey.payee.length > 0) {
-        if (!txn.payee || !txn.payee.name) match = false;
-        else {
-          if (!selectedGroupKey.payee.includes(txn.payee.name)) match = false;
-        }
-      }
-      return match;
-    });
-  }
-
-  return rawTxns;
-}
-
-// ─── Main adapter ────────────────────────────────────────────
-
-export function buildLatestItems(
-  reportData: ReportData,
-  selectedPeriodId: string | null,
-  selectedGroupKey: GroupKey | null,
-  flow: "outflows" | "inflows"
-): LatestItem[] {
-  const txns = extractTransactions(reportData, selectedPeriodId, selectedGroupKey);
-
-  return txns
-    .sort(
-      (a, b) =>
-        new Date(b.occurred_at).getTime() -
-        new Date(a.occurred_at).getTime()
-    )
-    .map((t, index) => ({
-      id: index + 1,
-      title: t.payee.name,
-      subtitle: t.tags.map((tag) => tag.name).join(", "),
-      amount: formatCurrency(t.amount),
-      timeAgo: new Date(t.occurred_at).toLocaleDateString("en-IN"),
-    }));
-}

src/components/LatestItems/LatestItems.models.ts

@@ -1,16 +1,18 @@
+import * as React from "react";
+
 export interface LatestItem {
   id: string | number;
+  icon: React.ReactNode;
+  iconBgColor?: string;
   title: string;
   subtitle: string;
   amount: string;
   timeAgo: string;
 }
 
-export interface LatestItemsViewProps {
+export interface LatestItemsListProps {
+  title?: string;
   items: LatestItem[];
-  header: string;
+  onViewAll?: () => void;
   accentColor: string;
-  canExpand: boolean;
-  onExpand: () => void;
-  isFetching?: boolean;
 }

src/components/LatestItems/LatestItems.tsx

@@ -1,47 +1,112 @@
 import * as React from "react";
-import { ReportData, GroupKey } from "../../features/report";
-import { buildLatestItems } from "./LatestItems.adapter";
-import LatestItemsView from "./LatestItems.view";
+import {
+  List,
+  ListItem,
+  ListItemAvatar,
+  ListItemText,
+  Avatar,
+  Typography,
+  Box,
+  Button,
+} from "@mui/material";
 
-type Props = {
-  reportData: ReportData;
-  flow: "outflows" | "inflows";
-  header: string;
-  selectedPeriodId: string | null;
-  selectedGroupKey?: GroupKey | null;
-  accentColor: string;
-  isFetching?: boolean;
-};
+export interface LatestItem {
+  id: string | number;
+  icon: React.ReactNode;
+  iconBgColor?: string;
+  title: string;
+  subtitle: string;
+  amount: string;
+  timeAgo: string;
+}
+
+export interface LatestItemsListProps {
+  title?: string;
+  items: LatestItem[];
+  onViewAll?: () => void;
+  accentColor: any;
+}
 
 export default function LatestItems({
-  reportData,
-  flow,
-  header,
-  selectedPeriodId,
-  selectedGroupKey = null,
+  title = "Recent Transactions",
+  items,
+  onViewAll,
   accentColor,
-  isFetching,
-}: Props) {
-  const [visibleCount, setVisibleCount] = React.useState(5);
-
-  const allItems = React.useMemo(() => {
-    return buildLatestItems(reportData, selectedPeriodId, selectedGroupKey, flow);
-  }, [reportData, selectedPeriodId, selectedGroupKey, flow]);
-
-  const visibleItems = React.useMemo(() => {
-    return allItems.slice(0, visibleCount);
-  }, [allItems, visibleCount]);
-
-  const canExpand = visibleCount < allItems.length;
-
+}: LatestItemsListProps) {
   return (
-    <LatestItemsView
-      items={visibleItems}
-      header={header}
-      accentColor={accentColor}
-      canExpand={canExpand}
-      isFetching={isFetching}
-      onExpand={() => setVisibleCount((prev) => prev + 5)}
+    <Box sx={{ width: "100%", bgcolor: "background.paper", borderRadius: 4, p: 2 }}>
+      {/* Header */}
+      <Box sx={{ display: "flex", justifyContent: "space-between", alignItems: "center", mb: 2, px: 2 }}>
+        <Typography variant="h6" fontWeight="bold">
+          {title}
+        </Typography>
+        {onViewAll && (
+          <Button
+            variant="text"
+            color="inherit"
+            size="small"
+            sx={{ textTransform: "none", color: "text.secondary", fontWeight: "medium" }}
+            onClick={onViewAll}
+          >
+            view all
+          </Button>
+        )}
+      </Box>
+
+      {/* List */}
+      <List disablePadding>
+        {items.map((item, index) => (
+          <ListItem
+            key={item.id}
+            sx={{
+              px: { xs: 1, sm: 2 },
+              py: 2,
+              mb: index !== items.length - 1 ? 1 : 0,
+              borderRadius: 3,
+              "&:hover": { bgcolor: "action.hover" },
+              transition: "background-color 0.2s ease",
+            }}
+          >
+            <ListItemAvatar>
+              <Avatar
+                variant="rounded"
+                sx={{
+                  bgcolor: `${accentColor}22`,
+                  color: "inherit",
+                  width: 48,
+                  height: 48,
+                  borderRadius: 3,
+                  mr: 2,
+                }}
+              >
+                {item.icon}
+              </Avatar>
+            </ListItemAvatar>
+            
+            <ListItemText
+              primary={
+                <Typography variant="subtitle1" fontWeight={600} color="text.primary">
+                  {item.title}
+                </Typography>
+              }
+              secondary={
+                <Typography variant="body2" color="text.secondary">
+                  {item.subtitle}
+                </Typography>
+              }
             />
+
+            <Box sx={{ textAlign: "right" }}>
+              <Typography variant="subtitle1" fontWeight={700} color="text.primary">
+                {item.amount}
+              </Typography>
+              <Typography variant="caption" color="text.secondary" sx={{ display: 'block', mt: 0.5 }}>
+                {item.timeAgo}
+              </Typography>
+            </Box>
+          </ListItem>
+        ))}
+      </List>
+    </Box>
   );
 }

src/components/LatestItems/LatestItems.view.tsx

@@ -1,90 +1,6 @@
-import * as React from "react";
-import {
-  List,
-  ListItem,
-  ListItemAvatar,
-  ListItemText,
-  Avatar,
-  Typography,
-  Box,
-  IconButton,
-} from "@mui/material";
-import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
-import { LatestItemsViewProps } from "./LatestItems.models";
+import LatestItemsListView from "./LatestItems.view";
+import { LatestItemsListProps } from "./LatestItems.models";
 
-export default function LatestItemsView({
-  items,
-  header,
-  accentColor,
-  canExpand,
-  onExpand,
-  isFetching,
-}: LatestItemsViewProps) {
-  return (
-    <Box sx={{ width: "100%", bgcolor: "background.paper", borderRadius: 4, p: 2, opacity: isFetching ? 0.6 : 1, transition: "opacity 0.3s ease", pointerEvents: isFetching ? "none" : "auto" }}>
-      <Box sx={{ mb: 2, px: 2 }}>
-        <Typography variant="h6" fontWeight="bold">
-          {header}
-        </Typography>
-      </Box>
-
-      <List disablePadding>
-        {items.map((item, index) => (
-          <ListItem
-            key={item.id}
-            sx={{
-              px: { xs: 1, sm: 2 },
-              py: 2,
-              mb: index !== items.length - 1 ? 1 : 0,
-              borderRadius: 3,
-              "&:hover": { bgcolor: "action.hover" },
-            }}
-          >
-            <ListItemAvatar>
-              <Avatar
-                variant="rounded"
-                sx={{
-                  bgcolor: `${accentColor}22`,
-                  width: 48,
-                  height: 48,
-                  borderRadius: 3,
-                  mr: 2,
-                }}
-              />
-            </ListItemAvatar>
-
-            <ListItemText
-              primary={
-                <Typography variant="subtitle1" fontWeight={600}>
-                  {item.title}
-                </Typography>
-              }
-              secondary={
-                <Typography variant="body2" color="text.secondary">
-                  {item.subtitle}
-                </Typography>
-              }
-            />
-
-            <Box sx={{ textAlign: "right" }}>
-              <Typography variant="subtitle1" fontWeight={700}>
-                {item.amount}
-              </Typography>
-              <Typography variant="caption" color="text.secondary">
-                {item.timeAgo}
-              </Typography>
-            </Box>
-          </ListItem>
-        ))}
-
-        {canExpand && (
-          <Box sx={{ display: "flex", justifyContent: "center", mt: 2 }}>
-            <IconButton size="small" onClick={onExpand}>
-              <ExpandMoreIcon />
-            </IconButton>
-          </Box>
-        )}
-      </List>
-    </Box>
-  );
+export default function LatestItemsList(props: LatestItemsListProps) {
+  return <LatestItemsListView {...props} />;
 }

src/components/ProgressCard/ProgressCard.models.ts

@@ -5,7 +5,4 @@ export interface ProgressCardProps {
   totalAmount: number;
   colorTheme?: "primary" | "secondary" | "error" | "info" | "success" | "warning";
   compact?: boolean;
-  selected?: boolean;
-  onClick?: () => void;
-  isFetching?: boolean;
 }

src/components/ProgressCard/ProgressCard.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import ProgressCardView from "./ProgressCard.view";
 import { ProgressCardProps } from "./ProgressCard.models";
-import { getPercentage, formatCurrency } from "../report.helpers";
+import { getPercentage, formatCurrency } from "./ProgressCard.utils";
 
 export default function ProgressCard(props: ProgressCardProps) {
   const { progressAmount, totalAmount, compact = false } = props;
@@ -18,8 +18,6 @@ export default function ProgressCard(props: ProgressCardProps) {
       formattedProgress={formattedProgress}
       formattedTotal={formattedTotal}
       compact={compact}
-      selected={props.selected}
-      onClick={props.onClick}
     />
   );
 }

src/components/ProgressCard/ProgressCard.utils.ts

@@ -0,0 +1,15 @@
+export const getPercentage = (progressAmount: number, totalAmount: number) => {
+  if (!totalAmount) return 0;
+  return Math.min(100, Math.max(0, (progressAmount / totalAmount) * 100));
+};
+
+export const formatCurrency = (val: number) => {
+  const absVal = Math.abs(val);
+  if (absVal >= 100000) {
+    return `₹ ${(val / 100000).toFixed(2)}L`;
+  }
+  if (absVal >= 1000) {
+    return `₹ ${(val / 1000).toFixed(2)}k`;
+  }
+  return `₹ ${val.toFixed(2)}`;
+};

src/components/ProgressCard/ProgressCard.view.tsx

@@ -14,8 +14,6 @@ interface ViewProps extends ProgressCardProps {
   percentage: number;
   formattedProgress: string;
   formattedTotal: string;
-  selected?: boolean;
-  onClick?: () => void;
 }
 
 export default function ProgressCardView({
@@ -25,8 +23,6 @@ export default function ProgressCardView({
   formattedProgress,
   formattedTotal,
   compact = false,
-  selected,
-  onClick,
 }: ViewProps) {
   const theme = useTheme();
   const isDark = theme.palette.mode === "dark";
@@ -34,14 +30,10 @@ export default function ProgressCardView({
   return (
     <Paper
       elevation={compact ? 2 : 4}
-      onClick={onClick}
       sx={{
         width: "100%",
         p: compact ? { xs: 2.5, md: 3 } : { xs: 3, md: 4 },
         borderRadius: compact ? 3 : 4,
-        cursor: onClick ? "pointer" : "default",
-        transform: selected ? "scale(1.02)" : "scale(1)",
-        transition: "transform 0.2s ease, box-shadow 0.2s ease",
         background: (theme) => {
           const baseColor = theme.palette[colorTheme]?.main || theme.palette.primary.main;
           const lightColor = theme.palette[colorTheme]?.light || theme.palette.primary.light;
@@ -56,21 +48,13 @@ export default function ProgressCardView({
         justifyContent: "center",
         position: "relative",
         overflow: "hidden",
-        border: selected 
-          ? `2px solid #fff`
-          : isDark ? "1px solid rgba(255,255,255,0.1)" : "none",
-        boxShadow: (theme) => {
-          const baseShadow = `0 ${compact ? 6 : 12}px ${compact ? 12 : 24}px -10px ${
+        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
-          }`;
-          return selected 
-            ? `${baseShadow}, 0 0 0 2px ${theme.palette.background.paper}, 0 0 0 4px ${theme.palette[colorTheme]?.main || theme.palette.primary.main}` 
-            : baseShadow;
-        },
-        opacity: arguments[0].isFetching ? 0.6 : 1,
-        pointerEvents: arguments[0].isFetching ? "none" : "auto",
+          }`,
       }}
     >
       <Typography 

src/components/ProgressCard/TopPayees.adapter.ts

@@ -1,65 +0,0 @@
-import { mergeBucketPeriods, periodIdToKey } from "../report.helpers";
-import { GroupKey, ReportData } from "../../features/report";
-
-export interface PayeeItem {
-  name: string;
-  amount: number;
-}
-
-export function extractTopPayees(
-  reportData: ReportData,
-  flow: "outflows" | "inflows",
-  selectedPeriodId?: string | null,
-  selectedGroupKey?: GroupKey | null
-): { items: PayeeItem[]; total: number } {
-  const payeeMap = new Map<string, number>();
-
-  let targetPeriods = [];
-
-  if (selectedPeriodId) {
-    const key = periodIdToKey(selectedPeriodId);
-    const periods = mergeBucketPeriods(reportData.buckets, key);
-    const selected = periods.find((p) => p.id === selectedPeriodId);
-    if (selected) {
-      targetPeriods.push(selected);
-    }
-  } else {
-    // If no specific period is selected, aggregate over the "all" period bucket
-    targetPeriods = mergeBucketPeriods(reportData.buckets, "all");
-  }
-
-  for (const p of targetPeriods) {
-    let txns = p.metric.transactions || [];
-    
-    if (selectedGroupKey?.tags && selectedGroupKey.tags.length > 0) {
-      txns = txns.filter(txn => {
-        if (!txn.tags) return false;
-        const txnTags = txn.tags.map(t => typeof t === "string" ? t : t.name);
-        return selectedGroupKey.tags!.every(selectedTag => txnTags.includes(selectedTag));
-      });
-    }
-
-    for (const txn of txns) {
-      if (txn.payee && txn.payee.name) {
-        const current = payeeMap.get(txn.payee.name) || 0;
-        payeeMap.set(txn.payee.name, current + txn.amount);
-      }
-    }
-  }
-
-  let items: PayeeItem[] = [];
-  let total = 0;
-
-  for (const [name, amount] of payeeMap.entries()) {
-    items.push({ name, amount });
-    total += amount;
-  }
-
-  // Sort descending by amount
-  items.sort((a, b) => b.amount - a.amount);
-
-  return {
-    items: items.slice(0, 4), // Top 4
-    total,
-  };
-}

src/components/ProgressCard/TopPayees.tsx

@@ -1,93 +0,0 @@
-import * as React from "react";
-import { Box, Paper, Typography } from "@mui/material";
-import { ReportData, GroupKey } from "../../features/report";
-import ProgressCard from "./ProgressCard";
-import { extractTopPayees } from "./TopPayees.adapter";
-
-type Props = {
-  reportData: ReportData;
-  flow: "outflows" | "inflows";
-  header: string;
-  selectedPeriodId?: string | null;
-  selectedGroupKey?: GroupKey | null;
-  setSelectedGroupKey?: (key: GroupKey | null) => void;
-  compact?: boolean;
-  isFetching?: boolean;
-};
-
-export default function TopPayees({
-  reportData,
-  flow,
-  header,
-  selectedPeriodId,
-  selectedGroupKey,
-  setSelectedGroupKey,
-  compact = true,
-  isFetching,
-}: Props) {
-  const { items, total } = React.useMemo(() => {
-    return extractTopPayees(reportData, flow, selectedPeriodId, selectedGroupKey);
-  }, [reportData, flow, selectedPeriodId, selectedGroupKey]);
-
-  return (
-    <Paper
-      sx={{
-        p: { xs: 2.5, sm: 4 },
-        borderRadius: 4,
-        width: "100%",
-        boxShadow: "none",
-        border: "1px solid",
-        borderColor: "divider",
-        bgcolor: "background.paper",
-        opacity: isFetching ? 0.6 : 1,
-        transition: "opacity 0.3s ease",
-        pointerEvents: isFetching ? "none" : "auto",
-      }}
-    >
-      <Typography variant="h6" fontWeight={700} gutterBottom>
-        {header}
-      </Typography>
-
-      <Box
-        sx={{
-          display: "grid",
-          gridTemplateColumns: {
-            xs: "1fr",
-            sm: "repeat(2, 1fr)",
-            md: "repeat(4, 1fr)",
-          },
-          gap: 2,
-        }}
-      >
-        {items.map((item) => {
-          const isSelected = selectedGroupKey?.payee?.includes(item.name);
-          return (
-            <ProgressCard
-              key={item.name}
-              header={item.name}
-              progressAmount={item.amount}
-              totalAmount={total}
-              compact={compact}
-              colorTheme={flow === "outflows" ? "error" : "success"}
-              selected={isSelected}
-              isFetching={isFetching}
-              onClick={() => {
-                if (setSelectedGroupKey) {
-                  let newKey = selectedGroupKey ? { ...selectedGroupKey } : {};
-
-                  if (isSelected) {
-                    delete newKey.payee;
-                  } else {
-                    newKey.payee = [item.name];
-                  }
-
-                  setSelectedGroupKey(Object.keys(newKey).length ? newKey : null);
-                }
-              }}
-            />
-          );
-        })}
-      </Box>
-    </Paper>
-  );
-}

src/components/ProgressCard/TopTags.adapter.ts

@@ -1,71 +0,0 @@
-import { ReportData } from "../../features/report";
-import {
-  mergeBucketPeriods,
-  periodIdToKey,
-} from "../report.helpers";
-
-import { GroupKey } from "../../features/report";
-
-export interface TagItem {
-  tag: string;
-  amount: number;
-}
-
-export function extractTopTags(
-  reportData: ReportData,
-  flow: "outflows" | "inflows",
-  selectedPeriodId?: string | null,
-  selectedGroupKey?: GroupKey | null
-): { items: TagItem[]; total: number } {
-  const tagMap = new Map<string, number>();
-
-  let periodKey: ReturnType<typeof periodIdToKey> = "all";
-  if (selectedPeriodId) {
-    periodKey = periodIdToKey(selectedPeriodId);
-  }
-
-  const periods = mergeBucketPeriods(reportData.buckets, periodKey);
-
-  let period = periods[0];
-  if (selectedPeriodId) {
-    period = periods.find(p => p.id === selectedPeriodId) || period;
-  } else if (periods.length > 0) {
-    period = periods.reduce((latest, p) =>
-      new Date(p.start).getTime() > new Date(latest.start).getTime()
-        ? p
-        : latest
-    );
-  }
-
-  if (period && period.metric && period.metric.transactions) {
-    let txns = period.metric.transactions;
-    if (selectedGroupKey?.payee && selectedGroupKey.payee.length > 0) {
-      txns = txns.filter(txn => 
-        txn.payee?.name && selectedGroupKey.payee!.includes(txn.payee.name)
-      );
-    }
-
-    for (const txn of txns) {
-      if (txn.tags && txn.tags.length > 0) {
-        for (const tagObj of txn.tags) {
-          const tagName = typeof tagObj === "string" ? tagObj : tagObj.name;
-          tagMap.set(tagName, (tagMap.get(tagName) || 0) + txn.amount);
-        }
-      } else {
-        tagMap.set("Untagged", (tagMap.get("Untagged") || 0) + txn.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 };
-}

src/components/ProgressCard/TopTags.tsx

@@ -1,93 +0,0 @@
-import * as React from "react";
-import { Box, Paper, Typography } from "@mui/material";
-import { ReportData, GroupKey } from "../../features/report";
-import ProgressCard from "./ProgressCard";
-import { extractTopTags } from "./TopTags.adapter";
-
-type Props = {
-  reportData: ReportData;
-  flow: "outflows" | "inflows";
-  header: string;
-  selectedPeriodId?: string | null;
-  selectedGroupKey?: GroupKey | null;
-  setSelectedGroupKey?: (key: GroupKey | null) => void;
-  compact?: boolean;
-  isFetching?: boolean;
-};
-
-export default function TopTags({
-  reportData,
-  flow,
-  header,
-  selectedPeriodId,
-  selectedGroupKey,
-  setSelectedGroupKey,
-  compact = true,
-  isFetching,
-}: Props) {
-  const { items, total } = React.useMemo(() => {
-    return extractTopTags(reportData, flow, selectedPeriodId, selectedGroupKey);
-  }, [reportData, flow, selectedPeriodId, selectedGroupKey]);
-
-  return (
-    <Paper
-      sx={{
-        p: { xs: 2.5, sm: 4 },
-        borderRadius: 4,
-        width: "100%",
-        boxShadow: "none",
-        border: "1px solid",
-        borderColor: "divider",
-        bgcolor: "background.paper",
-        opacity: isFetching ? 0.6 : 1,
-        transition: "opacity 0.3s ease",
-        pointerEvents: isFetching ? "none" : "auto",
-      }}
-    >
-      <Typography variant="h6" fontWeight={700} gutterBottom>
-        {header}
-      </Typography>
-
-      <Box
-        sx={{
-          display: "grid",
-          gridTemplateColumns: {
-            xs: "1fr",
-            sm: "repeat(2, 1fr)",
-            md: "repeat(4, 1fr)",
-          },
-          gap: 2,
-        }}
-      >
-        {items.map((item) => {
-          const isSelected = selectedGroupKey?.tags?.includes(item.tag);
-          return (
-            <ProgressCard
-              key={item.tag}
-              header={item.tag}
-              progressAmount={item.amount}
-              totalAmount={total}
-              compact={compact}
-              colorTheme={flow === "outflows" ? "error" : "success"}
-              selected={isSelected}
-              isFetching={isFetching}
-              onClick={() => {
-                if (setSelectedGroupKey) {
-                  let newKey = selectedGroupKey ? { ...selectedGroupKey } : {};
-                  
-                  if (isSelected) {
-                    delete newKey.tags;
-                  } else {
-                    newKey.tags = [item.tag];
-                  }
-
-                  setSelectedGroupKey(Object.keys(newKey).length ? newKey : null);
-                }
-              }}
-            />
-          );
-        })}
-      </Box>
-    </Paper>
-  );
-}

src/components/report.helpers.ts

@@ -1,142 +0,0 @@
-import {
-  ReportPeriod,
-  ReportBucket,
-  GroupKey,
-  PeriodType,
-} from "../features/report";
-
-// ─── Types ────────────────────────────────────────────────────
-
-export type PeriodKey = PeriodType;
-
-export type DecoratedPeriod = ReportPeriod & {
-  id: string;
-  label: string;
-};
-
-// ─── Period helpers ───────────────────────────────────────────
-
-const PREFIX_TO_KEY: Record<string, PeriodKey> = {
-  D: "daily",
-  W: "weekly",
-  M: "monthly",
-  ALL: "all",
-};
-
-/**
- * Derive the period key from a decorated-period id.
- * E.g. `"W:2026-04-28_2026-05-04"` → `"weekly"`
- */
-export function periodIdToKey(periodId: string): PeriodKey {
-  const prefix = periodId.split(":")[0];
-  return PREFIX_TO_KEY[prefix] ?? "all";
-}
-
-// ─── Metric helpers ───────────────────────────────────────────
-
-export function getAmount(period: ReportPeriod): number {
-  return period.metric.sum;
-}
-
-function mergeMetric(a: ReportPeriod["metric"], b: ReportPeriod["metric"]) {
-  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,
-  };
-}
-
-/**
- * Merge periods with the same id across all buckets, summing
- * their metrics and concatenating transactions.
- *
- * Returns sorted by start date ascending.
- */
-export function mergeBucketPeriods(
-  buckets: ReportBucket[],
-  key: PeriodKey
-): 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,
-          metric: { ...p.metric },
-        });
-      } else {
-        map.set(p.id, {
-          ...existing,
-          metric: mergeMetric(existing.metric, p.metric),
-        });
-      }
-    }
-  }
-
-  return Array.from(map.values()).sort(
-    (a, b) => new Date(a.start).getTime() - new Date(b.start).getTime()
-  );
-}
-
-// ─── Formatting ───────────────────────────────────────────────
-
-export const formatCurrency = (val: number) => {
-  const absVal = Math.abs(val);
-  if (absVal >= 100000) {
-    return `₹ ${(val / 100000).toFixed(2)}L`;
-  }
-  if (absVal >= 1000) {
-    return `₹ ${(val / 1000).toFixed(2)}k`;
-  }
-  return `₹ ${val.toFixed(2)}`;
-};
-
-export const getPercentage = (progressAmount: number, totalAmount: number) => {
-  if (!totalAmount) return 0;
-  return Math.min(100, Math.max(0, (progressAmount / totalAmount) * 100));
-};
-
-// ─── Group filtering ──────────────────────────────────────────
-
-/**
- * Check if a bucket's group_key matches the selected GroupKey.
- * Every dimension present in `selected` must exist in the bucket
- * and contain all the selected values.
- */
-export function matchesGroupKey(
-  bucket: ReportBucket,
-  selected: GroupKey
-): boolean {
-  for (const [dim, values] of Object.entries(selected)) {
-    const bucketValues = bucket.group_key[dim];
-    if (!bucketValues) return false;
-    if (!(values as string[]).every((v) => bucketValues.includes(v)))
-      return false;
-  }
-  return true;
-}
-
-/**
- * Return only buckets matching the selected group key,
- * or all buckets if no selection.
- */
-export function filterBuckets(
-  buckets: ReportBucket[],
-  selectedGroupKey: GroupKey | null
-): ReportBucket[] {
-  if (!selectedGroupKey) return buckets;
-  return buckets.filter((b) => matchesGroupKey(b, selectedGroupKey));
-}

src/dashboard-config.ts

@@ -1,8 +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";
-import TopPayees from "./components/ProgressCard/TopPayees";
 
 export const configuration: DashboardConfig = {
   sections: [
@@ -11,19 +10,9 @@ export const configuration: DashboardConfig = {
       title: "Breakdown",
       summary: "Interactive chronological tracking",
       component: HistoryChart,
+      dataKey: "chartData",
       settings: {
-        tabs: ["Weekly", "Monthly"],
-      },
-      style: {
-        size: 12,
-      },
-    },
-    {
-      id: "top-categories",
-      title: 'Top Categories',
-      component: TopTags,
-      settings: {
-        compact: true,
+        tabs: ["Daily", "Weekly", "Monthly"],
       },
       style: {
         size: 12,
@@ -32,7 +21,9 @@ export const configuration: DashboardConfig = {
     {
       id: "top-payees",
       title: 'Top Payees',
-      component: TopPayees,
+      component: ProgressCard,
+      dataKey: "topPayees",
+      isList: true,
       settings: {
         compact: true,
       },
@@ -41,9 +32,10 @@ export const configuration: DashboardConfig = {
       },
     },
     {
-      id: "items",
+      id: "latest",
       title: 'Recent Transactions',
       component: LatestItems,
+      dataKey: "latest",
       style: {
         size: 12,
       },
@@ -51,7 +43,7 @@ export const configuration: DashboardConfig = {
   ],
   style: {
     palette: {
-      outflows: {
+      expense: {
         light: {
           primary: "#d32f2f",
           background: "#fdecea",
@@ -63,7 +55,7 @@ export const configuration: DashboardConfig = {
           text: "#ffcdd2"
         }
       },
-      inflows: {
+      income: {
         light: {
           primary: "#2e7d32",
           background: "#e8f5e9",

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: "full", 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,15 +1,3 @@
 export {
   useReport
 } from './useReport'
-export type {
-  Transaction,
-  ReportData,
-  ReportBucket,
-  ReportPeriod,
-  ReportQuery,
-  GroupKey,
-  PeriodType,
-} 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,112 +0,0 @@
-export interface Payor {
-  id?: string;
-  name: string;
-  username: string;
-  email: string;
-}
-
-export interface Payee {
-  type: "merchant" | "person" | "transfer" | "other";
-  name: string;
-}
-
-export interface Account {
-  id: string;
-  name: string;
-  number: string;
-  type: "cash" | "bank" | "credit_card" | "wallet" | "other";
-  currency: string;
-  is_active?: boolean;
-}
-
-export interface Tag {
-  id: string;
-  name: string;
-  icon: string;
-  parent_id?: string | null;
-}
-
-export interface Transaction {
-  id: string;
-  payor: Payor;
-  payee: Payee;
-  amount: number;
-  account: Account;
-  tags: Tag[];
-  occurred_at: string;
-  created_at: string;
-}
-
-// -----------------------------
-// Metrics
-// -----------------------------
-
-export interface ReportMetric {
-  sum: number;
-  count: number;
-  average: number;
-  transactions?: Transaction[];
-}
-
-// -----------------------------
-// Period
-// -----------------------------
-
-export type PeriodType = "daily" | "weekly" | "monthly" | "all";
-
-export interface ReportPeriod {
-  start: string;
-  end: string;
-  metric: ReportMetric;
-}
-
-// -----------------------------
-// Group (bucket)
-// -----------------------------
-
-export type GroupKey = {
-  [dimension: string]: string[];
-};
-
-export interface ReportBucket {
-  group_key: GroupKey;
-
-  periods: {
-    daily?: ReportPeriod[];
-    weekly?: ReportPeriod[];
-    monthly?: ReportPeriod[];
-    all?: ReportPeriod[];
-  };
-}
-
-// -----------------------------
-// Report Query
-// -----------------------------
-
-export interface ReportQuery {
-  accounts?: string[] | null;
-  ignore_self?: boolean | null;
-  start_date?: string | null;
-  end_date?: string | null;
-  min_amount?: number | null;
-  max_amount?: number | null;
-}
-
-// -----------------------------
-// Final Report
-// -----------------------------
-
-export interface ReportData {
-  snapshot_id?: string | null;
-
-  flow?: "inflows" | "outflows" | null;
-
-  periods: PeriodType[];
-
-  tags?: string[] | null;
-  payee?: string[] | null;
-
-  buckets: ReportBucket[];
-
-  query: ReportQuery;
-}

src/features/report/report.utils.ts

@@ -1,117 +0,0 @@
-import {
-  ReportData,
-  ReportPeriod,
-  PeriodType,
-} 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: PeriodType,
-  start: Date,
-  end: Date
-): string {
-  const s = formatDate(start);
-  const e = formatDate(end);
-
-  switch (type) {
-    case "daily":
-      return `D:${s}_${e}`;
-    case "weekly":
-      return `W:${s}_${e}`;
-    case "monthly":
-      return `M:${s}_${e}`;
-    case "all":
-      return `ALL:${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 buildLabel(
-  type: PeriodType,
-  start: Date,
-  end: Date
-): string {
-  switch (type) {
-    case "daily":
-      return dayFmt.format(start);
-
-    case "weekly": {
-      const sDay = start.getUTCDate();
-      const m = monthFmt.format(start);
-      return `${sDay} ${m}`;
-    }
-
-    case "monthly":
-      return `${monthFmt.format(start)} ${yearFmt.format(start)}`;
-
-    default:
-      return `${monthDayFmt.format(start)} - ${monthDayFmt.format(end)}`;
-  }
-}
-
-/* ---------- MAIN ---------- */
-
-function decoratePeriods(
-  type: PeriodType,
-  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,18 +1,14 @@
 import { useResourceByName } from "../../../react-openapi";
 
 export interface ReportParams {
-  snapshot_id?: string;
-  periods?: ("daily" | "weekly" | "monthly" | "all")[];
-  flow?: "inflows" | "outflows";
-  payee?: string[];
-  tags?: string[];
+  period: "weekly" | "monthly" | "yearly" | "fyly";
+  rolling?: boolean;
+  report_date?: string;
+  group_by?: ("flow" | "payee" | "tags")[];
+  ignore_self?: boolean;
 }
 
 export function useReport(params: ReportParams) {
   const { useList } = useResourceByName("reports");
-
-  return useList({
-    ...params,
-    periods: params.periods,
-  });
+  return useList(params);
 }