openapi-spec-reader (#10 )

### Summary of Changes: 1. **Spec-Driven Enums**: - Updated `openapi_loader.ts` to collect all standalone enum schemas (e.g., `FetchRequestStatus`) into the `AppConfig.enums` map. - Implemented `mergeProperties` and `oneOf`/`anyOf` resolution in `openapi_loader.ts` to ensure complex schemas like `FetchRequest` (using `allOf`) and `source` (using `oneOf`) are correctly parsed. 2. **Customizable Labeling**: - Added `enumOption` (template-based) and `enumLabels` (mapping-based) to the config and field types. - Implemented `resolveTemplate` in `utils/options.ts` to handle placeholders like `'{name} {number}'` or plain field names. 3. **UI Integration**: - **`FormField.tsx`**: Updated relation and enum selects to use `getFieldOptions()` for correct key/value pairs and labels. Added value normalization to extract keys from API objects. - **`EnhancedTable.tsx`**: Updated `valueOptions` to use key/value pairs for `singleSelect` and updated `FieldRenderer` to show the human-readable label for enums. - **`FilterBar.tsx`**: Updated `extractOptions` to use spec-driven labels for enum filters. - **`ResourceView.tsx`**: Centralized filter matching logic into a `getDisplayString` helper, ensuring filter comparisons use the same templates as the UI labels. 4. **App Fixes**: - `FetchRequests.tsx` and `FetchRequestDetail.tsx` now derive status and format options from the OpenAPI spec via `useConfig()` instead of using hardcoded arrays. Reviewed-on: #10 Co-authored-by: Vishesh 'ironeagle' Bangotra <aetoskia@gmail.com> Co-committed-by: Vishesh 'ironeagle' Bangotra <aetoskia@gmail.com>
icici not icici_ocr
2026-06-04 17:23:44 +00:00 · 2026-06-03 19:01:38 +05:30 · 2026-05-31 09:28:26 +00:00 · 2026-05-24 17:23:02 +00:00 · 2026-05-23 11:41:57 +00:00 · 2026-05-19 07:11:46 +00:00
66 changed files with 3836 additions and 1112 deletions
--- a/index.html
+++ b/index.html
@@ -9,6 +9,7 @@
      rel="stylesheet"
      href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500;700&display=swap"
    />
+    <link rel="icon" type="image/png" href="/favicon.png" />
    <title>khata - Aetoskia</title>
  </head>
  <body>
--- a/public/favicon.png
+++ b/public/favicon.png
--- a/react-openapi/api/client.ts
+++ b/react-openapi/api/client.ts
@@ -46,6 +46,10 @@ export const api = {
    if (!_api) throw new Error("API client not initialized");
    return _api.delete(...args);
  },
+  patch: (...args: Parameters<AxiosInstance["patch"]>) => {
+    if (!_api) throw new Error("API client not initialized");
+    return _api.patch(...args);
+  },
 };

 export const auth = {
--- a/react-openapi/components/EnhancedTable.tsx
+++ b/react-openapi/components/EnhancedTable.tsx
@@ -31,6 +31,7 @@ import VisibilityIcon from '@mui/icons-material/Visibility';
 import MoreVertIcon from '@mui/icons-material/MoreVert';
 import { useNavigate } from 'react-router-dom';
 import { ResourceConfig } from '../types/config';
+import { getFieldOptions, toGridValueOptions, resolveTemplate } from '../utils/options';

 interface EnhancedTableProps {
  config: ResourceConfig;
@@ -49,8 +50,8 @@ export default function EnhancedTable({
  config,
  data,
  total,
-  paginationModel,
-  onPaginationModelChange,
+  paginationModel: externalPaginationModel,
+  onPaginationModelChange: externalOnPaginationModelChange,
  loading = false,
  onEdit,
  onDelete,
@@ -60,6 +61,14 @@ export default function EnhancedTable({
  const theme = useTheme();
  const isMobile = useMediaQuery(theme.breakpoints.down('md'));
  const navigate = useNavigate();
+
+  const isServer = config.filterOptions?.mode !== "client";
+  const [internalPaginationModel, setInternalPaginationModel] = React.useState<GridPaginationModel>({
+    page: 0,
+    pageSize: 10,
+  });
+  const paginationModel = isServer ? externalPaginationModel : internalPaginationModel;
+  const onPaginationModelChange = isServer ? externalOnPaginationModelChange : setInternalPaginationModel;
  
  const columns: GridColDef[] = React.useMemo(() => {
    const cols: GridColDef[] = Object.entries(config.fields).map(([key, field]) => {
@@ -87,9 +96,8 @@ export default function EnhancedTable({
        };
      }

-      if (muiType === 'singleSelect' && field.options) {
-        // @ts-ignore
-        col.valueOptions = field.options;
+      if (muiType === 'singleSelect') {
+        col.valueOptions = toGridValueOptions(getFieldOptions(field));
      }

      return col;
@@ -122,6 +130,15 @@ export default function EnhancedTable({
    return cols;
  }, [config, onDelete, navigate, onNavigateToResource]);

+  const mobilePageSize = 10;
+  const [mobilePage, setMobilePage] = React.useState(0);
+  const mobileTotalPages = Math.ceil(data.length / mobilePageSize) || 1;
+  const mobileData = data.slice(mobilePage * mobilePageSize, (mobilePage + 1) * mobilePageSize);
+
+  React.useEffect(() => {
+    if (mobilePage >= mobileTotalPages) setMobilePage(0);
+  }, [data.length, mobilePage, mobileTotalPages]);
+
  if (isMobile) {
    return (
      <Box>
@@ -132,7 +149,7 @@ export default function EnhancedTable({
          </Button>
        </Box>
        <Box sx={{ display: 'flex', flexDirection: 'column', gap: 2 }}>
-          {data.map((row) => (
+          {mobileData.map((row) => (
            <Box key={row[config.primaryKey] || Math.random()}>
              <MobileCardRow 
                row={row} 
@@ -145,6 +162,17 @@ export default function EnhancedTable({
            </Box>
          ))}
        </Box>
+        <Box sx={{ display: 'flex', justifyContent: 'center', gap: 1, mt: 2, flexWrap: 'wrap' }}>
+          <Button size="small" disabled={mobilePage === 0} onClick={() => setMobilePage(mobilePage - 1)}>
+            Previous
+          </Button>
+          <Typography variant="body2" sx={{ alignSelf: 'center', px: 1 }}>
+            Page {mobilePage + 1} of {mobileTotalPages}
+          </Typography>
+          <Button size="small" disabled={mobilePage >= mobileTotalPages - 1} onClick={() => setMobilePage(mobilePage + 1)}>
+            Next
+          </Button>
+        </Box>
      </Box>
    );
  }
@@ -161,20 +189,18 @@ export default function EnhancedTable({
        rows={data || []}
        columns={columns}
        autoHeight
-        paginationMode={config.pagination ? 'server' : 'client'}
-        rowCount={(() => {
-          if (!config.pagination) return data.length;
-          if (total !== undefined) return total;
-          
-          // Graceful fallback for missing total count
-          const page = paginationModel?.page || 0;
-          const pageSize = paginationModel?.pageSize || 10;
-          if (data.length < pageSize) {
-            return page * pageSize + data.length;
-          }
-          // Enable 'Next' button by pretending there's at least one more page
-          return (page + 2) * pageSize;
-        })()}
+        paginationMode={isServer ? 'server' : 'client'}
+        {...(isServer ? {
+          rowCount: (() => {
+            if (total !== undefined) return total;
+            const page = paginationModel?.page || 0;
+            const pageSize = paginationModel?.pageSize || 10;
+            if (data.length < pageSize) {
+              return page * pageSize + data.length;
+            }
+            return (page + 2) * pageSize;
+          })(),
+        } : {})}
        loading={loading}
        paginationModel={paginationModel || { page: 0, pageSize: 10 }}
        onPaginationModelChange={onPaginationModelChange}
@@ -234,7 +260,7 @@ function MobileCardRow({ row, config, onDelete, onNavigate, navigate }: any) {
                            <Typography variant="caption" color="text.secondary" sx={{ display: 'block' }}>
                                {field.label}
                            </Typography>
-                            <Typography variant="body2" sx={{ fontWeight: 500, wordBreak: 'break-all' }}>
+                            <Typography variant="body2" component="div" sx={{ fontWeight: 500, wordBreak: 'break-all' }}>
                                <FieldRenderer params={{ value: row[key], row }} field={field} fieldKey={key} config={config} onNavigate={onNavigate} navigate={navigate} isMobile />
                            </Typography>
                        </Box>
@@ -248,8 +274,9 @@ function MobileCardRow({ row, config, onDelete, onNavigate, navigate }: any) {
    );
 }

-function getFormattedDisplayValue(item: any, displayField?: string | string[]) {
+function getFormattedDisplayValue(item: any, displayField?: string | string[], enumValue?: string) {
    if (!item) return "";
+    if (enumValue) return resolveTemplate(enumValue, item);
    if (!displayField) return item.name || item.title || item.label || item.id || JSON.stringify(item);

    if (Array.isArray(displayField)) {
@@ -271,7 +298,7 @@ function FieldRenderer({ params, field, fieldKey, config, onNavigate, navigate,
    // 1. Single Relation
    if (field.relation && value && !Array.isArray(value)) {
        const relationId = typeof value === 'object' ? (value.id || value._id || value.pk) : value;
-        const displayValue = getFormattedDisplayValue(value, field.displayField);
+        const displayValue = getFormattedDisplayValue(value, field.displayField, field.enumOption?.value);
        
        return (
            <Chip 
@@ -290,7 +317,8 @@ function FieldRenderer({ params, field, fieldKey, config, onNavigate, navigate,

    // 2. Multi-Select (Array of relations or simple strings)
    if (field.type === 'array' && Array.isArray(value)) {
-        const tooltipTitle = value.map((item) => getFormattedDisplayValue(item, field.displayField)).join(', ');
+        const enumValue = field.enumOption?.value;
+        const tooltipTitle = value.map((item) => getFormattedDisplayValue(item, field.displayField, enumValue)).join(', ');

        return (
            <Tooltip title={tooltipTitle} arrow placement="top">
@@ -298,7 +326,7 @@ function FieldRenderer({ params, field, fieldKey, config, onNavigate, navigate,
                    {value.map((item, idx) => (
                        <Chip
                            key={idx}
-                            label={getFormattedDisplayValue(item, field.displayField)}
+                            label={getFormattedDisplayValue(item, field.displayField, enumValue)}
                            size="small"
                            variant="filled"
                            sx={{ maxWidth: 120 }}
@@ -318,7 +346,7 @@ function FieldRenderer({ params, field, fieldKey, config, onNavigate, navigate,

    // 3. Simple Objects
    if (field.type === 'object' && value) {
-        return getFormattedDisplayValue(value, field.displayField) || (isMobile ? 'Object' : JSON.stringify(value));
+        return getFormattedDisplayValue(value, field.displayField, field.enumOption?.value) || (isMobile ? 'Object' : JSON.stringify(value));
    }

    if (field.type === 'number' && typeof value === 'number') {
@@ -353,6 +381,11 @@ function FieldRenderer({ params, field, fieldKey, config, onNavigate, navigate,
    
    if (field.type === 'datetime' || field.type === 'date') return value ? new Date(value).toLocaleString() : '';

+    if (field.type === 'enum') {
+      const opt = getFieldOptions(field).find(o => o.key === value);
+      return opt?.value ?? value;
+    }
+
    if (isPk && !isMobile) {
        return (
            <Chip 
--- a/react-openapi/components/FilterBar.tsx
+++ b/react-openapi/components/FilterBar.tsx
@@ -0,0 +1,316 @@
+import * as React from "react";
+import {
+  Box,
+  Button,
+  Chip,
+  Paper,
+  TextField,
+  Autocomplete,
+  Typography,
+} from "@mui/material";
+import DoneIcon from "@mui/icons-material/Done";
+import FilterListIcon from "@mui/icons-material/FilterList";
+import { ResourceField, ResourceMode } from "../types/config";
+import { getFieldOptions, resolveTemplate } from "../utils/options";
+
+function FilterAutocomplete({
+  options,
+  value,
+  label,
+  onChange,
+}: {
+  options: string[];
+  value: string[];
+  label: string;
+  onChange: (val: string[]) => void;
+}) {
+  const listboxRef = React.useRef<HTMLUListElement>(null);
+  const scrollPosRef = React.useRef(0);
+  const [open, setOpen] = React.useState(false);
+  const [frozenValue, setFrozenValue] = React.useState<string[]>(value);
+
+  const toggleDropdown = () => {
+    setOpen(prev => {
+      const next = !prev;
+      setFrozenValue(value);
+      return next;
+    });
+  };
+  const sortedOptions = React.useMemo(() => {
+    const sel = new Set(frozenValue);
+    const picked: string[] = [];
+    const rest: string[] = [];
+    for (const o of options) {
+      if (sel.has(o)) picked.push(o);
+      else rest.push(o);
+    }
+    return [...picked, ...rest];
+  }, [options, frozenValue]);
+
+  return (
+    <Autocomplete
+      multiple
+      freeSolo
+      disableCloseOnSelect
+      open={open}
+      onOpen={toggleDropdown}
+      onClose={toggleDropdown}
+      options={sortedOptions}
+      value={value}
+      getOptionKey={(option) => option}
+      onChange={(_, val) => onChange(val.length > 0 ? val : [])}
+      ListboxProps={{
+        ref: listboxRef,
+        onScroll: (e) => { scrollPosRef.current = (e.target as HTMLUListElement).scrollTop; },
+      }}
+      renderOption={(props, option, { selected }) => {
+        const { key, ...rest } = props;
+        return (
+          <li key={key} {...rest}>
+            {selected ? <DoneIcon sx={{ fontSize: 14, mr: 1, color: 'primary.main' }} /> : <Box sx={{ width: 22, mr: 1 }} />}
+            {option}
+          </li>
+        );
+      }}
+      renderTags={(tagValue, getTagProps) => {
+        const maxChips = 1;
+        return (
+          <>
+            {tagValue.slice(0, maxChips).map((tag, index) => {
+              const { key, ...tagProps } = getTagProps({ index });
+              return <Chip
+                key={key}
+                {...tagProps}
+                label={tag.length > 10 ? `${tag.slice(0, 8)}..` : tag}
+                size="small"
+                onClick={toggleDropdown}
+                sx={{ cursor: 'pointer' }}
+              />;
+            })}
+            {tagValue.length > maxChips && (
+              <Chip
+                label={`+${tagValue.length - maxChips}`}
+                size="small"
+                onClick={toggleDropdown}
+                sx={{ cursor: 'pointer' }}
+              />
+            )}
+          </>
+        );
+      }}
+      renderInput={(params) => <TextField {...params} placeholder={`Add ${label}...`} />}
+      sx={{ '& .MuiOutlinedInput-root': { minHeight: '3rem', py: 0.5 } }}
+    />
+  );
+}
+
+function extractOptions(
+  fieldName: string,
+  field: ResourceField,
+  data: any[]
+): string[] {
+  const values = new Set<string>();
+
+  if (field.type === 'enum') {
+    return getFieldOptions(field).map(o => o.value);
+  }
+  if (!data) return [];
+
+  const pull = (item: any): string | null => {
+    if (item == null) return null;
+    if (typeof item === "string") return item;
+    if (typeof item !== "object") return String(item);
+
+    if (field.enumOption?.value) return resolveTemplate(field.enumOption.value, item);
+
+    const df = field.displayField;
+    if (!df) return null;
+
+    if (Array.isArray(df)) {
+      const parts = df.map((k) => item[k]).filter((v) => v != null);
+      if (parts.length > 0) return parts.join(" ");
+    }
+    const v = item[df];
+    if (v != null) return String(v);
+
+    return null;
+  };
+
+  for (const row of data) {
+    const v = row[fieldName];
+    if (v == null) continue;
+
+    if (Array.isArray(v)) {
+      for (const el of v) {
+        const label = pull(el);
+        if (label) values.add(label);
+      }
+    } else {
+      const label = pull(v);
+      if (label) values.add(label);
+    }
+  }
+
+  // console.log('extracted', fieldName, Array.from(values).sort())
+  return Array.from(values).sort();
+}
+
+function renderFilterInput(
+  fieldName: string,
+  field: ResourceField,
+  options: string[],
+  value: any,
+  onChange: (key: string, val: any) => void
+) {
+  const filterType = field.filterType;
+
+  if (filterType === "number-range") {
+    const rangeVal = (value as { min?: string; max?: string }) || {};
+    return (
+      <Box sx={{ display: "flex", gap: 1 }}>
+        <TextField type="number" placeholder="Min" size="small" value={rangeVal.min ?? ""}
+          onChange={(e) => onChange("min", e.target.value || undefined)} sx={{ width: 100 }} />
+        <TextField type="number" placeholder="Max" size="small" value={rangeVal.max ?? ""}
+          onChange={(e) => onChange("max", e.target.value || undefined)} sx={{ width: 100 }} />
+      </Box>
+    );
+  }
+
+  if (filterType === "date-range") {
+    const rangeVal = (value as { start?: string; end?: string }) || {};
+    return (
+      <Box sx={{ display: "flex", gap: 1 }}>
+        <TextField type="datetime-local" placeholder="From" size="small" value={rangeVal.start ?? ""}
+          onChange={(e) => onChange("start", e.target.value || undefined)} InputLabelProps={{ shrink: true }} sx={{ width: 170 }} />
+        <TextField type="datetime-local" placeholder="To" size="small" value={rangeVal.end ?? ""}
+          onChange={(e) => onChange("end", e.target.value || undefined)} InputLabelProps={{ shrink: true }} sx={{ width: 170 }} />
+      </Box>
+    );
+  }
+
+  const selected = Array.isArray(value) ? value : [];
+
+  return (
+    <FilterAutocomplete
+      options={options}
+      value={selected}
+      label={field.label}
+      onChange={(val) => onChange("value", val.length > 0 ? val : undefined)}
+    />
+  );
+}
+
+export interface FilterBarProps {
+  fields: Record<string, ResourceField>;
+  filterableFields: string[];
+  mode: ResourceMode;
+  data?: any[];
+  appliedValues: Record<string, any>;
+  onApply: (values: Record<string, any>) => void;
+  onClear: () => void;
+}
+
+export default function FilterBar({
+  fields,
+  filterableFields,
+  data,
+  appliedValues,
+  onApply,
+  onClear,
+}: FilterBarProps) {
+  const [open, setOpen] = React.useState(false);
+  const [draft, setDraft] = React.useState<Record<string, any>>(() => ({ ...appliedValues }));
+
+  React.useEffect(() => {
+    if (!open) setDraft({ ...appliedValues });
+  }, [appliedValues, open]);
+
+  if (!filterableFields || filterableFields.length === 0) return null;
+
+  const activeCount = Object.keys(appliedValues).filter((k) => {
+    const v = appliedValues[k];
+    if (v == null || v === "") return false;
+    if (typeof v === "object" && Object.values(v).every((x) => x == null || x === "")) return false;
+    return true;
+  }).length;
+
+  const handleApply = () => onApply({ ...draft });
+  const handleClear = () => {
+    setDraft({});
+    onClear();
+  };
+
+  const updateDraft = (fieldName: string, key: string, val: any) => {
+    setDraft((prev) => {
+      if (key === "value") {
+        return { ...prev, [fieldName]: val };
+      }
+      const existing = prev[fieldName] || {};
+      return { ...prev, [fieldName]: { ...existing, [key]: val } };
+    });
+  };
+
+  return (
+    <Paper variant="outlined" sx={{ mb: 2, borderRadius: 2, overflow: "hidden" }}>
+      <Box
+        sx={{
+          display: "flex",
+          alignItems: "center",
+          justifyContent: "space-between",
+          px: 2,
+          py: 1,
+          cursor: "pointer",
+          "&:hover": { bgcolor: "action.hover" },
+        }}
+        onClick={() => setOpen((o) => !o)}
+      >
+        <Box sx={{ display: "flex", alignItems: "center", gap: 1 }}>
+          <FilterListIcon fontSize="small" color="action" />
+          <Typography variant="subtitle2" fontWeight={600}>
+            {open ? "Hide Filters" : "Show Filters"}
+          </Typography>
+        </Box>
+        {activeCount > 0 && (
+          <Typography variant="caption" color="primary" fontWeight={600}>
+            {activeCount} active
+          </Typography>
+        )}
+      </Box>
+
+      {open && (
+        <Box sx={{ px: 2, pb: 2, borderTop: "1px solid", borderColor: "divider", pt: 2 }}>
+          <Box sx={{ display: "flex", flexWrap: "wrap", gap: 2, alignItems: "flex-end" }}>
+            {filterableFields.map((fieldName) => {
+              const field = fields[fieldName];
+              if (!field) return null;
+
+              const needsOptions = !field.filterType || field.filterType === "autocomplete" || field.filterType === "multiselect";
+              const options = needsOptions ? extractOptions(fieldName, field, data ?? []) : [];
+              const raw = draft[fieldName];
+
+              return (
+                <Box key={fieldName} sx={{ display: "flex", flexDirection: "column", flex: { xs: '0 0 100%', sm: 1 }, minWidth: { sm: 200 } }}>
+                  <Box sx={{ typography: "caption", mb: 0.5, color: "text.secondary" }}>
+                    {field.label}
+                  </Box>
+                  {renderFilterInput(fieldName, field, options, raw, (key, val) =>
+                    updateDraft(fieldName, key, val)
+                  )}
+                </Box>
+              );
+            })}
+          </Box>
+
+          <Box sx={{ mt: 2, display: "flex", gap: 1 }}>
+            <Button variant="contained" onClick={handleApply}>
+              Apply
+            </Button>
+            <Button variant="outlined" onClick={handleClear}>
+              Clear
+            </Button>
+          </Box>
+        </Box>
+      )}
+    </Paper>
+  );
+}
--- a/react-openapi/components/ResourceView.tsx
+++ b/react-openapi/components/ResourceView.tsx
@@ -1,10 +1,13 @@
 import * as React from 'react';
-import { Box, Typography, Paper, CircularProgress } from '@mui/material';
+import { Box, Paper, CircularProgress } from '@mui/material';
 import { ResourceConfig } from '../types/config';
+import type { ResourceField } from '../types/config';
 import { useResource } from '../hooks/useResource';
+import { resolveTemplate } from '../utils/options';
 import GenericForm from './GenericForm';
 import EnhancedTable from './EnhancedTable';
-import { useParams, useLocation, useNavigate, Routes, Route } from 'react-router-dom';
+import FilterBar from './FilterBar';
+import { useParams, useLocation, useNavigate } from 'react-router-dom';

 interface ResourceViewProps {
  config: ResourceConfig;
@@ -13,36 +16,126 @@ interface ResourceViewProps {

 import { GridPaginationModel } from '@mui/x-data-grid';

+function getDisplayString(item: any, field: ResourceField): string {
+  if (item == null || typeof item !== 'object') return String(item ?? '');
+  if (field.enumOption?.value) return resolveTemplate(field.enumOption.value, item);
+  const df = field.displayField;
+  if (!df) return item.name ?? item.title ?? item.label ?? item.id ?? JSON.stringify(item);
+  if (Array.isArray(df)) {
+    const parts = df.map((k: string) => item[k]).filter((v: any) => v != null);
+    return parts.length > 0 ? parts.join(' ') : '';
+  }
+  return String(item[df] ?? '');
+}
+
+function applyClientFilters(
+  data: any[],
+  filters: Record<string, any>,
+  fields: Record<string, ResourceField>
+): any[] {
+  const entries = Object.entries(filters).filter(([_, v]) => {
+    if (v == null || v === "" || (Array.isArray(v) && v.length === 0)) return false;
+    if (typeof v === "object" && !Array.isArray(v) && Object.values(v).every((x) => x == null || x === "")) return false;
+    return true;
+  });
+
+  if (entries.length === 0) return data;
+
+  return data.filter((item) =>
+    entries.every(([fieldName, filterValue]) => {
+      const field = fields[fieldName];
+      if (!field) return true;
+
+      const itemValue = item[fieldName];
+
+      if (typeof filterValue === "object" && !Array.isArray(filterValue)) {
+        if (field.type === "number") {
+          if (filterValue.min != null && filterValue.min !== "" && Number(itemValue) < Number(filterValue.min)) return false;
+          if (filterValue.max != null && filterValue.max !== "" && Number(itemValue) > Number(filterValue.max)) return false;
+          return true;
+        }
+        if (field.type === "datetime" || field.type === "date") {
+          const itemTime = new Date(itemValue).getTime();
+          if (filterValue.start && new Date(filterValue.start).getTime() > itemTime) return false;
+          if (filterValue.end && new Date(filterValue.end).getTime() < itemTime) return false;
+          return true;
+        }
+        return true;
+      }
+
+      if (Array.isArray(filterValue)) {
+        if (field.type === "array" && Array.isArray(itemValue)) {
+          return itemValue.some((el: any) =>
+            filterValue.includes(getDisplayString(el, field))
+          );
+        }
+        if (itemValue && typeof itemValue === "object") {
+          return filterValue.includes(getDisplayString(itemValue, field));
+        }
+        return filterValue.includes(String(itemValue));
+      }
+
+      if (!filterValue) return true;
+
+      if (field.type === "boolean") {
+        return String(itemValue) === filterValue;
+      }
+
+      if (field.type === "array" && Array.isArray(itemValue)) {
+        return itemValue.some((el: any) =>
+          getDisplayString(el, field) === String(filterValue)
+        );
+      }
+
+      if (itemValue && typeof itemValue === "object") {
+        return getDisplayString(itemValue, field) === String(filterValue);
+      }
+
+      return String(itemValue) === String(filterValue);
+    })
+  );
+}
+
 export default function ResourceView({ config, onNavigateToResource }: ResourceViewProps) {
  const { id } = useParams();
  const location = useLocation();
  const navigate = useNavigate();
-  
+
  const isCreate = location.pathname.endsWith('/create');
  const isEdit = location.pathname.includes('/edit/');
  const isView = !!id && !isEdit;
  const isList = !id && !isCreate;

+  const isServer = config.filterOptions?.mode !== "client";
+
  const [paginationModel, setPaginationModel] = React.useState<GridPaginationModel>({
    page: 0,
    pageSize: 10,
  });

+  const [appliedFilters, setAppliedFilters] = React.useState<Record<string, any>>({});
+
  const { useList, useRead, useCreate, useUpdate, useDelete } = useResource(config);

-  // Determine query parameters based on pagination config
  const queryParams = React.useMemo(() => {
-    if (!config.pagination) return {};
+    if (!isServer) return { limit: 10000 };
    return {
      skip: paginationModel.page * paginationModel.pageSize,
      limit: paginationModel.pageSize,
    };
-  }, [config.pagination, paginationModel]);
+  }, [isServer, paginationModel]);

  const listQuery = useList(queryParams);
  const itemQuery = useRead(id || "");
-  
-  const paginatedData = listQuery.data || { data: [], total: undefined };
+
+  const rawData = listQuery.data?.data || [];
+  const totalCount = listQuery.data?.total;
+
+  const filteredData = React.useMemo(
+    () => (isServer ? rawData : applyClientFilters(rawData, appliedFilters, config.fields)),
+    [isServer, rawData, appliedFilters, config.fields]
+  );
+
  const createMutation = useCreate();
  const updateMutation = useUpdate();
  const deleteMutation = useDelete();
@@ -80,18 +173,31 @@ export default function ResourceView({ config, onNavigateToResource }: ResourceV
  return (
    <Box>
      {isList ? (
-        <EnhancedTable
-          config={config}
-          data={paginatedData.data || []}
-          total={paginatedData.total}
-          paginationModel={paginationModel}
-          onPaginationModelChange={setPaginationModel}
-          loading={listQuery.isFetching}
-          onEdit={handleEdit}
-          onDelete={handleDelete}
-          onCreate={handleCreate}
-          onNavigateToResource={(res, id) => navigate(`/admin/${res}/${id}`)}
-        />
+        <Box>
+          {!isServer && config.filterOptions?.fields && config.filterOptions.fields.length > 0 && (
+            <FilterBar
+              fields={config.fields}
+              filterableFields={config.filterOptions.fields}
+              mode={config.filterOptions?.mode || "server"}
+              data={rawData}
+              appliedValues={appliedFilters}
+              onApply={setAppliedFilters}
+              onClear={() => setAppliedFilters({})}
+            />
+          )}
+          <EnhancedTable
+            config={config}
+            data={filteredData}
+            total={isServer ? totalCount : filteredData.length}
+            paginationModel={isServer ? paginationModel : undefined}
+            onPaginationModelChange={isServer ? setPaginationModel : undefined}
+            loading={listQuery.isFetching}
+            onEdit={handleEdit}
+            onDelete={handleDelete}
+            onCreate={handleCreate}
+            onNavigateToResource={(res, id) => navigate(`/admin/${res}/${id}`)}
+          />
+        </Box>
      ) : (
        <Paper sx={{ p: 4 }}>
          <GenericForm
--- a/react-openapi/components/fields/FormField.tsx
+++ b/react-openapi/components/fields/FormField.tsx
@@ -12,6 +12,7 @@ import {
  Divider,
 } from '@mui/material';
 import { ResourceField } from '../../types/config';
+import { getFieldOptions } from '../../utils/options';
 import ImageUploadField from './ImageUploadField';

 interface FormFieldProps {
@@ -73,40 +74,40 @@ export default function FormField({
  if (field.relation && relationDataMap[field.relation]) {
    const relationData = relationDataMap[field.relation].data;
    const isArrayRelation = field.type === 'array';
-    
-    // Determine how to display the related item
-    const getOptionLabel = (option: any) => {
-        if (!option) return "";
-        if (field.displayField && option[field.displayField]) return option[field.displayField];
-        // Standard naming fields
-        return option.name || option.title || option.label || option.id || JSON.stringify(option);
-    };
+    const options = getFieldOptions(field, relationData);
+    const keyField = field.enumOption?.key ?? 'id';

-    const getOptionValue = (option: any) => {
-        // Return the whole object to maintain identity
-        return option;
-    };
+    // Normalize value: API returns whole objects on GET, but form uses key strings
+    const normalizedValue = (() => {
+      if (isArrayRelation && Array.isArray(value)) {
+        return value.map((v: any) => (v != null && typeof v === 'object' ? String(v[keyField] ?? '') : String(v)));
+      }
+      if (value != null && typeof value === 'object') {
+        return String(value[keyField] ?? '');
+      }
+      return value ?? (isArrayRelation ? [] : "");
+    })();

    return (
      <FormControl fullWidth>
        <InputLabel shrink>{label}</InputLabel>
        <Select
          multiple={isArrayRelation}
-          value={value || (isArrayRelation ? [] : "")}
+          value={normalizedValue}
          label={label}
          displayEmpty
          onChange={(e) => onChange(e.target.value)}
          disabled={disabled}
          renderValue={(selected: any) => {
            if (isArrayRelation) {
-              return (selected as any[]).map(getOptionLabel).join(', ');
+              return (selected as string[]).map(k => options.find(o => o.key === k)?.value ?? k).join(', ');
            }
-            return getOptionLabel(selected);
+            return options.find(o => o.key === selected)?.value ?? selected;
          }}
        >
-          {relationData.map((option) => (
-            <MenuItem key={option.id || JSON.stringify(option)} value={getOptionValue(option)}>
-              {getOptionLabel(option)}
+          {options.map((opt) => (
+            <MenuItem key={opt.key} value={opt.key}>
+              {opt.value}
            </MenuItem>
          ))}
        </Select>
@@ -148,7 +149,8 @@ export default function FormField({
  }

  // 5. Enum Handling
-  if (field.type === 'enum' && field.options) {
+  if (field.type === 'enum') {
+    const options = getFieldOptions(field);
    return (
      <FormControl fullWidth>
        <InputLabel>{label}</InputLabel>
@@ -158,9 +160,9 @@ export default function FormField({
          onChange={(e) => onChange(e.target.value)}
          disabled={disabled}
        >
-          {field.options.map((opt: string) => (
-            <MenuItem key={opt} value={opt}>
-              {opt}
+          {options.map((opt) => (
+            <MenuItem key={opt.key} value={opt.key}>
+              {opt.value}
            </MenuItem>
          ))}
        </Select>
--- 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,16 +26,17 @@ export function useResource<T = any>(config: ResourceConfig | undefined) {
        };
      },
      enabled: !!endpoint,
+      placeholderData: keepPreviousData,
    });

  // --- READ ONE ---
-  const useRead = (id: string | null) =>
+  const useRead = (id: string, params?: any | null) =>
    useQuery({
-      queryKey: [name, "detail", id],
+      queryKey: [name, "detail", id, params],
      queryFn: async () => {
        if (!id || !endpoint) return null;
        // @ts-ignore
-        const res = await api.get<T>(`${endpoint}/${id}`);
+        const res = await api.get<T>(`${endpoint}/${id}`, params ? { params } : undefined);
        return res.data;
      },
      enabled: !!id && !!endpoint,
@@ -72,6 +73,23 @@ export function useResource<T = any>(config: ResourceConfig | undefined) {
      },
    });

+  // --- PATCH ---
+  const usePatch = () =>
+    useMutation({
+      mutationFn: async ({ id, data }: { id: string; data: Partial<T> }) => {
+        if (!endpoint) throw new Error("Endpoint not defined");
+        // @ts-ignore
+        const res = await api.patch<T>(`${endpoint}/${id}`, data);
+        return res.data;
+      },
+      onSuccess: (updatedItem) => {
+        // @ts-ignore
+        const id = updatedItem[primaryKey];
+        queryClient.invalidateQueries({ queryKey: [name, "list"] });
+        queryClient.invalidateQueries({ queryKey: [name, "detail", id] });
+      },
+    });
+
  // --- DELETE ---
  const useDelete = () =>
    useMutation({
@@ -135,6 +153,7 @@ export function useResource<T = any>(config: ResourceConfig | undefined) {
    useMe,
    useCreate,
    useUpdate,
+    usePatch,
    useUpdateMe,
    useDelete,
    getListQueryOptions,
--- a/react-openapi/index.ts
+++ b/react-openapi/index.ts
@@ -1,7 +1,8 @@
 export { default as Admin } from "./Admin";
 export { api, auth, initializeApiClients } from "./api/client";
 export { getAppConfig } from "./config";
-export type { AppConfig, ResourceConfig, ResourceField } from "./types/config";
+export type { AppConfig, ResourceConfig, ResourceField, ResourceMode } from "./types/config";
 export { AppProvider } from "./providers/AppProvider";
 export { ConfigContext, useConfig } from "./providers/ConfigContext";
 export { useResource, useResourceByName } from "./hooks/useResource";
+export { default as FilterBar } from "./components/FilterBar";
--- a/react-openapi/types/config.ts
+++ b/react-openapi/types/config.ts
@@ -10,6 +10,16 @@ export type FieldType =
  | 'object'
  | 'array';

+export interface SelectOption {
+  key: string;
+  value: string;
+}
+
+export interface EnumOption {
+  key: string;
+  value: string;
+}
+
 export interface ResourceField {
  type: FieldType;
  label: string;
@@ -19,9 +29,14 @@ export interface ResourceField {
  schema?: Record<string, ResourceField>;
  displayField?: string | string[];
  formatter?: (value: any) => string;
-  relation?: string; // Name of the target resource
+  relation?: string;
+  filterType?: "autocomplete" | "multiselect" | "number-range" | "date-range";
+  enumOption?: EnumOption;
+  enumLabels?: Record<string, string>;
 }

+export type ResourceMode = "server" | "client";
+
 export interface ResourceConfig {
  name: string;
  label: string;
@@ -31,12 +46,18 @@ export interface ResourceConfig {
  fields: Record<string, ResourceField>;
  pagination?: boolean;
  hidden?: boolean;
+  filterOptions?: {
+    mode?: ResourceMode;
+    fields?: string[];
+  };
+  enumOption?: EnumOption;
 }

 export interface AppConfig {
  baseUrl: string;
  authBaseUrl: string;
  resources: ResourceConfig[];
+  enums: Record<string, string[]>;
  profile?: {
    resource: string;
    extraFields?: Record<string, any>;
--- a/react-openapi/types/overrides.ts
+++ b/react-openapi/types/overrides.ts
@@ -1,16 +1,23 @@
-/**
- * This file contains application-specific overrides and configuration
- * for the generic Admin Panel.
- */
+export interface EnumOption {
+  key: string;
+  value: string;
+}

 export interface FieldOverride {
  displayField?: string | string[];
  display?: boolean;
  formatter?: (value: any) => string;
+  filterType?: "autocomplete" | "multiselect" | "number-range" | "date-range";
+  enumLabels?: Record<string, string>;
 }

 export interface ResourceOverride {
  fields?: Record<string, FieldOverride>;
  pagination?: boolean;
  hidden?: boolean;
+  filterOptions?: {
+    mode?: "server" | "client";
+    fields?: string[];
+  };
+  enumOption?: EnumOption;
 }
--- a/react-openapi/utils/openapi_loader.ts
+++ b/react-openapi/utils/openapi_loader.ts
@@ -36,6 +36,26 @@ function mapOpenApiType(prop: any): FieldType {
 /**
 * Recursively converts OpenAPI schemas to ResourceField map
 */
+function mergeProperties(schema: any): { properties: Record<string, any>; required: string[] } {
+  let properties: Record<string, any> = {};
+  let required: string[] = [];
+
+  if (schema.allOf) {
+    for (const sub of schema.allOf) {
+      const merged = mergeProperties(sub);
+      properties = { ...properties, ...merged.properties };
+      required = [...required, ...merged.required];
+    }
+  }
+  if (schema.properties) {
+    properties = { ...properties, ...schema.properties };
+  }
+  if (schema.required) {
+    required = [...required, ...schema.required];
+  }
+  return { properties, required };
+}
+
 function parseSchemaFields(
  schema: any,
  resourceName: string,
@@ -43,12 +63,19 @@ function parseSchemaFields(
  configuration: Record<string, any> = {}
 ): Record<string, ResourceField> {
  const fields: Record<string, ResourceField> = {};
-  const properties = schema.properties || {};
-  const required = schema.required || [];
+  const { properties, required } = mergeProperties(schema);
  const overrides = configuration[resourceName]?.fields || {};

  for (const [key, prop] of Object.entries(properties) as [string, any]) {
-    const type = mapOpenApiType(prop);
+    // Resolve oneOf/anyOf by merging all branch properties
+    let resolvedProp = prop;
+    if (prop.oneOf || prop.anyOf) {
+      const branches = prop.oneOf || prop.anyOf;
+      const merged = mergeProperties({ allOf: branches });
+      resolvedProp = { ...prop, type: 'object', properties: merged.properties, required: merged.required };
+    }
+
+    const type = mapOpenApiType(resolvedProp);
    const override = overrides[key];

    // Explicitly skip 'id' as it's the primary key and handled elsewhere
@@ -57,12 +84,12 @@ function parseSchemaFields(
    fields[key] = {
      type,
      label:
-        prop.title ||
+        resolvedProp.title ||
        key.charAt(0).toUpperCase() + key.slice(1).replace(/_/g, " "),
      required: required.includes(key),
-      options: prop.enum,
+      options: resolvedProp.enum,
      readOnly:
-        prop.readOnly ||
+        resolvedProp.readOnly ||
        key === "created_at" ||
        key === "updated_at",
      ...override,
@@ -71,20 +98,35 @@ function parseSchemaFields(
    // STRICT RELATION DETECTION
    // A field is a relation ONLY if its schema object (or items schema) 
    // exactly matches a schema that is defined as a resource.
-    let targetSchema = prop;
-    if (type === "array" && prop.items) {
-      targetSchema = prop.items;
+    let targetSchema = resolvedProp;
+    if (type === "array" && resolvedProp.items) {
+      targetSchema = resolvedProp.items;
    }

    // Check if this schema object is registered as a resource
    const relation = schemaToResourceMap.get(targetSchema);
    if (relation) {
      fields[key].relation = relation;
+
+      // Propagate enumOption from target resource config, or derive from target schema
+      const explicitEnumOption = configuration[relation]?.enumOption;
+      if (explicitEnumOption) {
+        fields[key].enumOption = explicitEnumOption;
+      } else {
+        const targetProps = targetSchema.properties || {};
+        const valueField = Object.entries(targetProps).find(
+          ([name, p]: [string, any]) => name !== 'id' && p.type === 'string'
+        )?.[0];
+        fields[key].enumOption = {
+          key: 'id',
+          value: valueField ?? 'id',
+        };
+      }
    }

    // Recursively parse nested objects (only if not a relation)
-    if (fields[key].type === "object" && prop.properties && !relation) {
-      fields[key].schema = parseSchemaFields(prop, resourceName, schemaToResourceMap, configuration);
+    if (fields[key].type === "object" && resolvedProp.properties && !relation) {
+      fields[key].schema = parseSchemaFields(resolvedProp, resourceName, schemaToResourceMap, configuration);
    }
  }

@@ -154,18 +196,34 @@ export async function loadConfigFromOpenApi(baseUrl: string, configuration: Reco

    const resourceOverride = configuration[name] || {};

+    const fo = resourceOverride.filterOptions || {};
+
    resources.push({
      name,
      label: schema.title || label,
      pluralLabel: pluralLabel,
      endpoint: listPath,
-      primaryKey: "id", // Strict default, no heuristics
+      primaryKey: "id",
      fields,
      pagination: resourceOverride.pagination,
      hidden: resourceOverride.hidden,
+      filterOptions: {
+        mode: fo.mode || "server",
+        fields: fo.fields,
+      },
    });
  }

+  // Collect standalone enum schemas (e.g. FetchRequestStatus, AccountType, etc.)
+  const enums: Record<string, string[]> = {};
+  if (api.components?.schemas) {
+    for (const [name, schema] of Object.entries(api.components.schemas) as [string, any]) {
+      if (schema.enum) {
+        enums[name] = schema.enum;
+      }
+    }
+  }
+
  // @ts-ignore
  const serverBaseUrl = import.meta.env.VITE_API_BASE_URL || (api.servers?.[0]?.url ?? "")
  // @ts-ignore
@@ -174,6 +232,7 @@ export async function loadConfigFromOpenApi(baseUrl: string, configuration: Reco
    baseUrl: serverBaseUrl,
    authBaseUrl: authBaseUrl,
    resources,
+    enums,
    profile: profileConfiguration,
  };
 }
--- a/react-openapi/utils/options.ts
+++ b/react-openapi/utils/options.ts
@@ -0,0 +1,33 @@
+import { ResourceField, SelectOption } from "../types/config";
+
+export function resolveTemplate(template: string, item: any): string {
+  if (/\{(\w+)\}/.test(template)) {
+    return template.replace(/\{(\w+)\}/g, (_, field: string) => String(item[field] ?? ''));
+  }
+  return String(item[template] ?? '');
+}
+
+export function getFieldOptions(field: ResourceField, relationData?: any[]): SelectOption[] {
+  if (field.type === 'enum') {
+    return (field.options ?? []).map(opt => ({
+      key: opt,
+      value: field.enumLabels?.[opt] ?? opt,
+    }));
+  }
+
+  if (field.relation) {
+    const data = relationData ?? [];
+    const enumOption = field.enumOption ?? { key: 'id', value: 'name' };
+
+    return data.map(item => ({
+      key: String(item[enumOption.key] ?? ''),
+      value: resolveTemplate(enumOption.value, item),
+    }));
+  }
+
+  return [];
+}
+
+export function toGridValueOptions(options: SelectOption[]): { value: string; label: string }[] {
+  return options.map(opt => ({ value: opt.key, label: opt.value }));
+}
--- a/src/AppTheme.tsx
+++ b/src/AppTheme.tsx
@@ -1,48 +0,0 @@
-import * as React from "react";
-import { ThemeProvider, createTheme } from "@mui/material/styles";
-import { getDesignTokens } from "./shared-theme/themePrimitives";
-import { inputsCustomizations } from "./shared-theme/customizations/inputs";
-import { dataDisplayCustomizations } from "./shared-theme/customizations/dataDisplay";
-import { feedbackCustomizations } from "./shared-theme/customizations/feedback";
-import { navigationCustomizations } from "./shared-theme/customizations/navigation";
-import { surfacesCustomizations } from "./shared-theme/customizations/surfaces";
-
-export const ColorModeContext = React.createContext({
-  toggleColorMode: () => {},
-  mode: "light" as "light" | "dark",
-});
-
-export default function AppTheme({ children }: { children: React.ReactNode }) {
-  const [mode, setMode] = React.useState<"light" | "dark">("light");
-
-  const colorMode = React.useMemo(
-    () => ({
-      toggleColorMode: () => {
-        setMode((prevMode) => (prevMode === "light" ? "dark" : "light"));
-      },
-      mode,
-    }),
-    [mode]
-  );
-
-  const theme = React.useMemo(
-    () =>
-      createTheme({
-        ...getDesignTokens(mode),
-        components: {
-          ...inputsCustomizations,
-          ...dataDisplayCustomizations,
-          ...feedbackCustomizations,
-          ...navigationCustomizations,
-          ...surfacesCustomizations,
-        },
-      }),
-    [mode]
-  );
-
-  return (
-    <ColorModeContext.Provider value={colorMode}>
-      <ThemeProvider theme={theme}>{children}</ThemeProvider>
-    </ColorModeContext.Provider>
-  );
-}
--- a/src/Dashboard.tsx
+++ b/src/Dashboard.tsx
@@ -10,14 +10,41 @@ import {
  Button
 } from "@mui/material";

-import ConfigurableDashboard from "./components/Dashboard";
+import DashboardView from "./components/Dashboard";
+
+import {
+  DashboardState,
+  DashboardStateSetters,
+  DashboardFlow,
+} from "./components/Dashboard";
+
 import { configuration } from "./dashboard-config";
 import {
  useReport,
  prepareReport,
 } from "./features/report";
+import { useResourceByName } from "../react-openapi";
+
+function formatSnapshotDate(iso: string) {
+  const d = new Date(iso);
+  return d.toLocaleString(undefined, {
+    year: "numeric",
+    month: "short",
+    day: "numeric",
+    hour: "2-digit",
+    minute: "2-digit",
+  });
+}

 export default function Dashboard() {
+  const [state, setState] = React.useState<DashboardState>({
+    flow: "outflows",
+    periodType: "rolling",
+    selectedPeriodId: null,
+    selectedGroupKey: null,
+    comparison: false,
+  });
+
  const [appliedPayees, setAppliedPayees] = React.useState<string[]>([]);
  const [appliedTags, setAppliedTags] = React.useState<string[]>([]);

@@ -27,26 +54,42 @@ export default function Dashboard() {
  const [loadedPayees, setLoadedPayees] = React.useState<string[]>([]);
  const [loadedTags, setLoadedTags] = React.useState<string[]>([]);

+  const [selectedSnapshotId, setSelectedSnapshotId] = React.useState<string | null>(null);
+
+  const { data: snapshotsData } = useResourceByName("reports").useList();
+  const snapshotOptions = React.useMemo(() => {
+    const options: { label: string; value: string | null }[] = [
+      { label: "Latest (auto)", value: null },
+    ];
+    if (snapshotsData?.data) {
+      for (const snap of snapshotsData.data) {
+        options.push({
+          label: `Snapshot from ${formatSnapshotDate(snap.created_at)}`,
+          value: snap.snapshot_id,
+        });
+      }
+    }
+    return options;
+  }, [snapshotsData]);
+
+  const selectedSnapshotOption = snapshotOptions.find((o) => o.value === selectedSnapshotId) ?? snapshotOptions[0];
+
  const report = useReport({
-    periods: ["weekly", "monthly", "full"],
-    rolling: true,
-    include_transactions: true,
-    group_by: ["tags"],
+    snapshot_id: selectedSnapshotId ?? undefined,
+    periods: ["daily", "weekly", "monthly", "all"],
+    flow: state.flow,
    payee: appliedPayees.length > 0 ? appliedPayees : undefined,
    tags: appliedTags.length > 0 ? appliedTags : undefined,
  });

  React.useEffect(() => {
-    if (report.data?.data) {
+    if (report.data) {
      setLoadedPayees(prev => {
        const pSet = new Set<string>(prev);
-        report.data.data.buckets.forEach((b: any) => {
+        report.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);
              });
            });
@@ -57,13 +100,10 @@ export default function Dashboard() {

      setLoadedTags(prev => {
        const tSet = new Set<string>(prev);
-        report.data.data.buckets.forEach((b: any) => {
+        report.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));
              });
            });
@@ -72,12 +112,126 @@ export default function Dashboard() {
        return Array.from(tSet).sort();
      });
    }
-  }, [report.data?.data]);
+  }, [report.data]);
+
+  const toggleFlow =
+    React.useCallback(() => {
+      setState((prev) => ({
+        ...prev,
+
+        flow:
+          prev.flow ===
+          "outflows"
+            ? "inflows"
+            : "outflows",
+
+        selectedGroupKey:
+          null,
+
+        selectedPeriodId:
+          null,
+      }));
+    }, []);
+
+  const setFlow =
+    React.useCallback(
+      (
+        flow: DashboardFlow
+      ) => {
+        setState((prev) => ({
+          ...prev,
+
+          flow,
+
+          selectedGroupKey:
+            null,
+
+          selectedPeriodId:
+            null,
+        }));
+      },
+      []
+    );
+
+  const togglePeriodType =
+    React.useCallback(() => {
+      setState((prev) => ({
+        ...prev,
+
+        periodType:
+          prev.periodType ===
+          "rolling"
+            ? "calendar"
+            : "rolling",
+      }));
+    }, []);
+
+  const toggleComparison =
+    React.useCallback(() => {
+      setState((prev) => ({
+        ...prev,
+
+        comparison:
+          !prev.comparison,
+      }));
+    }, []);
+
+  const setSelectedPeriodId =
+    React.useCallback(
+      (
+        selectedPeriodId: DashboardState["selectedPeriodId"]
+      ) => {
+        setState((prev) => ({
+          ...prev,
+
+          selectedPeriodId,
+        }));
+      },
+      []
+    );
+
+  const setSelectedGroupKey =
+    React.useCallback(
+      (
+        selectedGroupKey: DashboardState["selectedGroupKey"]
+      ) => {
+        setState((prev) => ({
+          ...prev,
+
+          selectedGroupKey,
+        }));
+      },
+      []
+    );
+
+  const stateSetters: DashboardStateSetters =
+    React.useMemo(
+      () => ({
+        toggleFlow,
+
+        setFlow,
+
+        togglePeriodType,
+
+        toggleComparison,
+
+        setSelectedPeriodId,
+
+        setSelectedGroupKey,
+      }),
+      [
+        toggleFlow,
+        setFlow,
+        togglePeriodType,
+        toggleComparison,
+        setSelectedPeriodId,
+        setSelectedGroupKey,
+      ]
+    );

  const isLoading = report.isLoading;
  const error = report.error;

-
  if (isLoading && !report.data) {
    return (
      <Box sx={{ display: "flex", justifyContent: "center", alignItems: "center", height: "60vh" }}>
@@ -98,7 +252,7 @@ export default function Dashboard() {
    return null;
  }

-  const data = prepareReport(report.data.data);
+  const data = prepareReport(report.data);
  return (
    <Box>
      <Container>
@@ -144,23 +298,41 @@ export default function Dashboard() {
              sx={{ '& .MuiOutlinedInput-root': { height: 'auto', minHeight: '2.5rem', py: 0.5 } }}
            />
          </Box>
-          <Button 
-            variant="contained" 
+          <Box sx={{ display: 'flex', flexDirection: 'column', minWidth: { sm: 220 } }}>
+            <Box sx={{ typography: 'caption', mb: 1, color: 'text.secondary' }}>
+              Snapshot
+            </Box>
+            <Autocomplete
+              options={snapshotOptions}
+              value={selectedSnapshotOption}
+              onChange={(_, option) => setSelectedSnapshotId(option?.value ?? null)}
+              getOptionLabel={(o) => o.label}
+              isOptionEqualToValue={(o, v) => o.value === v.value}
+              renderInput={(params) => <TextField {...params} placeholder="Select snapshot..." />}
+              sx={{ '& .MuiOutlinedInput-root': { height: 'auto', minHeight: '2.5rem', py: 0.5 } }}
+            />
+          </Box>
+
+          <Button
+            variant="contained"
            size="large"
            onClick={() => {
              setAppliedPayees(payeeInput);
              setAppliedTags(tagsInput);
            }}
            disabled={isLoading}
-            sx={{ height: 40, borderRadius: 2 }} // Changed from 56 to 40 to match minHeight of inputs
+            sx={{ height: 40, borderRadius: 2 }}
          >
            Apply
          </Button>
        </Paper>
      </Container>
-      <ConfigurableDashboard
+      <DashboardView
        config={configuration}
        data={data}
+        state={state}
+        stateSetters={stateSetters}
+        isFetching={report.isFetching}
      />
    </Box>
  );
--- a/src/FetchRequestDetail.tsx
+++ b/src/FetchRequestDetail.tsx
@@ -0,0 +1,675 @@
+import * as React from "react";
+import { useParams, useNavigate } from "react-router-dom";
+import {
+  Box,
+  Container,
+  Paper,
+  Typography,
+  Button,
+  Chip,
+  CircularProgress,
+  Alert,
+  Stepper,
+  Step,
+  StepLabel,
+  StepIcon,
+  LinearProgress,
+  IconButton,
+  Snackbar,
+} from "@mui/material";
+import ArrowBackIcon from "@mui/icons-material/ArrowBack";
+import ReplayIcon from "@mui/icons-material/Replay";
+import CheckCircleIcon from "@mui/icons-material/CheckCircle";
+import ErrorIcon from "@mui/icons-material/Error";
+import WarningAmberIcon from "@mui/icons-material/WarningAmber";
+import PlayArrowIcon from "@mui/icons-material/PlayArrow";
+import RemoveCircleOutlineIcon from "@mui/icons-material/RemoveCircleOutline";
+import FiberManualRecordIcon from "@mui/icons-material/FiberManualRecord";
+import {
+  useFetchRequest,
+  useUpdateFetchRequest,
+  useFetchRequestAmbiguities,
+  useResolveAmbiguity,
+} from "./features/fetch-requests";
+import type {
+  FetchRequestStatus,
+  SSEEvent,
+  ProgressMessage,
+} from "./features/fetch-requests";
+import { RETRY_MAX, formatApiError } from "./features/fetch-requests";
+import { useConfig } from "../react-openapi";
+
+const statusColors: Record<FetchRequestStatus, "default" | "primary" | "warning" | "info" | "success" | "error"> = {
+  pending: "default",
+  processing: "info",
+  paused: "warning",
+  raw_expenses_done: "primary",
+  enriched_done: "warning",
+  completed: "success",
+  failed: "error",
+};
+
+const statusIcons: Record<FetchRequestStatus, React.ReactNode> = {
+  pending: <PlayArrowIcon sx={{ fontSize: 16 }} />,
+  processing: <CircularProgress size={14} />,
+  paused: <WarningAmberIcon sx={{ fontSize: 16 }} />,
+  raw_expenses_done: <CheckCircleIcon sx={{ fontSize: 16 }} />,
+  enriched_done: <CheckCircleIcon sx={{ fontSize: 16 }} />,
+  completed: <CheckCircleIcon sx={{ fontSize: 16 }} />,
+  failed: <ErrorIcon sx={{ fontSize: 16 }} />,
+};
+
+function computeProgressPercent(
+  status: FetchRequestStatus,
+  liveCount: number,
+  seenSteps: Set<string>,
+  stepStats: Record<string, number>,
+  txnBlockCount: number,
+  txnDictCount: number,
+): number {
+  if (status === "pending") return 0;
+  if (status === "completed") return 100;
+
+  let pct = 0;
+
+  if (seenSteps.has("raw_lines") || seenSteps.has("txn_blocks")) pct += 10;
+
+  if (txnBlockCount > 0) {
+    const current = Math.max(liveCount, stepStats.txn_dicts ?? 0);
+    pct += Math.min(1, current / txnBlockCount) * 20;
+  }
+
+  if (txnDictCount > 0) {
+    pct += Math.min(1, (stepStats.enrich_count ?? 0) / txnDictCount) * 50;
+    pct += Math.min(1, (stepStats.save_count ?? 0) / txnDictCount) * 20;
+  }
+
+  return Math.round(Math.min(100, pct));
+}
+
+const stepLabels = ["Extract", "Raw Expense", "Enrich", "Save"];
+
+function computeActiveStep(status: FetchRequestStatus, seenSteps: Set<string>): number {
+  if (status === "completed") return stepLabels.length;
+
+  if (seenSteps.has("save_expenses/completed") || seenSteps.has("complete/completed")) return stepLabels.length;
+  if (seenSteps.has("save_expenses") || seenSteps.has("complete")) return 3;
+
+  if (seenSteps.has("enrich/completed")) return 3;
+  if (seenSteps.has("enrich")) return 2;
+
+  if (seenSteps.has("txn_dicts/completed") || status === "raw_expenses_done") return 2;
+  if (seenSteps.has("txn_dicts")) return 1;
+
+  if (seenSteps.has("txn_blocks/completed")) return 1;
+  if (seenSteps.has("raw_lines") || seenSteps.has("txn_blocks")) return 0;
+
+  if (status === "processing" || status === "paused") return 0;
+
+  return -1;
+}
+
+function formatProgressMessage(msg: ProgressMessage): string {
+  if (msg.lines !== undefined) return `${msg.lines} lines`;
+  if (msg.blocks !== undefined) return `${msg.blocks} blocks`;
+  if (msg.count !== undefined && msg.unit) return `${msg.count} ${msg.unit}`;
+  if (msg.count !== undefined) return `${msg.count} items`;
+  if (msg.raw_ocr_line) return `"${msg.raw_ocr_line.slice(0, 60)}${msg.raw_ocr_line.length > 60 ? "…" : ""}"`;
+  if (msg.error) return msg.error.slice(0, 80);
+  return "";
+}
+
+function sseIcon(status: SSEEvent["status"]) {
+  switch (status) {
+    case "started": return <CircularProgress size={14} />;
+    case "completed": return <CheckCircleIcon sx={{ fontSize: 16, color: "success.main" }} />;
+    case "failed": return <ErrorIcon sx={{ fontSize: 16, color: "error.main" }} />;
+    case "skipped": return <RemoveCircleOutlineIcon sx={{ fontSize: 16, color: "text.disabled" }} />;
+    case "paused": return <WarningAmberIcon sx={{ fontSize: 16, color: "warning.main" }} />;
+    case "progress": return (
+      <FiberManualRecordIcon
+        sx={{ fontSize: 14, color: "info.main" }}
+      />
+    );
+  }
+}
+
+function isMathValid(candidate: { amount: number; balance: number }, prevBalance: number) {
+  return (
+    candidate.balance === prevBalance + candidate.amount ||
+    candidate.balance === prevBalance - candidate.amount ||
+    Math.abs(candidate.balance - (prevBalance + candidate.amount)) < 0.01 ||
+    Math.abs(candidate.balance - (prevBalance - candidate.amount)) < 0.01
+  );
+}
+
+export default function FetchRequestDetail() {
+  const { id } = useParams<{ id: string }>();
+  const navigate = useNavigate();
+  const config = useConfig();
+
+  const { data: fetchRequest, isLoading, error: fetchError, refetch: refetchRequest } = useFetchRequest(id!);
+  const updateMutation = useUpdateFetchRequest();
+  const resolveMutation = useResolveAmbiguity();
+  const { data: ambiguities, refetch: refetchAmbiguities } = useFetchRequestAmbiguities(id!);
+
+  const [sseEvents, setSseEvents] = React.useState<SSEEvent[]>([]);
+  const [sseConnected, setSseConnected] = React.useState(false);
+  const [liveParsedCount, setLiveParsedCount] = React.useState<number | undefined>(undefined);
+  const [stepStats, setStepStats] = React.useState<Record<string, number>>({});
+  const [failNotif, setFailNotif] = React.useState<string | null>(null);
+  const sseRef = React.useRef<EventSource | null>(null);
+  const feedRef = React.useRef<HTMLDivElement>(null);
+
+  const txnBlockCount = React.useMemo(() => {
+    const blocks = (fetchRequest as any)?.source?.txn_blocks;
+    if (!blocks) return 0;
+    return Object.values(blocks).reduce(
+      (sum: number, list: any) => sum + (Array.isArray(list) ? list.length : 0),
+      0,
+    );
+  }, [fetchRequest]);
+
+  const stepMessages = React.useMemo(() => {
+    const msgs: Record<number, string> = {};
+    const source = (fetchRequest as any)?.source;
+
+    const rawLineCount = stepStats.raw_lines ?? (source?.raw_lines?.length ?? 0);
+    if (rawLineCount) msgs[0] = `${rawLineCount}`;
+
+    const sourceDictCount = source?.txn_dict_count ?? source?.txn_dicts_count ?? 0;
+    const dictLive = liveParsedCount ?? stepStats.txn_dicts ?? 0;
+    const dictCurrent = Math.max(dictLive, sourceDictCount);
+    if (dictCurrent && txnBlockCount) msgs[1] = `${dictCurrent}/${txnBlockCount}`;
+    else if (dictCurrent) msgs[1] = `${dictCurrent}`;
+
+    const txnDictDenom = stepStats.txn_dicts ?? sourceDictCount;
+    if (stepStats.enrich_count && txnDictDenom) msgs[2] = `${stepStats.enrich_count}/${txnDictDenom}`;
+    else if (stepStats.enrich_count) msgs[2] = `${stepStats.enrich_count}`;
+
+    if (stepStats.save_count && txnDictDenom) msgs[3] = `${stepStats.save_count}/${txnDictDenom}`;
+    else if (stepStats.save_count) msgs[3] = `${stepStats.save_count}`;
+
+    return msgs;
+  }, [fetchRequest, stepStats, liveParsedCount, txnBlockCount]);
+
+  React.useEffect(() => {
+    if (!id || !config?.baseUrl) return;
+    const url = `${config.baseUrl}/fetch-requests/${id}/events`;
+    const es = new EventSource(url);
+    sseRef.current = es;
+
+    es.onopen = () => setSseConnected(true);
+    es.onerror = () => setSseConnected(false);
+    es.onmessage = (event) => {
+      try {
+        const parsed: SSEEvent = JSON.parse(event.data);
+        setSseEvents((prev) => [...prev, parsed]);
+
+        if (parsed.status === "progress" && parsed.message.count !== undefined) {
+          if (parsed.step === "txn_dicts") setLiveParsedCount(parsed.message.count);
+          if (parsed.step === "enrich") setStepStats((prev) => ({ ...prev, enrich_count: parsed.message.count! }));
+          if (parsed.step === "save_expenses") setStepStats((prev) => ({ ...prev, save_count: parsed.message.count! }));
+        }
+
+        if (parsed.status === "completed" && parsed.message.count !== undefined) {
+          const stats: Record<string, number> = {};
+          if (parsed.step === "raw_lines" && parsed.message.lines !== undefined) stats.raw_lines = parsed.message.lines;
+          if (parsed.step === "txn_blocks" && parsed.message.blocks !== undefined) stats.txn_blocks = parsed.message.blocks;
+          if (parsed.step === "txn_dicts") stats.txn_dicts = parsed.message.count;
+          if (parsed.step === "enrich") stats.enrich_count = parsed.message.count;
+          if (parsed.step === "save_expenses") stats.save_count = parsed.message.count;
+          if (Object.keys(stats).length) {
+            setStepStats((prev) => ({ ...prev, ...stats }));
+          }
+        }
+
+        if (parsed.status === "paused") {
+          refetchRequest();
+          refetchAmbiguities();
+        }
+        if (parsed.status === "failed") {
+          setFailNotif(parsed.message.error || "Fetch request failed");
+          refetchRequest();
+        }
+        if (parsed.status === "completed" || parsed.step === "resume_extract") {
+          refetchRequest();
+        }
+      } catch {
+        // ignore malformed events
+      }
+    };
+
+    return () => {
+      es.close();
+      sseRef.current = null;
+    };
+  }, [id, config?.baseUrl]);
+
+  React.useEffect(() => {
+    if (feedRef.current) {
+      feedRef.current.scrollTop = feedRef.current.scrollHeight;
+    }
+  }, [sseEvents]);
+
+  const displayEvents = React.useMemo(() => {
+    const progressSteps = new Set(["txn_dicts", "enrich", "save_expenses"]);
+    const lastProgressIdx: Record<string, number> = {};
+    for (let i = sseEvents.length - 1; i >= 0; i--) {
+      const e = sseEvents[i];
+      if (progressSteps.has(e.step) && e.status === "progress" && lastProgressIdx[e.step] === undefined) {
+        lastProgressIdx[e.step] = i;
+      }
+    }
+
+    const terminalStatuses = new Set(["completed", "skipped", "paused", "failed"]);
+    return sseEvents.filter((e, i) => {
+      if (progressSteps.has(e.step) && e.status === "progress") return i === lastProgressIdx[e.step];
+      if (e.status === "started") {
+        return !sseEvents.slice(i + 1).some(
+          (later) => later.step === e.step && terminalStatuses.has(later.status),
+        );
+      }
+      return true;
+    });
+  }, [sseEvents]);
+
+  const seenSteps = React.useMemo(() => {
+    const steps = new Set<string>();
+    for (const evt of sseEvents) {
+      steps.add(evt.step);
+      if (evt.status === "completed") steps.add(`${evt.step}/completed`);
+      if (evt.status === "failed") steps.add(`${evt.step}/failed`);
+      if (evt.status === "started") steps.add(`${evt.step}/started`);
+      if (evt.status === "progress") steps.add(`${evt.step}/progress`);
+    }
+    return steps;
+  }, [sseEvents]);
+
+  const displayParsedCount = React.useMemo(() => {
+    if (liveParsedCount && liveParsedCount > 0) return liveParsedCount;
+    const source = (fetchRequest as any)?.source;
+    const persistedCount = source?.txn_dict_count ?? source?.txn_dicts_count ?? 0;
+    if (persistedCount > 0) return persistedCount;
+    const dicts = source?.txn_dicts;
+    if (Array.isArray(dicts) && dicts.length > 0) return dicts.length;
+    return 0;
+  }, [liveParsedCount, fetchRequest]);
+
+  const txnDictCount = React.useMemo(() => {
+    const source = (fetchRequest as any)?.source;
+    if (stepStats.txn_dicts && stepStats.txn_dicts > 0) return stepStats.txn_dicts;
+    return source?.txn_dict_count ?? source?.txn_dicts_count ?? 0;
+  }, [fetchRequest, stepStats]);
+
+  const progressPercent = React.useMemo(
+    () => computeProgressPercent(
+      (fetchRequest as any)?.status as FetchRequestStatus ?? "pending",
+      displayParsedCount,
+      seenSteps,
+      stepStats,
+      txnBlockCount,
+      txnDictCount,
+    ),
+    [fetchRequest, displayParsedCount, seenSteps, stepStats, txnBlockCount, txnDictCount],
+  );
+
+  const handleRetry = async () => {
+    if (!id) return;
+    try {
+      await updateMutation.mutateAsync({ id, data: { status: "pending" } });
+    } catch (err: any) {
+      setFailNotif(formatApiError(err));
+    }
+  };
+
+  const handleResolve = async (ambiguity: any, candidate: { amount: number; balance: number }) => {
+    await resolveMutation.mutateAsync({
+      ambiguityId: ambiguity.id,
+      payload: { chosen: { amount: candidate.amount, balance: candidate.balance } },
+    });
+    refetchAmbiguities();
+  };
+
+  if (isLoading) {
+    return (
+      <Box sx={{ display: "flex", justifyContent: "center", p: 8 }}>
+        <CircularProgress />
+      </Box>
+    );
+  }
+
+  if (fetchError || !fetchRequest) {
+    return (
+      <Container sx={{ mt: 4 }}>
+        <Button startIcon={<ArrowBackIcon />} onClick={() => navigate("/fetch-requests")} sx={{ mb: 2 }}>
+          Back
+        </Button>
+        <Alert severity="error">Failed to load fetch request</Alert>
+      </Container>
+    );
+  }
+
+  const req = fetchRequest as any;
+  const activeStep = computeActiveStep(req.status as FetchRequestStatus, seenSteps);
+  const retryCount = req.retry_count ?? 0;
+  const isRetryExhausted = retryCount >= RETRY_MAX;
+  const pendingAmbiguities = ambiguities?.filter((a: any) => a.status === "pending") ?? [];
+  const resolvedAmbiguities = ambiguities?.filter((a: any) => a.status === "resolved") ?? [];
+  const hasAmbiguities = ambiguities && ambiguities.length > 0;
+  const allResolved = hasAmbiguities && pendingAmbiguities.length === 0;
+  const ambiguitiesLoading = !ambiguities;
+
+  return (
+    <Container sx={{ mt: 4, mb: 4 }}>
+      <Button startIcon={<ArrowBackIcon />} onClick={() => navigate("/fetch-requests")} sx={{ mb: 2 }}>
+        Back to Fetch Requests
+      </Button>
+
+      <Paper sx={{ p: 3, borderRadius: 4, mb: 3 }} variant="outlined">
+        <Box sx={{ display: "flex", alignItems: "center", gap: 2, mb: 2, flexWrap: "wrap" }}>
+          <Chip
+            icon={statusIcons[req.status as FetchRequestStatus] as any}
+            label={req.status.replace(/_/g, " ")}
+            color={statusColors[req.status as FetchRequestStatus]}
+          />
+          <Typography variant="h6" fontWeight={600}>{req.account_name}</Typography>
+          <Chip
+            label={"path" in req.source ? "File" : "Email"}
+            size="small"
+            variant="outlined"
+            color={"path" in req.source ? "primary" : "secondary"}
+          />
+        </Box>
+
+        <Box sx={{ display: "flex", gap: 4, flexWrap: "wrap", mb: 2 }}>
+          <Box>
+            <Typography variant="caption" color="text.secondary">Date Range</Typography>
+            <Typography variant="body2">
+              {(req as any).start_date ? new Date((req as any).start_date).toLocaleDateString() : "?"} → {(req as any).end_date ? new Date((req as any).end_date).toLocaleDateString() : "?"}
+            </Typography>
+          </Box>
+          <Box>
+            <Typography variant="caption" color="text.secondary">Created</Typography>
+            <Typography variant="body2">{new Date(req.created_at).toLocaleString()}</Typography>
+          </Box>
+          {req.completed_at && (
+            <Box>
+              <Typography variant="caption" color="text.secondary">Completed</Typography>
+              <Typography variant="body2">{new Date(req.completed_at).toLocaleString()}</Typography>
+            </Box>
+          )}
+        </Box>
+
+        <Box sx={{ mb: 2 }}>
+          <Box sx={{ display: "flex", alignItems: "center", gap: 2, mb: 0.5 }}>
+            <Typography variant="caption" color="text.secondary">
+              Overall Progress
+            </Typography>
+            {["processing", "paused"].includes(req.status) && displayParsedCount > 0 && (
+              <Typography variant="caption" fontWeight={600} color="info.main">
+                Validated: {displayParsedCount} transactions
+              </Typography>
+            )}
+          </Box>
+          <LinearProgress
+            variant="determinate"
+            value={progressPercent}
+            color={req.status === "failed" ? "error" : req.status === "completed" ? "success" : "primary"}
+            sx={{ borderRadius: 1, height: 8, transition: "width 0.3s ease" }}
+          />
+          <Typography variant="caption" color="text.secondary" sx={{ mt: 0.25, display: "block" }}>
+            {progressPercent}%
+          </Typography>
+        </Box>
+
+        <Box sx={{ display: "flex", alignItems: "center", gap: 2 }}>
+          <Box sx={{ flex: 1, maxWidth: 300 }}>
+            <Typography variant="caption" color="text.secondary">
+              Retries: {retryCount}/{RETRY_MAX}
+            </Typography>
+            <LinearProgress
+              variant="determinate"
+              value={(retryCount / RETRY_MAX) * 100}
+              color={isRetryExhausted ? "error" : "primary"}
+              sx={{ mt: 0.5, borderRadius: 1, height: 6 }}
+            />
+          </Box>
+          {req.status === "failed" && !isRetryExhausted && (
+            <Button
+              variant="outlined"
+              size="small"
+              startIcon={<ReplayIcon />}
+              onClick={handleRetry}
+              disabled={updateMutation.isPending}
+            >
+              Retry
+            </Button>
+          )}
+        </Box>
+      </Paper>
+
+      {req.status === "failed" && req.error_message && (
+        <Alert severity="error" sx={{ mb: 3, borderRadius: 2 }}>
+          {req.error_message}
+        </Alert>
+      )}
+
+      {isRetryExhausted && req.status === "failed" && (
+        <Alert severity="info" sx={{ mb: 3, borderRadius: 2 }}>
+          Max retries reached — no further retry attempts will be made.
+        </Alert>
+      )}
+
+      <Paper sx={{ p: 3, borderRadius: 4, mb: 3 }} variant="outlined">
+        <Typography variant="subtitle1" fontWeight={600} gutterBottom>
+          Pipeline Progress
+        </Typography>
+        <Stepper activeStep={activeStep} alternativeLabel>
+          {stepLabels.map((label, index) => {
+            const isCompleted = index < activeStep;
+            const isActive = index === activeStep;
+            const isPaused = req.status === "paused" && isActive;
+            const isFailed = req.status === "failed" && isActive;
+
+            let icon: React.ReactNode;
+            if (isCompleted) {
+              icon = <CheckCircleIcon sx={{ color: "success.main" }} />;
+            } else if (isFailed) {
+              icon = <ErrorIcon sx={{ color: "error.main" }} />;
+            } else if (isPaused) {
+              icon = <WarningAmberIcon sx={{ color: "warning.main" }} />;
+            } else if (isActive) {
+              icon = <CircularProgress size={20} />;
+            } else {
+              icon = <Typography variant="caption" color="text.disabled">{index + 1}</Typography>;
+            }
+
+            const stepMsg = stepMessages[index];
+
+            return (
+              <Step key={label}>
+                <StepLabel
+                  StepIconComponent={() => <Box sx={{ display: "flex", alignItems: "center" }}>{icon}</Box>}
+                >
+                  <Typography variant="body2" fontWeight={600}>{label}</Typography>
+                  {stepMsg && (
+                    <Typography variant="caption" color="text.secondary" sx={{ display: "block", lineHeight: 1.2 }}>
+                      {stepMsg}
+                    </Typography>
+                  )}
+                </StepLabel>
+              </Step>
+            );
+          })}
+        </Stepper>
+      </Paper>
+
+      <Paper sx={{ borderRadius: 4, mb: 3 }} variant="outlined">
+        <Box sx={{ display: "flex", alignItems: "center", gap: 1, p: 2, pb: 0 }}>
+          <Typography variant="subtitle1" fontWeight={600} sx={{ flex: 1 }}>
+            Progress Events
+          </Typography>
+          <Box
+            sx={{
+              width: 10,
+              height: 10,
+              borderRadius: "50%",
+              bgcolor: sseConnected ? "success.main" : "error.main",
+              flexShrink: 0,
+            }}
+          />
+          <Typography variant="caption" color="text.secondary">
+            {sseConnected ? "Connected" : "Disconnected"}
+          </Typography>
+        </Box>
+        <Box
+          ref={feedRef}
+          sx={{
+            maxHeight: 300,
+            overflowY: "auto",
+            p: 2,
+            display: "flex",
+            flexDirection: "column",
+            gap: 1,
+          }}
+        >
+          {displayEvents.length === 0 ? (
+            <Typography variant="body2" color="text.disabled" sx={{ textAlign: "center", py: 2 }}>
+              Waiting for events...
+            </Typography>
+          ) : (
+            displayEvents.map((evt, i) => (
+              <Box
+                key={i}
+                sx={{
+                  display: "flex",
+                  alignItems: "center",
+                  gap: 1.5,
+                  p: 1,
+                  borderRadius: 2,
+                  bgcolor: "action.hover",
+                }}
+              >
+                {sseIcon(evt.status)}
+                <Box sx={{ flex: 1 }}>
+                  <Typography variant="body2" fontWeight={600}>
+                    {evt.step.replace(/_/g, " ")}
+                  </Typography>
+                  {evt.message && formatProgressMessage(evt.message) && (
+                    <Typography variant="caption" color="text.secondary">
+                      {formatProgressMessage(evt.message)}
+                    </Typography>
+                  )}
+                </Box>
+                <Typography variant="caption" color="text.disabled">
+                  {new Date().toLocaleTimeString()}
+                </Typography>
+              </Box>
+            ))
+          )}
+        </Box>
+      </Paper>
+
+      {hasAmbiguities && (
+        <Paper sx={{ p: 3, borderRadius: 4, mb: 3 }} variant="outlined">
+          <Typography variant="subtitle1" fontWeight={600} gutterBottom>
+            Ambiguity Resolution
+          </Typography>
+
+          {allResolved ? (
+            <Alert severity="success" sx={{ mb: 2, borderRadius: 2 }}>
+              All ambiguities resolved — pipeline will resume on next poll cycle
+            </Alert>
+          ) : (
+            <Alert severity="warning" sx={{ mb: 2, borderRadius: 2 }}>
+              Pipeline paused — resolve ambiguities to continue
+            </Alert>
+          )}
+
+          <Box sx={{ display: "flex", flexDirection: "column", gap: 2 }}>
+            {ambiguities.map((ambiguity: any) => {
+              const isResolved = ambiguity.status === "resolved";
+              return (
+                <Paper
+                  key={ambiguity.id}
+                  sx={{
+                    p: 2,
+                    borderRadius: 3,
+                    border: 1,
+                    borderColor: isResolved ? "success.main" : "divider",
+                    opacity: isResolved ? 0.8 : 1,
+                  }}
+                  variant="outlined"
+                >
+                  <Box sx={{ fontFamily: "monospace", fontSize: "0.85rem", mb: 1.5, p: 1, bgcolor: "grey.900", borderRadius: 1, color: "grey.100" }}>
+                    {ambiguity.line}
+                  </Box>
+
+                  <Box sx={{ display: "flex", gap: 3, mb: 1.5, flexWrap: "wrap" }}>
+                    <Box>
+                      <Typography variant="caption" color="text.secondary">OCR Amount</Typography>
+                      <Typography variant="body2" sx={{ textDecoration: "line-through", color: "text.secondary" }}>
+                        ₹{ambiguity.ocr_amount}
+                      </Typography>
+                    </Box>
+                    <Box>
+                      <Typography variant="caption" color="text.secondary">OCR Balance</Typography>
+                      <Typography variant="body2" sx={{ textDecoration: "line-through", color: "text.secondary" }}>
+                        ₹{ambiguity.ocr_balance}
+                      </Typography>
+                    </Box>
+                    <Box>
+                      <Typography variant="caption" color="text.secondary">Previous Balance</Typography>
+                      <Typography variant="body2">₹{ambiguity.prev_balance}</Typography>
+                    </Box>
+                  </Box>
+
+                  {isResolved ? (
+                    <Alert severity="success" sx={{ py: 0.5, borderRadius: 2 }} icon={<CheckCircleIcon />}>
+                      Resolved: ₹{ambiguity.chosen?.amount} / ₹{ambiguity.chosen?.balance}
+                    </Alert>
+                  ) : (
+                    <Box sx={{ display: "flex", gap: 1, flexWrap: "wrap" }}>
+                      {ambiguity.candidates.map((candidate: any, ci: number) => {
+                        const isCredit = candidate.amount > 0;
+                        const isDebit = candidate.amount < 0;
+                        const cColor = isCredit ? "success.main" : isDebit ? "error.main" : undefined;
+                        return (
+                          <Button
+                            key={ci}
+                            variant="outlined"
+                            size="small"
+                            onClick={() => handleResolve(ambiguity, candidate)}
+                            disabled={resolveMutation.isPending}
+                            sx={{
+                              borderColor: cColor,
+                              color: cColor,
+                              "&:hover": cColor ? { borderColor: cColor } : undefined,
+                            }}
+                          >
+                            ₹{candidate.amount} / ₹{candidate.balance}
+                          </Button>
+                        );
+                      })}
+                    </Box>
+                  )}
+                </Paper>
+              );
+            })}
+          </Box>
+      </Paper>
+    )}
+    <Snackbar
+      open={!!failNotif}
+      autoHideDuration={6000}
+      onClose={() => setFailNotif(null)}
+      anchorOrigin={{ vertical: "bottom", horizontal: "center" }}
+    >
+      <Alert severity="error" onClose={() => setFailNotif(null)} sx={{ borderRadius: 2 }}>
+        {failNotif}
+      </Alert>
+    </Snackbar>
+    </Container>
+  );
+}
--- a/src/FetchRequests.tsx
+++ b/src/FetchRequests.tsx
@@ -0,0 +1,541 @@
+import * as React from "react";
+import {
+  Box,
+  Container,
+  Paper,
+  Typography,
+  TextField,
+  Button,
+  ToggleButtonGroup,
+  ToggleButton,
+  Table,
+  TableBody,
+  TableCell,
+  TableContainer,
+  TableHead,
+  TableRow,
+  Chip,
+  IconButton,
+  CircularProgress,
+  Alert,
+  Snackbar,
+  Dialog,
+  DialogTitle,
+  DialogContent,
+  DialogContentText,
+  DialogActions,
+  Tooltip,
+  Select,
+  MenuItem,
+  InputLabel,
+  FormControl,
+  OutlinedInput,
+  Autocomplete,
+} from "@mui/material";
+import DeleteIcon from "@mui/icons-material/Delete";
+import CloudUploadIcon from "@mui/icons-material/CloudUpload";
+import RefreshIcon from "@mui/icons-material/Refresh";
+import ContentCopyIcon from "@mui/icons-material/ContentCopy";
+import ReplayIcon from "@mui/icons-material/Replay";
+import CheckCircleIcon from "@mui/icons-material/CheckCircle";
+import ErrorIcon from "@mui/icons-material/Error";
+import ScheduleIcon from "@mui/icons-material/Schedule";
+import HourglassEmptyIcon from "@mui/icons-material/HourglassEmpty";
+import WarningAmberIcon from "@mui/icons-material/WarningAmber";
+import {
+  useFetchRequestsList,
+  useCreateFetchRequest,
+  useUpdateFetchRequest,
+  useDeleteFetchRequest,
+  useUploadFile,
+} from "./features/fetch-requests";
+import type {
+  FetchRequest,
+  FetchRequestStatus,
+  FileSource,
+  EmailSource,
+} from "./features/fetch-requests";
+import { RETRY_MAX, formatApiError } from "./features/fetch-requests";
+import { useNavigate } from "react-router-dom";
+import { useResourceByName, useConfig } from "../react-openapi";
+
+const statusColors: Record<FetchRequestStatus, "default" | "primary" | "warning" | "info" | "success" | "error"> = {
+  pending: "default",
+  processing: "info",
+  paused: "warning",
+  raw_expenses_done: "primary",
+  enriched_done: "warning",
+  completed: "success",
+  failed: "error",
+};
+
+const statusIcons: Record<FetchRequestStatus, React.ReactNode> = {
+  pending: <ScheduleIcon sx={{ fontSize: 16 }} />,
+  processing: <CircularProgress size={14} sx={{ mr: 0.5 }} />,
+  paused: <WarningAmberIcon sx={{ fontSize: 16, color: "warning.main" }} />,
+  raw_expenses_done: <HourglassEmptyIcon sx={{ fontSize: 16 }} />,
+  enriched_done: <HourglassEmptyIcon sx={{ fontSize: 16 }} />,
+  completed: <CheckCircleIcon sx={{ fontSize: 16, color: "success.main" }} />,
+  failed: <ErrorIcon sx={{ fontSize: 16, color: "error.main" }} />,
+};
+
+function formatDate(iso: string) {
+  const d = new Date(iso);
+  return d.toLocaleString();
+}
+
+function formatDateRange(start?: string, end?: string) {
+  if (!start && !end) return "—";
+  const s = start ? new Date(start).toLocaleDateString() : "?";
+  const e = end ? new Date(end).toLocaleDateString() : "?";
+  return `${s} → ${e}`;
+}
+
+function shortId(fp: string) {
+  return fp.length > 8 ? fp.slice(0, 8) + "…" : fp;
+}
+
+export default function FetchRequests() {
+  const navigate = useNavigate();
+
+  const [sourceType, setSourceType] = React.useState<"file" | "email">("file");
+  const [accountName, setAccountName] = React.useState("");
+  const [payorUsername, setPayorUsername] = React.useState("aetos");
+  const [format, setFormat] = React.useState("");
+  const [file, setFile] = React.useState<File | null>(null);
+  const [uploadedPath, setUploadedPath] = React.useState<string | null>(null);
+  const [fromEmail, setFromEmail] = React.useState("");
+  const [subject, setSubject] = React.useState("");
+  const [rawTerms, setRawTerms] = React.useState("");
+  const [startDate, setStartDate] = React.useState("");
+  const [endDate, setEndDate] = React.useState("");
+  const [snackbar, setSnackbar] = React.useState<{ message: string; severity: "success" | "error" } | null>(null);
+  const [deleteTarget, setDeleteTarget] = React.useState<FetchRequest | null>(null);
+
+  const [statusFilter, setStatusFilter] = React.useState<string[]>([]);
+  const [accountFilter, setAccountFilter] = React.useState("");
+  const [sourceFilter, setSourceFilter] = React.useState<"all" | "file" | "email">("all");
+
+  const { data: listData, isLoading, isFetching, refetch } = useFetchRequestsList({
+    ...(statusFilter.length > 0 ? { status: statusFilter.join(",") } : {}),
+    ...(accountFilter ? { account_name: accountFilter } : {}),
+    ...(sourceFilter !== "all" ? { source_type: sourceFilter } : {}),
+  });
+  const { useList: useAccountsList } = useResourceByName("accounts");
+  const { data: accountsData } = useAccountsList();
+  const accountOptions: string[] = React.useMemo(() => {
+    return (accountsData?.data ?? []).map((a: any) => a.name).filter(Boolean);
+  }, [accountsData]);
+
+  const config = useConfig();
+  const fetchRes = config?.resources.find((r: any) => r.name === "fetch-requests");
+  const formatOptions: string[] = fetchRes?.fields?.source?.schema?.format?.options as string[] ?? [];
+
+  const createMutation = useCreateFetchRequest();
+  const updateMutation = useUpdateFetchRequest();
+  const deleteMutation = useDeleteFetchRequest();
+  const uploadMutation = useUploadFile();
+
+  const requests = listData?.data ?? [];
+
+  const handleUpload = async () => {
+    if (!file) return;
+    const result = await uploadMutation.mutateAsync(file);
+    if (result?.saved_as) {
+      setUploadedPath(result.saved_as);
+      if (!format) setFormat(file.name.split(".").pop() || "");
+      setSnackbar({ message: `File uploaded: ${result.saved_as}`, severity: "success" });
+    }
+  };
+
+  const handleCreate = async () => {
+    if (!accountName) return;
+
+    let source: FileSource | EmailSource;
+
+    if (sourceType === "file") {
+      if (!uploadedPath || !format) return;
+      source = { path: uploadedPath, format } as FileSource;
+    } else {
+      if (!format) return;
+      const emailSource: EmailSource = { format };
+      if (fromEmail) emailSource.from_email = fromEmail;
+      if (subject) emailSource.subject = subject;
+      if (rawTerms.trim()) emailSource.raw_terms = rawTerms.split(",").map((s) => s.trim()).filter(Boolean);
+      source = emailSource;
+    }
+
+    try {
+      const result = await createMutation.mutateAsync({
+        source,
+        account_name: accountName,
+        payor_username: payorUsername,
+        ...(startDate ? { start_date: new Date(startDate).toISOString() } : {}),
+        ...(endDate ? { end_date: new Date(endDate).toISOString() } : {}),
+      });
+      setSnackbar({ message: "Fetch request created", severity: "success" });
+      resetForm();
+      navigate(`/fetch-requests/${result.id}`);
+    } catch (err: any) {
+      if (err?.response?.status === 409) {
+        setSnackbar({ message: "Duplicate — same fingerprint already exists", severity: "error" });
+      } else {
+        setSnackbar({ message: formatApiError(err) || "Failed to create fetch request", severity: "error" });
+      }
+    }
+  };
+
+  const resetForm = () => {
+    setAccountName("");
+    setFormat("");
+    setFile(null);
+    setUploadedPath(null);
+    setFromEmail("");
+    setSubject("");
+    setRawTerms("");
+    setStartDate("");
+    setEndDate("");
+  };
+
+  const handleRetry = async (req: FetchRequest) => {
+    try {
+      await updateMutation.mutateAsync({ id: req.id, data: { status: "pending" } });
+      setSnackbar({ message: "Retrying fetch request", severity: "success" });
+    } catch {
+      setSnackbar({ message: "Failed to retry", severity: "error" });
+    }
+  };
+
+  const handleDelete = async () => {
+    if (!deleteTarget) return;
+    try {
+      await deleteMutation.mutateAsync(deleteTarget.id);
+      setSnackbar({ message: "Fetch request deleted", severity: "success" });
+    } catch {
+      setSnackbar({ message: "Failed to delete", severity: "error" });
+    }
+    setDeleteTarget(null);
+  };
+
+  const sourceTypeOptions: ("all" | "file" | "email")[] = ["all", "file", "email"];
+
+  return (
+    <Container sx={{ mt: 4, mb: 4 }}>
+      <Typography variant="h5" fontWeight="bold" gutterBottom>
+        Fetch Request Pipeline
+      </Typography>
+
+      <Paper sx={{ p: 3, mb: 4, borderRadius: 4 }} variant="outlined">
+        <Typography variant="subtitle1" fontWeight={600} gutterBottom>
+          New Fetch Request
+        </Typography>
+
+        <ToggleButtonGroup
+          value={sourceType}
+          exclusive
+          onChange={(_, val) => val && setSourceType(val)}
+          sx={{ mb: 3 }}
+          size="small"
+        >
+          <ToggleButton value="file">File Upload</ToggleButton>
+          <ToggleButton value="email">Email Fetch</ToggleButton>
+        </ToggleButtonGroup>
+
+        <Box sx={{ display: "flex", flexDirection: "column", gap: 2 }}>
+          {sourceType === "file" ? (
+            <>
+              <Box sx={{ display: "flex", gap: 2, alignItems: "flex-end" }}>
+                <Button variant="outlined" component="label" startIcon={<CloudUploadIcon />}>
+                  Choose File
+                  <input type="file" hidden onChange={(e) => setFile(e.target.files?.[0] ?? null)} />
+                </Button>
+                <Typography variant="body2" sx={{ flex: 1, color: "text.secondary" }}>
+                  {file ? file.name : "No file selected"}
+                </Typography>
+                <Button
+                  variant="contained"
+                  onClick={handleUpload}
+                  disabled={!file || uploadMutation.isPending}
+                >
+                  {uploadMutation.isPending ? "Uploading..." : "Upload"}
+                </Button>
+              </Box>
+              {uploadedPath && (
+                <Alert severity="success" sx={{ py: 0 }}>
+                  Uploaded as: {uploadedPath}
+                </Alert>
+              )}
+              <FormControl size="small">
+                <InputLabel>Format</InputLabel>
+                <Select value={format} onChange={(e) => setFormat(e.target.value)} label="Format">
+                  {formatOptions.map((opt) => (
+                    <MenuItem key={opt} value={opt}>{opt}</MenuItem>
+                  ))}
+                </Select>
+              </FormControl>
+            </>
+          ) : (
+            <>
+              <FormControl size="small">
+                <InputLabel>Format</InputLabel>
+                <Select value={format} onChange={(e) => setFormat(e.target.value)} label="Format">
+                  {formatOptions.map((opt) => (
+                    <MenuItem key={opt} value={opt}>{opt}</MenuItem>
+                  ))}
+                </Select>
+              </FormControl>
+              <TextField label="From Email" value={fromEmail} onChange={(e) => setFromEmail(e.target.value)} size="small" />
+              <TextField label="Subject" value={subject} onChange={(e) => setSubject(e.target.value)} size="small" />
+              <TextField label="Raw Terms" value={rawTerms} onChange={(e) => setRawTerms(e.target.value)} size="small" helperText="Comma-separated search terms" />
+            </>
+          )}
+
+          <Autocomplete
+            options={accountOptions}
+            value={accountName || null}
+            onChange={(_, val) => setAccountName(val ?? "")}
+            renderInput={(params) => (
+              <TextField {...params} label="Account Name" size="small" required />
+            )}
+            sx={{ "& .MuiOutlinedInput-root": { height: "auto", minHeight: "2.5rem" } }}
+          />
+          <TextField label="Payor Username" value={payorUsername} onChange={(e) => setPayorUsername(e.target.value)} size="small" helperText="Default: aetos" />
+
+          <Box sx={{ display: "flex", gap: 2 }}>
+            <TextField
+              label="Start Date"
+              type="date"
+              value={startDate}
+              onChange={(e) => setStartDate(e.target.value)}
+              size="small"
+              InputLabelProps={{ shrink: true }}
+              inputProps={{ max: new Date().toISOString().split("T")[0] }}
+              sx={{ flex: 1 }}
+            />
+            <TextField
+              label="End Date"
+              type="date"
+              value={endDate}
+              onChange={(e) => setEndDate(e.target.value)}
+              size="small"
+              InputLabelProps={{ shrink: true }}
+              inputProps={{ max: new Date().toISOString().split("T")[0] }}
+              sx={{ flex: 1 }}
+            />
+          </Box>
+
+          <Button
+            variant="contained"
+            onClick={handleCreate}
+            disabled={createMutation.isPending || !accountName || (sourceType === "file" && (!uploadedPath || !format)) || (sourceType === "email" && !format)}
+          >
+            {createMutation.isPending ? "Creating..." : "Create Fetch Request"}
+          </Button>
+        </Box>
+      </Paper>
+
+      <Paper sx={{ borderRadius: 4, mb: 2, p: 2 }} variant="outlined">
+        <Box sx={{ display: "flex", alignItems: "center", gap: 2, flexWrap: "wrap" }}>
+          <FormControl size="small" sx={{ minWidth: 200 }}>
+            <InputLabel>Status</InputLabel>
+            <Select
+              multiple
+              value={statusFilter}
+              onChange={(e) => setStatusFilter(e.target.value as string[])}
+              input={<OutlinedInput label="Status" />}
+              renderValue={(selected) => (selected as string[]).join(", ")}
+            >
+              {(config?.enums?.FetchRequestStatus ?? []).map((s: string) => (
+                <MenuItem key={s} value={s}>{s.replace(/_/g, " ")}</MenuItem>
+              ))}
+            </Select>
+          </FormControl>
+          <TextField
+            label="Account"
+            value={accountFilter}
+            onChange={(e) => setAccountFilter(e.target.value)}
+            size="small"
+            sx={{ minWidth: 160 }}
+          />
+          <ToggleButtonGroup
+            value={sourceFilter}
+            exclusive
+            onChange={(_, val) => val && setSourceFilter(val)}
+            size="small"
+          >
+            {sourceTypeOptions.map((opt) => (
+              <ToggleButton key={opt} value={opt}>
+                {opt === "all" ? "All" : opt === "file" ? "File" : "Email"}
+              </ToggleButton>
+            ))}
+          </ToggleButtonGroup>
+          <Box sx={{ flex: 1 }} />
+          <IconButton onClick={() => refetch()} disabled={isFetching}>
+            <RefreshIcon />
+          </IconButton>
+        </Box>
+      </Paper>
+
+      {isLoading ? (
+        <Box sx={{ display: "flex", justifyContent: "center", p: 4 }}>
+          <CircularProgress />
+        </Box>
+      ) : requests.length === 0 ? (
+        <Box sx={{ p: 4, textAlign: "center", color: "text.secondary" }}>
+          No fetch requests yet
+        </Box>
+      ) : (
+        <TableContainer component={Paper} variant="outlined" sx={{ borderRadius: 4 }}>
+          <Table size="small">
+            <TableHead>
+              <TableRow>
+                <TableCell>ID</TableCell>
+                <TableCell>Account</TableCell>
+                <TableCell>Source</TableCell>
+                <TableCell>Date Range</TableCell>
+                <TableCell>Status</TableCell>
+                <TableCell>Retries</TableCell>
+                <TableCell>Created</TableCell>
+                <TableCell align="right">Actions</TableCell>
+              </TableRow>
+            </TableHead>
+            <TableBody>
+              {[...requests]
+                .sort((a, b) => new Date(b.created_at).getTime() - new Date(a.created_at).getTime())
+                .map((req: FetchRequest) => (
+                <TableRow
+                  key={req.id}
+                  hover
+                  onClick={() => navigate(`/fetch-requests/${req.id}`)}
+                  sx={{ cursor: "pointer", "&:last-child td": { border: 0 } }}
+                >
+                  <TableCell sx={{ fontFamily: "monospace", fontSize: "0.8rem" }}>
+                    <Box sx={{ display: "flex", alignItems: "center", gap: 0.5 }}>
+                      {shortId(req.fingerprint)}
+                      <IconButton
+                        size="small"
+                        onClick={(e) => {
+                          e.stopPropagation();
+                          navigator.clipboard.writeText(req.fingerprint);
+                          setSnackbar({ message: "Copied!", severity: "success" });
+                        }}
+                        sx={{ opacity: 0.5, '&:hover': { opacity: 1 } }}
+                      >
+                        <ContentCopyIcon sx={{ fontSize: 14 }} />
+                      </IconButton>
+                    </Box>
+                  </TableCell>
+                  <TableCell>{req.account_name}</TableCell>
+                  <TableCell>
+                    <Chip
+                      label={"path" in req.source ? "File" : "Email"}
+                      size="small"
+                      variant="outlined"
+                      color={"path" in req.source ? "primary" : "secondary"}
+                    />
+                  </TableCell>
+                  <TableCell>
+                    <Typography variant="body2" sx={{ fontSize: "0.8rem", whiteSpace: "nowrap" }}>
+                      {formatDateRange((req as any).start_date, (req as any).end_date)}
+                    </Typography>
+                  </TableCell>
+                  <TableCell>
+                    <Box sx={{ display: "flex", alignItems: "center", gap: 0.5 }}>
+                      <Tooltip title={req.error_message || req.status.replace(/_/g, " ")}>
+                        <Chip
+                          icon={statusIcons[req.status] as any}
+                          label={req.status.replace(/_/g, " ")}
+                          color={statusColors[req.status]}
+                          size="small"
+                        />
+                      </Tooltip>
+                    </Box>
+                  </TableCell>
+                  <TableCell>
+                    {(req.retry_count ?? 0) > 0 ? (
+                      <Typography variant="body2" sx={{ fontSize: "0.8rem" }}>
+                        {req.retry_count}/{RETRY_MAX}
+                      </Typography>
+                    ) : (
+                      <Typography variant="body2" sx={{ fontSize: "0.8rem", color: "text.disabled" }}>
+                        —
+                      </Typography>
+                    )}
+                  </TableCell>
+                  <TableCell sx={{ whiteSpace: "nowrap", fontSize: "0.8rem" }}>
+                    {formatDate(req.created_at)}
+                  </TableCell>
+                  <TableCell align="right">
+                    <Box sx={{ display: "flex", gap: 0.5, justifyContent: "flex-end" }}>
+                      {req.status === "paused" && (
+                        <Tooltip title="Resolve ambiguities">
+                          <IconButton
+                            size="small"
+                            onClick={(e) => {
+                              e.stopPropagation();
+                              navigate(`/fetch-requests/${req.id}`);
+                            }}
+                          >
+                            <WarningAmberIcon fontSize="small" color="warning" />
+                          </IconButton>
+                        </Tooltip>
+                      )}
+                      {req.status === "failed" && (req.retry_count ?? 0) < RETRY_MAX && (
+                        <Tooltip title="Retry">
+                          <IconButton
+                            size="small"
+                            onClick={(e) => {
+                              e.stopPropagation();
+                              handleRetry(req);
+                            }}
+                          >
+                            <ReplayIcon fontSize="small" />
+                          </IconButton>
+                        </Tooltip>
+                      )}
+                      <Tooltip title="Delete">
+                        <IconButton
+                          size="small"
+                          onClick={(e) => {
+                            e.stopPropagation();
+                            setDeleteTarget(req);
+                          }}
+                        >
+                          <DeleteIcon fontSize="small" />
+                        </IconButton>
+                      </Tooltip>
+                    </Box>
+                  </TableCell>
+                </TableRow>
+              ))}
+            </TableBody>
+          </Table>
+        </TableContainer>
+      )}
+
+      <Snackbar
+        open={!!snackbar}
+        autoHideDuration={4000}
+        onClose={() => setSnackbar(null)}
+        anchorOrigin={{ vertical: "bottom", horizontal: "center" }}
+      >
+        {snackbar ? <Alert severity={snackbar.severity} onClose={() => setSnackbar(null)}>{snackbar.message}</Alert> : undefined}
+      </Snackbar>
+
+      <Dialog open={!!deleteTarget} onClose={() => setDeleteTarget(null)}>
+        <DialogTitle>Delete Fetch Request?</DialogTitle>
+        <DialogContent>
+          <DialogContentText>
+            This will permanently delete the fetch request and all associated data.
+          </DialogContentText>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={() => setDeleteTarget(null)}>Cancel</Button>
+          <Button onClick={handleDelete} color="error" disabled={deleteMutation.isPending}>
+            {deleteMutation.isPending ? "Deleting..." : "Delete"}
+          </Button>
+        </DialogActions>
+      </Dialog>
+    </Container>
+  );
+}
--- a/src/Header.tsx
+++ b/src/Header.tsx
@@ -20,7 +20,7 @@ import DarkModeIcon from "@mui/icons-material/DarkMode";
 import LightModeIcon from "@mui/icons-material/LightMode";
 import { useNavigate } from "react-router-dom";
 import { useAuth } from "../react-auth";
-import { ColorModeContext } from "./AppTheme";
+import { ColorModeContext } from "./shared-theme/AppTheme";

 interface HeaderProps {
  routerMapping: {
@@ -91,6 +91,32 @@ export default function Header({

        <span style={{ flexGrow: 1 }} />

+        {/* NAV LINKS */}
+        <Box
+          sx={{
+            display: { xs: "none", md: "flex" },
+            alignItems: "center",
+            mr: 2,
+            gap: 1,
+          }}
+        >
+          {[
+            { label: "Dashboard", path: "/dashboard" },
+            { label: "Fetch", path: "/fetch-requests" },
+            { label: "Reports", path: "/reports" },
+          ].map(({ label, path }) => (
+            <Button
+              key={path}
+              color="inherit"
+              onClick={() => navigate(path)}
+              sx={{ textTransform: "none", fontWeight: 500, px: 1.5 }}
+              size="small"
+            >
+              {label}
+            </Button>
+          ))}
+        </Box>
+
        {/* AUTH SECTION */}
        {isAuthenticated ? (
          <>
--- a/src/Home.tsx
+++ b/src/Home.tsx
@@ -1,70 +1,180 @@
 import * as React from "react";
-import { Box, Typography, Button, Container, Stack } from "@mui/material";
+import { Box, Typography, Button, Container, Grid, Paper, Chip } from "@mui/material";
+import { useTheme, alpha } from "@mui/material/styles";
 import { useNavigate } from "react-router-dom";
+import DashboardIcon from "@mui/icons-material/Dashboard";
+import SyncIcon from "@mui/icons-material/Sync";
+import BarChartIcon from "@mui/icons-material/BarChart";
+import SettingsIcon from "@mui/icons-material/Settings";
 import ArrowForwardIcon from "@mui/icons-material/ArrowForward";
+import { useAuth } from "../react-auth";
+
+interface FeatureCardProps {
+  icon: React.ReactNode;
+  title: string;
+  description: string;
+  path: string;
+  label?: string;
+  accent: string;
+}
+
+function FeatureCard({ icon, title, description, path, label, accent }: FeatureCardProps) {
+  const navigate = useNavigate();
+  const theme = useTheme();
+
+  return (
+    <Paper
+      elevation={0}
+      onClick={() => navigate(path)}
+      sx={{
+        p: 3,
+        borderRadius: 3,
+        border: "1px solid",
+        borderColor: "divider",
+        cursor: "pointer",
+        height: "100%",
+        display: "flex",
+        flexDirection: "column",
+        position: "relative",
+        overflow: "hidden",
+        transition: "all 0.25s ease",
+        "&::before": {
+          content: '""',
+          position: "absolute",
+          top: 0,
+          left: 0,
+          right: 0,
+          height: 3,
+          background: accent,
+          opacity: 0,
+          transition: "opacity 0.25s ease",
+        },
+        "&:hover": {
+          transform: "translateY(-4px)",
+          boxShadow: `0 12px 32px ${alpha(theme.palette.common.black, theme.palette.mode === "dark" ? 0.3 : 0.08)}`,
+          borderColor: "transparent",
+          "&::before": { opacity: 1 },
+        },
+      }}
+    >
+      <Box sx={{ display: "flex", alignItems: "center", gap: 1.5, mb: 1.5 }}>
+        <Box
+          sx={{
+            width: 40,
+            height: 40,
+            borderRadius: 2,
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center",
+            background: alpha(accent, 0.12),
+            color: accent,
+          }}
+        >
+          {icon}
+        </Box>
+        <Typography variant="subtitle1" fontWeight={700}>
+          {title}
+        </Typography>
+      </Box>
+
+      <Typography variant="body2" color="text.secondary" sx={{ flex: 1, lineHeight: 1.6 }}>
+        {description}
+      </Typography>
+
+      {label && (
+        <Chip
+          label={label}
+          size="small"
+          variant="outlined"
+          sx={{ mt: 2, alignSelf: "flex-start", textTransform: "capitalize" }}
+        />
+      )}
+    </Paper>
+  );
+}

 export default function Home() {
  const navigate = useNavigate();
+  const theme = useTheme();
+  const { currentUser } = useAuth();
+
+  const features = [
+    {
+      icon: <DashboardIcon />,
+      title: "Dashboard",
+      description: "Visualise inflows and outflows with interactive charts, drill into categories, and track trends over daily, weekly, and monthly periods.",
+      path: "/dashboard",
+      accent: theme.palette.mode === "dark" ? "#818cf8" : "#6366f1",
+    },
+    {
+      icon: <SyncIcon />,
+      title: "Fetch Requests",
+      description: "Upload bank statements or configure email ingestion to auto-import transactions. Track pipeline status from pending through to completion.",
+      path: "/fetch-requests",
+      accent: theme.palette.mode === "dark" ? "#34d399" : "#10b981",
+    },
+    {
+      icon: <BarChartIcon />,
+      title: "Report Snapshots",
+      description: "Generate cached report snapshots with custom filters — accounts, date ranges, amount bounds — then pin a snapshot on the dashboard for consistent comparisons.",
+      path: "/reports",
+      accent: theme.palette.mode === "dark" ? "#fbbf24" : "#f59e0b",
+    },
+    {
+      icon: <SettingsIcon />,
+      title: "Admin",
+      description: "Full CRUD over accounts, expenses, tags, and payors. Manage your data programmatically through the OpenAPI-driven admin panel.",
+      path: "/admin",
+      accent: theme.palette.mode === "dark" ? "#e879f9" : "#d946ef",
+    },
+  ];

  return (
    <Box
      sx={{
-        width: "100%",
-        minHeight: "calc(100vh - 64px)", // accounting for header
+        minHeight: "calc(100vh - 64px)",
        display: "flex",
-        alignItems: "center",
-        justifyContent: "center",
+        flexDirection: "column",
        position: "relative",
        overflow: "hidden",
        "&::before": {
          content: '""',
          position: "absolute",
-          top: "-20%",
-          left: "-10%",
-          width: "50%",
-          height: "60%",
-          background: "radial-gradient(circle, rgba(99,102,241,0.15) 0%, rgba(0,0,0,0) 70%)",
+          top: "-15%",
+          left: "-8%",
+          width: "45%",
+          height: "55%",
+          background: "radial-gradient(circle, rgba(99,102,241,0.12) 0%, transparent 70%)",
          zIndex: 0,
        },
        "&::after": {
          content: '""',
          position: "absolute",
-          bottom: "-20%",
-          right: "-10%",
-          width: "50%",
-          height: "60%",
-          background: "radial-gradient(circle, rgba(236,72,153,0.15) 0%, rgba(0,0,0,0) 70%)",
+          bottom: "-15%",
+          right: "-8%",
+          width: "45%",
+          height: "55%",
+          background: "radial-gradient(circle, rgba(236,72,153,0.1) 0%, transparent 70%)",
          zIndex: 0,
        },
      }}
    >
-      <Container maxWidth="lg" sx={{ position: "relative", zIndex: 1 }}>
-        <Stack
-          spacing={4}
-          alignItems="center"
-          textAlign="center"
+      <Container maxWidth="lg" sx={{ position: "relative", zIndex: 1, flex: 1, display: "flex", flexDirection: "column", justifyContent: "center", py: 6 }}>
+        <Box
          sx={{
-            p: { xs: 4, md: 8 },
-            backdropFilter: "blur(20px)",
-            backgroundColor: (theme) => 
-               theme.palette.mode === "dark" ? "rgba(255, 255, 255, 0.03)" : "rgba(255, 255, 255, 0.6)",
-            border: "1px solid",
-            borderColor: "divider",
-            borderRadius: 4,
-            boxShadow: (theme) =>
-              theme.palette.mode === "dark"
-                ? "0 8px 32px 0 rgba(0, 0, 0, 0.37)"
-                : "0 8px 32px 0 rgba(31, 38, 135, 0.07)",
+            textAlign: "center",
+            mb: 6,
          }}
        >
          <Typography
            variant="h1"
            sx={{
              fontWeight: 800,
-              fontSize: { xs: "3rem", md: "5rem" },
-              background: "linear-gradient(45deg, #6366f1 30%, #ec4899 90%)",
+              fontSize: { xs: "2.5rem", sm: "3.5rem", md: "5rem" },
+              background: "linear-gradient(135deg, #6366f1 0%, #ec4899 50%, #f59e0b 100%)",
              WebkitBackgroundClip: "text",
              WebkitTextFillColor: "transparent",
+              letterSpacing: "-0.03em",
              mb: 2,
            }}
          >
@@ -72,14 +182,20 @@ export default function Home() {
          </Typography>

          <Typography
-            variant="h5"
+            variant="h6"
            color="text.secondary"
-            sx={{ maxWidth: "600px", lineHeight: 1.6 }}
+            sx={{
+              maxWidth: 580,
+              mx: "auto",
+              lineHeight: 1.7,
+              fontWeight: 400,
+              fontSize: { xs: "1rem", md: "1.15rem" },
+            }}
          >
-            Your intelligent, extensible financial ledger. Control accounts, manage transactions, and track your data dynamically with our OpenAPI-driven architecture.
+            Your intelligent, extensible financial ledger. Import transactions, generate reports, and stay on top of your cashflow.
          </Typography>

-          <Box mt={4}>
+          <Box sx={{ mt: 4, display: "flex", gap: 2, justifyContent: "center", flexWrap: "wrap" }}>
            <Button
              variant="contained"
              size="large"
@@ -87,21 +203,44 @@ export default function Home() {
              onClick={() => navigate("/dashboard")}
              sx={{
                px: 4,
-                py: 1.5,
+                py: 1.4,
                borderRadius: "50px",
-                fontWeight: "bold",
-                background: "linear-gradient(45deg, #6366f1 30%, #ec4899 90%)",
-                transition: "transform 0.2s ease-in-out, box-shadow 0.2s",
+                fontWeight: 700,
+                background: "linear-gradient(135deg, #6366f1 0%, #ec4899 100%)",
+                transition: "transform 0.2s ease, box-shadow 0.2s",
                "&:hover": {
-                  transform: "translateY(-3px)",
-                  boxShadow: "0 8px 20px rgba(236,72,153,0.4)",
+                  transform: "translateY(-2px)",
+                  boxShadow: `0 8px 24px ${alpha(theme.palette.primary.main, 0.35)}`,
                },
              }}
            >
              Enter Dashboard
            </Button>
+            <Button
+              variant="outlined"
+              size="large"
+              onClick={() => navigate("/fetch-requests")}
+              sx={{
+                px: 4,
+                py: 1.4,
+                borderRadius: "50px",
+                fontWeight: 600,
+                borderWidth: 2,
+                "&:hover": { borderWidth: 2 },
+              }}
+            >
+              Import Data
+            </Button>
          </Box>
-        </Stack>
+        </Box>
+
+        <Grid container spacing={3}>
+          {features.map((f) => (
+            <Grid key={f.title} size={{ xs: 12, sm: 6, md: 3 }}>
+              <FeatureCard {...f} />
+            </Grid>
+          ))}
+        </Grid>
      </Container>
    </Box>
  );
--- a/src/ReportSnapshots.tsx
+++ b/src/ReportSnapshots.tsx
@@ -0,0 +1,273 @@
+import * as React from "react";
+import {
+  Box,
+  Container,
+  Paper,
+  Typography,
+  TextField,
+  Button,
+  Table,
+  TableBody,
+  TableCell,
+  TableContainer,
+  TableHead,
+  TableRow,
+  IconButton,
+  CircularProgress,
+  Alert,
+  Snackbar,
+  Dialog,
+  DialogTitle,
+  DialogContent,
+  DialogContentText,
+  DialogActions,
+  Switch,
+  FormControlLabel,
+  Chip,
+} from "@mui/material";
+import DeleteIcon from "@mui/icons-material/Delete";
+import AddCircleIcon from "@mui/icons-material/AddCircle";
+import RefreshIcon from "@mui/icons-material/Refresh";
+import ContentCopyIcon from "@mui/icons-material/ContentCopy";
+import {
+  useReportSnapshotsList,
+  useCreateSnapshot,
+  useDeleteSnapshot,
+} from "./features/report-snapshots";
+import type { ReportSnapshot } from "./features/report-snapshots";
+
+function formatDate(iso: string) {
+  const d = new Date(iso);
+  return d.toLocaleString();
+}
+
+export default function ReportSnapshots() {
+  const [ignoreSelf, setIgnoreSelf] = React.useState(true);
+  const [startDate, setStartDate] = React.useState("");
+  const [endDate, setEndDate] = React.useState("");
+  const [minAmount, setMinAmount] = React.useState("");
+  const [maxAmount, setMaxAmount] = React.useState("");
+  const [snackbar, setSnackbar] = React.useState<{ message: string; severity: "success" | "error" } | null>(null);
+  const [deleteTarget, setDeleteTarget] = React.useState<ReportSnapshot | null>(null);
+  const [createdSnapshotId, setCreatedSnapshotId] = React.useState<string | null>(null);
+
+  const { data: listData, isLoading, isFetching, refetch } = useReportSnapshotsList();
+  const createMutation = useCreateSnapshot();
+  const deleteMutation = useDeleteSnapshot();
+
+  const snapshots = listData?.data ?? [];
+
+  const handleCreate = async () => {
+    try {
+      const result = await createMutation.mutateAsync({
+        ignore_self: ignoreSelf || null,
+        start_date: startDate ? new Date(startDate).toISOString() : null,
+        end_date: endDate ? new Date(endDate).toISOString() : null,
+        min_amount: minAmount ? parseFloat(minAmount) : null,
+        max_amount: maxAmount ? parseFloat(maxAmount) : null,
+      });
+      const snapshotId = (result as any)?.snapshot_id;
+      if (snapshotId) {
+        setCreatedSnapshotId(snapshotId);
+        setSnackbar({ message: `Snapshot created: ${snapshotId}`, severity: "success" });
+      } else {
+        setSnackbar({ message: "Snapshot created", severity: "success" });
+      }
+      resetForm();
+    } catch (err: any) {
+      setSnackbar({ message: err?.response?.data?.detail || "Failed to create snapshot", severity: "error" });
+    }
+  };
+
+  const resetForm = () => {
+    setIgnoreSelf(false);
+    setStartDate("");
+    setEndDate("");
+    setMinAmount("");
+    setMaxAmount("");
+  };
+
+  const handleDelete = async () => {
+    if (!deleteTarget) return;
+    try {
+      await deleteMutation.mutateAsync(deleteTarget.snapshot_id);
+      setSnackbar({ message: "Snapshot deleted", severity: "success" });
+    } catch {
+      setSnackbar({ message: "Failed to delete snapshot", severity: "error" });
+    }
+    setDeleteTarget(null);
+  };
+
+  return (
+    <Container sx={{ mt: 4, mb: 4 }}>
+      <Typography variant="h5" fontWeight="bold" gutterBottom>
+        Report Snapshots
+      </Typography>
+
+      <Paper sx={{ p: 3, mb: 4, borderRadius: 4 }} variant="outlined">
+        <Typography variant="subtitle1" fontWeight={600} gutterBottom>
+          Generate New Snapshot
+        </Typography>
+
+        <Box sx={{ display: "flex", flexDirection: "column", gap: 2 }}>
+          <FormControlLabel
+            control={<Switch checked={ignoreSelf} onChange={(e) => setIgnoreSelf(e.target.checked)} />}
+            label="Ignore self-transfers"
+          />
+
+          <Box sx={{ display: "flex", gap: 2 }}>
+            <TextField
+              label="Start Date"
+              type="datetime-local"
+              value={startDate}
+              onChange={(e) => setStartDate(e.target.value)}
+              size="small"
+              InputLabelProps={{ shrink: true }}
+              sx={{ flex: 1 }}
+            />
+            <TextField
+              label="End Date"
+              type="datetime-local"
+              value={endDate}
+              onChange={(e) => setEndDate(e.target.value)}
+              size="small"
+              InputLabelProps={{ shrink: true }}
+              sx={{ flex: 1 }}
+            />
+          </Box>
+
+          <Box sx={{ display: "flex", gap: 2 }}>
+            <TextField
+              label="Min Amount"
+              type="number"
+              value={minAmount}
+              onChange={(e) => setMinAmount(e.target.value)}
+              size="small"
+              sx={{ flex: 1 }}
+            />
+            <TextField
+              label="Max Amount"
+              type="number"
+              value={maxAmount}
+              onChange={(e) => setMaxAmount(e.target.value)}
+              size="small"
+              sx={{ flex: 1 }}
+            />
+          </Box>
+
+          <Button
+            variant="contained"
+            startIcon={<AddCircleIcon />}
+            onClick={handleCreate}
+            disabled={createMutation.isPending}
+          >
+            {createMutation.isPending ? "Generating..." : "Generate Snapshot"}
+          </Button>
+
+          {createdSnapshotId && (
+            <Alert severity="success" onClose={() => setCreatedSnapshotId(null)}>
+              Snapshot created: <strong>{createdSnapshotId}</strong>. Use it in the Dashboard snapshot selector.
+            </Alert>
+          )}
+        </Box>
+      </Paper>
+
+      <Paper sx={{ borderRadius: 4 }} variant="outlined">
+        <Box sx={{ display: "flex", alignItems: "center", justifyContent: "space-between", p: 2, pb: 0 }}>
+          <Typography variant="subtitle1" fontWeight={600}>
+            Existing Snapshots
+          </Typography>
+          <IconButton onClick={() => refetch()} disabled={isFetching}>
+            <RefreshIcon />
+          </IconButton>
+        </Box>
+
+        {isLoading ? (
+          <Box sx={{ display: "flex", justifyContent: "center", p: 4 }}>
+            <CircularProgress />
+          </Box>
+        ) : snapshots.length === 0 ? (
+          <Box sx={{ p: 4, textAlign: "center", color: "text.secondary" }}>
+            No snapshots yet
+          </Box>
+        ) : (
+          <TableContainer>
+            <Table size="small">
+              <TableHead>
+                <TableRow>
+                  <TableCell>Snapshot ID</TableCell>
+                  <TableCell>Created</TableCell>
+                  <TableCell>Query</TableCell>
+                  <TableCell align="right">Actions</TableCell>
+                </TableRow>
+              </TableHead>
+              <TableBody>
+                {snapshots.map((snap: ReportSnapshot) => (
+                  <TableRow key={snap.id}>
+                    <TableCell sx={{ fontFamily: "monospace", fontSize: "0.8rem" }}>
+                      <Box sx={{ display: "flex", alignItems: "center", gap: 0.5 }}>
+                        {snap.snapshot_id}
+                        <IconButton
+                          size="small"
+                          onClick={() => {
+                            navigator.clipboard.writeText(snap.snapshot_id);
+                            setSnackbar({ message: "Copied!", severity: "success" });
+                          }}
+                          sx={{ opacity: 0.5, '&:hover': { opacity: 1 } }}
+                        >
+                          <ContentCopyIcon sx={{ fontSize: 14 }} />
+                        </IconButton>
+                      </Box>
+                    </TableCell>
+                    <TableCell>{formatDate(snap.created_at)}</TableCell>
+                    <TableCell>
+                      {snap.query ? (
+                        <Box sx={{ display: "flex", gap: 0.5, flexWrap: "wrap" }}>
+                          {snap.query.accounts && <Chip label={`${snap.query.accounts.length} account(s)`} size="small" variant="outlined" />}
+                          {snap.query.ignore_self && <Chip label="ignore_self" size="small" variant="outlined" />}
+                          {snap.query.start_date && <Chip label="start" size="small" variant="outlined" />}
+                          {snap.query.end_date && <Chip label="end" size="small" variant="outlined" />}
+                        </Box>
+                      ) : (
+                        <Typography variant="body2" color="text.secondary">—</Typography>
+                      )}
+                    </TableCell>
+                    <TableCell align="right">
+                      <IconButton size="small" onClick={() => setDeleteTarget(snap)}>
+                        <DeleteIcon fontSize="small" />
+                      </IconButton>
+                    </TableCell>
+                  </TableRow>
+                ))}
+              </TableBody>
+            </Table>
+          </TableContainer>
+        )}
+      </Paper>
+
+      <Snackbar
+        open={!!snackbar}
+        autoHideDuration={4000}
+        onClose={() => setSnackbar(null)}
+        anchorOrigin={{ vertical: "bottom", horizontal: "center" }}
+      >
+        {snackbar ? <Alert severity={snackbar.severity} onClose={() => setSnackbar(null)}>{snackbar.message}</Alert> : undefined}
+      </Snackbar>
+
+      <Dialog open={!!deleteTarget} onClose={() => setDeleteTarget(null)}>
+        <DialogTitle>Delete Snapshot?</DialogTitle>
+        <DialogContent>
+          <DialogContentText>
+            This will permanently delete the report snapshot.
+          </DialogContentText>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={() => setDeleteTarget(null)}>Cancel</Button>
+          <Button onClick={handleDelete} color="error" disabled={deleteMutation.isPending}>
+            {deleteMutation.isPending ? "Deleting..." : "Delete"}
+          </Button>
+        </DialogActions>
+      </Dialog>
+    </Container>
+  );
+}
--- a/src/components/Dashboard/Dashboard.models.ts
+++ b/src/components/Dashboard/Dashboard.models.ts
@@ -4,50 +4,58 @@ 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;
-}
-
-export interface ThemeAwarePalette {
-  light: ColorDefinition;
-  dark: ColorDefinition;
 }

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

-export interface DashboardProps {
+export interface DashboardViewProps {
  config: DashboardConfig;
  data: ReportData;
+  state: DashboardState;
+  stateSetters: DashboardStateSetters;
+  isFetching: boolean;
+}
+
+export interface ColorScheme {
+  primary: string;
+  surface: string;
+  text: string;
+}
+
+export interface ComponentProps extends DashboardSection {
+  reportData: ReportData;
+
+  state: DashboardState;
+  stateSetters: DashboardStateSetters;
+  isFetching: boolean;
+
+  colorScheme: ColorScheme;
 }
--- a/src/components/Dashboard/Dashboard.tsx
+++ b/src/components/Dashboard/Dashboard.tsx
@@ -1,55 +0,0 @@
-import * as React from "react";
-import DashboardView from "./Dashboard.view";
-import { DashboardProps, DashboardState } from "./Dashboard.models";
-
-export default function Dashboard(props: DashboardProps) {
-  const [state, setState] = React.useState<DashboardState>({
-    mode: "expense",
-    periodType: "rolling",
-    selectedPeriodId: null,
-    selectedGroupKey: null,
-    comparison: false,
-  });
-
-  const toggleMode = () => {
-    setState(prev => ({
-      ...prev,
-      mode: prev.mode === "expense" ? "income" : "expense",
-    }));
-  };
-
-  const togglePeriodType = () => {
-    setState(prev => ({
-      ...prev,
-      periodType: prev.periodType === "rolling" ? "calendar" : "rolling",
-    }));
-  };
-
-  const toggleComparison = () => {
-    setState(prev => ({
-      ...prev,
-      comparison: !prev.comparison,
-    }));
-  };
-
-  const setSelectedPeriodId = (selectedPeriodId: typeof state.selectedPeriodId) => {
-    setState(prev => ({ ...prev, selectedPeriodId }));
-  };
-
-  const setSelectedGroupKey = (groupKey: typeof state.selectedGroupKey) => {
-    setState(prev => ({ ...prev, selectedGroupKey: groupKey }));
-  };
-
-  return (
-    <DashboardView
-      {...props}
-      state={state}
-      setState={setState}
-      toggleMode={toggleMode}
-      togglePeriodType={togglePeriodType}
-      toggleComparison={toggleComparison}
-      setSelectedPeriodId={setSelectedPeriodId}
-      setSelectedGroupKey={setSelectedGroupKey}
-    />
-  );
-}
--- a/src/components/Dashboard/Dashboard.view.tsx
+++ b/src/components/Dashboard/Dashboard.view.tsx
@@ -3,132 +3,98 @@ import {
  Box,
  Container,
  Grid,
-  Typography,
  ToggleButton,
-  ToggleButtonGroup
+  ToggleButtonGroup,
+  Button
 } 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;
-}
+import { DashboardViewProps } from "./Dashboard.models";

 export default function DashboardView({
  config,
  data,
  state,
-  setState,
-  toggleMode,
-  togglePeriodType,
-  toggleComparison,
-  setSelectedPeriodId,
-  setSelectedGroupKey,
-}: ViewProps) {
+  stateSetters,
+  isFetching,
+}: DashboardViewProps) {
  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;
+  const {
+    flow,
+    selectedGroupKey,
+  } = state;

-    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]);
+  const colorScheme = flow === "outflows" ? theme.palette.flows.outflows : theme.palette.flows.inflows;

  return (
    <Container
      sx={{
        mt: 4,
        mb: 4,
-        background: `linear-gradient(180deg, ${colors.light} 0%, transparent 100%)`,
+        background: `linear-gradient(180deg, ${alpha(colorScheme.primary, theme.palette.mode === "dark" ? 0.06 : 0.04)} 0%, transparent 100%)`,
        borderRadius: 4,
        p: 2,
-        transition: 'background 0.3s ease'
+        transition: "background 0.3s ease",
      }}
    >
-      <Box sx={{ display: "flex", justifyContent: "center", mb: 3 }}>
+      <Box
+        sx={{
+          display: "flex",
+          flexDirection: "column",
+          alignItems: "center",
+          mb: 3,
+        }}
+      >
        <ToggleButtonGroup
-          value={mode}
+          value={flow}
          exclusive
-          onChange={toggleMode}
+          onChange={stateSetters.toggleFlow}
          sx={{
            borderRadius: 3,
            overflow: "hidden",
            "& .MuiToggleButton-root": {
              px: 3,
              textTransform: "none",
-              color: "text.secondary"
+              color: "text.secondary",
            },
            "&.Mui-selected": {
-              bgcolor: colors.primary,
+              bgcolor: colorScheme.primary,
              color: "white",
-              borderColor: colors.primary
+              borderColor: colorScheme.primary,
            },
          }}
        >
-          <ToggleButton value="expense">Expenses</ToggleButton>
-          <ToggleButton value="income">Income</ToggleButton>
+          <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={() => stateSetters.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={section.style?.size || 12 as any}>
-              {section.title && !section.isList && (
-                <Box sx={{ mb: 2 }}>
-                  <Typography variant="h6" fontWeight={700}>
-                    {section.title}
-                  </Typography>
-                </Box>
-              )}
-
+            <Grid key={section.id} size={12}>
              <Component
-                {...section.settings}
-                header={section.title}
-                summary={section.summary}
+                {...section}
+
                reportData={data}
-                title={section.title}
-                accentColor={colors.primary}
-                colorScheme={colors}

-                // State management
-                mode={mode}
+                state={state}
+                stateSetters={stateSetters}
+                isFetching={isFetching}

-                periodType={periodType}
-                comparison={comparison}
-                selectedPeriodId={selectedPeriodId}
-                selectedGroupKey={selectedGroupKey}
-
-                togglePeriodType={togglePeriodType}
-                toggleComparison={toggleComparison}
-                setSelectedPeriodId={setSelectedPeriodId}
-                setSelectedGroupKey={setSelectedGroupKey}
+                colorScheme={colorScheme}
              />
            </Grid>
          );
--- a/src/components/Dashboard/index.ts
+++ b/src/components/Dashboard/index.ts
@@ -1,2 +1,2 @@
-export { default } from "./Dashboard";
+export { default } from "./Dashboard.view";
 export * from "./Dashboard.models";
--- 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,49 +11,34 @@ 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({
+  title,
+  summary,
+  settings,

-export default function HistoryChartView(props: ViewProps) {
-  const {
-    header,
-    summary,
-    tabs,
-    colorScheme,
+  state,
+  stateSetters,
+  isFetching,

-    mode,
-    periodType,
-    selectedPeriodId,
-    comparison,
+  colorScheme,

-    togglePeriodType,
-    setSelectedPeriodId,
-    toggleComparison,
+  activeTab,
+  setActiveTab,
+  currentData,
+  visibleData,
+  maxAmount,
+  visibleCount,
+  startIndex,
+  setStartIndex,
+  activeDataKey,
+}: HistoryChartViewProps) {

-    activeTab,
-    setActiveTab,
-    currentData,
-    visibleData,
-    maxAmount,
-    visibleCount,
-    startIndex,
-    setStartIndex,
-    activeDataKey,
-  } = props;
+  const { flow, periodType, selectedPeriodId, comparison } = state;
+  const { togglePeriodType, setSelectedPeriodId, toggleComparison } = stateSetters;

  const theme = useTheme();
  const isDark = theme.palette.mode === "dark";
@@ -91,11 +76,14 @@ export default function HistoryChartView(props: ViewProps) {
        boxShadow: "none",
        border: "1px solid",
        borderColor: "divider",
-        bgcolor: isDark ? "background.paper" : colorScheme.light,
+        bgcolor: isDark ? "background.paper" : colorScheme.surface,
+        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(props: LatestItemsProps) {
+  const {
+    reportData,
+    state,
+    stateSetters,
+    isFetching,
+  } = props;

-export default function LatestItems({
-  reportData,
-  mode,
-  selectedPeriodId,
-  selectedGroupKey = null,
-  accentColor,
-}: 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
@@ -9,20 +9,25 @@ import {
  Box,
  IconButton,
 } from "@mui/material";
+import { alpha } from "@mui/material/styles";
 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>

@@ -42,7 +47,7 @@ export default function LatestItemsView({
              <Avatar
                variant="rounded"
                sx={{
-                  bgcolor: `${accentColor}22`,
+                  bgcolor: alpha(accentColor, 0.13),
                  width: 48,
                  height: 48,
                  borderRadius: 3,
--- 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,79 @@ 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.surface,
+        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;
-        },
+        border: selected
+          ? `2px solid ${colorScheme.primary}`
+          : "1px solid",
+        borderColor: selected ? colorScheme.primary : "divider",
+        boxShadow: "none",
+        opacity: isFetching ? 0.6 : 1,
+        pointerEvents: isFetching ? "none" : "auto",
      }}
    >
-      <Typography 
-        variant={compact ? "body2" : "subtitle1"} 
-        fontWeight={700} 
-        sx={{ 
-          opacity: 0.95, 
-          mb: compact ? 1.5 : 2, 
-          width: '100%', 
-          overflow: 'hidden', 
-          textOverflow: 'ellipsis', 
-          whiteSpace: 'nowrap',
+      <Typography
+        variant={settings.compact ? "body2" : "subtitle1"}
+        fontWeight={700}
+        sx={{
+          opacity: 0.95,
+          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'
        }}
      >
-        {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,
+          }}
        >
          {formattedProgress}
        </Typography>
@@ -100,38 +88,38 @@ export default function ProgressCardView({
        <Divider
          sx={{
            my: 1,
-            borderColor: "rgba(255,255,255,0.25)",
+            borderColor: "divider",
            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: alpha(theme.palette.divider, 0.5),
            },
            [`& .${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,61 +1,83 @@
 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,
+
+    reportData,
+    state,
+    stateSetters,
+
+    isFetching,
+  } = props
+  const { flow, selectedPeriodId, selectedGroupKey } = state;
+  const { setSelectedGroupKey } = stateSetters;

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

  return (
-    <Box
+    <Paper
      sx={{
-        display: "grid",
-        gridTemplateColumns: {
-          xs: "1fr",
-          sm: "repeat(2, 1fr)",
-          md: "repeat(4, 1fr)",
-        },
-        gap: 2,
+        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",
      }}
    >
-      {items.map((item) => {
-        const isSelected = selectedGroupKey?.tags?.includes(item.tag);
-        return (
-          <ProgressCard
-            key={item.tag}
-            header={item.tag}
-            progressAmount={item.amount}
-            totalAmount={total}
-            compact={compact}
-            colorTheme={mode === "expense" ? "error" : "success"}
-            selected={isSelected}
-            onClick={() => {
-              if (setSelectedGroupKey) {
-                setSelectedGroupKey(isSelected ? null : { tags: [item.tag] });
-              }
-            }}
-          />
-        );
-      })}
-    </Box>
+      <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?.tags?.includes(item.tag);
+          return (
+            <ProgressCardView
+              {...props}
+              key={item.tag}
+              title={item.tag}
+              progressAmount={item.amount}
+              totalAmount={total}
+              selected={isSelected}
+              onClick={() => {
+                if (setSelectedGroupKey) {
+                  let newKey = selectedGroupKey ? { ...selectedGroupKey } : {};
+                  
+                  if (isSelected) {
+                    delete newKey.tags;
+                  } else {
+                    newKey.tags = [item.tag];
+                  }
+
+                  setSelectedGroupKey(Object.keys(newKey).length ? newKey : null);
+                }
+              }}
+            />
+          );
+        })}
+      </Box>
+    </Paper>
  );
 }
--- 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,44 +22,19 @@ 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: {
-        light: {
-          primary: "#d32f2f",
-          background: "#fdecea",
-          text: "#b71c1c"
-        },
-        dark: {
-          primary: "#f44336",
-          background: "rgba(244, 67, 54, 0.15)",
-          text: "#ffcdd2"
-        }
-      },
-      income: {
-        light: {
-          primary: "#2e7d32",
-          background: "#e8f5e9",
-          text: "#1b5e20"
-        },
-        dark: {
-          primary: "#4caf50",
-          background: "rgba(76, 175, 80, 0.15)",
-          text: "#c8e6c9"
-        }
-      }
-    }
-  }
 };
--- a/src/features/fetch-requests/fetch-requests.models.ts
+++ b/src/features/fetch-requests/fetch-requests.models.ts
@@ -0,0 +1,133 @@
+export type FetchRequestStatus =
+  | "pending"
+  | "processing"
+  | "paused"
+  | "raw_expenses_done"
+  | "enriched_done"
+  | "completed"
+  | "failed";
+
+export interface FileSource {
+  path: string;
+  format: string;
+  raw_lines?: string[];
+  txn_blocks?: Record<string, any>;
+  txn_dicts?: Record<string, any>[];
+  txn_dict_count?: number;
+  txn_dicts_count?: number;
+}
+
+export interface EmailSource {
+  format: string;
+  from_email?: string;
+  subject?: string;
+  raw_terms?: string[];
+  txn_dict_count?: number;
+  txn_dicts_count?: number;
+}
+
+export interface FetchRequestCreate {
+  source: FileSource | EmailSource;
+  account_name: string;
+  payor_username?: string;
+  start_date?: string;
+  end_date?: string;
+}
+
+export interface FetchRequestUpdate {
+  status?: FetchRequestStatus;
+  error_message?: string | null;
+}
+
+export interface FetchRequest extends FetchRequestCreate {
+  id: string;
+  status: FetchRequestStatus;
+  fingerprint: string;
+  completed_at?: string | null;
+  error_message?: string | null;
+  retry_count?: number;
+  created_at: string;
+}
+
+export interface UploadResult {
+  original_filename: string;
+  saved_as: string;
+  content_type: string;
+  url: string;
+  absolute_path: string;
+}
+
+export interface AmbiguityCandidate {
+  amount: number;
+  balance: number;
+}
+
+export interface PendingAmbiguity {
+  id: string;
+  fetch_request: string;
+  step_index?: number;
+  line: string;
+  ocr_amount: number;
+  ocr_balance: number;
+  prev_balance: number;
+  candidates: AmbiguityCandidate[];
+  chosen?: AmbiguityCandidate | null;
+  resolved_at?: string | null;
+  status: "pending" | "resolved";
+  created_at: string;
+}
+
+export interface ResolveAmbiguityPayload {
+  chosen: {
+    amount: number;
+    balance: number;
+  };
+}
+
+export type SSEEventStep =
+  | "load_content" | "raw_lines" | "txn_blocks" | "txn_dicts"
+  | "resume_extract" | "extract" | "paused" | "complete" | "enrich"
+  | "save_expenses" | "pipeline";
+
+export type SSEEventStatus =
+  | "started" | "completed" | "skipped" | "paused" | "progress" | "failed";
+
+export interface ProgressMessage {
+  lines?: number;
+  blocks?: number;
+  count?: number;
+  unit?: string;
+  raw_ocr_line?: string;
+  error?: string;
+}
+
+export interface SSEEvent {
+  step: SSEEventStep;
+  status: SSEEventStatus;
+  message: ProgressMessage;
+}
+
+export interface FetchRequestFilters {
+  status?: FetchRequestStatus[];
+  account_name?: string;
+  source_type?: "file" | "email";
+}
+
+export function formatApiError(err: any): string {
+  if (!err?.response) return err?.message || "Request failed";
+  const data = err.response.data;
+  const status = err.response.status;
+
+  if (status === 422 && Array.isArray(data?.detail)) {
+    return data.detail.map((d: any) => {
+      const field = d.loc?.filter((s: string) => s !== "body").pop() || "field";
+      if (d.type === "value_error.missing") return `Missing: ${field}`;
+      return `${field}: ${d.msg}`;
+    }).join("; ");
+  }
+
+  if (typeof data?.detail === "string") return data.detail;
+  return `Request failed (${status})`;
+}
+
+export const RETRY_MAX = 3;
--- a/src/features/fetch-requests/index.ts
+++ b/src/features/fetch-requests/index.ts
@@ -0,0 +1,28 @@
+export type {
+  FetchRequest,
+  FetchRequestCreate,
+  FetchRequestUpdate,
+  FetchRequestStatus,
+  FetchRequestFilters,
+  FileSource,
+  EmailSource,
+  UploadResult,
+  PendingAmbiguity,
+  AmbiguityCandidate,
+  ResolveAmbiguityPayload,
+  SSEEvent,
+  SSEEventStep,
+  SSEEventStatus,
+  ProgressMessage,
+} from "./fetch-requests.models";
+export { RETRY_MAX, formatApiError } from "./fetch-requests.models";
+export {
+  useFetchRequestsList,
+  useFetchRequest,
+  useCreateFetchRequest,
+  useUpdateFetchRequest,
+  useDeleteFetchRequest,
+  useUploadFile,
+  useFetchRequestAmbiguities,
+  useResolveAmbiguity,
+} from "./useFetchRequests";
--- a/src/features/fetch-requests/useFetchRequests.ts
+++ b/src/features/fetch-requests/useFetchRequests.ts
@@ -0,0 +1,90 @@
+import { useResourceByName } from "../../../react-openapi";
+import { api } from "../../../react-openapi/api/client";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import type { ResolveAmbiguityPayload } from "./fetch-requests.models";
+
+export function useFetchRequestsList(params?: {
+  status?: string;
+  account_name?: string;
+  source_type?: string;
+}) {
+  const { useList } = useResourceByName("fetch-requests");
+  return useList(params);
+}
+
+export function useFetchRequest(id: string) {
+  const { useRead } = useResourceByName("fetch-requests");
+  return useRead(id);
+}
+
+export function useCreateFetchRequest() {
+  const { useCreate } = useResourceByName("fetch-requests");
+  return useCreate();
+}
+
+export function useUpdateFetchRequest() {
+  const { usePatch } = useResourceByName("fetch-requests");
+  return usePatch();
+}
+
+export function useDeleteFetchRequest() {
+  const { useDelete } = useResourceByName("fetch-requests");
+  return useDelete();
+}
+
+export function useUploadFile() {
+  return useMutation({
+    mutationFn: async (file: File) => {
+      const arrayBuffer = await file.arrayBuffer();
+      const binary = new Uint8Array(arrayBuffer);
+      const res = await api.post("/uploads", binary, {
+        headers: {
+          "Content-Type": file.type,
+          "Content-Disposition": `attachment; filename="${file.name}"`,
+        },
+      });
+      return res.data;
+    },
+  });
+}
+
+export function useFetchRequestAmbiguities(fetchRequestId: string) {
+  return useQuery({
+    queryKey: ["fetch-requests", fetchRequestId, "ambiguities"],
+    queryFn: async () => {
+      const res = await api.get(
+        `/fetch-requests/${fetchRequestId}/ambiguities`
+      );
+      return res.data;
+    },
+    enabled: !!fetchRequestId,
+  });
+}
+
+export function useResolveAmbiguity() {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: async ({
+      ambiguityId,
+      payload,
+    }: {
+      ambiguityId: string;
+      payload: ResolveAmbiguityPayload;
+    }) => {
+      const res = await api.post(
+        `/ambiguities/${ambiguityId}/resolve`,
+        payload
+      );
+      return res.data;
+    },
+    onSuccess: (data: any) => {
+      queryClient.invalidateQueries({
+        queryKey: ["fetch-requests", data.fetch_request, "ambiguities"],
+      });
+      queryClient.invalidateQueries({
+        queryKey: ["fetch-requests", "detail", data.fetch_request],
+      });
+    },
+  });
+}
--- a/src/features/report-snapshots/index.ts
+++ b/src/features/report-snapshots/index.ts
@@ -0,0 +1,9 @@
+export type {
+  ReportSnapshot,
+  ReportQuery,
+} from "./report-snapshots.models";
+export {
+  useReportSnapshotsList,
+  useCreateSnapshot,
+  useDeleteSnapshot,
+} from "./useReportSnapshots";
--- a/src/features/report-snapshots/report-snapshots.models.ts
+++ b/src/features/report-snapshots/report-snapshots.models.ts
@@ -0,0 +1,15 @@
+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;
+}
+
+export interface ReportSnapshot {
+  id: string;
+  snapshot_id: string;
+  created_at: string;
+  query?: ReportQuery;
+}
--- a/src/features/report-snapshots/useReportSnapshots.ts
+++ b/src/features/report-snapshots/useReportSnapshots.ts
@@ -0,0 +1,16 @@
+import { useResourceByName } from "../../../react-openapi";
+
+export function useReportSnapshotsList() {
+  const { useList } = useResourceByName("reports");
+  return useList();
+}
+
+export function useCreateSnapshot() {
+  const { useCreate } = useResourceByName("reports");
+  return useCreate();
+}
+
+export function useDeleteSnapshot() {
+  const { useDelete } = useResourceByName("reports");
+  return useDelete();
+}
--- 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,28 +1,21 @@
 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) {
-  const { useList } = useResourceByName("reports");
+  const { useRead } = useResourceByName("reports");

-  return useList({
-    ...params,
-    periods: params.periods,
-    group_by: params.group_by,
-  });
+  return useRead(
+    params.snapshot_id ? params.snapshot_id : "latest",
+    {
+      ...params,
+      periods: params.periods,
+    }
+  );
 }
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -12,6 +12,9 @@ import {
 } from "@mui/material";
 import Home from './Home';
 import Dashboard from './Dashboard';
+import FetchRequests from './FetchRequests';
+import FetchRequestDetail from './FetchRequestDetail';
+import ReportSnapshots from './ReportSnapshots';
 import { Admin, AppProvider } from '../react-openapi';
 import { configuration, profileConfiguration } from './openapi-config';
 import { Buffer } from 'buffer';
@@ -19,7 +22,7 @@ import process from 'process';
 import { AuthProvider } from "../react-auth";
 import Header from './Header';
 import Footer from './Footer';
-import AppTheme from './AppTheme';
+import AppTheme from './shared-theme/AppTheme';

 window.Buffer = Buffer;
 window.process = process;
@@ -33,6 +36,9 @@ const routerMapping = [
  { path: "/", component: Home, headerTitle: "Home" },
  { path: "/home", component: Home, headerTitle: "Home" },
  { path: "/dashboard", component: Dashboard, headerTitle: "Dashboard" },
+  { path: "/fetch-requests", component: FetchRequests, headerTitle: "Fetch Requests" },
+  { path: "/fetch-requests/:id", component: FetchRequestDetail, headerTitle: "Fetch Request" },
+  { path: "/reports", component: ReportSnapshots, headerTitle: "Reports" },
  { path: "/admin/*", component: Admin, headerTitle: "Admin" },
 ];

--- a/src/openapi-config.ts
+++ b/src/openapi-config.ts
@@ -2,9 +2,14 @@ import { ResourceOverride } from "../react-openapi/types/overrides";

 export const configuration: Record<string, ResourceOverride> = {
  expenses: {
+    filterOptions: {
+      mode: "client",
+      fields: ["account", "payee", "tags", "occurred_at", "amount"],
+    },
    fields: {
      payee: {
        displayField: "name",
+        filterType: "autocomplete",
      },
      payor: {
        display: false,
@@ -12,11 +17,14 @@ export const configuration: Record<string, ResourceOverride> = {
      },
      account: {
        displayField: "name",
+        filterType: "multiselect",
      },
      tags: {
        displayField: ["name", "icon"],
+        filterType: "autocomplete",
      },
      occurred_at: {
+        filterType: "date-range",
        formatter: (val: string) => {
            const date = new Date(val);
            const day = date.getDate();
@@ -34,15 +42,26 @@ export const configuration: Record<string, ResourceOverride> = {
            return `${day}${suffix(day)} ${month} ${year}`;
        }
      },
+      amount: {
+        filterType: "number-range",
+      },
      created_at: {
        display: false
      }
    },
-    pagination: true,
  },
-  reports: {
-    hidden: true
-  }
+  accounts: {
+    enumOption: {
+      key: 'id',
+      value: '{name} - XXXX{number}'
+    }
+  },
+  tags: {
+    enumOption: {
+      key: 'id',
+      value: '{icon} {name}'
+    }
+  },
 };

 export const profileConfiguration = {
--- a/src/shared-theme/AppTheme.tsx
+++ b/src/shared-theme/AppTheme.tsx
@@ -1,53 +1,103 @@
-import * as React from 'react';
-import { ThemeProvider, createTheme } from '@mui/material/styles';
-import type { ThemeOptions } from '@mui/material/styles';
-import { inputsCustomizations } from './customizations/inputs';
-import { dataDisplayCustomizations } from './customizations/dataDisplay';
-import { feedbackCustomizations } from './customizations/feedback';
-import { navigationCustomizations } from './customizations/navigation';
-import { surfacesCustomizations } from './customizations/surfaces';
-import { colorSchemes, typography, shadows, shape } from './themePrimitives';
+import * as React from "react";
+import {
+  ThemeProvider,
+  createTheme,
+  CssBaseline,
+  Box,
+} from "@mui/material";

-interface AppThemeProps {
+import { getDesignTokens } from "./themePrimitives";
+import { getSemanticColors } from "./themeConfig";
+
+import { inputsCustomizations } from "./customizations/inputs";
+import { dataDisplayCustomizations } from "./customizations/dataDisplay";
+import { feedbackCustomizations } from "./customizations/feedback";
+import { navigationCustomizations } from "./customizations/navigation";
+import { surfacesCustomizations } from "./customizations/surfaces";
+
+export type ColorMode = "light" | "dark";
+
+type ColorModeContextValue = {
+  mode: ColorMode;
+  setMode: (mode: ColorMode) => void;
+  toggleColorMode: () => void;
+};
+
+export const ColorModeContext =
+  React.createContext<ColorModeContextValue>({
+    mode: "light",
+    setMode: () => {},
+    toggleColorMode: () => {},
+  });
+
+type AppThemeProps = {
  children: React.ReactNode;
-  /**
-   * This is for the docs site. You can ignore it or remove it.
-   */
-  disableCustomTheme?: boolean;
-  themeComponents?: ThemeOptions['components'];
-}
+  defaultMode?: ColorMode;
+};
+
+export default function AppTheme({
+  children,
+  defaultMode = "light",
+}: AppThemeProps) {
+  const [mode, setMode] =
+    React.useState<ColorMode>(defaultMode);
+
+  const toggleColorMode = React.useCallback(() => {
+    setMode((prev) =>
+      prev === "light" ? "dark" : "light"
+    );
+  }, []);
+
+  const contextValue = React.useMemo(
+    () => ({
+      mode,
+      setMode,
+      toggleColorMode,
+    }),
+    [mode, toggleColorMode]
+  );
+
+  const semantic = React.useMemo(
+    () => getSemanticColors(mode),
+    [mode]
+  );
+
+  const theme = React.useMemo(
+    () =>
+      createTheme({
+        ...getDesignTokens(mode),
+        semantic,
+
+        components: {
+          ...inputsCustomizations,
+          ...dataDisplayCustomizations,
+          ...feedbackCustomizations,
+          ...navigationCustomizations,
+          ...surfacesCustomizations,
+        },
+      }),
+    [mode, semantic]
+  );

-export default function AppTheme(props: AppThemeProps) {
-  const { children, disableCustomTheme, themeComponents } = props;
-  const theme = React.useMemo(() => {
-    return disableCustomTheme
-      ? {}
-      : createTheme({
-          // For more details about CSS variables configuration, see https://mui.com/material-ui/customization/css-theme-variables/configuration/
-          cssVariables: {
-            colorSchemeSelector: 'data-mui-color-scheme',
-            cssVarPrefix: 'template',
-          },
-          colorSchemes, // Recently added in v6 for building light & dark mode app, see https://mui.com/material-ui/customization/palette/#color-schemes
-          typography,
-          shadows,
-          shape,
-          components: {
-            ...inputsCustomizations,
-            ...dataDisplayCustomizations,
-            ...feedbackCustomizations,
-            ...navigationCustomizations,
-            ...surfacesCustomizations,
-            ...themeComponents,
-          },
-        });
-  }, [disableCustomTheme, themeComponents]);
-  if (disableCustomTheme) {
-    return <React.Fragment>{children}</React.Fragment>;
-  }
  return (
-    <ThemeProvider theme={theme} disableTransitionOnChange>
-      {children}
-    </ThemeProvider>
+    <ColorModeContext.Provider value={contextValue}>
+      <ThemeProvider theme={theme}>
+        <CssBaseline />
+        <Box
+          sx={{
+            "--bg-page": semantic.surface.page,
+            "--bg-card": semantic.surface.card,
+            "--bg-elevated": semantic.surface.elevated,
+            "--border-default": semantic.border.default,
+            "--border-subtle": semantic.border.subtle,
+            "--text-primary": semantic.text.primary,
+            "--text-secondary": semantic.text.secondary,
+            "--text-muted": semantic.text.muted,
+          }}
+        >
+          {children}
+        </Box>
+      </ThemeProvider>
+    </ColorModeContext.Provider>
  );
 }
--- a/src/shared-theme/ColorModeIconDropdown.tsx
+++ b/src/shared-theme/ColorModeIconDropdown.tsx
@@ -1,89 +0,0 @@
-import * as React from 'react';
-import DarkModeIcon from '@mui/icons-material/DarkModeRounded';
-import LightModeIcon from '@mui/icons-material/LightModeRounded';
-import Box from '@mui/material/Box';
-import IconButton, { IconButtonOwnProps } from '@mui/material/IconButton';
-import Menu from '@mui/material/Menu';
-import MenuItem from '@mui/material/MenuItem';
-import { useColorScheme } from '@mui/material/styles';
-
-export default function ColorModeIconDropdown(props: IconButtonOwnProps) {
-  const { mode, systemMode, setMode } = useColorScheme();
-  const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);
-  const open = Boolean(anchorEl);
-  const handleClick = (event: React.MouseEvent<HTMLElement>) => {
-    setAnchorEl(event.currentTarget);
-  };
-  const handleClose = () => {
-    setAnchorEl(null);
-  };
-  const handleMode = (targetMode: 'system' | 'light' | 'dark') => () => {
-    setMode(targetMode);
-    handleClose();
-  };
-  if (!mode) {
-    return (
-      <Box
-        data-screenshot="toggle-mode"
-        sx={(theme) => ({
-          verticalAlign: 'bottom',
-          display: 'inline-flex',
-          width: '2.25rem',
-          height: '2.25rem',
-          borderRadius: (theme.vars || theme).shape.borderRadius,
-          border: '1px solid',
-          borderColor: (theme.vars || theme).palette.divider,
-        })}
-      />
-    );
-  }
-  const resolvedMode = (systemMode || mode) as 'light' | 'dark';
-  const icon = {
-    light: <LightModeIcon />,
-    dark: <DarkModeIcon />,
-  }[resolvedMode];
-  return (
-    <React.Fragment>
-      <IconButton
-        data-screenshot="toggle-mode"
-        onClick={handleClick}
-        disableRipple
-        size="small"
-        aria-controls={open ? 'color-scheme-menu' : undefined}
-        aria-haspopup="true"
-        aria-expanded={open ? 'true' : undefined}
-        {...props}
-      >
-        {icon}
-      </IconButton>
-      <Menu
-        anchorEl={anchorEl}
-        id="account-menu"
-        open={open}
-        onClose={handleClose}
-        onClick={handleClose}
-        slotProps={{
-          paper: {
-            variant: 'outlined',
-            elevation: 0,
-            sx: {
-              my: '4px',
-            },
-          },
-        }}
-        transformOrigin={{ horizontal: 'right', vertical: 'top' }}
-        anchorOrigin={{ horizontal: 'right', vertical: 'bottom' }}
-      >
-        <MenuItem selected={mode === 'system'} onClick={handleMode('system')}>
-          System
-        </MenuItem>
-        <MenuItem selected={mode === 'light'} onClick={handleMode('light')}>
-          Light
-        </MenuItem>
-        <MenuItem selected={mode === 'dark'} onClick={handleMode('dark')}>
-          Dark
-        </MenuItem>
-      </Menu>
-    </React.Fragment>
-  );
-}
--- a/src/shared-theme/ColorModeSelect.tsx
+++ b/src/shared-theme/ColorModeSelect.tsx
@@ -1,28 +0,0 @@
-import * as React from 'react';
-import { useColorScheme } from '@mui/material/styles';
-import MenuItem from '@mui/material/MenuItem';
-import Select, { SelectProps } from '@mui/material/Select';
-
-export default function ColorModeSelect(props: SelectProps) {
-  const { mode, setMode } = useColorScheme();
-  if (!mode) {
-    return null;
-  }
-  return (
-    <Select
-      value={mode}
-      onChange={(event) =>
-        setMode(event.target.value as 'system' | 'light' | 'dark')
-      }
-      SelectDisplayProps={{
-        // @ts-ignore
-        'data-screenshot': 'toggle-mode',
-      }}
-      {...props}
-    >
-      <MenuItem value="system">System</MenuItem>
-      <MenuItem value="light">Light</MenuItem>
-      <MenuItem value="dark">Dark</MenuItem>
-    </Select>
-  );
-}
--- a/src/shared-theme/customizations/feedback.tsx
+++ b/src/shared-theme/customizations/feedback.tsx
@@ -14,8 +14,8 @@ export const feedbackCustomizations: Components<Theme> = {
          color: orange[500],
        },
        ...theme.applyStyles('dark', {
-          backgroundColor: `${alpha(orange[900], 0.5)}`,
-          border: `1px solid ${alpha(orange[800], 0.5)}`,
+          backgroundColor: alpha(orange[900], 0.35),
+          border: `1px solid ${alpha(orange[800], 0.3)}`,
        }),
      }),
    },
--- a/src/shared-theme/customizations/inputs.tsx
+++ b/src/shared-theme/customizations/inputs.tsx
@@ -125,15 +125,15 @@ export const inputsCustomizations: Components<Theme> = {
                backgroundColor: gray[200],
              },
              ...theme.applyStyles('dark', {
-                backgroundColor: gray[800],
-                borderColor: gray[700],
+                backgroundColor: 'hsla(0, 0%, 100%, 0.06)',
+                borderColor: (theme.vars || theme).palette.divider,

                '&:hover': {
-                  backgroundColor: gray[900],
-                  borderColor: gray[600],
+                  backgroundColor: 'hsla(0, 0%, 100%, 0.1)',
+                  borderColor: 'hsla(0, 0%, 100%, 0.15)',
                },
                '&:active': {
-                  backgroundColor: gray[900],
+                  backgroundColor: 'hsla(0, 0%, 100%, 0.1)',
                },
              }),
            },
@@ -183,12 +183,12 @@ export const inputsCustomizations: Components<Theme> = {
                backgroundColor: gray[200],
              },
              ...theme.applyStyles('dark', {
-                color: gray[50],
+                color: 'hsl(0, 0%, 92%)',
                '&:hover': {
-                  backgroundColor: gray[700],
+                  backgroundColor: 'hsla(0, 0%, 100%, 0.08)',
                },
                '&:active': {
-                  backgroundColor: alpha(gray[700], 0.7),
+                  backgroundColor: 'hsla(0, 0%, 100%, 0.12)',
                },
              }),
            },
@@ -241,14 +241,14 @@ export const inputsCustomizations: Components<Theme> = {
          backgroundColor: gray[200],
        },
        ...theme.applyStyles('dark', {
-          backgroundColor: gray[800],
-          borderColor: gray[700],
+          backgroundColor: 'hsla(0, 0%, 100%, 0.06)',
+          borderColor: (theme.vars || theme).palette.divider,
          '&:hover': {
-            backgroundColor: gray[900],
-            borderColor: gray[600],
+            backgroundColor: 'hsla(0, 0%, 100%, 0.1)',
+            borderColor: 'hsla(0, 0%, 100%, 0.15)',
          },
          '&:active': {
-            backgroundColor: gray[900],
+            backgroundColor: 'hsla(0, 0%, 100%, 0.1)',
          },
        }),
        variants: [
@@ -288,7 +288,7 @@ export const inputsCustomizations: Components<Theme> = {
          [`& .${toggleButtonGroupClasses.selected}`]: {
            color: '#fff',
          },
-          boxShadow: `0 4px 16px ${alpha(brand[700], 0.5)}`,
+          boxShadow: `0 2px 8px ${alpha(brand[700], 0.3)}`,
        }),
      }),
    },
@@ -302,7 +302,7 @@ export const inputsCustomizations: Components<Theme> = {
        fontWeight: 500,
        ...theme.applyStyles('dark', {
          color: gray[400],
-          boxShadow: '0 4px 16px rgba(0, 0, 0, 0.5)',
+          boxShadow: '0 2px 8px rgba(0, 0, 0, 0.25)',
          [`&.${toggleButtonClasses.selected}`]: {
            color: brand[300],
          },
--- a/src/shared-theme/customizations/navigation.tsx
+++ b/src/shared-theme/customizations/navigation.tsx
@@ -49,9 +49,8 @@ export const navigationCustomizations: Components<Theme> = {
          },
        },
        ...theme.applyStyles('dark', {
-          background: gray[900],
-          boxShadow:
-            'hsla(220, 30%, 5%, 0.7) 0px 4px 16px 0px, hsla(220, 25%, 10%, 0.8) 0px 8px 16px -5px',
+          background: (theme.vars || theme).palette.background.paper,
+          boxShadow: '0 4px 16px rgba(0, 0, 0, 0.4), 0 8px 24px rgba(0, 0, 0, 0.3)',
        }),
      }),
    },
@@ -84,17 +83,17 @@ export const navigationCustomizations: Components<Theme> = {

        ...theme.applyStyles('dark', {
          borderRadius: (theme.vars || theme).shape.borderRadius,
-          borderColor: gray[700],
+          borderColor: (theme.vars || theme).palette.divider,
          backgroundColor: (theme.vars || theme).palette.background.paper,
-          boxShadow: `inset 0 1px 0 1px ${alpha(gray[700], 0.15)}, inset 0 -1px 0 1px hsla(220, 0%, 0%, 0.7)`,
+          boxShadow: 'inset 0 1px 0 hsla(0, 0%, 100%, 0.05)',
          '&:hover': {
-            borderColor: alpha(gray[700], 0.7),
+            borderColor: 'hsla(0, 0%, 100%, 0.15)',
            backgroundColor: (theme.vars || theme).palette.background.paper,
            boxShadow: 'none',
          },
          [`&.${selectClasses.focused}`]: {
            outlineOffset: 0,
-            borderColor: gray[900],
+            borderColor: 'hsl(210, 55%, 55%)',
          },
          '&:before, &:after': {
            display: 'none',
@@ -108,7 +107,7 @@ export const navigationCustomizations: Components<Theme> = {
          display: 'flex',
          alignItems: 'center',
          '&:focus-visible': {
-            backgroundColor: gray[900],
+            backgroundColor: (theme.vars || theme).palette.background.default,
          },
        }),
      }),
@@ -151,6 +150,7 @@ export const navigationCustomizations: Components<Theme> = {
    styleOverrides: {
      paper: ({ theme }) => ({
        backgroundColor: (theme.vars || theme).palette.background.default,
+        borderRight: `1px solid ${(theme.vars || theme).palette.divider}`,
      }),
    },
  },
@@ -204,8 +204,8 @@ export const navigationCustomizations: Components<Theme> = {
        ...theme.applyStyles('dark', {
          ':hover': {
            color: (theme.vars || theme).palette.text.primary,
-            backgroundColor: gray[800],
-            borderColor: gray[700],
+            backgroundColor: alpha((theme.vars || theme).palette.common.white, 0.08),
+            borderColor: (theme.vars || theme).palette.divider,
          },
          [`&.${tabClasses.selected}`]: {
            color: '#fff',
--- a/src/shared-theme/customizations/surfaces.ts
+++ b/src/shared-theme/customizations/surfaces.ts
@@ -40,7 +40,7 @@ export const surfacesCustomizations: Components<Theme> = {
        '&:hover': { backgroundColor: gray[50] },
        '&:focus-visible': { backgroundColor: 'transparent' },
        ...theme.applyStyles('dark', {
-          '&:hover': { backgroundColor: gray[800] },
+          '&:hover': { backgroundColor: alpha(theme.palette.common.white, 0.06) },
        }),
      }),
    },
@@ -67,7 +67,7 @@ export const surfacesCustomizations: Components<Theme> = {
          border: `1px solid ${(theme.vars || theme).palette.divider}`,
          boxShadow: 'none',
          ...theme.applyStyles('dark', {
-            backgroundColor: gray[800],
+            backgroundColor: (theme.vars || theme).palette.background.paper,
          }),
          variants: [
            {
@@ -79,7 +79,7 @@ export const surfacesCustomizations: Components<Theme> = {
                boxShadow: 'none',
                background: 'hsl(0, 0%, 100%)',
                ...theme.applyStyles('dark', {
-                  background: alpha(gray[900], 0.4),
+                  background: alpha((theme.vars || theme).palette.background.paper, 0.6),
                }),
              },
            },
--- a/src/shared-theme/themeConfig.ts
+++ b/src/shared-theme/themeConfig.ts
@@ -0,0 +1,72 @@
+import { gray } from "./themePrimitives";
+import { alpha } from "@mui/material/styles";
+
+declare module "@mui/material/styles" {
+  interface Theme {
+    semantic: SemanticColors;
+  }
+  interface ThemeOptions {
+    semantic?: SemanticColors;
+  }
+}
+
+export type SemanticColorMode = "light" | "dark";
+
+export interface SemanticColors {
+  surface: {
+    page: string;
+    card: string;
+    elevated: string;
+  };
+  border: {
+    default: string;
+    subtle: string;
+  };
+  text: {
+    primary: string;
+    secondary: string;
+    muted: string;
+  };
+}
+
+const darkBg = 'hsl(0, 0%, 9%)';
+const darkPaper = 'hsl(0, 0%, 14%)';
+const darkElevated = 'hsl(0, 0%, 19%)';
+
+export function getSemanticColors(mode: SemanticColorMode): SemanticColors {
+  if (mode === "dark") {
+    return {
+      surface: {
+        page: darkBg,
+        card: darkPaper,
+        elevated: darkElevated,
+      },
+      border: {
+        default: 'hsla(0, 0%, 100%, 0.08)',
+        subtle: 'hsla(0, 0%, 100%, 0.04)',
+      },
+      text: {
+        primary: 'hsl(0, 0%, 92%)',
+        secondary: 'hsl(0, 0%, 60%)',
+        muted: 'hsl(0, 0%, 45%)',
+      },
+    };
+  }
+
+  return {
+    surface: {
+      page: "hsl(0, 0%, 99%)",
+      card: "hsl(220, 35%, 97%)",
+      elevated: gray[100],
+    },
+    border: {
+      default: alpha(gray[300], 0.4),
+      subtle: alpha(gray[200], 0.3),
+    },
+    text: {
+      primary: gray[800],
+      secondary: gray[600],
+      muted: gray[500],
+    },
+  };
+}
--- a/src/shared-theme/themePrimitives.ts
+++ b/src/shared-theme/themePrimitives.ts
@@ -23,6 +23,10 @@ declare module '@mui/material/styles' {

  interface Palette {
    baseShadow: string;
+    flows: {
+      outflows: { primary: string; surface: string; text: string };
+      inflows: { primary: string; surface: string; text: string };
+    };
  }
 }

@@ -52,7 +56,9 @@ export const gray = {
  500: 'hsl(220, 20%, 42%)',
  600: 'hsl(220, 20%, 35%)',
  700: 'hsl(220, 20%, 25%)',
+  750: 'hsl(220, 20%, 18%)',
  800: 'hsl(220, 30%, 6%)',
+  850: 'hsl(220, 22%, 11%)',
  900: 'hsl(220, 35%, 3%)',
 };

@@ -95,10 +101,14 @@ export const red = {
  900: 'hsl(0, 93%, 6%)',
 };

+const darkBg = 'hsl(0, 0%, 9%)';
+const darkPaper = 'hsl(0, 0%, 14%)';
+const darkElevated = 'hsl(0, 0%, 19%)';
+
 export const getDesignTokens = (mode: PaletteMode) => {
  customShadows[1] =
    mode === 'dark'
-      ? 'hsla(220, 30%, 5%, 0.7) 0px 4px 16px 0px, hsla(220, 25%, 10%, 0.8) 0px 8px 16px -5px'
+      ? '0 4px 16px rgba(0, 0, 0, 0.4), 0 8px 24px rgba(0, 0, 0, 0.3)'
      : 'hsla(220, 30%, 5%, 0.07) 0px 4px 16px 0px, hsla(220, 25%, 10%, 0.07) 0px 8px 16px -5px';

  return {
@@ -111,9 +121,9 @@ export const getDesignTokens = (mode: PaletteMode) => {
        contrastText: brand[50],
        ...(mode === 'dark' && {
          contrastText: brand[50],
-          light: brand[300],
-          main: brand[400],
-          dark: brand[700],
+          light: 'hsl(210, 50%, 65%)',
+          main: 'hsl(210, 55%, 55%)',
+          dark: 'hsl(210, 50%, 35%)',
        }),
      },
      info: {
@@ -122,10 +132,10 @@ export const getDesignTokens = (mode: PaletteMode) => {
        dark: brand[600],
        contrastText: gray[50],
        ...(mode === 'dark' && {
-          contrastText: brand[300],
-          light: brand[500],
-          main: brand[700],
-          dark: brand[900],
+          contrastText: 'hsl(210, 30%, 80%)',
+          light: 'hsl(210, 40%, 50%)',
+          main: 'hsl(210, 35%, 40%)',
+          dark: 'hsl(210, 30%, 25%)',
        }),
      },
      warning: {
@@ -133,9 +143,9 @@ export const getDesignTokens = (mode: PaletteMode) => {
        main: orange[400],
        dark: orange[800],
        ...(mode === 'dark' && {
-          light: orange[400],
-          main: orange[500],
-          dark: orange[700],
+          light: 'hsl(45, 60%, 55%)',
+          main: 'hsl(45, 55%, 45%)',
+          dark: 'hsl(45, 50%, 30%)',
        }),
      },
      error: {
@@ -143,9 +153,9 @@ export const getDesignTokens = (mode: PaletteMode) => {
        main: red[400],
        dark: red[800],
        ...(mode === 'dark' && {
-          light: red[400],
-          main: red[500],
-          dark: red[700],
+          light: 'hsl(0, 55%, 60%)',
+          main: 'hsl(0, 55%, 50%)',
+          dark: 'hsl(0, 50%, 35%)',
        }),
      },
      success: {
@@ -153,34 +163,46 @@ export const getDesignTokens = (mode: PaletteMode) => {
        main: green[400],
        dark: green[800],
        ...(mode === 'dark' && {
-          light: green[400],
-          main: green[500],
-          dark: green[700],
+          light: 'hsl(120, 40%, 55%)',
+          main: 'hsl(120, 40%, 45%)',
+          dark: 'hsl(120, 35%, 30%)',
        }),
      },
      grey: {
        ...gray,
      },
-      divider: mode === 'dark' ? alpha(gray[700], 0.6) : alpha(gray[300], 0.4),
+      divider: mode === 'dark' ? 'hsla(0, 0%, 100%, 0.08)' : alpha(gray[300], 0.4),
      background: {
        default: 'hsl(0, 0%, 99%)',
        paper: 'hsl(220, 35%, 97%)',
-        ...(mode === 'dark' && { default: gray[900], paper: 'hsl(220, 30%, 7%)' }),
+        ...(mode === 'dark' && { default: darkBg, paper: darkPaper }),
      },
      text: {
        primary: gray[800],
        secondary: gray[600],
        warning: orange[400],
-        ...(mode === 'dark' && { primary: 'hsl(0, 0%, 100%)', secondary: gray[400] }),
+        ...(mode === 'dark' && { primary: 'hsl(0, 0%, 92%)', secondary: 'hsl(0, 0%, 60%)' }),
      },
      action: {
        hover: alpha(gray[200], 0.2),
        selected: `${alpha(gray[200], 0.3)}`,
        ...(mode === 'dark' && {
-          hover: alpha(gray[600], 0.2),
-          selected: alpha(gray[600], 0.3),
+          hover: 'hsla(0, 0%, 100%, 0.06)',
+          selected: 'hsla(0, 0%, 100%, 0.1)',
        }),
      },
+      flows: {
+        outflows: {
+          primary: mode === 'dark' ? 'hsl(0, 55%, 60%)' : '#d32f2f',
+          surface: mode === 'dark' ? 'hsla(0, 35%, 25%, 0.6)' : '#fdecea',
+          text: mode === 'dark' ? 'hsl(0, 60%, 80%)' : '#b71c1c',
+        },
+        inflows: {
+          primary: mode === 'dark' ? 'hsl(120, 40%, 55%)' : '#2e7d32',
+          surface: mode === 'dark' ? 'hsla(120, 25%, 22%, 0.6)' : '#e8f5e9',
+          text: mode === 'dark' ? 'hsl(120, 40%, 78%)' : '#1b5e20',
+        },
+      },
    },
    typography: {
      fontFamily: 'Inter, sans-serif',
@@ -285,6 +307,18 @@ export const colorSchemes = {
        hover: alpha(gray[200], 0.2),
        selected: `${alpha(gray[200], 0.3)}`,
      },
+      flows: {
+        outflows: {
+          primary: '#d32f2f',
+          surface: '#fdecea',
+          text: '#b71c1c',
+        },
+        inflows: {
+          primary: '#2e7d32',
+          surface: '#e8f5e9',
+          text: '#1b5e20',
+        },
+      },
      baseShadow:
        'hsla(220, 30%, 5%, 0.07) 0px 4px 16px 0px, hsla(220, 25%, 10%, 0.07) 0px 8px 16px -5px',
    },
@@ -293,49 +327,60 @@ export const colorSchemes = {
    palette: {
      primary: {
        contrastText: brand[50],
-        light: brand[300],
-        main: brand[400],
-        dark: brand[700],
+        light: 'hsl(210, 50%, 65%)',
+        main: 'hsl(210, 55%, 55%)',
+        dark: 'hsl(210, 50%, 35%)',
      },
      info: {
-        contrastText: brand[300],
-        light: brand[500],
-        main: brand[700],
-        dark: brand[900],
+        contrastText: 'hsl(210, 30%, 80%)',
+        light: 'hsl(210, 40%, 50%)',
+        main: 'hsl(210, 35%, 40%)',
+        dark: 'hsl(210, 30%, 25%)',
      },
      warning: {
-        light: orange[400],
-        main: orange[500],
-        dark: orange[700],
+        light: 'hsl(45, 60%, 55%)',
+        main: 'hsl(45, 55%, 45%)',
+        dark: 'hsl(45, 50%, 30%)',
      },
      error: {
-        light: red[400],
-        main: red[500],
-        dark: red[700],
+        light: 'hsl(0, 55%, 60%)',
+        main: 'hsl(0, 55%, 50%)',
+        dark: 'hsl(0, 50%, 35%)',
      },
      success: {
-        light: green[400],
-        main: green[500],
-        dark: green[700],
+        light: 'hsl(120, 40%, 55%)',
+        main: 'hsl(120, 40%, 45%)',
+        dark: 'hsl(120, 35%, 30%)',
      },
      grey: {
        ...gray,
      },
-      divider: alpha(gray[700], 0.6),
+      divider: 'hsla(0, 0%, 100%, 0.08)',
      background: {
-        default: gray[900],
-        paper: 'hsl(220, 30%, 7%)',
+        default: darkBg,
+        paper: darkPaper,
      },
      text: {
-        primary: 'hsl(0, 0%, 100%)',
-        secondary: gray[400],
+        primary: 'hsl(0, 0%, 92%)',
+        secondary: 'hsl(0, 0%, 60%)',
      },
      action: {
-        hover: alpha(gray[600], 0.2),
-        selected: alpha(gray[600], 0.3),
+        hover: 'hsla(0, 0%, 100%, 0.06)',
+        selected: 'hsla(0, 0%, 100%, 0.1)',
      },
-      baseShadow:
-        'hsla(220, 30%, 5%, 0.7) 0px 4px 16px 0px, hsla(220, 25%, 10%, 0.8) 0px 8px 16px -5px',
+      flows: {
+        outflows: {
+          primary: 'hsl(0, 55%, 60%)',
+          surface: 'hsla(0, 35%, 25%, 0.6)',
+          text: 'hsl(0, 60%, 80%)',
+        },
+        inflows: {
+          primary: 'hsl(120, 40%, 55%)',
+          surface: 'hsla(120, 25%, 22%, 0.6)',
+          text: 'hsl(120, 40%, 78%)',
+        },
+      },
+      baseShadow: '0 4px 16px rgba(0, 0, 0, 0.4), 0 8px 24px rgba(0, 0, 0, 0.3)',
    },
  },
 };