cleanup

## Summary

This MR introduces a major refactor of the dashboard and react-openapi integration, focusing on configurability, separation of concerns, and improved extensibility.

---

## Key Changes

### 1. OpenAPI / Admin Refactor

* Extracted `ConfigContext` into a dedicated provider.
* Introduced `AppProvider` to encapsulate:

  * Config loading
  * API client initialization
  * React Query setup
* Removed internal `QueryClientProvider` from `Admin` for better composability.
* `Admin` now supports both:

  * Standalone usage
  * Nested usage inside an existing provider

### 2. Resource System Improvements

* Added `hidden` flag to `ResourceConfig` and overrides.
* Admin UI now filters out hidden resources.
* Added `useResourceByName` helper for dynamic resource access.
* Improved `useResource`:

  * Handles undefined config safely
  * Adds guards for missing endpoints
  * Disables queries when endpoint is absent

### 3. API Client Enhancements

* Added custom `paramsSerializer`:

  * Serializes arrays without `[]`
  * Ensures backend-compatible query formats

### 4. Dashboard Architecture Overhaul

* Replaced hardcoded dashboard with **config-driven system**:

  * Introduced `ConfigurableDashboard`
  * Dashboard sections defined via config
* New state model:

  * `mode` (expense/income)
  * `periodType` (rolling/calendar)
  * `comparison`
  * `selectedPeriodId`

### 5. Component Refactor (View / Logic Split)

* Split major components into:

  * `.tsx` (logic/controller)
  * `.view.tsx` (presentation)
  * `.models.ts` (types)
* Applied to:

  * Dashboard
  * HistoryChart
  * ProgressCard
  * LatestItems

### 6. HistoryChart Redesign

* Fully rebuilt using report-driven data
* Supports:

  * Weekly / Monthly / Yearly / FY / Full views
  * Rolling vs Calendar periods
  * Comparison mode (auto-aligned offsets)
* Introduced:

  * Bucket merging logic
  * Dynamic comparison attachment

### 7. Reporting Integration

* Dashboard now powered by:

  * `useReport`
  * `prepareReport`
* Removes need for multiple manual API calls

### 8. UI / UX Improvements

* Theme-aware color system
* Dynamic accent colors per mode
* Cleaner layout using section-based rendering
* Improved selection and interaction in charts

### 9. Cleanup & Removals

* Removed legacy components:

  * Old `HistoryChart`
  * Old `ProgressCard`
* Simplified Header layout spacing

---

## Behavior Changes

* Hidden resources are no longer visible in Admin UI.
* Dashboard is now entirely configuration-driven.
* API query params for arrays no longer use `[]`.
* Resource hooks no longer crash on missing config.

---

## Risks / Considerations

* Dashboard depends on correct configuration structure.
* Hidden flag may unintentionally hide resources if misconfigured.
* Query param serialization change must align with backend expectations.

---

## Follow-ups

* Add typing improvements to remove `@ts-ignore` in `GenericForm`.
* Extend dashboard config with more reusable section presets.
* Add tests for report aggregation and comparison logic.

---

Reviewed-on: #1
Co-authored-by: Vishesh 'ironeagle' Bangotra <aetoskia@gmail.com>
Co-committed-by: Vishesh 'ironeagle' Bangotra <aetoskia@gmail.com>

react-openapi/api/client.ts

@@ -7,6 +7,28 @@ 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");
@@ -38,6 +60,6 @@ export const auth = {
 };
 
 export function initializeApiClients(baseUrl: string, authBaseUrl: string) {
-  _api = createApiClient(baseUrl);
-  _auth = createApiClient(authBaseUrl);
+  _api = withParamsSerializer(createApiClient(baseUrl));
+  _auth = withParamsSerializer(createApiClient(authBaseUrl));
 }

src/Dashboard.tsx

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

src/components/Dashboard/Dashboard.models.ts

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

src/components/Dashboard/Dashboard.tsx

@@ -6,14 +6,50 @@ export default function Dashboard(props: DashboardProps) {
   const [state, setState] = React.useState<DashboardState>({
     mode: "expense",
     periodType: "rolling",
+    selectedPeriodId: null,
+    selectedGroupKey: null,
     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 }));
