Dashboard Refactor (#5 )

# Dashboard Refactor ## Overview This merge request performs a major cleanup and architectural refactor of the dashboard component system. The primary goals were: * Consolidate dashboard state handling * Standardize component contracts * Remove duplicated transaction aggregation logic * Simplify theming * Eliminate unnecessary wrapper/view layers * Improve maintainability and type safety --- # Major Changes ## Dashboard Architecture Refactor ### Consolidated State API Introduced a centralized `DashboardStateSetters` interface: ```ts export interface DashboardStateSetters { setSelectedPeriodId: (id: DashboardSelectedPeriodId) => void; setSelectedGroupKey: (groupKey: GroupKey | null) => void; toggleFlow: () => void; togglePeriodType: () => void; toggleComparison: () => void; } ``` This removes scattered prop drilling and standardizes dashboard interaction handling. --- ### Introduced Shared `ComponentProps` All dashboard widgets now consume a unified contract: ```ts export interface ComponentProps extends DashboardSection { reportData: ReportData; state: DashboardState; stateSetters: DashboardStateSetters; isFetching: boolean; colorScheme: { primary: string; light: string; text: string; }; } ``` Benefits: * Consistent widget APIs * Reduced repetitive prop definitions * Easier extensibility * Cleaner component composition --- ### Removed `Dashboard.view.tsx` The view/container split was removed. Dashboard rendering now lives directly inside: ```ts Dashboard.tsx ``` Benefits: * Reduced indirection * Easier navigation * Lower cognitive overhead * Simpler state flow --- ## Dashboard Config Cleanup Removed legacy `style.size` configuration from dashboard sections. Before: ```ts style: { size: 12, } ``` Now: ```ts { id: "items", title: "Recent Transactions", component: LatestItems, } ``` This simplifies section configuration and removes unnecessary abstraction. --- # Shared Transaction Utilities ## Added `extractFilteredTransactions` Created a reusable transaction extraction helper: ```ts extractFilteredTransactions( reportData, selectedPeriodId, selectedGroupKey ) ``` This centralizes: * Period resolution * Group filtering * Tag filtering * Payee filtering Previously duplicated across: * LatestItems * TopTags * TopPayees --- ## Added `aggregateTransactions` Created a reusable aggregation utility: ```ts aggregateTransactions( transactions, keyExtractor, limit ) ``` Benefits: * Removes repeated Map aggregation logic * Standardizes sorting and totals * Simplifies adapters significantly --- # HistoryChart Refactor ## Split Models vs Props Separated: * data models * component props * view props into dedicated files. New: ```txt HistoryChart.models.ts HistoryChart.props.ts ``` Benefits: * Cleaner typing boundaries * Better maintainability * Reduced coupling --- ## Migrated to Shared Dashboard State HistoryChart now consumes: ```ts state stateSetters ``` instead of individual props. This aligns it with the new dashboard architecture. --- # LatestItems Refactor ## Simplified Component Contract Removed duplicated props: * flow * header * accentColor * selectedPeriodId * selectedGroupKey Now inherited from shared `ComponentProps`. --- ## Added Auto Reset on Flow Change ```ts React.useEffect(() => { setVisibleCount(5); }, [flow]); ``` Improves UX when switching inflow/outflow views. --- # ProgressCard Refactor ## Removed `ProgressCard.tsx` Deleted unnecessary wrapper component. Rendering logic now lives directly in: ```txt ProgressCard.view.tsx ``` --- ## Introduced `ProgressCard.props.ts` Separated props into dedicated interfaces: ```ts ProgressCardProps ProgressCardViewProps ``` --- ## Reworked Styling System Removed dependency on: ```ts colorTheme ``` Now fully driven by: ```ts colorScheme ``` Benefits: * Consistent dashboard-wide theming * Better dark mode behavior * Reduced MUI palette coupling --- ## Improved Visual Consistency Updated: * borders * shadows * progress bar styling * dark mode surfaces * selection state styling to use standardized dashboard colors. --- # TopTags & TopPayees Refactor ## Removed Duplicated Aggregation Logic Both adapters now use: ```ts extractFilteredTransactions() aggregateTransactions() ``` instead of maintaining separate filtering/aggregation implementations. Benefits: * Less code duplication * Consistent behavior * Easier future maintenance --- ## Migrated to Shared Component Props Both components now consume: ```ts ComponentProps ``` via: ```ts ProgressCardProps ``` This aligns all dashboard widgets under the same architecture. --- # Theme System Cleanup ## Consolidated AppTheme Moved to: ```txt src/shared-theme/AppTheme.tsx ``` and removed unused duplicate implementations. --- ## Added Explicit Color Mode Context Introduced: ```ts ColorModeContext ``` with: * `mode` * `setMode` * `toggleColorMode` This provides a cleaner foundation for future theme controls. --- ## Simplified Theme Creation Replaced older MUI experimental color scheme setup with: ```ts getDesignTokens(mode) ``` Benefits: * Easier to reason about * Cleaner light/dark handling * Less framework complexity --- ## Added Global CssBaseline ```tsx <CssBaseline /> ``` is now applied centrally inside `AppTheme`. --- # Type Safety Improvements ## Removed Optional Fields Where Invalid Several previously optional fields are now required: ```ts title: string background: string text: string isFetching: boolean style.palette ``` Benefits: * Stronger guarantees * Fewer runtime fallbacks * Simpler rendering logic --- # Cleanup Summary ## Removed * `Dashboard.view.tsx` * `ProgressCard.tsx` * legacy prop duplication * repeated transaction extraction logic * repeated aggregation logic * unused style configuration * legacy theme configuration complexity --- ## Added * centralized dashboard state setters * reusable transaction helpers * reusable aggregation helper * unified component props * dedicated prop definition files * explicit color mode context * consolidated theme provider --- # Result The dashboard system is now: * significantly more maintainable * easier to extend * more type-safe * less repetitive * more consistent across widgets * cleaner in terms of state ownership * simpler to theme and customize Reviewed-on: #5 Co-authored-by: Vishesh 'ironeagle' Bangotra <aetoskia@gmail.com> Co-committed-by: Vishesh 'ironeagle' Bangotra <aetoskia@gmail.com>
Dashboard Refactor: Flow-based Metrics + Unified Data Model (#4 )
2026-05-19 07:11:46 +00:00 · 2026-05-18 05:37:51 +00:00
30 changed files with 768 additions and 651 deletions
--- a/react-openapi/hooks/useResource.ts
+++ b/react-openapi/hooks/useResource.ts
@@ -1,4 +1,4 @@
-import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
+import { useQuery, useMutation, useQueryClient, keepPreviousData } from "@tanstack/react-query";
 import { api } from "../api/client";
 import { ResourceConfig } from "../types/config";
 import { ConfigContext } from "../providers/ConfigContext";
@@ -26,6 +26,7 @@ export function useResource<T = any>(config: ResourceConfig | undefined) {
        };
      },
      enabled: !!endpoint,
+      placeholderData: keepPreviousData,
    });

  // --- READ ONE ---
--- a/src/Dashboard.tsx
+++ b/src/Dashboard.tsx
@@ -11,6 +11,7 @@ import {
 } from "@mui/material";

 import ConfigurableDashboard from "./components/Dashboard";
