items-by-period (#2)

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

src/components/Dashboard/Dashboard.models.ts

@@ -1,6 +1,7 @@
 import * as React from "react";
 import {
-  ReportData
+  ReportData,
+  GroupKey,
 } from "../../features/report";
 
 export type DashboardMode = "expense" | "income";
@@ -11,6 +12,7 @@ export interface DashboardState {
   mode: DashboardMode;
   periodType: DashboardPeriodType;
   selectedPeriodId: DashboardSelectedPeriodId;
+  selectedGroupKey: GroupKey | null;
   comparison: boolean;
 }
 

src/components/Dashboard/Dashboard.tsx

@@ -7,6 +7,7 @@ export default function Dashboard(props: DashboardProps) {
     mode: "expense",
     periodType: "rolling",
     selectedPeriodId: null,
+    selectedGroupKey: null,
     comparison: false,
   });
 
@@ -35,6 +36,10 @@ export default function Dashboard(props: DashboardProps) {
     setState(prev => ({ ...prev, selectedPeriodId }));
   };
 
+  const setSelectedGroupKey = (groupKey: typeof state.selectedGroupKey) => {
+    setState(prev => ({ ...prev, selectedGroupKey: groupKey }));
+  };
+
   return (
     <DashboardView
       {...props}
@@ -44,6 +49,7 @@ export default function Dashboard(props: DashboardProps) {
       togglePeriodType={togglePeriodType}
       toggleComparison={toggleComparison}
       setSelectedPeriodId={setSelectedPeriodId}
+      setSelectedGroupKey={setSelectedGroupKey}
     />
   );
 }

src/components/Dashboard/Dashboard.view.tsx