+  };
+
+  const setSelectedGroupKey = (groupKey: typeof state.selectedGroupKey) => {
+    setState(prev => ({ ...prev, selectedGroupKey: groupKey }));
+  };
+
   return (
     <DashboardView
       {...props}
       state={state}
       setState={setState}
+      toggleMode={toggleMode}
+      togglePeriodType={togglePeriodType}
+      toggleComparison={toggleComparison}
+      setSelectedPeriodId={setSelectedPeriodId}
+      setSelectedGroupKey={setSelectedGroupKey}
     />
   );
 }

src/components/Dashboard/Dashboard.view.tsx

@@ -8,26 +8,33 @@ import {
   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>>;
+  toggleMode: () => void;
+  togglePeriodType: () => void;
+  setSelectedPeriodId: (id: string | null) => void;
+  setSelectedGroupKey: (groupKey: GroupKey | null) => void;
+  toggleComparison: () => void;
 }
 
 export default function DashboardView({
   config,
   data,
-  latest,
   state,
   setState,
-  onModeChange,
-  selectedPeriodId,
-  onSelectPeriodId,
+  toggleMode,
+  togglePeriodType,
+  toggleComparison,
+  setSelectedPeriodId,
+  setSelectedGroupKey,
 }: ViewProps) {
   const theme = useTheme();
   const themeMode = theme.palette.mode;
-  const { mode, periodType, comparison } = state;
+  const { mode, periodType, comparison, selectedPeriodId, selectedGroupKey } = state;
 
   // Resolve colors with fallbacks
   const colors = React.useMemo(() => {
@@ -51,13 +58,6 @@ export default function DashboardView({
     };
   }, [config.style?.palette, mode, themeMode, theme.palette]);
 
-  const handleModeChange = (_: any, newMode: any) => {
-    if (newMode && onModeChange) {
-      onModeChange(newMode);
-      setState(prev => ({ ...prev, mode: newMode }));
-    }
-  };
-
   return (
     <Container
       sx={{
@@ -73,7 +73,7 @@ export default function DashboardView({
         <ToggleButtonGroup
           value={mode}
           exclusive
-          onChange={handleModeChange}
+          onChange={toggleMode}
           sx={{
             borderRadius: 3,
             overflow: "hidden",
@@ -108,47 +108,28 @@ export default function DashboardView({
                 </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}
-                  data={section.dataKey ? data[section.dataKey] : data.chartData}
-                  items={section.dataKey === 'latest' ? latest : (data[section.dataKey || ''] || [])}
+                reportData={data}
                 title={section.title}
                 accentColor={colors.primary}
                 colorScheme={colors}
+
+                // State management
+                mode={mode}
+
                 periodType={periodType}
-                  onPeriodTypeChange={(p: any) => setState(prev => ({ ...prev, periodType: p }))}
                 comparison={comparison}
-                  setComparison={(c: any) => setState(prev => ({ ...prev, comparison: c }))}
                 selectedPeriodId={selectedPeriodId}
-                  onSelectPeriodId={onSelectPeriodId}
+                selectedGroupKey={selectedGroupKey}
+
+                togglePeriodType={togglePeriodType}
+                toggleComparison={toggleComparison}
+                setSelectedPeriodId={setSelectedPeriodId}
+                setSelectedGroupKey={setSelectedGroupKey}
               />
-              )}
             </Grid>
           );
         })}

src/components/HistoryChart/HistoryChart.adapter.ts

@@ -0,0 +1,75 @@
+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> = {
+  Weekly: "weekly",
+  Monthly: "monthly",
+  Yearly: "yearly",
+  "Financial Year": "fyly",
+  "All Time": "full",
+};
+
+export function tabToKey(tab: string): PeriodKey {
+  return TAB_TO_KEY[tab] ?? "full";
+}
+
+// ─── Comparison ──────────────────────────────────────────────
+
+function attachComparison(
+  points: ChartDataPoint[],
+  key: PeriodKey
+): 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,
+    };
+  });
+}
+
+// ─── Main adapter ────────────────────────────────────────────
+
+export function buildChartData(
+  reportData: ReportData,
+  key: PeriodKey,
+  mode: "expense" | "income",
+  comparison: boolean
+): ChartDataPoint[] {
+  const merged = mergeBucketPeriods(reportData.buckets, key);
+
+  let points: ChartDataPoint[] = merged.map((p) => ({
+    id: p.id,
+    label: p.label,
+    amount: getAmount(p, mode),
+  }));
+
+  if (comparison) {
+    points = attachComparison(points, key);
+  }
+
+  return points;
+}