+import { DashboardState } from "./components/Dashboard";
 import { configuration } from "./dashboard-config";
 import {
  useReport,
@@ -18,6 +19,8 @@ import {
 } from "./features/report";

 export default function Dashboard() {
+  const [flow, setFlow] = React.useState<"outflows" | "inflows">("outflows");
+
  const [appliedPayees, setAppliedPayees] = React.useState<string[]>([]);
  const [appliedTags, setAppliedTags] = React.useState<string[]>([]);

@@ -28,10 +31,8 @@ export default function Dashboard() {
  const [loadedTags, setLoadedTags] = React.useState<string[]>([]);

  const report = useReport({
-    periods: ["weekly", "monthly", "full"],
-    rolling: true,
-    include_transactions: true,
-    group_by: ["tags"],
+    periods: ["daily", "weekly", "monthly", "all"],
+    flow: flow,
    payee: appliedPayees.length > 0 ? appliedPayees : undefined,
    tags: appliedTags.length > 0 ? appliedTags : undefined,
  });
@@ -43,10 +44,7 @@ export default function Dashboard() {
        report.data.data.buckets.forEach((b: any) => {
          Object.values(b.periods).forEach((periodArray: any) => {
            periodArray?.forEach((p: any) => {
-              p.expenses?.transactions?.forEach((t: any) => {
-                if (t.payee?.name) pSet.add(t.payee.name);
-              });
-              p.incomes?.transactions?.forEach((t: any) => {
+              p.metric?.transactions?.forEach((t: any) => {
                if (t.payee?.name) pSet.add(t.payee.name);
              });
            });
@@ -60,10 +58,7 @@ export default function Dashboard() {
        report.data.data.buckets.forEach((b: any) => {
          Object.values(b.periods).forEach((periodArray: any) => {
            periodArray?.forEach((p: any) => {
-              p.expenses?.transactions?.forEach((t: any) => {
-                t.tags?.forEach((tag: any) => tSet.add(tag.name || tag));
-              });
-              p.incomes?.transactions?.forEach((t: any) => {
+              p.metric?.transactions?.forEach((t: any) => {
                t.tags?.forEach((tag: any) => tSet.add(tag.name || tag));
              });
            });
@@ -77,6 +72,10 @@ export default function Dashboard() {
  const isLoading = report.isLoading;
  const error = report.error;

+  /** Callback for the ConfigurableDashboard's flow toggle */
+  const handleFlowChange = React.useCallback((newState: DashboardState) => {
+    setFlow(newState.flow);
+  }, []);

  if (isLoading && !report.data) {
    return (
@@ -152,7 +151,7 @@ export default function Dashboard() {
              setAppliedTags(tagsInput);
            }}
            disabled={isLoading}
-            sx={{ height: 40, borderRadius: 2 }} // Changed from 56 to 40 to match minHeight of inputs
+            sx={{ height: 40, borderRadius: 2 }}
          >
            Apply
          </Button>
@@ -161,6 +160,8 @@ export default function Dashboard() {
      <ConfigurableDashboard
        config={configuration}
        data={data}
+        isFetching={report.isFetching}
+        onFlowChange={handleFlowChange}
      />
    </Box>
  );
--- a/src/components/Dashboard/Dashboard.models.ts
+++ b/src/components/Dashboard/Dashboard.models.ts
@@ -4,35 +4,38 @@ import {
  GroupKey,
 } from "../../features/report";

-export type DashboardMode = "expense" | "income";
+export type DashboardFlow = "outflows" | "inflows";
 export type DashboardPeriodType = "rolling" | "calendar";
 export type DashboardSelectedPeriodId = string | null;

 export interface DashboardState {
-  mode: DashboardMode;
+  flow: DashboardFlow;
  periodType: DashboardPeriodType;
  selectedPeriodId: DashboardSelectedPeriodId;
  selectedGroupKey: GroupKey | null;
  comparison: boolean;
 }

+export interface DashboardStateSetters {
+  setSelectedPeriodId: (id: DashboardSelectedPeriodId) => void;
+  setSelectedGroupKey: (groupKey: GroupKey | null) => void;
+  toggleFlow: () => void;
+  togglePeriodType: () => void;
+  toggleComparison: () => void;
+}
+
 export interface DashboardSection {
  id: string;
-  title?: string;
-  summary?: string;
+  title: string;
  component: React.ComponentType<any>;
+  summary?: string;
  settings?: Record<string, any>;
-  isList?: boolean;
-  style?: {
-    size?: number;
-    [key: string]: any;
-  };
 }

 export interface ColorDefinition {
  primary: string;
-  background?: string;
-  text?: string;
+  background: string;
+  text: string;
 }

 export interface ThemeAwarePalette {
@@ -42,12 +45,29 @@ export interface ThemeAwarePalette {

 export interface DashboardConfig {
  sections: DashboardSection[];
-  style?: {
-    palette?: Record<DashboardMode, ThemeAwarePalette>;
+  style: {
+    palette: Record<DashboardFlow, ThemeAwarePalette>;
  };
 }

 export interface DashboardProps {
  config: DashboardConfig;
  data: ReportData;
+  isFetching: boolean;
+  onFlowChange?: (state: DashboardState) => void;
+}
+
+
+export interface ComponentProps extends DashboardSection {
+  reportData: ReportData;
+
+  state: DashboardState;
+  stateSetters: DashboardStateSetters;
+  isFetching: boolean;
+
+  colorScheme: {
+    primary: string;
+    light: string;
+    text: string;
+  };
 }
--- a/src/components/Dashboard/Dashboard.tsx
+++ b/src/components/Dashboard/Dashboard.tsx
@@ -1,21 +1,62 @@
 import * as React from "react";
-import DashboardView from "./Dashboard.view";
-import { DashboardProps, DashboardState } from "./Dashboard.models";
+import {
+  Box,
+  Container,
+  Grid,
+  ToggleButton,
+  ToggleButtonGroup,
+  Button
+} from "@mui/material";
+import { useTheme, alpha } from "@mui/material/styles";
+import { DashboardProps, DashboardState, DashboardStateSetters, DashboardFlow } from "./Dashboard.models";
+
+export default function Dashboard({
+  config,
+  data,
+  isFetching,
+  onFlowChange,
+}: DashboardProps) {
+  const theme = useTheme();
+  const themeMode = theme.palette.mode;

-export default function Dashboard(props: DashboardProps) {
  const [state, setState] = React.useState<DashboardState>({
-    mode: "expense",
+    flow: "outflows",
    periodType: "rolling",
    selectedPeriodId: null,
    selectedGroupKey: null,
    comparison: false,
  });

-  const toggleMode = () => {
-    setState(prev => ({
+  const toggleFlow = () => {
+    setState(prev => {
+      const nextFlow: DashboardFlow = prev.flow === "outflows" ? "inflows" : "outflows";
+      const nextState: DashboardState = {
        ...prev,
-      mode: prev.mode === "expense" ? "income" : "expense",
-    }));
+        flow: nextFlow,
+        selectedGroupKey: null,
+        selectedPeriodId: null,
+      };
+      onFlowChange?.(nextState);
+      return nextState;
+    });
+  };
+
+  const handleFlowChange = (
+    _event: React.MouseEvent<HTMLElement>,
+    newFlow: DashboardFlow | null
+  ) => {
+    if (newFlow !== null && newFlow !== state.flow) {
+      setState(prev => {
+        const nextState: DashboardState = {
+          ...prev,
+          flow: newFlow,
+          selectedGroupKey: null,
+          selectedPeriodId: null,
+        };
+        onFlowChange?.(nextState);
+        return nextState;
+      });
+    }
  };

  const togglePeriodType = () => {
@@ -40,16 +81,122 @@ export default function Dashboard(props: DashboardProps) {
    setState(prev => ({ ...prev, selectedGroupKey: groupKey }));
  };

+  const stateSetters: DashboardStateSetters = {
+    togglePeriodType,
+    toggleComparison,
+    toggleFlow,
+    setSelectedPeriodId,
+    setSelectedGroupKey,
+  };
+
+  const { flow, selectedGroupKey } = state;
+
+  const colors = React.useMemo(() => {
+    const palette = config.style.palette[flow];
+    const modeColors = palette[themeMode];
+
+    return {
+      primary: modeColors.primary,
+      light: modeColors.background || alpha(modeColors.primary, 0.1),
+      text:
+        modeColors.text ||
+        (themeMode === "light" ? theme.palette.text.primary : "#fff"),
+    };
+
+    // if (modeColors) {
+    //   return {
+    //     primary: modeColors.primary,
+    //     light: modeColors.background || alpha(modeColors.primary, 0.1),
+    //     text:
+    //       modeColors.text ||
+    //       (themeMode === "light" ? theme.palette.text.primary : "#fff"),
+    //   };
+    // }
+    //
+    // const themeColor =
+    //   flow === "outflows" ? theme.palette.error : theme.palette.success;
+    //
+    // return {
+    //   primary: themeColor.main,
+    //   light: alpha(themeColor.main, themeMode === "light" ? 0.08 : 0.15),
+    //   text: themeColor.main,
+    // };
+  }, [config.style?.palette, flow, themeMode, theme.palette]);
+
  return (
-    <DashboardView
-      {...props}
+    <Container
+      sx={{
+        mt: 4,
+        mb: 4,
+        background: `linear-gradient(180deg, ${colors.light} 0%, transparent 100%)`,
+        borderRadius: 4,
+        p: 2,
+        transition: "background 0.3s ease",
+      }}
+    >
+      <Box
+        sx={{
+          display: "flex",
+          flexDirection: "column",
+          alignItems: "center",
+          mb: 3,
+        }}
+      >
+        <ToggleButtonGroup
+          value={flow}
+          exclusive
+          onChange={handleFlowChange}
+          sx={{
+            borderRadius: 3,
+            overflow: "hidden",
+            "& .MuiToggleButton-root": {
+              px: 3,
+              textTransform: "none",
+              color: "text.secondary",
+            },
+            "&.Mui-selected": {
+              bgcolor: colors.primary,
+              color: "white",
+              borderColor: colors.primary,
+            },
+          }}
+        >
+          <ToggleButton value="outflows">Outflows</ToggleButton>
+          <ToggleButton value="inflows">Inflows</ToggleButton>
+        </ToggleButtonGroup>
+
+        {selectedGroupKey && Object.keys(selectedGroupKey).length > 0 && (
+          <Button
+            size="small"
+            sx={{ mt: 1, textTransform: "none" }}
+            onClick={() => setSelectedGroupKey(null)}
+          >
+            Clear Drill-down
+          </Button>
+        )}
+      </Box>
+
+      <Grid container spacing={4}>
+        {config.sections.map((section) => {
+          const Component = section.component;
+
+          return (
+            <Grid key={section.id} size={12}>
+              <Component
+                {...section}
+
+                reportData={data}
+
                state={state}
-      setState={setState}
-      toggleMode={toggleMode}
-      togglePeriodType={togglePeriodType}
-      toggleComparison={toggleComparison}
-      setSelectedPeriodId={setSelectedPeriodId}
-      setSelectedGroupKey={setSelectedGroupKey}
+                stateSetters={stateSetters}
+                isFetching={isFetching}
+
+                colorScheme={colors}
              />
+            </Grid>
+          );
+        })}
+      </Grid>
+    </Container>
  );
 }
--- a/src/components/Dashboard/Dashboard.view.tsx
+++ b/src/components/Dashboard/Dashboard.view.tsx
@@ -1,139 +0,0 @@
-import * as React from "react";
-import {
-  Box,
-  Container,
-  Grid,
-  Typography,
-  ToggleButton,
-  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,
-  state,
-  setState,
-  toggleMode,
-  togglePeriodType,
-  toggleComparison,
-  setSelectedPeriodId,
-  setSelectedGroupKey,
-}: ViewProps) {
-  const theme = useTheme();
-  const themeMode = theme.palette.mode;
-  const { mode, periodType, comparison, selectedPeriodId, selectedGroupKey } = state;
-
-  // Resolve colors with fallbacks
-  const colors = React.useMemo(() => {
-    const palette = config.style?.palette?.[mode];
-    const modeColors = palette ? palette[themeMode] : null;
-
-    if (modeColors) {
-      return {
-        primary: modeColors.primary,
-        light: modeColors.background || alpha(modeColors.primary, 0.1),
-        text: modeColors.text || (themeMode === 'light' ? theme.palette.text.primary : '#fff')
-      };
-    }
-
-    // Fallback to standard theme colors
-    const themeColor = mode === 'expense' ? theme.palette.error : theme.palette.success;
-    return {
-      primary: themeColor.main,
-      light: alpha(themeColor.main, themeMode === 'light' ? 0.08 : 0.15),
-      text: themeColor.main
-    };
-  }, [config.style?.palette, mode, themeMode, theme.palette]);
-
-  return (
-    <Container
-      sx={{
-        mt: 4,
-        mb: 4,
-        background: `linear-gradient(180deg, ${colors.light} 0%, transparent 100%)`,
-        borderRadius: 4,
-        p: 2,
-        transition: 'background 0.3s ease'
-      }}
-    >
-      <Box sx={{ display: "flex", justifyContent: "center", mb: 3 }}>
-        <ToggleButtonGroup
-          value={mode}
-          exclusive
-          onChange={toggleMode}
-          sx={{
-            borderRadius: 3,
-            overflow: "hidden",
-            "& .MuiToggleButton-root": {
-              px: 3,
-              textTransform: "none",
-              color: "text.secondary"
-            },
-            "&.Mui-selected": {
-              bgcolor: colors.primary,
-              color: "white",
-              borderColor: colors.primary
-            },
-          }}
-        >
-          <ToggleButton value="expense">Expenses</ToggleButton>
-          <ToggleButton value="income">Income</ToggleButton>
-        </ToggleButtonGroup>
-      </Box>
-
-      <Grid container spacing={4}>
-        {config.sections.map((section) => {
-          const Component = section.component;
-          
-          return (
-            <Grid key={section.id} size={section.style?.size || 12 as any}>
-              {section.title && !section.isList && (
-                <Box sx={{ mb: 2 }}>
-                  <Typography variant="h6" fontWeight={700}>
-                    {section.title}
-                  </Typography>
-                </Box>
-              )}
-
-              <Component
-                {...section.settings}
-                header={section.title}
-                summary={section.summary}
-                reportData={data}
-                title={section.title}
-                accentColor={colors.primary}
-                colorScheme={colors}
-
-                // State management
-                mode={mode}
-
-                periodType={periodType}
-                comparison={comparison}
-                selectedPeriodId={selectedPeriodId}
-                selectedGroupKey={selectedGroupKey}
-
-                togglePeriodType={togglePeriodType}
-                toggleComparison={toggleComparison}
-                setSelectedPeriodId={setSelectedPeriodId}
-                setSelectedGroupKey={setSelectedGroupKey}
-              />
-            </Grid>
-          );
-        })}
-      </Grid>
-    </Container>
-  );
-}
--- a/src/components/HistoryChart/HistoryChart.adapter.ts
+++ b/src/components/HistoryChart/HistoryChart.adapter.ts
@@ -9,15 +9,14 @@ import { ChartDataPoint } from "./HistoryChart.models";
 // ─── Tab → PeriodKey ─────────────────────────────────────────

 const TAB_TO_KEY: Record<string, PeriodKey> = {
+  Daily: "daily",
  Weekly: "weekly",
  Monthly: "monthly",
-  Yearly: "yearly",
-  "Financial Year": "fyly",
-  "All Time": "full",
+  "All Time": "all",
 };

 export function tabToKey(tab: string): PeriodKey {
-  return TAB_TO_KEY[tab] ?? "full";
+  return TAB_TO_KEY[tab] ?? "all";
 }

 // ─── Comparison ──────────────────────────────────────────────
@@ -27,10 +26,9 @@ function attachComparison(
  key: PeriodKey
 ): ChartDataPoint[] {
  const getCompareIndex = (i: number) => {
+    if (key === "daily") return i - 7;
    if (key === "weekly") return i - 4;
    if (key === "monthly") return i - 12;
-    if (key === "yearly") return i - 1;
-    if (key === "fyly") return i - 1;
    return -1;
  };

@@ -56,7 +54,7 @@ function attachComparison(
 export function buildChartData(
  reportData: ReportData,
  key: PeriodKey,
-  mode: "expense" | "income",
+  flow: "outflows" | "inflows",
  comparison: boolean
 ): ChartDataPoint[] {
  const merged = mergeBucketPeriods(reportData.buckets, key);
@@ -64,7 +62,7 @@ export function buildChartData(
  let points: ChartDataPoint[] = merged.map((p) => ({
    id: p.id,
    label: p.label,
-    amount: getAmount(p, mode),
+    amount: getAmount(p),
  }));

  if (comparison) {
--- a/src/components/HistoryChart/HistoryChart.models.ts
+++ b/src/components/HistoryChart/HistoryChart.models.ts
@@ -1,10 +1,3 @@
-import {
-  DashboardMode,
-  DashboardPeriodType,
-  DashboardSelectedPeriodId
-} from "../Dashboard";
-import { ReportData } from "../../features/report";
-
 export interface _ChartDataPoint {
  id: string;
  label: string;
@@ -15,26 +8,3 @@ export interface _ChartDataPoint {
 export interface ChartDataPoint extends _ChartDataPoint {
  compare?: _ChartDataPoint;
 }
-
-export interface HistoryChartProps {
-  header: string;
-  summary?: string;
-  tabs: string[];
-
-  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;
-}
--- a/src/components/HistoryChart/HistoryChart.props.ts
+++ b/src/components/HistoryChart/HistoryChart.props.ts
@@ -0,0 +1,21 @@
+import * as React from "react";
+import { ComponentProps } from "../Dashboard";
+import { ChartDataPoint } from "./HistoryChart.models";
+
+export interface HistoryChartProps extends ComponentProps {
+  settings: {
+    tabs: string[];
+  };
+}
+
+export interface HistoryChartViewProps extends HistoryChartProps {
+  activeTab: string;
+  setActiveTab: (v: string) => void;
+  currentData: ChartDataPoint[];
+  visibleData: ChartDataPoint[];
+  maxAmount: number;
+  visibleCount: number;
+  startIndex: number;
+  setStartIndex: React.Dispatch<React.SetStateAction<number>>;
+  activeDataKey: string;
+}
--- a/src/components/HistoryChart/HistoryChart.tsx
+++ b/src/components/HistoryChart/HistoryChart.tsx
@@ -1,26 +1,31 @@
 import * as React from "react";
-import { HistoryChartProps } from "./HistoryChart.models";
 import HistoryChartView from "./HistoryChart.view";
 import { buildChartData, tabToKey } from "./HistoryChart.adapter";
+import { HistoryChartProps } from "./HistoryChart.props";
+

 export default function HistoryChart(props: HistoryChartProps) {
  const {
-    tabs,
+    settings,
    reportData,
-    mode,
-    comparison,
-    selectedPeriodId,
-    setSelectedPeriodId
+    state,
+    stateSetters,
+
+    isFetching,
  } = props;

+  const { flow, comparison, selectedPeriodId } = state;
+  const { setSelectedPeriodId } = stateSetters;
+  const { tabs } = settings;
+
  const [activeTab, setActiveTab] = React.useState<string>(tabs[0] || "");
  const [startIndex, setStartIndex] = React.useState(0);

  const activeDataKey = tabToKey(activeTab);

  const currentData = React.useMemo(() => {
-    return buildChartData(reportData, activeDataKey, mode, comparison);
-  }, [reportData, activeDataKey, mode, comparison]);
+    return buildChartData(reportData, activeDataKey, flow, comparison);
+  }, [reportData, activeDataKey, flow, comparison]);

  const maxAmount =
    currentData.length > 0
@@ -35,11 +40,10 @@ export default function HistoryChart(props: HistoryChartProps) {
      : 1;

  const visibleCountMap = {
+    daily: 7,
    weekly: 6,
    monthly: 4,
-    yearly: 4,
-    fyly: 4,
-    full: 4,
+    all: 4,
  };

  const visibleCount = visibleCountMap[activeDataKey] ?? 4;
--- a/src/components/HistoryChart/HistoryChart.view.tsx
+++ b/src/components/HistoryChart/HistoryChart.view.tsx
@@ -11,39 +11,21 @@ import IconButton from "@mui/material/IconButton";
 import ChevronLeftIcon from "@mui/icons-material/ChevronLeft";
 import ChevronRightIcon from "@mui/icons-material/ChevronRight";
 import {
-  ChartDataPoint,
-  HistoryChartProps,
-} from "./HistoryChart.models";
+  HistoryChartViewProps,
+} from "./HistoryChart.props";
 import { formatDisplay } from "./HistoryChart.utils";

-interface ViewProps extends HistoryChartProps {
-  activeTab: string;
-  setActiveTab: (v: string) => void;
-  currentData: ChartDataPoint[];
-  visibleData: ChartDataPoint[];
-  maxAmount: number;
-  visibleCount: number;
-  startIndex: number;
-  setStartIndex: React.Dispatch<React.SetStateAction<number>>;
-  activeDataKey: string;
-}
-
-export default function HistoryChartView(props: ViewProps) {
-  const {
-    header,
+export default function HistoryChartView({
+  title,
  summary,
-    tabs,
+  settings,
+
+  state,
+  stateSetters,
+  isFetching,
+
  colorScheme,

-    mode,
-    periodType,
-    selectedPeriodId,
-    comparison,
-
-    togglePeriodType,
-    setSelectedPeriodId,
-    toggleComparison,
-
  activeTab,
  setActiveTab,
  currentData,
@@ -53,7 +35,10 @@ export default function HistoryChartView(props: ViewProps) {
  startIndex,
  setStartIndex,
  activeDataKey,
-  } = props;
+}: HistoryChartViewProps) {
+
+  const { flow, periodType, selectedPeriodId, comparison } = state;
+  const { togglePeriodType, setSelectedPeriodId, toggleComparison } = stateSetters;

  const theme = useTheme();
  const isDark = theme.palette.mode === "dark";
@@ -92,10 +77,13 @@ export default function HistoryChartView(props: ViewProps) {
        border: "1px solid",
        borderColor: "divider",
        bgcolor: isDark ? "background.paper" : colorScheme.light,
+        opacity: isFetching ? 0.6 : 1,
+        transition: "opacity 0.3s ease",
+        pointerEvents: isFetching ? "none" : "auto",
      }}
    >
      <Typography variant="h6" fontWeight={700} gutterBottom>
-        {header}
+        {title}
      </Typography>

      {summary && (
@@ -105,7 +93,7 @@ export default function HistoryChartView(props: ViewProps) {
      )}

      <ToggleButtonGroup value={activeTab} exclusive onChange={handleTabChange} fullWidth sx={{ mb: 4 }}>
-        {tabs.map((tab) => (
+        {settings.tabs.map((tab) => (
          <ToggleButton key={tab} value={tab}>
            {tab}
          </ToggleButton>
--- a/src/components/LatestItems/LatestItems.adapter.ts
+++ b/src/components/LatestItems/LatestItems.adapter.ts
@@ -1,56 +1,21 @@
-import { ReportData, Transaction, GroupKey } from "../../features/report";
+import { ReportData, GroupKey } from "../../features/report";
 import {
-  mergeBucketPeriods,
-  periodIdToKey,
  formatCurrency,
-  filterBuckets,
+  extractFilteredTransactions,
 } 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"
+  selectedPeriodId: string | null | undefined,
+  selectedGroupKey: GroupKey | null | undefined,
+  flow: "outflows" | "inflows"
 ): LatestItem[] {
-  const txns = extractTransactions(reportData, selectedPeriodId, selectedGroupKey, mode);
+  const txns = extractFilteredTransactions(reportData, selectedPeriodId, selectedGroupKey);

  return txns
-    .filter((t) => (mode === "expense" ? t.amount < 0 : t.amount >= 0))
    .sort(
      (a, b) =>
        new Date(b.occurred_at).getTime() -
--- a/src/components/LatestItems/LatestItems.models.ts
+++ b/src/components/LatestItems/LatestItems.models.ts
@@ -5,10 +5,3 @@ export interface LatestItem {
  amount: string;
  timeAgo: string;
 }
-
-export interface LatestItemsViewProps {
-  items: LatestItem[];
-  accentColor: string;
-  canExpand: boolean;
-  onExpand: () => void;
-}
--- a/src/components/LatestItems/LatestItems.props.ts
+++ b/src/components/LatestItems/LatestItems.props.ts
@@ -0,0 +1,10 @@
+import { ComponentProps } from "../Dashboard";
+import { LatestItem } from "./LatestItems.models";
+
+export interface LatestItemsProps extends ComponentProps {}
+
+export interface LatestItemsViewProps extends LatestItemsProps {
+  items: LatestItem[];
+  canExpand: boolean;
+  onExpand: () => void;
+}
--- a/src/components/LatestItems/LatestItems.tsx
+++ b/src/components/LatestItems/LatestItems.tsx
@@ -1,42 +1,38 @@
 import * as React from "react";
-import { ReportData, GroupKey } from "../../features/report";
 import { buildLatestItems } from "./LatestItems.adapter";
 import LatestItemsView from "./LatestItems.view";
+import { LatestItemsProps } from "./LatestItems.props";

-type Props = {
-  reportData: ReportData;
-  mode: "expense" | "income";
-  selectedPeriodId: string | null;
-  selectedGroupKey?: GroupKey | null;
-  accentColor: string;
-};
-
-export default function LatestItems({
+export default function LatestItems(props: LatestItemsProps) {
+  const {
    reportData,
-  mode,
-  selectedPeriodId,
-  selectedGroupKey = null,
-  accentColor,
-}: Props) {
+    state,
+    stateSetters,
+    isFetching,
+  } = props;
+
+  const { flow, selectedPeriodId, selectedGroupKey } = state;
  const [visibleCount, setVisibleCount] = React.useState(5);

-  const allItems = React.useMemo(() => {
-    return buildLatestItems(reportData, selectedPeriodId, selectedGroupKey, mode);
-  }, [reportData, selectedPeriodId, selectedGroupKey, mode]);
+  // Reset count when flow changes to start clean
+  React.useEffect(() => {
+    setVisibleCount(5);
+  }, [flow]);

-  const hasSelection = Boolean(selectedPeriodId) || Boolean(selectedGroupKey);
+  const allItems = React.useMemo(() => {
+    return buildLatestItems(reportData, selectedPeriodId, selectedGroupKey, flow);
+  }, [reportData, selectedPeriodId, selectedGroupKey, flow]);

  const visibleItems = React.useMemo(() => {
-    if (!hasSelection) return allItems.slice(0, 5);
    return allItems.slice(0, visibleCount);
-  }, [allItems, hasSelection, visibleCount]);
+  }, [allItems, visibleCount]);

-  const canExpand = hasSelection && visibleCount < allItems.length;
+  const canExpand = visibleCount < allItems.length;

  return (
    <LatestItemsView
+      {...props}
      items={visibleItems}
-      accentColor={accentColor}
      canExpand={canExpand}
      onExpand={() => setVisibleCount((prev) => prev + 5)}
    />
--- a/src/components/LatestItems/LatestItems.view.tsx
+++ b/src/components/LatestItems/LatestItems.view.tsx
@@ -10,19 +10,23 @@ import {
  IconButton,
 } from "@mui/material";
 import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
-import { LatestItemsViewProps } from "./LatestItems.models";
+import { LatestItemsViewProps } from "./LatestItems.props";

 export default function LatestItemsView({
  items,
-  accentColor,
+  title,
  canExpand,
  onExpand,
+  isFetching,
+  colorScheme,
 }: LatestItemsViewProps) {
+  const accentColor = colorScheme?.primary || "";
+
  return (
-    <Box sx={{ width: "100%", bgcolor: "background.paper", borderRadius: 4, p: 2 }}>
+    <Box sx={{ width: "100%", bgcolor: "background.paper", borderRadius: 4, p: 2, opacity: isFetching ? 0.6 : 1, transition: "opacity 0.3s ease", pointerEvents: isFetching ? "none" : "auto" }}>
      <Box sx={{ mb: 2, px: 2 }}>
        <Typography variant="h6" fontWeight="bold">
-          Recent Transactions
+          {title}
        </Typography>
      </Box>

--- a/src/components/ProgressCard/ProgressCard.models.ts
+++ b/src/components/ProgressCard/ProgressCard.models.ts
@@ -1,10 +0,0 @@
-export interface ProgressCardProps {
-  header: string;
-  summary?: string;
-  progressAmount: number;
-  totalAmount: number;
-  colorTheme?: "primary" | "secondary" | "error" | "info" | "success" | "warning";
-  compact?: boolean;
-  selected?: boolean;
-  onClick?: () => void;
-}
--- a/src/components/ProgressCard/ProgressCard.props.ts
+++ b/src/components/ProgressCard/ProgressCard.props.ts
@@ -0,0 +1,14 @@
+import { ComponentProps } from "../Dashboard";
+
+export interface ProgressCardProps extends ComponentProps {
+  settings: {
+    compact: boolean;
+  };
+}
+
+export interface ProgressCardViewProps extends ProgressCardProps {
+  progressAmount: number;
+  totalAmount: number;
+  selected: boolean;
+  onClick: () => void;
+}
--- a/src/components/ProgressCard/ProgressCard.tsx
+++ b/src/components/ProgressCard/ProgressCard.tsx
@@ -1,25 +0,0 @@
-import * as React from "react";
-import ProgressCardView from "./ProgressCard.view";
-import { ProgressCardProps } from "./ProgressCard.models";
-import { getPercentage, formatCurrency } from "../report.helpers";
-
-export default function ProgressCard(props: ProgressCardProps) {
-  const { progressAmount, totalAmount, compact = false } = props;
-
-  const percentage = getPercentage(progressAmount, totalAmount);
-  
-  const formattedProgress = formatCurrency(progressAmount);
-  const formattedTotal = formatCurrency(totalAmount);
-
-  return (
-    <ProgressCardView
-      {...props}
-      percentage={percentage}
-      formattedProgress={formattedProgress}
-      formattedTotal={formattedTotal}
-      compact={compact}
-      selected={props.selected}
-      onClick={props.onClick}
-    />
-  );
-}
--- a/src/components/ProgressCard/ProgressCard.view.tsx
+++ b/src/components/ProgressCard/ProgressCard.view.tsx
@@ -8,91 +8,83 @@ import {
  linearProgressClasses
 } from "@mui/material";
 import { useTheme, alpha } from "@mui/material/styles";
-import { ProgressCardProps } from "./ProgressCard.models";
-
-interface ViewProps extends ProgressCardProps {
-  percentage: number;
-  formattedProgress: string;
-  formattedTotal: string;
-  selected?: boolean;
-  onClick?: () => void;
-}
+import { getPercentage, formatCurrency } from "../report.helpers";
+import { ProgressCardViewProps } from "./ProgressCard.props";

 export default function ProgressCardView({
-  header,
-  colorTheme = "info",
-  percentage,
-  formattedProgress,
-  formattedTotal,
-  compact = false,
+  title,
+  settings,
+
+  isFetching,
+
+  colorScheme,
+
+  progressAmount,
+  totalAmount,
  selected,
  onClick,
-}: ViewProps) {
+}: ProgressCardViewProps) {
  const theme = useTheme();
  const isDark = theme.palette.mode === "dark";

+  const percentage = getPercentage(progressAmount, totalAmount);
+  const formattedProgress = formatCurrency(progressAmount);
+  const formattedTotal = formatCurrency(totalAmount);
+
  return (
    <Paper
-      elevation={compact ? 2 : 4}
+      elevation={settings.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",
+        p: settings.compact ? { xs: 2.5, md: 3 } : { xs: 3, md: 4 },
+        borderRadius: settings.compact ? 3 : 4,
        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;
-          return isDark
-            ? `linear-gradient(135deg, ${alpha(baseColor, 0.9)} 0%, ${alpha(baseColor, 0.3)} 100%)`
-            : `linear-gradient(135deg, ${baseColor} 0%, ${lightColor} 100%)`;
-        },
-        color: "#fff",
+        bgcolor: colorScheme.light,
+        color: colorScheme.text,
        display: "flex",
        flexDirection: "column",
-        alignItems: compact ? "flex-start" : "center",
+        alignItems: settings.compact ? "flex-start" : "center",
        justifyContent: "center",
        position: "relative",
        overflow: "hidden",
        border: selected
-          ? `2px solid #fff`
-          : isDark ? "1px solid rgba(255,255,255,0.1)" : "none",
-        boxShadow: (theme) => {
-          const baseShadow = `0 ${compact ? 6 : 12}px ${compact ? 12 : 24}px -10px ${
-            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;
-        },
+          ? `2px solid ${colorScheme.primary}`
+          : isDark
+          ? "1px solid rgba(255,255,255,0.1)"
+          : "1px solid rgba(0,0,0,0.06)",
+        boxShadow: "none",
+        opacity: isFetching ? 0.6 : 1,
+        pointerEvents: isFetching ? "none" : "auto",
      }}
    >
      <Typography
-        variant={compact ? "body2" : "subtitle1"} 
+        variant={settings.compact ? "body2" : "subtitle1"}
        fontWeight={700}
        sx={{
          opacity: 0.95,
-          mb: compact ? 1.5 : 2, 
-          width: '100%', 
-          overflow: 'hidden', 
-          textOverflow: 'ellipsis', 
-          whiteSpace: 'nowrap',
+          mb: settings.compact ? 1.5 : 2,
+          width: "100%",
+          overflow: "hidden",
+          textOverflow: "ellipsis",
+          whiteSpace: "nowrap",
          letterSpacing: 0.5,
-          textShadow: isDark ? '0 1px 2px rgba(0,0,0,0.3)' : 'none'
+          textShadow: isDark ? "0 1px 2px rgba(0,0,0,0.3)" : "none",
        }}
      >
-        {header}
+        {title}
      </Typography>

-      <Box sx={{ mb: compact ? 2 : 3, width: '100%' }}>
+      <Box sx={{ mb: settings.compact ? 2 : 3, width: "100%" }}>
        <Typography
-          variant={compact ? "h5" : "h3"}
+          variant={settings.compact ? "h5" : "h3"}
          fontWeight={900}
-          sx={{ mb: 0.5, lineHeight: 1.2, textShadow: isDark ? '0 2px 4px rgba(0,0,0,0.3)' : 'none' }}
+          sx={{
+            mb: 0.5,
+            lineHeight: 1.2,
+            textShadow: isDark ? "0 2px 4px rgba(0,0,0,0.3)" : "none",
+          }}
        >
          {formattedProgress}
        </Typography>
@@ -100,38 +92,38 @@ export default function ProgressCardView({
        <Divider
          sx={{
            my: 1,
-            borderColor: "rgba(255,255,255,0.25)",
+            borderColor: isDark ? "rgba(255,255,255,0.15)" : "rgba(0,0,0,0.1)",
            width: "100%",
          }}
        />

        <Typography
-          variant={compact ? "caption" : "body2"}
+          variant={settings.compact ? "caption" : "body2"}
          sx={{
            opacity: 0.85,
            fontWeight: 500,
            display: "block",
-            color: "rgba(255,255,255,0.9)"
+            color: alpha(colorScheme.text, 0.85),
          }}
        >
          of {formattedTotal}
        </Typography>
      </Box>

-      <Box sx={{ width: "100%", mt: 'auto' }}>
+      <Box sx={{ width: "100%", mt: "auto" }}>
        <LinearProgress
          variant="determinate"
          value={percentage}
          sx={{
-            height: compact ? 6 : 10,
+            height: settings.compact ? 6 : 10,
            borderRadius: 5,
            [`&.${linearProgressClasses.colorPrimary}`]: {
-              backgroundColor: "rgba(0, 0, 0, 0.25)",
+              backgroundColor: isDark ? "rgba(255, 255, 255, 0.12)" : "rgba(0, 0, 0, 0.08)",
            },
            [`& .${linearProgressClasses.bar}`]: {
              borderRadius: 5,
-              backgroundColor: "#fff",
-              boxShadow: '0 0 8px rgba(255,255,255,0.4)'
+              backgroundColor: colorScheme.primary,
+              boxShadow: `0 0 8px ${alpha(colorScheme.primary, 0.4)}`,
            },
          }}
        />
--- a/src/components/ProgressCard/TopPayees.adapter.ts
+++ b/src/components/ProgressCard/TopPayees.adapter.ts
@@ -0,0 +1,31 @@
+import { GroupKey, ReportData } from "../../features/report";
+import {
+  extractFilteredTransactions,
+  aggregateTransactions,
+} from "../report.helpers";
+
+export interface PayeeItem {
+  name: string;
+  amount: number;
+}
+
+export function extractTopPayees(
+  reportData: ReportData,
+  flow: "outflows" | "inflows",
+  selectedPeriodId?: string | null,
+  selectedGroupKey?: GroupKey | null
+): { items: PayeeItem[]; total: number } {
+  const txns = extractFilteredTransactions(reportData, selectedPeriodId, selectedGroupKey);
+
+  const { items, total } = aggregateTransactions(txns, (txn) => {
+    if (txn.payee && txn.payee.name) {
+      return [txn.payee.name];
+    }
+    return [];
+  });
+
+  return {
+    items,
+    total,
+  };
+}
--- a/src/components/ProgressCard/TopPayees.tsx
+++ b/src/components/ProgressCard/TopPayees.tsx
@@ -0,0 +1,83 @@
+import * as React from "react";
+import { Box, Paper, Typography } from "@mui/material";
+import ProgressCardView from "./ProgressCard.view";
+import { extractTopPayees } from "./TopPayees.adapter";
+import { ProgressCardProps } from "./ProgressCard.props";
+
+export default function TopPayees(props: ProgressCardProps) {
+  const {
+    title,
+
+    reportData,
+    state,
+    stateSetters,
+
+    isFetching,
+  } = props
+  const { flow, selectedPeriodId, selectedGroupKey } = state;
+  const { setSelectedGroupKey } = stateSetters;
+
+  const { items, total } = React.useMemo(() => {
+    return extractTopPayees(reportData, flow, selectedPeriodId, selectedGroupKey);
+  }, [reportData, flow, selectedPeriodId, selectedGroupKey]);
+
+  return (
+    <Paper
+      sx={{
+        p: { xs: 2.5, sm: 4 },
+        borderRadius: 4,
+        width: "100%",
+        boxShadow: "none",
+        border: "1px solid",
+        borderColor: "divider",
+        bgcolor: "background.paper",
+        opacity: isFetching ? 0.6 : 1,
+        transition: "opacity 0.3s ease",
+        pointerEvents: isFetching ? "none" : "auto",
+      }}
+    >
+      <Typography variant="h6" fontWeight={700} gutterBottom>
+        {title}
+      </Typography>
+
+      <Box
+        sx={{
+          display: "grid",
+          gridTemplateColumns: {
+            xs: "1fr",
+            sm: "repeat(2, 1fr)",
+            md: "repeat(4, 1fr)",
+          },
+          gap: 2,
+        }}
+      >
+        {items.map((item) => {
+          const isSelected = !!selectedGroupKey?.payee?.includes(item.name);
+          return (
+            <ProgressCardView
+              {...props}
+              key={item.name}
+              title={item.name}
+              progressAmount={item.amount}
+              totalAmount={total}
+              selected={isSelected}
+              onClick={() => {
+                if (setSelectedGroupKey) {
+                  let newKey = selectedGroupKey ? { ...selectedGroupKey } : {};
+
+                  if (isSelected) {
+                    delete newKey.payee;
+                  } else {
+                    newKey.payee = [item.name];
+                  }
+
+                  setSelectedGroupKey(Object.keys(newKey).length ? newKey : null);
+                }
+              }}
+            />
+          );
+        })}
+      </Box>
+    </Paper>
+  );
+}
--- a/src/components/ProgressCard/TopTags.adapter.ts
+++ b/src/components/ProgressCard/TopTags.adapter.ts
@@ -1,32 +1,9 @@
-import { ReportData } from "../../features/report";
+import { ReportData, GroupKey } from "../../features/report";
 import {
-  getAmount,
-  DecoratedPeriod,
+  extractFilteredTransactions,
+  aggregateTransactions,
 } 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;
@@ -34,41 +11,21 @@ export interface TagItem {

 export function extractTopTags(
  reportData: ReportData,
-  mode: "expense" | "income",
-  selectedPeriodId?: string | null
+  flow: "outflows" | "inflows",
+  selectedPeriodId?: string | null,
+  selectedGroupKey?: GroupKey | null
 ): { items: TagItem[]; total: number } {
-  const tagMap = new Map<string, number>();
+  const txns = extractFilteredTransactions(reportData, selectedPeriodId, selectedGroupKey);

-  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 { items, total } = aggregateTransactions(txns, (txn) => {
+    if (txn.tags && txn.tags.length > 0) {
+      return txn.tags.map((t) => (typeof t === "string" ? t : t.name));
    }
+    return ["Untagged"];
+  });

-  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 };
+  return {
+    items: items.map((item) => ({ tag: item.name, amount: item.amount })),
+    total,
+  };
 }
--- a/src/components/ProgressCard/TopTags.tsx
+++ b/src/components/ProgressCard/TopTags.tsx
@@ -1,31 +1,45 @@
 import * as React from "react";
-import { Box } from "@mui/material";
-import { ReportData, GroupKey } from "../../features/report";
-import ProgressCard from "./ProgressCard";
+import { Box, Paper, Typography } from "@mui/material";
+import ProgressCardView from "./ProgressCard.view";
 import { extractTopTags } from "./TopTags.adapter";
+import { ProgressCardProps } from "./ProgressCard.props";

-type Props = {
-  reportData: ReportData;
-  mode: "expense" | "income";
-  selectedPeriodId?: string | null;
-  selectedGroupKey?: GroupKey | null;
-  setSelectedGroupKey?: (key: GroupKey | null) => void;
-  compact?: boolean;
-};
+export default function TopTags(props: ProgressCardProps) {
+  const {
+    title,

-export default function TopTags({
    reportData,
-  mode,
-  selectedPeriodId,
-  selectedGroupKey,
-  setSelectedGroupKey,
-  compact = true,
-}: Props) {
+    state,
+    stateSetters,
+
+    isFetching,
+  } = props
+  const { flow, selectedPeriodId, selectedGroupKey } = state;
+  const { setSelectedGroupKey } = stateSetters;
+
  const { items, total } = React.useMemo(() => {
-    return extractTopTags(reportData, mode, selectedPeriodId);
-  }, [reportData, mode, selectedPeriodId]);
+    return extractTopTags(reportData, flow, selectedPeriodId, selectedGroupKey);
+  }, [reportData, flow, selectedPeriodId, selectedGroupKey]);

  return (
+    <Paper
+      sx={{
+        p: { xs: 2.5, sm: 4 },
+        borderRadius: 4,
+        width: "100%",
+        boxShadow: "none",
+        border: "1px solid",
+        borderColor: "divider",
+        bgcolor: "background.paper",
+        opacity: isFetching ? 0.6 : 1,
+        transition: "opacity 0.3s ease",
+        pointerEvents: isFetching ? "none" : "auto",
+      }}
+    >
+      <Typography variant="h6" fontWeight={700} gutterBottom>
+        {title}
+      </Typography>
+
      <Box
        sx={{
          display: "grid",
@@ -38,24 +52,32 @@ export default function TopTags({
        }}
      >
        {items.map((item) => {
-        const isSelected = selectedGroupKey?.tags?.includes(item.tag);
+          const isSelected = !!selectedGroupKey?.tags?.includes(item.tag);
          return (
-          <ProgressCard
+            <ProgressCardView
+              {...props}
              key={item.tag}
-            header={item.tag}
+              title={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] });
+                  let newKey = selectedGroupKey ? { ...selectedGroupKey } : {};
+                  
+                  if (isSelected) {
+                    delete newKey.tags;
+                  } else {
+                    newKey.tags = [item.tag];
+                  }
+
+                  setSelectedGroupKey(Object.keys(newKey).length ? newKey : null);
                }
              }}
            />
          );
        })}
      </Box>
+    </Paper>
  );
 }
--- a/src/components/ProgressCard/index.ts
+++ b/src/components/ProgressCard/index.ts
@@ -1,2 +1,2 @@
-export { default } from "./ProgressCard";
-export * from "./ProgressCard.models";
+export { default } from "./ProgressCard.view";
+export * from "./ProgressCard.props";
--- a/src/components/report.helpers.ts
+++ b/src/components/report.helpers.ts
@@ -2,11 +2,14 @@ import {
  ReportPeriod,
  ReportBucket,
  GroupKey,
+  PeriodType,
+  ReportData,
+  Transaction,
 } from "../features/report";

 // ─── Types ────────────────────────────────────────────────────

-export type PeriodKey = "weekly" | "monthly" | "yearly" | "fyly" | "full";
+export type PeriodKey = PeriodType;

 export type DecoratedPeriod = ReportPeriod & {
  id: string;
@@ -16,11 +19,10 @@ export type DecoratedPeriod = ReportPeriod & {
 // ─── Period helpers ───────────────────────────────────────────

 const PREFIX_TO_KEY: Record<string, PeriodKey> = {
+  D: "daily",
  W: "weekly",
  M: "monthly",
-  Y: "yearly",
-  FY: "fyly",
-  FULL: "full",
+  ALL: "all",
 };

 /**
@@ -29,19 +31,16 @@ const PREFIX_TO_KEY: Record<string, PeriodKey> = {
 */
 export function periodIdToKey(periodId: string): PeriodKey {
  const prefix = periodId.split(":")[0];
-  return PREFIX_TO_KEY[prefix] ?? "full";
+  return PREFIX_TO_KEY[prefix] ?? "all";
 }

 // ─── Metric helpers ───────────────────────────────────────────

-export function getAmount(
-  period: ReportPeriod,
-  mode: "expense" | "income"
-): number {
-  return mode === "expense" ? period.expenses.sum : period.incomes.sum;
+export function getAmount(period: ReportPeriod): number {
+  return period.metric.sum;
 }

-function mergeMetric(a: ReportPeriod["expenses"], b: ReportPeriod["expenses"]) {
+function mergeMetric(a: ReportPeriod["metric"], b: ReportPeriod["metric"]) {
  const sum = a.sum + b.sum;
  const count = a.count + b.count;

@@ -78,14 +77,12 @@ export function mergeBucketPeriods(
      if (!existing) {
        map.set(p.id, {
          ...p,
-          expenses: { ...p.expenses },
-          incomes: { ...p.incomes },
+          metric: { ...p.metric },
        });
      } else {
        map.set(p.id, {
          ...existing,
-          expenses: mergeMetric(existing.expenses, p.expenses),
-          incomes: mergeMetric(existing.incomes, p.incomes),
+          metric: mergeMetric(existing.metric, p.metric),
        });
      }
    }
@@ -126,7 +123,7 @@ export function matchesGroupKey(
  selected: GroupKey
 ): boolean {
  for (const [dim, values] of Object.entries(selected)) {
-    const bucketValues = bucket.group_key[dim as keyof GroupKey];
+    const bucketValues = bucket.group_key[dim];
    if (!bucketValues) return false;
    if (!(values as string[]).every((v) => bucketValues.includes(v)))
      return false;
@@ -145,3 +142,89 @@ export function filterBuckets(
  if (!selectedGroupKey) return buckets;
  return buckets.filter((b) => matchesGroupKey(b, selectedGroupKey));
 }
+
+export function extractFilteredTransactions(
+  reportData: ReportData,
+  selectedPeriodId: string | null | undefined,
+  selectedGroupKey: GroupKey | null | undefined
+): Transaction[] {
+  let txns: Transaction[] = [];
+
+  if (selectedPeriodId) {
+    const key = periodIdToKey(selectedPeriodId);
+    const periods = mergeBucketPeriods(reportData.buckets, key);
+    const selected = periods.find((p) => p.id === selectedPeriodId);
+    txns = selected?.metric.transactions || [];
+  } else {
+    const periods = mergeBucketPeriods(reportData.buckets, "all");
+    if (periods.length > 0) {
+      const period = periods.reduce((latest, p) =>
+        new Date(p.start).getTime() > new Date(latest.start).getTime()
+          ? p
+          : latest
+      , periods[0]);
+      txns = period?.metric.transactions || [];
+    }
+  }
+
+  if (selectedGroupKey) {
+    txns = txns.filter((txn) => {
+      let match = true;
+      if (selectedGroupKey.tags && selectedGroupKey.tags.length > 0) {
+        if (!txn.tags) {
+          match = false;
+        } else {
+          const txnTags = txn.tags.map((t: any) =>
+            typeof t === "string" ? t : t.name
+          );
+          if (
+            !selectedGroupKey.tags.every((selectedTag) =>
+              txnTags.includes(selectedTag)
+            )
+          ) {
+            match = false;
+          }
+        }
+      }
+      if (match && selectedGroupKey.payee && selectedGroupKey.payee.length > 0) {
+        if (!txn.payee || !txn.payee.name) {
+          match = false;
+        } else {
+          if (!selectedGroupKey.payee.includes(txn.payee.name)) {
+            match = false;
+          }
+        }
+      }
+      return match;
+    });
+  }
+
+  return txns;
+}
+
+export function aggregateTransactions(
+  transactions: Transaction[],
+  keyExtractor: (txn: Transaction) => string[],
+  limit = 4
+): { items: { name: string; amount: number }[]; total: number } {
+  const map = new Map<string, number>();
+
+  for (const txn of transactions) {
+    const keys = keyExtractor(txn);
+    for (const key of keys) {
+      map.set(key, (map.get(key) || 0) + txn.amount);
+    }
+  }
+
+  const items = Array.from(map.entries()).map(([name, amount]) => ({
+    name,
+    amount,
+  }));
+
+  items.sort((a, b) => b.amount - a.amount);
+
+  const top = items.slice(0, limit);
+  const total = top.reduce((sum, item) => sum + item.amount, 0);
+
+  return { items: top, total };
+}
--- a/src/dashboard-config.ts
+++ b/src/dashboard-config.ts
@@ -2,6 +2,7 @@ import HistoryChart from "./components/HistoryChart";
 import LatestItems from "./components/LatestItems";
 import { DashboardConfig } from "./components/Dashboard";
 import TopTags from "./components/ProgressCard/TopTags";
+import TopPayees from "./components/ProgressCard/TopPayees";

 export const configuration: DashboardConfig = {
  sections: [
@@ -12,10 +13,6 @@ export const configuration: DashboardConfig = {
      component: HistoryChart,
      settings: {
        tabs: ["Weekly", "Monthly"],
-        // tabs: ["Weekly", "Monthly", "Yearly", "Financial Year", "All Time"],
-      },
-      style: {
-        size: 12,
      },
    },
    {
@@ -25,21 +22,24 @@ export const configuration: DashboardConfig = {
      settings: {
        compact: true,
      },
-      style: {
-        size: 12,
+    },
+    {
+      id: "top-payees",
+      title: 'Top Payees',
+      component: TopPayees,
+      settings: {
+        compact: true,
      },
    },
    {
      id: "items",
+      title: 'Recent Transactions',
      component: LatestItems,
-      style: {
-        size: 12,
-      },
    },
  ],
  style: {
    palette: {
-      expense: {
+      outflows: {
        light: {
          primary: "#d32f2f",
          background: "#fdecea",
@@ -51,7 +51,7 @@ export const configuration: DashboardConfig = {
          text: "#ffcdd2"
        }
      },
-      income: {
+      inflows: {
        light: {
          primary: "#2e7d32",
          background: "#e8f5e9",
--- a/src/features/report/index.ts
+++ b/src/features/report/index.ts
@@ -6,7 +6,9 @@ export type {
  ReportData,
  ReportBucket,
  ReportPeriod,
+  ReportQuery,
  GroupKey,
+  PeriodType,
 } from './report.models'
 export {
  prepareReport
--- a/src/features/report/report.models.ts
+++ b/src/features/report/report.models.ts
@@ -1,29 +1,40 @@
 export interface Payor {
+  id?: string;
  name: string;
+  username: string;
+  email: string;
 }

 export interface Payee {
+  type: "merchant" | "person" | "transfer" | "other";
  name: string;
 }

 export interface Account {
+  id: string;
  name: string;
  number: string;
+  type: "cash" | "bank" | "credit_card" | "wallet" | "other";
+  currency: string;
+  is_active?: boolean;
 }

 export interface Tag {
+  id: string;
  name: string;
  icon: string;
-  description: string;
+  parent_id?: string | null;
 }

 export interface Transaction {
+  id: string;
  payor: Payor;
  payee: Payee;
  amount: number;
  account: Account;
  tags: Tag[];
-  occurred_at: Date;
+  occurred_at: string;
+  created_at: string;
 }

 // -----------------------------
@@ -41,12 +52,12 @@ export interface ReportMetric {
 // Period
 // -----------------------------

-export interface ReportPeriod {
-  start: Date;
-  end: Date;
+export type PeriodType = "daily" | "weekly" | "monthly" | "all";

-  expenses: ReportMetric;
-  incomes: ReportMetric;
+export interface ReportPeriod {
+  start: string;
+  end: string;
+  metric: ReportMetric;
 }

 // -----------------------------
@@ -54,46 +65,48 @@ export interface ReportPeriod {
 // -----------------------------

 export type GroupKey = {
-  payee?: string[];
-  tags?: string[];
-  flow?: string[];
+  [dimension: string]: string[];
 };

 export interface ReportBucket {
  group_key: GroupKey;

  periods: {
+    daily?: ReportPeriod[];
    weekly?: ReportPeriod[];
    monthly?: ReportPeriod[];
-    yearly?: ReportPeriod[];
-    fyly?: ReportPeriod[];
-    full?: ReportPeriod[];
+    all?: ReportPeriod[];
  };
 }

+// -----------------------------
+// Report Query
+// -----------------------------
+
+export interface ReportQuery {
+  accounts?: string[] | null;
+  ignore_self?: boolean | null;
+  start_date?: string | null;
+  end_date?: string | null;
+  min_amount?: number | null;
+  max_amount?: number | null;
+}
+
 // -----------------------------
 // Final Report
 // -----------------------------

 export interface ReportData {
-  periods: ("weekly" | "monthly" | "yearly" | "fyly" | "full")[];
+  snapshot_id?: string | null;

-  rolling: boolean;
-  report_date?: string;
+  flow?: "inflows" | "outflows" | null;

-  group_by: ("payee" | "tags")[];
+  periods: PeriodType[];

-  ignore_self: boolean;
-  include_transactions: boolean;
-
-  start_date?: string | null;
-  end_date?: string | null;
-  flow?: "expense" | "income" | null;
-  payee?: string[] | null;
-  account?: string[] | null;
  tags?: string[] | null;
-  min_amount?: number | null;
-  max_amount?: number | null;
+  payee?: string[] | null;

  buckets: ReportBucket[];
+
+  query: ReportQuery;
 }
--- a/src/features/report/report.utils.ts
+++ b/src/features/report/report.utils.ts
@@ -1,6 +1,7 @@
 import {
  ReportData,
-  ReportPeriod
+  ReportPeriod,
+  PeriodType,
 } from "./report.models";

 /* ---------- ID BUILDING ---------- */
@@ -13,7 +14,7 @@ function formatDate(d: Date): string {
 }

 function buildPeriodId(
-  type: "weekly" | "monthly" | "yearly" | "fyly" | "full",
+  type: PeriodType,
  start: Date,
  end: Date
 ): string {
@@ -21,16 +22,14 @@ function buildPeriodId(
  const e = formatDate(end);

  switch (type) {
+    case "daily":
+      return `D:${s}_${e}`;
    case "weekly":
      return `W:${s}_${e}`;
    case "monthly":
      return `M:${s}_${e}`;
-    case "yearly":
-      return `Y:${s}_${e}`;
-    case "fyly":
-      return `FY:${s}_${e}`;
-    case "full":
-      return `FULL:${s}_${e}`;
+    case "all":
+      return `ALL:${s}_${e}`;
    default:
      return `${s}_${e}`;
  }
@@ -60,19 +59,15 @@ const yearFmt = new Intl.DateTimeFormat("en-GB", {
  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",
+  type: PeriodType,
  start: Date,
  end: Date
 ): string {
  switch (type) {
+    case "daily":
+      return dayFmt.format(start);
+
    case "weekly": {
      const sDay = start.getUTCDate();
      const m = monthFmt.format(start);
@@ -82,15 +77,6 @@ function buildLabel(
    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)}`;
  }
@@ -99,7 +85,7 @@ function buildLabel(
 /* ---------- MAIN ---------- */

 function decoratePeriods(
-  type: "weekly" | "monthly" | "yearly" | "fyly" | "full",
+  type: PeriodType,
  periods: ReportPeriod[]
 ): (ReportPeriod & { id: string; label: string })[] {
  return periods.map((p) => ({
--- a/src/features/report/useReport.ts
+++ b/src/features/report/useReport.ts
@@ -1,20 +1,11 @@
 import { useResourceByName } from "../../../react-openapi";

 export interface ReportParams {
-  periods?: ("weekly" | "monthly" | "yearly" | "fyly" | "full")[];
-  rolling?: boolean;
-  report_date?: string;
-  group_by?: ("payee" | "tags")[];
-  ignore_self?: boolean;
-  include_transactions?: boolean;
-  start_date?: string;
-  end_date?: string;
-  flow?: "expense" | "income";
+  snapshot_id?: string;
+  periods?: ("daily" | "weekly" | "monthly" | "all")[];
+  flow?: "inflows" | "outflows";
  payee?: string[];
-  account?: string[];
  tags?: string[];
-  min_amount?: number;
-  max_amount?: number;
 }

 export function useReport(params: ReportParams) {
@@ -23,6 +14,5 @@ export function useReport(params: ReportParams) {
  return useList({
    ...params,
    periods: params.periods,
-    group_by: params.group_by,
  });
 }