@@ -8,6 +8,7 @@ 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 {
@@ -16,6 +17,7 @@ interface ViewProps extends DashboardProps {
   toggleMode: () => void;
   togglePeriodType: () => void;
   setSelectedPeriodId: (id: string | null) => void;
+  setSelectedGroupKey: (groupKey: GroupKey | null) => void;
   toggleComparison: () => void;
 }
 
@@ -28,10 +30,11 @@ export default function DashboardView({
   togglePeriodType,
   toggleComparison,
   setSelectedPeriodId,
+  setSelectedGroupKey,
 }: ViewProps) {
   const theme = useTheme();
   const themeMode = theme.palette.mode;
-  const { mode, periodType, comparison, selectedPeriodId } = state;
+  const { mode, periodType, comparison, selectedPeriodId, selectedGroupKey } = state;
 
   // Resolve colors with fallbacks
   const colors = React.useMemo(() => {
@@ -120,10 +123,12 @@ export default function DashboardView({
                 periodType={periodType}
                 comparison={comparison}
                 selectedPeriodId={selectedPeriodId}
+                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.tsx

@@ -1,133 +1,13 @@
 import * as React from "react";
-import { HistoryChartProps, ChartDataPoint } from "./HistoryChart.models";
+import { HistoryChartProps } from "./HistoryChart.models";
 import HistoryChartView from "./HistoryChart.view";
-import { ReportPeriod } from "../../features/report";
+import { buildChartData, tabToKey } from "./HistoryChart.adapter";
-
-type DecoratedPeriod = ReportPeriod & {
-  id: string;
-  label: string;
-};
-
-const TAB_TO_KEY: Record<string, "weekly" | "monthly" | "yearly" | "fyly" | "full"> = {
-  Weekly: "weekly",
-  Monthly: "monthly",
-  Yearly: "yearly",
-  'Financial Year': "fyly",
-  'All Time': "full"
-};
-
-function getAmount(p: ReportPeriod, mode: "expense" | "income") {
-  return mode === "expense" ? p.expenses.sum : p.incomes.sum;
-}
-
-function mergeMetric(a: any, b: any) {
-  const sum = a.sum + b.sum;
-  const count = a.count + b.count;
-
-  return {
-    ...a,
-    sum,
-    count,
-    average: count > 0 ? sum / count : 0,
-    transactions: a.transactions || b.transactions
-      ? [
-          ...(a.transactions || []),
-          ...(b.transactions || [])
-        ]
-      : undefined
-  };
-}
-
-function mergeBuckets(
-  buckets: any[],
-  key: "weekly" | "monthly" | "yearly" | "fyly" | "full"
-): DecoratedPeriod[] {
-  const map = new Map<string, DecoratedPeriod>();
-
-  for (const bucket of buckets) {
-    const periods = (bucket.periods[key] || []) as DecoratedPeriod[];
-
-    for (const p of periods) {
-      const existing = map.get(p.id);
-
-      if (!existing) {
-        map.set(p.id, {
-          ...p,
-          expenses: { ...p.expenses },
-          incomes: { ...p.incomes }
-        });
-      } else {
-        map.set(p.id, {
-          ...existing,
-          expenses: mergeMetric(existing.expenses, p.expenses),
-          incomes: mergeMetric(existing.incomes, p.incomes)
-        });
-      }
-    }
-  }
-
-  return Array.from(map.values()).sort(
-    (a, b) => new Date(a.start).getTime() - new Date(b.start).getTime()
-  );
-}
-
-function attachComparison(
-  points: ChartDataPoint[],
-  key: "weekly" | "monthly" | "yearly" | "fyly" | "full"
-): ChartDataPoint[] {
-  const getCompareIndex = (i: number) => {
-    if (key === "weekly") return i - 4;
-    if (key === "monthly") return i - 12;
-    if (key === "yearly") return i - 1;
-    if (key === "fyly") return i - 1;
-    return -1;
-  };
-
-  return points.map((p, i) => {
-    const ci = getCompareIndex(i);
-
-    return {
-      ...p,
-      compare:
-        ci >= 0 && points[ci]
-          ? {
-              id: points[ci].id,
-              label: points[ci].label,
-              amount: points[ci].amount
-            }
-          : undefined
-    };
-  });
-}
-
-function buildChartData(
-  reportData: HistoryChartProps["reportData"],
-  key: "weekly" | "monthly" | "yearly" | "fyly" | "full",
-  mode: "expense" | "income",
-  comparison: boolean
-): ChartDataPoint[] {
-  const merged = mergeBuckets(reportData.buckets, key);
-  console.log("Merged periods:", merged);
-
-  let points: ChartDataPoint[] = merged.map((p) => ({
-    id: p.id,
-    label: p.label,
-    amount: getAmount(p, mode)
-  }));
-
-  if (comparison) {
-    points = attachComparison(points, key);
-  }
-
-  return points;
-}
 
 export default function HistoryChart(props: HistoryChartProps) {
   const {
     tabs,
     reportData,
     mode,
-    periodType,
     comparison,
     selectedPeriodId,
     setSelectedPeriodId
@@ -136,7 +16,7 @@ export default function HistoryChart(props: HistoryChartProps) {
   const [activeTab, setActiveTab] = React.useState<string>(tabs[0] || "");
   const [startIndex, setStartIndex] = React.useState(0);
 
-  const activeDataKey = TAB_TO_KEY[activeTab];
+  const activeDataKey = tabToKey(activeTab);
 
   const currentData = React.useMemo(() => {
     return buildChartData(reportData, activeDataKey, mode, comparison);
@@ -184,7 +64,7 @@ export default function HistoryChart(props: HistoryChartProps) {
 
   React.useEffect(() => {
     setSelectedPeriodId(null);
-  }, [activeTab, periodType]);
+  }, [activeTab]);
 
   React.useEffect(() => {
     if (

src/components/HistoryChart/HistoryChart.view.tsx

@@ -58,19 +58,28 @@ 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 = startIndex > 0;
+  const canGoLeft = clampedStartIndex > 0;
-  const canGoRight = startIndex + visibleCount < currentData.length;
+  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 (

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 {
+export interface LatestItemsViewProps {
-  title?: string;
   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 {
+import { ReportData, GroupKey } from "../../features/report";
-  List,
+import { buildLatestItems } from "./LatestItems.adapter";
-  ListItem,
+import LatestItemsView from "./LatestItems.view";
-  ListItemAvatar,
-  ListItemText,
-  Avatar,
-  Typography,
-  Box,
-  Button,
-} from "@mui/material";
 
-export interface LatestItem {
+type Props = {
-  id: string | number;
+  reportData: ReportData;
-  icon: React.ReactNode;
+  mode: "expense" | "income";
-  iconBgColor?: string;
+  selectedPeriodId: string | null;
-  title: string;
+  selectedGroupKey?: GroupKey | null;
-  subtitle: string;
+  accentColor: string;
-  amount: string;
+};
-  timeAgo: string;
-}
-
-export interface LatestItemsListProps {
-  title?: string;
-  items: LatestItem[];
-  onViewAll?: () => void;
-  accentColor: any;
-}
 
 export default function LatestItems({
-  title = "Recent Transactions",
+  reportData,
-  items,
+  mode,
-  onViewAll,
+  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 }}>
+    <LatestItemsView
-      {/* Header */}
+      items={visibleItems}
-      <Box sx={{ display: "flex", justifyContent: "space-between", alignItems: "center", mb: 2, px: 2 }}>
+      accentColor={accentColor}
-        <Typography variant="h6" fontWeight="bold">
+      canExpand={canExpand}
-          {title}
+      onExpand={() => setVisibleCount((prev) => prev + 5)}
-        </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,6 +1,88 @@
-import LatestItemsListView from "./LatestItems.view";
+import * as React from "react";
-import { LatestItemsListProps } from "./LatestItems.models";
+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) {
+export default function LatestItemsView({
-  return <LatestItemsListView {...props} />;
+  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",
+        border: selected 
-        boxShadow: (theme) =>
+          ? `2px solid #fff`
-          `0 ${compact ? 6 : 12}px ${compact ? 12 : 24}px -10px ${
+          : 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

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

@@ -19,8 +19,8 @@ export const configuration: DashboardConfig = {
       },
     },
     {
-      id: "top-payees",
+      id: "top-categories",
-      title: 'Top Payees',
+      title: 'Top Categories',
       component: TopTags,
       settings: {
         compact: true,
@@ -29,15 +29,13 @@ export const configuration: DashboardConfig = {
         size: 12,
       },
     },
-    // {
+    {
-    //   id: "latest",
+      id: "items",
-    //   title: 'Recent Transactions',
+      component: LatestItems,
-    //   component: LatestItems,
+      style: {
-    //   dataKey: "latest",
+        size: 12,
-    //   style: {
+      },
-    //     size: 12,
+    },
-    //   },
-    // },
   ],
   style: {
     palette: {

src/features/report/index.ts

@@ -4,7 +4,9 @@ export {
 export type {
   Transaction,
   ReportData,
+  ReportBucket,
   ReportPeriod,
+  GroupKey,
 } from './report.models'
 export {
   prepareReport

src/features/report/report.utils.ts

@@ -73,14 +73,11 @@ function buildLabel(
   end: Date
 ): string {
   switch (type) {
-    case "weekly":
+    case "weekly": {
-      if (sameMonth(start, end)) {
       const sDay = start.getUTCDate();
-        const eDay = end.getUTCDate();
       const m = monthFmt.format(start);
-        return `${sDay} ${m} - ${eDay} ${m}`;
+      return `${sDay} ${m}`;
     }
-      return `${dayFmt.format(start)} - ${dayFmt.format(end)}`;
 
     case "monthly":
       return `${monthFmt.format(start)} ${yearFmt.format(start)}`;