src/components/HistoryChart/HistoryChart.models.ts

@@ -1,5 +1,13 @@
+import {
+  DashboardMode,
+  DashboardPeriodType,
+  DashboardSelectedPeriodId
+} from "../Dashboard";
+import { ReportData } from "../../features/report";
+
 export interface _ChartDataPoint {
   id: string;
+  label: string;
   amount: number;
   highlighted?: boolean;
 }
@@ -8,30 +16,25 @@ 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[];
-  data: ChartData;
-  periodType: "rolling" | "calendar";
-  onPeriodTypeChange: (p: "rolling" | "calendar") => void;
-  comparison: boolean;
-  setComparison: (v: boolean) => void;
+
+  reportData: ReportData;
+
   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,48 +1,80 @@
 import * as React from "react";
-import { ChartDataPoint, HistoryChartProps, ChartData } from "./HistoryChart.models";
+import { HistoryChartProps } from "./HistoryChart.models";
 import HistoryChartView from "./HistoryChart.view";
+import { buildChartData, tabToKey } from "./HistoryChart.adapter";
 
 export default function HistoryChart(props: HistoryChartProps) {
-  const { tabs, data, periodType, comparison } = props;
+  const {
+    tabs,
+    reportData,
+    mode,
+    comparison,
+    selectedPeriodId,
+    setSelectedPeriodId
+  } = props;
 
   const [activeTab, setActiveTab] = React.useState<string>(tabs[0] || "");
   const [startIndex, setStartIndex] = React.useState(0);
 
-  const activeDataKey = activeTab.toLowerCase() as keyof ChartData;
+  const activeDataKey = tabToKey(activeTab);
 
-  let rawData: ChartDataPoint[] = [];
-
-  if (activeDataKey === "daily") {
-    rawData = data.daily || [];
-  } else {
-    const section = data[activeDataKey];
-    rawData = section?.[periodType] || [];
-  }
-
-  const currentData = rawData;
+  const currentData = React.useMemo(() => {
+    return buildChartData(reportData, activeDataKey, mode, comparison);
+  }, [reportData, activeDataKey, mode, comparison]);
 
   const maxAmount =
     currentData.length > 0
       ? Math.max(
           ...currentData.flatMap((d) =>
-            comparison ? [d.amount, d.compare?.amount ?? 0] : [d.amount]
+            comparison
+              ? [d.amount, ...(d.compare ? [d.compare.amount] : [])]
+              : [d.amount]
           ),
           1
         )
       : 1;
 
-  const visibleCountMap = { daily: 7, weekly: 6, monthly: 4 };
-  const visibleCount = visibleCountMap[activeDataKey];
+  const visibleCountMap = {
+    weekly: 6,
+    monthly: 4,
+    yearly: 4,
+    fyly: 4,
+    full: 4,
+  };
+
+  const visibleCount = visibleCountMap[activeDataKey] ?? 4;
 
   const total = currentData.length;
 
-  const clampedStartIndex = Math.min(startIndex, Math.max(total - visibleCount, 0));
+  const clampedStartIndex = Math.min(
+    startIndex,
+    Math.max(total - visibleCount, 0)
+  );
+
+  React.useEffect(() => {
+    if (startIndex !== clampedStartIndex) {
+      setStartIndex(clampedStartIndex);
+    }
+  }, [startIndex, clampedStartIndex]);
 
   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}
@@ -52,7 +84,7 @@ export default function HistoryChart(props: HistoryChartProps) {
       visibleData={visibleData}
       maxAmount={maxAmount}
       visibleCount={visibleCount}
-      startIndex={startIndex}
+      startIndex={clampedStartIndex}
       setStartIndex={setStartIndex}
       activeDataKey={activeDataKey}
     />

src/components/HistoryChart/HistoryChart.utils.ts

@@ -25,19 +25,3 @@ 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, formatLabel } from "./HistoryChart.utils";
+import { formatDisplay } from "./HistoryChart.utils";
 
 interface ViewProps extends HistoryChartProps {
   activeTab: string;
@@ -26,8 +26,6 @@ interface ViewProps extends HistoryChartProps {
   startIndex: number;
   setStartIndex: React.Dispatch<React.SetStateAction<number>>;
   activeDataKey: string;
-  selectedPeriodId: string | null;
-  onSelectPeriodId: (id: string | null) => void;
 }
 
 export default function HistoryChartView(props: ViewProps) {
@@ -35,11 +33,17 @@ export default function HistoryChartView(props: ViewProps) {
     header,
     summary,
     tabs,
-    periodType,
-    onPeriodTypeChange,
-    comparison,
-    setComparison,
     colorScheme,
+
+    mode,
+    periodType,
+    selectedPeriodId,
+    comparison,
+
+    togglePeriodType,
+    setSelectedPeriodId,
+    toggleComparison,
+
     activeTab,
     setActiveTab,
     currentData,
@@ -49,26 +53,33 @@ export default function HistoryChartView(props: ViewProps) {
     startIndex,
     setStartIndex,
     activeDataKey,
-    selectedPeriodId,
-    onSelectPeriodId,
   } = 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 = startIndex > 0;
-  const canGoRight = startIndex + visibleCount < currentData.length;
+  const canGoLeft = clampedStartIndex > 0;
+  const canGoRight = clampedStartIndex < maxStartIndex;
 
   const handlePrev = () => {
-    if (canGoLeft) setStartIndex((prev) => prev - visibleCount);
+    if (!canGoLeft) return;
+    setStartIndex((prev) => Math.max(prev - visibleCount, 0));
   };
 
   const handleNext = () => {
-    if (canGoRight) setStartIndex((prev) => prev + visibleCount);
+    if (!canGoRight) return;
+    setStartIndex((prev) => {
+      const next = prev + visibleCount;
+      return Math.min(next, maxStartIndex);
+    });
   };
 
   return (
@@ -81,10 +92,9 @@ export default function HistoryChartView(props: ViewProps) {
         border: "1px solid",
         borderColor: "divider",
         bgcolor: isDark ? "background.paper" : colorScheme.light,
-        transition: 'background-color 0.3s ease, border-color 0.3s ease'
       }}
     >
-      <Typography variant="h6" fontWeight={700} gutterBottom sx={{ color: isDark ? 'text.primary' : colorScheme.text }}>
+      <Typography variant="h6" fontWeight={700} gutterBottom>
         {header}
       </Typography>
 
@@ -102,35 +112,17 @@ export default function HistoryChartView(props: ViewProps) {
         ))}
       </ToggleButtonGroup>
 
-      <Box sx={{ display: "flex", alignItems: "center", justifyContent: "space-between", mb: 3 }}>
-        <ToggleButtonGroup value={periodType} exclusive onChange={(_, v) => v && onPeriodTypeChange(v)} size="small">
+      <Box sx={{ display: "flex", justifyContent: "space-between", mb: 3 }}>
+        <ToggleButtonGroup value={periodType} exclusive onChange={togglePeriodType} size="small">
           <ToggleButton value="rolling">Rolling</ToggleButton>
-          <ToggleButton value="calendar" disabled={activeDataKey === "daily"}>
-            Calendar
-          </ToggleButton>
+          <ToggleButton value="calendar">Calendar</ToggleButton>
         </ToggleButtonGroup>
 
         <ToggleButton
           value="compare"
           selected={comparison}
-          onChange={() => setComparison(!comparison)}
+          onChange={toggleComparison}
           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>
@@ -139,19 +131,7 @@ 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%",
-                transform: "translateY(-50%)",
-                zIndex: 2,
-                bgcolor: "background.paper",
-                boxShadow: 1
-              }}
-            >
+            <IconButton onClick={handlePrev} size="small" sx={{ position: "absolute", left: 0, top: "50%" }}>
               <ChevronLeftIcon fontSize="small" />
             </IconButton>
           )}
@@ -162,92 +142,67 @@ export default function HistoryChartView(props: ViewProps) {
               const compareHeight = comparison
                 ? ((point.compare?.amount ?? 0) / maxAmount) * 100
                 : 0;
-              const labelHeight = Math.max(currentHeight, compareHeight);
+
               const isSelected = selectedPeriodId === point.id;
-              const display = formatDisplay(point, activeTab.toLowerCase(), comparison);
+              const display = formatDisplay(point, activeDataKey, comparison);
 
               return (
                 <Box
                   key={point.id}
-                  onClick={() => onSelectPeriodId(isSelected ? null : point.id)}
+                  onClick={() =>
+                    setSelectedPeriodId(isSelected ? null : point.id)
+                  }
                   sx={{
                     flex: 1,
                     display: "flex",
                     flexDirection: "column",
                     alignItems: "center",
-                    justifyContent: "flex-end",
-                    height: "100%",
-                    cursor: "pointer"
+                    cursor: "pointer",
+                    height: "100%"
                   }}
                 >
-                  <Box sx={{ display: "flex", alignItems: "flex-end", gap: comparison ? 1 : 0.5, 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",
-                        color: 'text.secondary',
-                        fontWeight: 600
-                      }}
-                    >
-                      {isSelected ? `SELECTED: ${display}` : display}
-                    </Typography>
-
+                  <Box sx={{ display: "flex", alignItems: "flex-end", gap: 1, height: "100%" }}>
                     {comparison && (
-                      <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: 8,
+                          height: `${compareHeight}%`,
+                          bgcolor: alpha(colorScheme.primary, 0.4),
+                          borderRadius: "4px 4px 0 0"
+                        }}
+                      />
                     )}
 
                     <Box
                       sx={{
-                        width: comparison ? 10 : 16,
+                        width: 12,
                         height: `${currentHeight}%`,
-                        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'
+                        bgcolor: isSelected ? "warning.main" : colorScheme.primary,
+                        borderRadius: "4px 4px 0 0"
                       }}
                     />
                   </Box>
 
-                  <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 variant="caption">
+                    {point.label}
                   </Typography>
 
-                    <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"}
+                  {comparison && point.compare && (
+                    <Typography variant="caption" color="text.secondary">
+                      {point.compare.label}
+                    </Typography>
+                  )}
+
+                  <Typography variant="caption">
+                    {display}
                   </Typography>
-                  </Box>
                 </Box>
               );
             })}
           </Box>
 
           {canGoRight && (
-            <IconButton
-              onClick={handleNext}
-              size="small"
-              sx={{
-                position: "absolute",
-                right: 0,
-                top: "50%",
-                transform: "translateY(-50%)",
-                zIndex: 2,
-                bgcolor: "background.paper",
-                boxShadow: 1
-              }}
-            >
+            <IconButton onClick={handleNext} size="small" sx={{ position: "absolute", right: 0, top: "50%" }}>
               <ChevronRightIcon fontSize="small" />
             </IconButton>
           )}

src/components/LatestItems/LatestItems.adapter.ts

@@ -0,0 +1,66 @@
+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,
+  mode: "expense" | "income"
+): Transaction[] {
+  const buckets = filterBuckets(reportData.buckets, selectedGroupKey);
+  if (selectedPeriodId) {
+    const key = periodIdToKey(selectedPeriodId);
+    const periods = mergeBucketPeriods(buckets, key);
+    const selected = periods.find((p) => p.id === selectedPeriodId);
+
+    if (!selected) return [];
+
+    return mode === "expense"
+      ? (selected.expenses.transactions || [])
+      : (selected.incomes.transactions || []);
+  }
+
+  const periods = mergeBucketPeriods(buckets, "full");
+
+  if (!periods.length) return [];
+
+  const full = periods[0];
+
+  return mode === "expense"
+    ? (full.expenses.transactions || [])
+    : (full.incomes.transactions || []);
+}
+
+// ─── Main adapter ────────────────────────────────────────────
+
+export function buildLatestItems(
+  reportData: ReportData,
+  selectedPeriodId: string | null,
+  selectedGroupKey: GroupKey | null,
+  mode: "expense" | "income"
+): LatestItem[] {
+  const txns = extractTransactions(reportData, selectedPeriodId, selectedGroupKey, mode);
+
+  return txns
+    .filter((t) => (mode === "expense" ? t.amount < 0 : t.amount >= 0))
+    .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,18 +1,14 @@
-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 LatestItemsListProps {
-  title?: string;
+export interface LatestItemsViewProps {
   items: LatestItem[];
-  onViewAll?: () => void;
   accentColor: string;
+  canExpand: boolean;
+  onExpand: () => void;
 }

src/components/LatestItems/LatestItems.tsx

@@ -1,112 +1,44 @@
 import * as React from "react";
-import {
-  List,
-  ListItem,
-  ListItemAvatar,
-  ListItemText,
-  Avatar,
-  Typography,
-  Box,
-  Button,
-} from "@mui/material";
+import { ReportData, GroupKey } from "../../features/report";
+import { buildLatestItems } from "./LatestItems.adapter";
+import LatestItemsView from "./LatestItems.view";
 
-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;
-}
+type Props = {
+  reportData: ReportData;
+  mode: "expense" | "income";
+  selectedPeriodId: string | null;
+  selectedGroupKey?: GroupKey | null;
+  accentColor: string;
+};
 
 export default function LatestItems({
-  title = "Recent Transactions",
-  items,
-  onViewAll,
+  reportData,
+  mode,
+  selectedPeriodId,
+  selectedGroupKey = null,
   accentColor,
-}: LatestItemsListProps) {
+}: Props) {
+  const [visibleCount, setVisibleCount] = React.useState(5);
+
+  const allItems = React.useMemo(() => {
+    return buildLatestItems(reportData, selectedPeriodId, selectedGroupKey, mode);
+  }, [reportData, selectedPeriodId, selectedGroupKey, mode]);
+
+  const hasSelection = Boolean(selectedPeriodId) || Boolean(selectedGroupKey);
+
+  const visibleItems = React.useMemo(() => {
+    if (!hasSelection) return allItems.slice(0, 5);
+    return allItems.slice(0, visibleCount);
+  }, [allItems, hasSelection, visibleCount]);
+
+  const canExpand = hasSelection && visibleCount < allItems.length;
+
   return (
-    <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>
-              }
+    <LatestItemsView
+      items={visibleItems}
+      accentColor={accentColor}
+      canExpand={canExpand}
+      onExpand={() => setVisibleCount((prev) => prev + 5)}
     />
-
-            <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,6 +1,88 @@
-import LatestItemsListView from "./LatestItems.view";
-import { LatestItemsListProps } from "./LatestItems.models";
+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";
 
-export default function LatestItemsList(props: LatestItemsListProps) {
-  return <LatestItemsListView {...props} />;
+export default function LatestItemsView({
+  items,
+  accentColor,
+  canExpand,
+  onExpand,
+}: LatestItemsViewProps) {
+  return (
+    <Box sx={{ width: "100%", bgcolor: "background.paper", borderRadius: 4, p: 2 }}>
+      <Box sx={{ mb: 2, px: 2 }}>
+        <Typography variant="h6" fontWeight="bold">
+          Recent Transactions
+        </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>
+  );
 }

src/components/ProgressCard/ProgressCard.models.ts

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

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 "./ProgressCard.utils";
+import { getPercentage, formatCurrency } from "../report.helpers";
 
 export default function ProgressCard(props: ProgressCardProps) {
   const { progressAmount, totalAmount, compact = false } = props;
@@ -18,6 +18,8 @@ export default function ProgressCard(props: ProgressCardProps) {
       formattedProgress={formattedProgress}
       formattedTotal={formattedTotal}
       compact={compact}
+      selected={props.selected}
+      onClick={props.onClick}
     />
   );
 }

src/components/ProgressCard/ProgressCard.utils.ts

@@ -1,15 +0,0 @@
-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,6 +14,8 @@ interface ViewProps extends ProgressCardProps {
   percentage: number;
   formattedProgress: string;
   formattedTotal: string;
+  selected?: boolean;
+  onClick?: () => void;
 }
 
 export default function ProgressCardView({
@@ -23,6 +25,8 @@ export default function ProgressCardView({
   formattedProgress,
   formattedTotal,
   compact = false,
+  selected,
+  onClick,
 }: ViewProps) {
   const theme = useTheme();
   const isDark = theme.palette.mode === "dark";
@@ -30,10 +34,14 @@ 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;
@@ -48,13 +56,19 @@ 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 ${
+        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 ${
             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;
+        },
       }}
     >
       <Typography 

src/components/ProgressCard/TopTags.adapter.ts

@@ -0,0 +1,74 @@
+import { ReportData } from "../../features/report";
+import {
+  getAmount,
+  DecoratedPeriod,
+} from "../report.helpers";
+
+// ─── Helpers ─────────────────────────────────────────────────
+
+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
+  );
+}
+
+// ─── Main adapter ────────────────────────────────────────────
+
+export interface TagItem {
+  tag: string;
+  amount: number;
+}
+
+export function extractTopTags(
+  reportData: ReportData,
+  mode: "expense" | "income",
+  selectedPeriodId?: string | null
+): { items: TagItem[]; total: number } {
+  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 };
+}

src/components/ProgressCard/TopTags.tsx

@@ -0,0 +1,61 @@
+import * as React from "react";
+import { Box } from "@mui/material";
+import { ReportData, GroupKey } from "../../features/report";
+import ProgressCard from "./ProgressCard";
+import { extractTopTags } from "./TopTags.adapter";
+
+type Props = {
+  reportData: ReportData;
+  mode: "expense" | "income";
+  selectedPeriodId?: string | null;
+  selectedGroupKey?: GroupKey | null;
+  setSelectedGroupKey?: (key: GroupKey | null) => void;
+  compact?: boolean;
+};
+
+export default function TopTags({
+  reportData,
+  mode,
+  selectedPeriodId,
+  selectedGroupKey,
+  setSelectedGroupKey,
+  compact = true,
+}: Props) {
+  const { items, total } = React.useMemo(() => {
+    return extractTopTags(reportData, mode, selectedPeriodId);
+  }, [reportData, mode, selectedPeriodId]);
+
+  return (
+    <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={mode === "expense" ? "error" : "success"}
+            selected={isSelected}
+            onClick={() => {
+              if (setSelectedGroupKey) {
+                setSelectedGroupKey(isSelected ? null : { tags: [item.tag] });
+              }
+            }}
+          />
+        );
+      })}
+    </Box>
+  );
+}

src/components/report.helpers.ts

@@ -0,0 +1,147 @@
+import {
+  ReportPeriod,
+  ReportBucket,
+  GroupKey,
+} from "../features/report";
+
+// ─── Types ────────────────────────────────────────────────────
+
+export type PeriodKey = "weekly" | "monthly" | "yearly" | "fyly" | "full";
+
+export type DecoratedPeriod = ReportPeriod & {
+  id: string;
+  label: string;
+};
+
+// ─── Period helpers ───────────────────────────────────────────
+
+const PREFIX_TO_KEY: Record<string, PeriodKey> = {
+  W: "weekly",
+  M: "monthly",
+  Y: "yearly",
+  FY: "fyly",
+  FULL: "full",
+};
+
+/**
+ * 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] ?? "full";
+}
+
+// ─── Metric helpers ───────────────────────────────────────────
+
+export function getAmount(
+  period: ReportPeriod,
+  mode: "expense" | "income"
+): number {
+  return mode === "expense" ? period.expenses.sum : period.incomes.sum;
+}
+
+function mergeMetric(a: ReportPeriod["expenses"], b: ReportPeriod["expenses"]) {
+  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,
+          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()
+  );
+}
+
+// ─── 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 as keyof GroupKey];
+    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,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,20 +10,18 @@ export const configuration: DashboardConfig = {
       title: "Breakdown",
       summary: "Interactive chronological tracking",
       component: HistoryChart,
-      dataKey: "chartData",
       settings: {
-        tabs: ["Daily", "Weekly", "Monthly"],
+        tabs: ["Weekly", "Monthly"],
+        // tabs: ["Weekly", "Monthly", "Yearly", "Financial Year", "All Time"],
       },
       style: {
         size: 12,
       },
     },
     {
-      id: "top-payees",
-      title: 'Top Payees',
-      component: ProgressCard,
-      dataKey: "topPayees",
-      isList: true,
+      id: "top-categories",
+      title: 'Top Categories',
+      component: TopTags,
       settings: {
         compact: true,
       },
@@ -32,10 +30,8 @@ export const configuration: DashboardConfig = {
       },
     },
     {
-      id: "latest",
-      title: 'Recent Transactions',
+      id: "items",
       component: LatestItems,
-      dataKey: "latest",
       style: {
         size: 12,
       },

src/features/dashboard/dashboard.mapper.ts

@@ -1,40 +0,0 @@
-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

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

src/features/dashboard/useDashboardData.ts

@@ -1,52 +0,0 @@
-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,3 +1,13 @@
 export {
   useReport
 } from './useReport'
+export type {
+  Transaction,
+  ReportData,
+  ReportBucket,
+  ReportPeriod,
+  GroupKey,
+} from './report.models'
+export {
+  prepareReport
+} from './report.utils'

src/features/report/report.mapper.ts

@@ -1,143 +0,0 @@
-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 getWeekOfMonth = (date: Date) => {
-  const firstDay = new Date(date.getFullYear(), date.getMonth(), 1);
-  return Math.ceil((date.getDate() + firstDay.getDay()) / 7);
-};
-
-const findCompareBucket = (
-  current: ReportBucket,
-  buckets: ReportBucket[],
-  type: "weekly" | "monthly"
-): ReportBucket | undefined => {
-  const start = new Date(current.start);
-
-  if (type === "monthly") {
-    const targetYear = start.getFullYear() - 1;
-    const targetMonth = start.getMonth();
-
-    return buckets.find(b => {
-      const d = new Date(b.start);
-      return (
-        d.getFullYear() === targetYear &&
-        d.getMonth() === targetMonth
-      );
-    });
-  }
-
-  if (type === "weekly") {
-    const weekIndex = getWeekOfMonth(start); // you must define this
-    const target = new Date(start);
-    target.setMonth(target.getMonth() - 1);
-
-    return buckets.find(b => {
-      const d = new Date(b.start);
-      return (
-        d.getFullYear() === target.getFullYear() &&
-        d.getMonth() === target.getMonth() &&
-        getWeekOfMonth(d) === weekIndex
-      );
-    });
-  }
-
-  return undefined;
-};
-
-const toPoints = (
-  buckets: ReportBucket[],
-  type: "weekly" | "monthly",
-  flow: "expenses" | "incomes"
-): ChartDataPoint[] => {
-  return buckets.map((b) => {
-    const amount = sumBucket(b, flow);
-    const prev = findCompareBucket(b, buckets, type);
-
-    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

@@ -0,0 +1,90 @@
+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

@@ -0,0 +1,131 @@
+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": {
+      const sDay = start.getUTCDate();
+      const m = monthFmt.format(start);
+      return `${sDay} ${m}`;
+    }
+
+    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,14 +1,20 @@
 import { useResourceByName } from "../../../react-openapi";
 
 export interface ReportParams {
-  period: "weekly" | "monthly" | "yearly" | "fyly";
+  periods?: ("weekly" | "monthly" | "yearly" | "fyly" | "full")[];
   rolling?: boolean;
   report_date?: string;
-  group_by?: ("flow" | "payee" | "tags")[];
+  group_by?: ("payee" | "tags")[];
   ignore_self?: boolean;
+  include_transactions?: boolean;
 }
 
 export function useReport(params: ReportParams) {
   const { useList } = useResourceByName("reports");
-  return useList(params);
+
+  return useList({
+    ...params,
+    periods: params.periods,
+    group_by: params.group_by,
+  });
 }