Add Fetch Request pipeline UI with real-time SSEs (#8 )

## Summary Add Fetch Request pipeline UI with real-time SSE progress tracking, ambiguity resolution, list page with filtering/retry, and detail page with stepper/event feed. ## Changes ### New files - **`src/FetchRequestDetail.tsx`** (+675 lines) — Full detail page for a single fetch request with: - SSE connection for real-time pipeline progress (`/fetch-requests/:id/events`) - 4-step stepper (Extract → Raw Expense → Enrich → Save) with active/completed/failed/paused states - Granular progress bar (10% Extract, 20% Raw Expense, 50% Enrich, 20% Save) - Progress event feed with auto-scroll and deduplication (only latest `progress` per step, hides `started` when terminal event follows) - Ambiguity resolution cards with candidate selection buttons - Retry support with retry-count progress bar - Failure/success snackbar notifications - Error display for failed fetch requests ### Modified files - **`react-openapi/api/client.ts`** — added `api.patch()` method for PATCH requests - **`react-openapi/hooks/useResource.ts`** — added `usePatch()` mutation hook for partial updates with cache invalidation - **`src/FetchRequests.tsx`** (+347/−73 lines) — Major list page rewrite: - Row-level actions: retry (failed <3 retries), navigate to detail (paused), delete with confirmation dialog - Filter bar: status multi-select, account text filter, file/email source toggle - Account name autocomplete from API - Format dropdown driven by `resourceOverrides` config - Date pickers (changed from `datetime-local` to `date`) - Copy fingerprint button, retry count display, date range column - Row click navigates to detail, sorted by `created_at` desc - `pause` status support in `statusColors` - 409 conflict handling on duplicate fingerprint - `formatApiError()` for 422 validation error display - **`src/features/fetch-requests/fetch-requests.models.ts`** — Added types: - `paused` to `FetchRequestStatus` - `FetchRequestUpdate` interface - `retry_count` to `FetchRequest` interface - `raw_lines`, `txn_blocks`, `txn_dicts`, `txn_dict_count`/`txn_dicts_count` to source types - `PendingAmbiguity`, `AmbiguityCandidate`, `ResolveAmbiguityPayload` - `SSEEvent`, `SSEEventStep`, `SSEEventStatus`, `ProgressMessage` - `FetchRequestFilters` - `formatApiError()` helper for FastAPI 422 error parsing - `RETRY_MAX = 3` constant - **`src/features/fetch-requests/index.ts`** — Barrel exports for all new types, hooks, and helpers - **`src/features/fetch-requests/useFetchRequests.ts`** — Added hooks: - `useUpdateFetchRequest()` — PATCH via `usePatch` - `useFetchRequestAmbiguities(id)` — queries `/fetch-requests/:id/ambiguities` - `useResolveAmbiguity()` — posts to `/ambiguities/:id/resolve` with cache invalidation - **`src/main.jsx`** — Added route `/fetch-requests/:id` → `FetchRequestDetail` ## Key decisions - SSE event stream is the single source of truth for progress; REST is only fallback for page load - Stepper shows granular ratio-based progress counts (e.g. `150/246` for enrich) - `pipeline/failed` SSE event triggers refetch + error snackbar - `load_content` events excluded from event feed entirely - Enrich/Save progress counts come only from SSE (no REST fallback since those phases don't pause) Reviewed-on: #8 Co-authored-by: Vishesh 'ironeagle' Bangotra <aetoskia@gmail.com> Co-committed-by: Vishesh 'ironeagle' Bangotra <aetoskia@gmail.com>
report-fetch-request-ui (#7 )
2026-05-30 15:58:48 +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 · 2026-05-18 05:37:51 +00:00 · 2026-05-12 06:24:47 +00:00
72 changed files with 4989 additions and 1094 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/Admin.tsx
+++ b/react-openapi/Admin.tsx
@@ -1,5 +1,4 @@
 import * as React from "react";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { useAuth, AuthPage } from "../react-auth";
 import { UploadProvider } from "./providers/UploadProvider";
 import AdminLayout from "./components/AdminLayout";
@@ -13,17 +12,17 @@ import {
  Route,
  useNavigate,
  useParams,
  Navigate,
 } from "react-router-dom";
-const queryClient = new QueryClient();
+import { ConfigContext } from "./providers/ConfigContext";
 // Create a context for the app config
 export const ConfigContext = React.createContext<AppConfig | null>(null);
 function Dashboard({ basePath }: { basePath: string }) {
  const config = React.useContext(ConfigContext);
  const navigate = useNavigate();
  const resources = config?.resources || [];
  const visibleResources = resources.filter((res) => !res.hidden);
  return (
    <Box>
      <Typography variant="h4" gutterBottom>
@@ -41,7 +40,7 @@ function Dashboard({ basePath }: { basePath: string }) {
          mt: 4,
        }}
      >
-        {config?.resources.map((res) => (
+        {visibleResources.map((res) => (
          <Paper 
            key={res.name} 
            sx={{ 
@@ -51,7 +50,7 @@ function Dashboard({ basePath }: { basePath: string }) {
                transition: 'transform 0.2s',
                '&:hover': { transform: 'translateY(-4px)', boxShadow: 4 }
            }}
-            onClick={() => navigate(`${basePath}/${res.name}`)}
+            onClick={() => navigate(`/admin/${res.name}`)}
          >
            <Typography variant="h6" color="primary">{res.pluralLabel}</Typography>
            <Typography variant="body2" color="text.secondary">Manage {res.pluralLabel.toLowerCase()}</Typography>
@@ -69,6 +68,9 @@ function AdminApp({ basePath }: { basePath: string }) {
  const config = React.useContext(ConfigContext);
  const navigate = useNavigate();
  const resources = config?.resources || [];
  const visibleResources = resources.filter((res) => !res.hidden);
  if (!currentUser) {
    return (
      <AuthPage
@@ -88,8 +90,8 @@ function AdminApp({ basePath }: { basePath: string }) {
    <AdminLayout
      username={currentUser.username}
      onLogout={logout}
-      onSelectResource={(name) => navigate(`${basePath}/${name}`)}
+      onSelectResource={(name) => navigate(`/admin/${name}`)}
-      resources={config?.resources || []}
+      resources={visibleResources}
    >
      <Routes>
        <Route path="/" element={<Dashboard basePath={basePath} />} />
@@ -120,14 +122,17 @@ interface AdminProps {
 }
 export default function Admin({ basePath = "/admin", resourceOverrides = {}, profileConfig = {} }: AdminProps) {
-  const [config, setConfig] = React.useState<AppConfig | null>(null);
+  const existingConfig = React.useContext(ConfigContext);
  const [config, setConfig] = React.useState<AppConfig | null>(existingConfig);
  React.useEffect(() => {
-    getAppConfig(resourceOverrides, profileConfig).then((cfg) => {
+    if (!existingConfig) {
-      initializeApiClients(cfg.baseUrl, cfg.authBaseUrl);
+      getAppConfig(resourceOverrides, profileConfig).then((cfg) => {
-      setConfig(cfg);
+        initializeApiClients(cfg.baseUrl, cfg.authBaseUrl);
-    });
+        setConfig(cfg);
-  }, [resourceOverrides, profileConfig]);
+      });
    }
  }, [resourceOverrides, profileConfig, existingConfig]);
  if (!config) {
    return (
@@ -144,13 +149,21 @@ export default function Admin({ basePath = "/admin", resourceOverrides = {}, pro
    );
  }
  const content = (
    <UploadProvider>
      <AdminApp basePath={basePath} />
    </UploadProvider>
  );
  // If we have an existing config, we are already inside a Provider and QueryClient
  if (existingConfig) {
    return content;
  }
  // Fallback for standalone usage
  return (
-    <QueryClientProvider client={queryClient}>
+    <ConfigContext.Provider value={config}>
-      <ConfigContext.Provider value={config}>
+      {content}
-        <UploadProvider>
+    </ConfigContext.Provider>
          <AdminApp basePath={basePath} />
        </UploadProvider>
      </ConfigContext.Provider>
    </QueryClientProvider>
  );
 }
--- a/react-openapi/api/client.ts
+++ b/react-openapi/api/client.ts
@@ -7,6 +7,28 @@ import { createApiClient } from "../../react-auth";
 let _api: AxiosInstance | null = null;
 let _auth: AxiosInstance | null = null;
 function withParamsSerializer(instance: AxiosInstance): AxiosInstance {
  instance.defaults.paramsSerializer = {
    serialize: (params) => {
      const searchParams = new URLSearchParams();
      Object.entries(params).forEach(([key, value]) => {
        if (Array.isArray(value)) {
          value.forEach((v) => {
            searchParams.append(key, String(v)); // NO []
          });
        } else if (value !== undefined && value !== null) {
          searchParams.append(key, String(value));
        }
      });
      return searchParams.toString();
    },
  };
  return instance;
 }
 export const api = {
  get: (...args: Parameters<AxiosInstance["get"]>) => {
    if (!_api) throw new Error("API client not initialized");
@@ -24,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 = {
@@ -38,6 +64,6 @@ export const auth = {
 };
 export function initializeApiClients(baseUrl: string, authBaseUrl: string) {
-  _api = createApiClient(baseUrl);
+  _api = withParamsSerializer(createApiClient(baseUrl));
-  _auth = createApiClient(authBaseUrl);
+  _auth = withParamsSerializer(createApiClient(authBaseUrl));
 }
--- a/react-openapi/components/EnhancedTable.tsx
+++ b/react-openapi/components/EnhancedTable.tsx
@@ -49,8 +49,8 @@ export default function EnhancedTable({
  config,
  data,
  total,
-  paginationModel,
+  paginationModel: externalPaginationModel,
-  onPaginationModelChange,
+  onPaginationModelChange: externalOnPaginationModelChange,
  loading = false,
  onEdit,
  onDelete,
@@ -60,6 +60,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]) => {
@@ -104,12 +112,12 @@ export default function EnhancedTable({
        <GridActionsCellItem
          icon={<VisibilityIcon />}
          label="View"
-          onClick={() => navigate(`/${config.name}/${params.id}`)}
+          onClick={() => navigate(`/admin/${config.name}/${params.id}`)}
        />,
        <GridActionsCellItem
          icon={<EditIcon />}
          label="Edit"
-          onClick={() => navigate(`/${config.name}/edit/${params.id}`)}
+          onClick={() => navigate(`/admin/${config.name}/edit/${params.id}`)}
        />,
        <GridActionsCellItem
          icon={<DeleteIcon />}
@@ -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'}
+        paginationMode={isServer ? 'server' : 'client'}
-        rowCount={(() => {
+        {...(isServer ? {
-          if (!config.pagination) return data.length;
+          rowCount: (() => {
-          if (total !== undefined) return total;
+            if (total !== undefined) return total;
-          
+            const page = paginationModel?.page || 0;
-          // Graceful fallback for missing total count
+            const pageSize = paginationModel?.pageSize || 10;
-          const page = paginationModel?.page || 0;
+            if (data.length < pageSize) {
-          const pageSize = paginationModel?.pageSize || 10;
+              return page * pageSize + data.length;
-          if (data.length < pageSize) {
+            }
-            return page * pageSize + data.length;
+            return (page + 2) * pageSize;
-          }
+          })(),
-          // Enable 'Next' button by pretending there's at least one more page
+        } : {})}
          return (page + 2) * pageSize;
        })()}
        loading={loading}
        paginationModel={paginationModel || { page: 0, pageSize: 10 }}
        onPaginationModelChange={onPaginationModelChange}
@@ -222,8 +248,8 @@ function MobileCardRow({ row, config, onDelete, onNavigate, navigate }: any) {
                        <MoreVertIcon fontSize="small" />
                    </IconButton>
                    <Menu anchorEl={anchorEl} open={open} onClose={handleClose}>
-                        <MenuItem onClick={() => { handleClose(); navigate(`/${config.name}/${id}`); }}>View</MenuItem>
+                        <MenuItem onClick={() => { handleClose(); navigate(`/admin/${config.name}/${id}`); }}>View</MenuItem>
-                        <MenuItem onClick={() => { handleClose(); navigate(`/${config.name}/edit/${id}`); }}>Edit</MenuItem>
+                        <MenuItem onClick={() => { handleClose(); navigate(`/admin/${config.name}/edit/${id}`); }}>Edit</MenuItem>
                        <MenuItem onClick={() => { handleClose(); onDelete(id); }} sx={{ color: 'error.main' }}>Delete</MenuItem>
                    </Menu>
                </Box>
@@ -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>
@@ -242,7 +268,7 @@ function MobileCardRow({ row, config, onDelete, onNavigate, navigate }: any) {
                </Box>
            </CardContent>
            <CardActions sx={{ justifyContent: 'flex-end', px: 2, pb: 2 }}>
-                 <Button size="small" onClick={() => navigate(`/${config.name}/${id}`)}>View Details</Button>
+                 <Button size="small" onClick={() => navigate(`/admin/${config.name}/${id}`)}>View Details</Button>
            </CardActions>
        </Card>
    );
@@ -359,7 +385,7 @@ function FieldRenderer({ params, field, fieldKey, config, onNavigate, navigate,
                label={value} 
                size="small" 
                color="primary"
-                onClick={(e) => { e.stopPropagation(); navigate(`/${config.name}/${params.row[config.primaryKey]}`); }}
+                onClick={(e) => { e.stopPropagation(); navigate(`/admin/${config.name}/${params.row[config.primaryKey]}`); }}
                sx={{ cursor: 'pointer', fontWeight: 'bold' }}
            />
        );
--- a/react-openapi/components/FilterBar.tsx
+++ b/react-openapi/components/FilterBar.tsx
@@ -0,0 +1,313 @@
 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";
 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.options) return field.options;
  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);
    const df = field.displayField;
    if (!df) { debugger; return null; }
    if (Array.isArray(df)) {
      const parts = df.map((k) => item[k]).filter((v) => v != null);
      if (parts.length > 0) return parts.join(" ");
    } else {
      const v = item[df];
      if (v != null) return String(v);
    }
    debugger;
    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/GenericForm.tsx
+++ b/react-openapi/components/GenericForm.tsx
@@ -11,7 +11,7 @@ import { useUpload } from '../providers/UploadProvider';
 import { useQueries } from '@tanstack/react-query';
 import { useResource } from '../hooks/useResource';
 import FormField from './fields/FormField';
-import { ConfigContext } from '../Admin';
+import { ConfigContext } from '../providers/ConfigContext';
 interface GenericFormProps {
  config: ResourceConfig;
@@ -67,7 +67,8 @@ export default function GenericForm({
  const relationDataMap = React.useMemo(() => {
    const map: Record<string, any[]> = {};
    allRelations.forEach((relName, index) => {
-        map[relName] = queries[index].data || [];
+      // @ts-ignore
      map[relName] = queries[index].data || [];
    });
    return map;
  }, [allRelations, queries]);
--- a/react-openapi/components/ProfileView.tsx
+++ b/react-openapi/components/ProfileView.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Box, Typography, Paper, CircularProgress, Alert } from '@mui/material';
 import { useResource } from '../hooks/useResource';
 import GenericForm from './GenericForm';
-import { ConfigContext } from '../Admin';
+import { ConfigContext } from '../providers/ConfigContext';
 export default function ProfileView() {
  const appConfig = React.useContext(ConfigContext);
--- a/react-openapi/components/ResourceView.tsx
+++ b/react-openapi/components/ResourceView.tsx
@@ -1,10 +1,12 @@
 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 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,46 +15,142 @@ interface ResourceViewProps {
 import { GridPaginationModel } from '@mui/x-data-grid';
 function getFilterDisplayFields(field: ResourceField): string[] {
  if (!field.displayField) return [];
  return (Array.isArray(field.displayField) ? field.displayField : [field.displayField]).filter(
    (df): df is string => !!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) => {
            if (el != null && typeof el === "object") {
              const dispFields = getFilterDisplayFields(field);
              return dispFields.some((df) => filterValue.includes(String(el[df])));
            }
            return filterValue.includes(String(el));
          });
        }
        if (itemValue && typeof itemValue === "object") {
          const dispFields = getFilterDisplayFields(field);
          const itemDisplay = dispFields.map((df) => itemValue[df]).filter((v) => v != null).join(" ");
          return filterValue.includes(itemDisplay);
        }
        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) => {
          if (el != null && typeof el === "object") {
            const dispFields = getFilterDisplayFields(field);
            return dispFields.some((df) => String(el[df]) === String(filterValue));
          }
          return String(el) === String(filterValue);
        });
      }
      if (itemValue && typeof itemValue === "object") {
        const dispFields = getFilterDisplayFields(field);
        return dispFields.some((df) => String(itemValue[df]) === 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();
  const handleEdit = (item: any) => {
-    navigate(`/${config.name}/edit/${item[config.primaryKey]}`);
+    navigate(`/admin/${config.name}/edit/${item[config.primaryKey]}`);
  };
  const handleCreate = () => {
-    navigate(`/${config.name}/create`);
+    navigate(`/admin/${config.name}/create`);
  };
  const handleSave = async (formData: any) => {
@@ -62,7 +160,7 @@ export default function ResourceView({ config, onNavigateToResource }: ResourceV
      } else {
        await createMutation.mutateAsync(formData);
      }
-      navigate(`/${config.name}`);
+      navigate(`/admin/${config.name}`);
    } catch (err) {
      console.error('Save failed:', err);
    }
@@ -80,28 +178,41 @@ export default function ResourceView({ config, onNavigateToResource }: ResourceV
  return (
    <Box>
      {isList ? (
-        <EnhancedTable
+        <Box>
-          config={config}
+          {!isServer && config.filterOptions?.fields && config.filterOptions.fields.length > 0 && (
-          data={paginatedData.data || []}
+            <FilterBar
-          total={paginatedData.total}
+              fields={config.fields}
-          paginationModel={paginationModel}
+              filterableFields={config.filterOptions.fields}
-          onPaginationModelChange={setPaginationModel}
+              mode={config.filterOptions?.mode || "server"}
-          loading={listQuery.isFetching}
+              data={rawData}
-          onEdit={handleEdit}
+              appliedValues={appliedFilters}
-          onDelete={handleDelete}
+              onApply={setAppliedFilters}
-          onCreate={handleCreate}
+              onClear={() => setAppliedFilters({})}
-          onNavigateToResource={(res, id) => navigate(`/${res}/${id}`)}
+            />
-        />
+          )}
          <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
            config={config}
            initialData={isCreate ? null : itemQuery.data}
            onSave={handleSave}
-            onCancel={() => navigate(`/${config.name}`)}
+            onCancel={() => navigate(`/admin/${config.name}`)}
            loading={createMutation.isPending || updateMutation.isPending}
            readOnly={isView}
-            onEditClick={() => navigate(`/${config.name}/edit/${id}`)}
+            onEditClick={() => navigate(`/admin/${config.name}/edit/${id}`)}
          />
        </Paper>
      )}
--- a/react-openapi/hooks/useResource.ts
+++ b/react-openapi/hooks/useResource.ts
@@ -1,16 +1,22 @@
-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";
 import * as React from "react";
-export function useResource<T = any>(config: ResourceConfig) {
+export function useResource<T = any>(config: ResourceConfig | undefined) {
  const queryClient = useQueryClient();
-  const { name, endpoint, primaryKey } = config;
+  
  // Return empty/disabled hooks if config is missing
  const { name = '', endpoint = '', primaryKey = 'id' } = config || {};
  // --- READ ALL ---
  const useList = (params?: any) => 
    useQuery({
      queryKey: [name, "list", params],
      queryFn: async () => {
        if (!endpoint) return { data: [], total: 0 };
        console.log('params:', params);
        // @ts-ignore
        const res = await api.get<T[]>(endpoint, { params });
        const total = res.headers ? parseInt(res.headers['x-total-count'] || res.headers['X-Total-Count']) : undefined;
@@ -18,26 +24,29 @@ export function useResource<T = any>(config: ResourceConfig) {
            data: res.data, 
            total: isNaN(total as any) ? undefined : total 
        };
-      }
+      },
      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) return null;
+        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,
+      enabled: !!id && !!endpoint,
    });
  // --- CREATE ---
  const useCreate = () =>
    useMutation({
      mutationFn: async (data: Partial<T>) => {
        if (!endpoint) throw new Error("Endpoint not defined");
        // @ts-ignore
        const res = await api.post<T>(endpoint, data);
        return res.data;
@@ -51,6 +60,7 @@ export function useResource<T = any>(config: ResourceConfig) {
  const useUpdate = () =>
    useMutation({
      mutationFn: async ({ id, data }: { id: string; data: Partial<T> }) => {
        if (!endpoint) throw new Error("Endpoint not defined");
        // @ts-ignore
        const res = await api.put<T>(`${endpoint}/${id}`, data);
        return res.data;
@@ -63,10 +73,28 @@ export function useResource<T = any>(config: ResourceConfig) {
      },
    });
  // --- 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({
      mutationFn: async (id: string) => {
        if (!endpoint) throw new Error("Endpoint not defined");
        await api.delete(`${endpoint}/${id}`);
        return id;
      },
@@ -79,6 +107,7 @@ export function useResource<T = any>(config: ResourceConfig) {
  const getListQueryOptions = (params?: any) => ({
    queryKey: [name, "list", params],
    queryFn: async () => {
      if (!endpoint) return { data: [], total: 0 };
      // @ts-ignore
      const res = await api.get<T[]>(endpoint, { params });
      const total = res.headers ? parseInt(res.headers['x-total-count'] || res.headers['X-Total-Count']) : undefined;
@@ -87,6 +116,7 @@ export function useResource<T = any>(config: ResourceConfig) {
          total: isNaN(total as any) ? undefined : total 
      };
    },
    enabled: !!endpoint,
  });
  // --- READ ME ---
@@ -94,16 +124,19 @@ export function useResource<T = any>(config: ResourceConfig) {
    useQuery({
      queryKey: [name, "me"],
      queryFn: async () => {
        if (!endpoint) return null;
        // @ts-ignore
        const res = await api.get<T>(`${endpoint}/me`);
        return res.data;
      },
      enabled: !!endpoint,
    });
  // --- UPDATE ME ---
  const useUpdateMe = () =>
    useMutation({
      mutationFn: async (data: Partial<T>) => {
        if (!endpoint) throw new Error("Endpoint not defined");
        // @ts-ignore
        const res = await api.put<T>(`${endpoint}/me`, data);
        return res.data;
@@ -120,8 +153,16 @@ export function useResource<T = any>(config: ResourceConfig) {
    useMe,
    useCreate,
    useUpdate,
    usePatch,
    useUpdateMe,
    useDelete,
    getListQueryOptions,
  };
 }
 export function useResourceByName<T = any>(name: string) {
  const config = React.useContext(ConfigContext);
  const resourceConfig = config?.resources.find((r) => r.name === name);
  return useResource<T>(resourceConfig);
 }
--- a/react-openapi/index.ts
+++ b/react-openapi/index.ts
@@ -1,4 +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/providers/AppProvider.tsx
+++ b/react-openapi/providers/AppProvider.tsx
@@ -0,0 +1,70 @@
 import * as React from "react";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { ConfigContext } from "./ConfigContext";
 import { getAppConfig } from "../config";
 import { initializeApiClients } from "../api/client";
 import { AppConfig } from "../types/config";
 import { Box, CircularProgress } from "@mui/material";
 const defaultQueryClient = new QueryClient({
  defaultOptions: {
    queries: {
      staleTime: 5 * 60 * 1000,
      retry: 1,
      refetchOnWindowFocus: false,
    },
  },
 });
 interface AppProviderProps {
  children: React.ReactNode;
  resourceOverrides?: Record<string, any>;
  profileConfig?: any;
  queryClient?: QueryClient;
 }
 export function AppProvider({
  children,
  resourceOverrides = {},
  profileConfig = {},
  queryClient = defaultQueryClient,
 }: AppProviderProps) {
  const [config, setConfig] = React.useState<AppConfig | null>(null);
  const [loading, setLoading] = React.useState(true);
  React.useEffect(() => {
    getAppConfig(resourceOverrides, profileConfig)
      .then((cfg) => {
        initializeApiClients(cfg.baseUrl, cfg.authBaseUrl);
        setConfig(cfg);
        setLoading(false);
      })
      .catch((err) => {
        console.error("Failed to load OpenAPI configuration:", err);
        setLoading(false);
      });
  }, [resourceOverrides, profileConfig]);
  if (loading) {
    return (
      <Box
        sx={{
          display: "flex",
          justifyContent: "center",
          alignItems: "center",
          height: "100vh",
        }}
      >
        <CircularProgress />
      </Box>
    );
  }
  return (
    <QueryClientProvider client={queryClient}>
      <ConfigContext.Provider value={config}>
        {children}
      </ConfigContext.Provider>
    </QueryClientProvider>
  );
 }
--- a/react-openapi/providers/ConfigContext.tsx
+++ b/react-openapi/providers/ConfigContext.tsx
@@ -0,0 +1,12 @@
 import * as React from "react";
 import { AppConfig } from "../types/config";
 export const ConfigContext = React.createContext<AppConfig | null>(null);
 export function useConfig() {
  const context = React.useContext(ConfigContext);
  if (context === undefined) {
    throw new Error("useConfig must be used within a ConfigProvider");
  }
  return context;
 }
--- a/react-openapi/types/config.ts
+++ b/react-openapi/types/config.ts
@@ -20,8 +20,11 @@ export interface ResourceField {
  displayField?: string | string[];
  formatter?: (value: any) => string;
  relation?: string; // Name of the target resource
  filterType?: "autocomplete" | "multiselect" | "number-range" | "date-range";
 }
 export type ResourceMode = "server" | "client";
 export interface ResourceConfig {
  name: string;
  label: string;
@@ -30,6 +33,11 @@ export interface ResourceConfig {
  primaryKey: string;
  fields: Record<string, ResourceField>;
  pagination?: boolean;
  hidden?: boolean;
  filterOptions?: {
    mode?: ResourceMode;
    fields?: string[];
  };
 }
 export interface AppConfig {
--- a/react-openapi/types/overrides.ts
+++ b/react-openapi/types/overrides.ts
@@ -7,9 +7,15 @@ export interface FieldOverride {
  displayField?: string | string[];
  display?: boolean;
  formatter?: (value: any) => string;
  filterType?: "autocomplete" | "multiselect" | "number-range" | "date-range";
 }
 export interface ResourceOverride {
  fields?: Record<string, FieldOverride>;
  pagination?: boolean;
  hidden?: boolean;
  filterOptions?: {
    mode?: "server" | "client";
    fields?: string[];
  };
 }
--- a/react-openapi/utils/openapi_loader.ts
+++ b/react-openapi/utils/openapi_loader.ts
@@ -154,14 +154,21 @@ 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,
      },
    });
  }
--- 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
@@ -2,90 +2,237 @@ import * as React from "react";
 import {
  Box,
  Container,
  Grid,
  CircularProgress,
  Alert,
-  ToggleButton,
+  TextField,
-  ToggleButtonGroup
+  Paper,
  Autocomplete,
  Button
 } from "@mui/material";
-import LatestItemsList, { LatestItem } from "./components/LatestItemsList";
+import DashboardView from "./components/Dashboard";
 import HistoryChart from "./components/HistoryChart";
 import {
-  fetchLatestTransactions,
+  DashboardState,
-  fetchAggregatedExpenses,
+  DashboardStateSetters,
-  fetchAggregatedIncome,
+  DashboardFlow,
-  AggregatedDashboardData
+} from "./components/Dashboard";
-} from "./utils/dashboardLoader";
+
 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 [latest, setLatest] = React.useState<{
+  const [state, setState] = React.useState<DashboardState>({
-    expense: LatestItem[];
+    flow: "outflows",
-    income: LatestItem[];
+    periodType: "rolling",
-  }>({
+    selectedPeriodId: null,
-    expense: [],
+    selectedGroupKey: null,
-    income: []
+    comparison: false,
  });
-  const [aggregated, setAggregated] = React.useState<{
+  const [appliedPayees, setAppliedPayees] = React.useState<string[]>([]);
-    expense: AggregatedDashboardData | null;
+  const [appliedTags, setAppliedTags] = React.useState<string[]>([]);
    income: AggregatedDashboardData | null;
  }>({
    expense: null,
    income: null
  });
-  const [mode, setMode] =
+  const [payeeInput, setPayeeInput] = React.useState<string[]>([]);
-    React.useState<"expense" | "income">("expense");
+  const [tagsInput, setTagsInput] = React.useState<string[]>([]);
-  const [loading, setLoading] = React.useState(true);
+  const [loadedPayees, setLoadedPayees] = React.useState<string[]>([]);
-  const [error, setError] = React.useState<string | null>(null);
+  const [loadedTags, setLoadedTags] = React.useState<string[]>([]);
-  // -------- LOAD ONCE --------
+  const [selectedSnapshotId, setSelectedSnapshotId] = React.useState<string | null>(null);
  React.useEffect(() => {
    async function loadData() {
      try {
        setLoading(true);
-        const [
+  const { data: snapshotsData } = useResourceByName("reports").useList();
-          latestExpense,
+  const snapshotOptions = React.useMemo(() => {
-          latestIncome,
+    const options: { label: string; value: string | null }[] = [
-          expenseData,
+      { label: "Latest (auto)", value: null },
-          incomeData
+    ];
-        ] = await Promise.all([
+    if (snapshotsData?.data) {
-          fetchLatestTransactions("expense"),
+      for (const snap of snapshotsData.data) {
-          fetchLatestTransactions("income"),
+        options.push({
-          fetchAggregatedExpenses(),
+          label: `Snapshot from ${formatSnapshotDate(snap.created_at)}`,
-          fetchAggregatedIncome()
+          value: snap.snapshot_id,
        ]);
        setLatest({
          expense: latestExpense,
          income: latestIncome
        });
        setAggregated({
          expense: expenseData,
          income: incomeData
        });
      } catch (err: any) {
        console.error(err);
        setError(err.message || "Failed to load dashboard data");
      } finally {
        setLoading(false);
      }
    }
    return options;
  }, [snapshotsData]);
-    loadData();
+  const selectedSnapshotOption = snapshotOptions.find((o) => o.value === selectedSnapshotId) ?? snapshotOptions[0];
  }, []);
-  const currentData = aggregated[mode];
+  const report = useReport({
-  const currentLatest = latest[mode];
+    snapshot_id: selectedSnapshotId ?? undefined,
    periods: ["daily", "weekly", "monthly", "all"],
    flow: state.flow,
    payee: appliedPayees.length > 0 ? appliedPayees : undefined,
    tags: appliedTags.length > 0 ? appliedTags : undefined,
  });
-  // -------- UI STATES --------
+  React.useEffect(() => {
-  if (loading) {
+    if (report.data) {
      setLoadedPayees(prev => {
        const pSet = new Set<string>(prev);
        report.data.buckets.forEach((b: any) => {
          Object.values(b.periods).forEach((periodArray: any) => {
            periodArray?.forEach((p: any) => {
              p.metric?.transactions?.forEach((t: any) => {
                if (t.payee?.name) pSet.add(t.payee.name);
              });
            });
          });
        });
        return Array.from(pSet).sort();
      });
      setLoadedTags(prev => {
        const tSet = new Set<string>(prev);
        report.data.buckets.forEach((b: any) => {
          Object.values(b.periods).forEach((periodArray: any) => {
            periodArray?.forEach((p: any) => {
              p.metric?.transactions?.forEach((t: any) => {
                t.tags?.forEach((tag: any) => tSet.add(tag.name || tag));
              });
            });
          });
        });
        return Array.from(tSet).sort();
      });
    }
  }, [report.data]);
  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" }}>
        <CircularProgress />
@@ -96,45 +243,97 @@ export default function Dashboard() {
  if (error) {
    return (
      <Container sx={{ mt: 4 }}>
-        <Alert severity="error">{error}</Alert>
+        <Alert severity="error">{String(error)}</Alert>
      </Container>
    );
  }
  if (!report.data) {
    return null;
  }
  const data = prepareReport(report.data);
  return (
-    <Container sx={{ mt: 4, mb: 4 }}>
+    <Box>
-      {/* -------- TOGGLE -------- */}
+      <Container>
-      <Box sx={{ display: "flex", justifyContent: "center", mb: 3 }}>
+        <Paper 
-        <ToggleButtonGroup
+          sx={{ 
-          value={mode}
+            mt: 4, 
-          exclusive
+            p: 2, 
-          onChange={(_, val) => val && setMode(val)}
+            display: "flex", 
            flexDirection: { xs: "column", sm: "row" },
            gap: 2, 
            alignItems: { xs: "stretch", sm: "flex-end" }, 
            borderRadius: 4,
            mb: -2 // pull up to be closer to the dashboard container below
          }} 
          elevation={0} 
          variant="outlined"
        >
-          <ToggleButton value="expense">Expenses</ToggleButton>
+          <Box sx={{ display: 'flex', flexDirection: 'column', flex: 1, minWidth: { sm: 250 } }}>
-          <ToggleButton value="income">Income</ToggleButton>
+            <Box sx={{ typography: 'caption', mb: 1, color: 'text.secondary' }}>
-        </ToggleButtonGroup>
+              Filter by Payee
-      </Box>
+            </Box>
            <Autocomplete
              multiple
              freeSolo
              options={loadedPayees}
              value={payeeInput}
              onChange={(_, val) => setPayeeInput(val as string[])}
              renderInput={(params) => <TextField {...params} placeholder="Add payees..." />}
              sx={{ '& .MuiOutlinedInput-root': { height: 'auto', minHeight: '2.5rem', py: 0.5 } }}
            />
          </Box>
          <Box sx={{ display: 'flex', flexDirection: 'column', flex: 1, minWidth: { sm: 250 } }}>
            <Box sx={{ typography: 'caption', mb: 1, color: 'text.secondary' }}>
              Filter by Tags
            </Box>
            <Autocomplete
              multiple
              freeSolo
              options={loadedTags}
              value={tagsInput}
              onChange={(_, val) => setTagsInput(val as string[])}
              renderInput={(params) => <TextField {...params} placeholder="Add tags..." />}
              sx={{ '& .MuiOutlinedInput-root': { height: 'auto', minHeight: '2.5rem', py: 0.5 } }}
            />
          </Box>
          <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>
-      <Grid container spacing={4} direction="row">
+          <Button
-        {/* LEFT → 1/3 */}
+            variant="contained"
-        <Grid size={4}>
+            size="large"
-          <LatestItemsList
+            onClick={() => {
-            title={`Recent ${mode === "expense" ? "Expenses" : "Income"}`}
+              setAppliedPayees(payeeInput);
-            items={currentLatest}
+              setAppliedTags(tagsInput);
-            onViewAll={() => {}}
+            }}
-          />
+            disabled={isLoading}
-        </Grid>
+            sx={{ height: 40, borderRadius: 2 }}
-
+          >
-        {/* RIGHT → 2/3 */}
+            Apply
-        <Grid size={8}>
+          </Button>
-          <HistoryChart
+        </Paper>
-            header={`${mode === "expense" ? "Expense" : "Income"} Breakdown`}
+      </Container>
-            summary="Interactive chronological tracking"
+      <DashboardView
-            tabs={["Week", "Month", "Year"]}
+        config={configuration}
-            data={currentData?.chartData || {}}
+        data={data}
-          />
+        state={state}
-        </Grid>
+        stateSetters={stateSetters}
-      </Grid>
+        isFetching={report.isFetching}
-    </Container>
+      />
    </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[]) ?? ["axis", "icici_ocr"];
  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(", ")}
            >
              {["pending", "processing", "paused", "raw_expenses_done", "enriched_done", "completed", "failed"].map((s) => (
                <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: {
@@ -83,12 +83,40 @@ export default function Header({
        <Typography
          variant="h6"
          noWrap
-          sx={{ flexGrow: 1, fontWeight: "bold", cursor: "pointer" }}
+          sx={{ fontWeight: "bold", cursor: "pointer" }}
          onClick={() => navigate("/")}
        >
          {headerTitle}
        </Typography>
        <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 ? (
          <>
@@ -101,10 +129,10 @@ export default function Header({
            >
              <Button
                color="inherit"
-                onClick={() => navigate("/dashboard")}
+                onClick={() => navigate("/admin")}
                sx={{ textTransform: "none", fontWeight: 500 }}
              >
-                Dashboard
+                Admin
              </Button>
              <Button
                color="inherit"
--- 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)",
        minHeight: "calc(100vh - 64px)", // accounting for header
        display: "flex",
-        alignItems: "center",
+        flexDirection: "column",
        justifyContent: "center",
        position: "relative",
        overflow: "hidden",
        "&::before": {
          content: '""',
          position: "absolute",
-          top: "-20%",
+          top: "-15%",
-          left: "-10%",
+          left: "-8%",
-          width: "50%",
+          width: "45%",
-          height: "60%",
+          height: "55%",
-          background: "radial-gradient(circle, rgba(99,102,241,0.15) 0%, rgba(0,0,0,0) 70%)",
+          background: "radial-gradient(circle, rgba(99,102,241,0.12) 0%, transparent 70%)",
          zIndex: 0,
        },
        "&::after": {
          content: '""',
          position: "absolute",
-          bottom: "-20%",
+          bottom: "-15%",
-          right: "-10%",
+          right: "-8%",
-          width: "50%",
+          width: "45%",
-          height: "60%",
+          height: "55%",
-          background: "radial-gradient(circle, rgba(236,72,153,0.15) 0%, rgba(0,0,0,0) 70%)",
+          background: "radial-gradient(circle, rgba(236,72,153,0.1) 0%, transparent 70%)",
          zIndex: 0,
        },
      }}
    >
-      <Container maxWidth="lg" sx={{ position: "relative", zIndex: 1 }}>
+      <Container maxWidth="lg" sx={{ position: "relative", zIndex: 1, flex: 1, display: "flex", flexDirection: "column", justifyContent: "center", py: 6 }}>
-        <Stack
+        <Box
          spacing={4}
          alignItems="center"
          textAlign="center"
          sx={{
-            p: { xs: 4, md: 8 },
+            textAlign: "center",
-            backdropFilter: "blur(20px)",
+            mb: 6,
            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)",
          }}
        >
          <Typography
            variant="h1"
            sx={{
              fontWeight: 800,
-              fontSize: { xs: "3rem", md: "5rem" },
+              fontSize: { xs: "2.5rem", sm: "3.5rem", md: "5rem" },
-              background: "linear-gradient(45deg, #6366f1 30%, #ec4899 90%)",
+              background: "linear-gradient(135deg, #6366f1 0%, #ec4899 50%, #f59e0b 100%)",
              WebkitBackgroundClip: "text",
              WebkitTextFillColor: "transparent",
              letterSpacing: "-0.03em",
              mb: 2,
            }}
          >
@@ -72,36 +182,65 @@ 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"
              endIcon={<ArrowForwardIcon />}
-              onClick={() => navigate("/admin")}
+              onClick={() => navigate("/dashboard")}
              sx={{
                px: 4,
-                py: 1.5,
+                py: 1.4,
                borderRadius: "50px",
-                fontWeight: "bold",
+                fontWeight: 700,
-                background: "linear-gradient(45deg, #6366f1 30%, #ec4899 90%)",
+                background: "linear-gradient(135deg, #6366f1 0%, #ec4899 100%)",
-                transition: "transform 0.2s ease-in-out, box-shadow 0.2s",
+                transition: "transform 0.2s ease, box-shadow 0.2s",
                "&:hover": {
-                  transform: "translateY(-3px)",
+                  transform: "translateY(-2px)",
-                  boxShadow: "0 8px 20px rgba(236,72,153,0.4)",
+                  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
@@ -0,0 +1,61 @@
 import * as React from "react";
 import {
  ReportData,
  GroupKey,
 } from "../../features/report";
 export type DashboardFlow = "outflows" | "inflows";
 export type DashboardPeriodType = "rolling" | "calendar";
 export type DashboardSelectedPeriodId = string | null;
 export interface DashboardState {
  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;
  component: React.ComponentType<any>;
  summary?: string;
  settings?: Record<string, any>;
 }
 export interface DashboardConfig {
  sections: DashboardSection[];
 }
 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.view.tsx
+++ b/src/components/Dashboard/Dashboard.view.tsx
@@ -0,0 +1,105 @@
 import * as React from "react";
 import {
  Box,
  Container,
  Grid,
  ToggleButton,
  ToggleButtonGroup,
  Button
 } from "@mui/material";
 import { useTheme, alpha } from "@mui/material/styles";
 import { DashboardViewProps } from "./Dashboard.models";
 export default function DashboardView({
  config,
  data,
  state,
  stateSetters,
  isFetching,
 }: DashboardViewProps) {
  const theme = useTheme();
  const {
    flow,
    selectedGroupKey,
  } = state;
  const colorScheme = flow === "outflows" ? theme.palette.flows.outflows : theme.palette.flows.inflows;
  return (
    <Container
      sx={{
        mt: 4,
        mb: 4,
        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",
      }}
    >
      <Box
        sx={{
          display: "flex",
          flexDirection: "column",
          alignItems: "center",
          mb: 3,
        }}
      >
        <ToggleButtonGroup
          value={flow}
          exclusive
          onChange={stateSetters.toggleFlow}
          sx={{
            borderRadius: 3,
            overflow: "hidden",
            "& .MuiToggleButton-root": {
              px: 3,
              textTransform: "none",
              color: "text.secondary",
            },
            "&.Mui-selected": {
              bgcolor: colorScheme.primary,
              color: "white",
              borderColor: colorScheme.primary,
            },
          }}
        >
          <ToggleButton value="outflows">Outflows</ToggleButton>
          <ToggleButton value="inflows">Inflows</ToggleButton>
        </ToggleButtonGroup>
        {selectedGroupKey && Object.keys(selectedGroupKey).length > 0 && (
          <Button
            size="small"
            sx={{ mt: 1, textTransform: "none" }}
            onClick={() => 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={12}>
              <Component
                {...section}
                reportData={data}
                state={state}
                stateSetters={stateSetters}
                isFetching={isFetching}
                colorScheme={colorScheme}
              />
            </Grid>
          );
        })}
      </Grid>
    </Container>
  );
 }
--- a/src/components/Dashboard/index.ts
+++ b/src/components/Dashboard/index.ts
@@ -0,0 +1,2 @@
 export { default } from "./Dashboard.view";
 export * from "./Dashboard.models";
--- a/src/components/HistoryChart.tsx
+++ b/src/components/HistoryChart.tsx
@@ -1,170 +0,0 @@
 import * as React from "react";
 import { Box, Typography, ToggleButtonGroup, ToggleButton, Paper } from "@mui/material";
 export interface ChartDataPoint {
  id: string;
  amount: number;
  count?: number;
  highlighted?: boolean;
 }
 export interface HistoryChartProps {
  header: string;
  summary?: string;
  tabs: string[];
  data: Record<string, ChartDataPoint[]>;
 }
 export default function HistoryChart({
  header,
  summary,
  tabs,
  data,
 }: HistoryChartProps) {
  const [activeTab, setActiveTab] = React.useState<string>(tabs[0] || "");
  const handleTabChange = (_: React.MouseEvent<HTMLElement>, newTab: string | null) => {
    if (newTab !== null) {
      setActiveTab(newTab);
    }
  };
  const activeDataKey = activeTab.toLowerCase();
  const rawData = data[activeDataKey] || data[activeTab] || [];
  const currentData = [...rawData].reverse();
  const maxAmount =
    currentData.length > 0
      ? Math.max(...currentData.map((d) => d.amount), 1)
      : 1;
  // ✅ Formatter (₹ + adaptive units)
  const formatAmount = (amount: number) => {
    const tab = activeTab.toLowerCase();
    if (amount === 0) return "";
    if (tab === "year") {
      if (amount >= 100000) {
        return `₹ ${(amount / 100000).toFixed(2)} L`;
      }
      return `₹ ${amount.toLocaleString("en-IN")}`;
    }
    if (tab === "month") {
      if (amount >= 1000) {
        return `₹ ${(amount / 1000).toFixed(1)} K`;
      }
      return `₹ ${amount.toLocaleString("en-IN")}`;
    }
    return `₹ ${amount.toLocaleString("en-IN")}`;
  };
  return (
    <Paper sx={{ p: { xs: 2, sm: 4 }, borderRadius: 4, width: "100%", boxShadow: 'none', border: '1px solid', borderColor: 'divider' }}>
      <Typography variant="h6" fontWeight={700} gutterBottom>
        {header}
      </Typography>
      {summary && (
        <Typography variant="body2" color="text.secondary" sx={{ mb: 3 }}>
          {summary}
        </Typography>
      )}
      <ToggleButtonGroup
        value={activeTab}
        exclusive
        onChange={handleTabChange}
        fullWidth
        sx={{
          mb: 4,
          bgcolor: (theme) => theme.palette.mode === 'dark' ? 'rgba(255,255,255,0.05)' : 'rgba(0,0,0,0.02)',
          borderRadius: 8,
          p: 0.5,
          "& .MuiToggleButton-root": {
            border: "none",
            borderRadius: 8,
            textTransform: "capitalize",
            fontWeight: 600,
            color: "text.secondary",
            "&.Mui-selected": {
              bgcolor: (theme) => theme.palette.mode === 'dark' ? 'primary.dark' : 'primary.light',
              color: (theme) => theme.palette.mode === 'dark' ? 'primary.contrastText' : 'primary.main',
              boxShadow: '0 2px 8px rgba(0,0,0,0.05)',
            },
          },
        }}
      >
        {tabs.map((tab) => (
          <ToggleButton key={tab} value={tab}>
            {tab}
          </ToggleButton>
        ))}
      </ToggleButtonGroup>
      {/* Chart Area */}
      {currentData.length > 0 ? (
        <Box sx={{ display: "flex", alignItems: "flex-end", height: 200, mt: 4, position: 'relative' }}>
          {currentData.map((point) => {
            const heightPerc = (point.amount / maxAmount) * 100;
            return (
              <Box
                key={
                  activeTab.toLowerCase() === "month"
                  ? point.id.replace(" - ", "\n")
                  : point.id
                }
                sx={{
                  flex: 1,
                  display: "flex",
                  flexDirection: "column",
                  alignItems: "center",
                  justifyContent: "flex-end",
                  height: "100%",
                }}
              >
                <Typography
                  variant="caption"
                  color="text.secondary"
                  sx={{
                    mt: 1,
                    fontWeight: 500,
                    fontSize: '0.7rem',
                    textAlign: 'center',
                    whiteSpace: 'pre-line'
                  }}
                >
                  {point.amount > 0 ? formatAmount(point.amount) : ""}
                </Typography>
                <Box
                  sx={{
                    width: "40%",
                    minWidth: 12,
                    maxWidth: 32,
                    height: `${heightPerc}%`,
                    minHeight: "4px",
                    bgcolor: point.highlighted ? "error.main" : "grey.300",
                    borderRadius: 4,
                    transition: "height 0.5s cubic-bezier(0.4, 0, 0.2, 1)",
                    ...(point.highlighted && {
                      boxShadow: (theme) => `0 4px 12px ${theme.palette.error.main}40`,
                    }),
                  }}
                />
                <Typography variant="caption" color="text.secondary" sx={{ mt: 1, fontWeight: 500, fontSize: '0.7rem' }}>
                  {point.id}
                </Typography>
              </Box>
            );
          })}
        </Box>
      ) : (
        <Box sx={{ height: 200, display: "flex", alignItems: "center", justifyContent: "center" }}>
          <Typography color="text.secondary">No Data Available</Typography>
        </Box>
      )}
    </Paper>
  );
 }
--- a/src/components/HistoryChart/HistoryChart.adapter.ts
+++ b/src/components/HistoryChart/HistoryChart.adapter.ts
@@ -0,0 +1,73 @@
 import { ReportData } from "../../features/report";
 import {
  mergeBucketPeriods,
  getAmount,
  PeriodKey,
 } from "../report.helpers";
 import { ChartDataPoint } from "./HistoryChart.models";
 // ─── Tab → PeriodKey ─────────────────────────────────────────
 const TAB_TO_KEY: Record<string, PeriodKey> = {
  Daily: "daily",
  Weekly: "weekly",
  Monthly: "monthly",
  "All Time": "all",
 };
 export function tabToKey(tab: string): PeriodKey {
  return TAB_TO_KEY[tab] ?? "all";
 }
 // ─── Comparison ──────────────────────────────────────────────
 function attachComparison(
  points: ChartDataPoint[],
  key: PeriodKey
 ): ChartDataPoint[] {
  const getCompareIndex = (i: number) => {
    if (key === "daily") return i - 7;
    if (key === "weekly") return i - 4;
    if (key === "monthly") return i - 12;
    return -1;
  };
  return points.map((p, i) => {
    const ci = getCompareIndex(i);
    return {
      ...p,
      compare:
        ci >= 0 && points[ci]
          ? {
              id: points[ci].id,
              label: points[ci].label,
              amount: points[ci].amount,
            }
          : undefined,
    };
  });
 }
 // ─── Main adapter ────────────────────────────────────────────
 export function buildChartData(
  reportData: ReportData,
  key: PeriodKey,
  flow: "outflows" | "inflows",
  comparison: boolean
 ): ChartDataPoint[] {
  const merged = mergeBucketPeriods(reportData.buckets, key);
  let points: ChartDataPoint[] = merged.map((p) => ({
    id: p.id,
    label: p.label,
    amount: getAmount(p),
  }));
  if (comparison) {
    points = attachComparison(points, key);
  }
  return points;
 }
--- a/src/components/HistoryChart/HistoryChart.models.ts
+++ b/src/components/HistoryChart/HistoryChart.models.ts
@@ -0,0 +1,10 @@
 export interface _ChartDataPoint {
  id: string;
  label: string;
  amount: number;
  highlighted?: boolean;
 }
 export interface ChartDataPoint extends _ChartDataPoint {
  compare?: _ChartDataPoint;
 }
--- 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
@@ -0,0 +1,96 @@
 import * as React from "react";
 import HistoryChartView from "./HistoryChart.view";
 import { buildChartData, tabToKey } from "./HistoryChart.adapter";
 import { HistoryChartProps } from "./HistoryChart.props";
 export default function HistoryChart(props: HistoryChartProps) {
  const {
    settings,
    reportData,
    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, flow, comparison);
  }, [reportData, activeDataKey, flow, comparison]);
  const maxAmount =
    currentData.length > 0
      ? Math.max(
          ...currentData.flatMap((d) =>
            comparison
              ? [d.amount, ...(d.compare ? [d.compare.amount] : [])]
              : [d.amount]
          ),
          1
        )
      : 1;
  const visibleCountMap = {
    daily: 7,
    weekly: 6,
    monthly: 4,
    all: 4,
  };
  const visibleCount = visibleCountMap[activeDataKey] ?? 4;
  const total = currentData.length;
  const clampedStartIndex = Math.min(
    startIndex,
    Math.max(total - visibleCount, 0)
  );
  React.useEffect(() => {
    if (startIndex !== clampedStartIndex) {
      setStartIndex(clampedStartIndex);
    }
  }, [startIndex, clampedStartIndex]);
  const visibleData = currentData.slice(
    clampedStartIndex,
    clampedStartIndex + visibleCount
  );
  React.useEffect(() => {
    setSelectedPeriodId(null);
  }, [activeTab]);
  React.useEffect(() => {
    if (
      selectedPeriodId &&
      !visibleData.some((p) => p.id === selectedPeriodId)
    ) {
      setSelectedPeriodId(null);
    }
  }, [visibleData, selectedPeriodId]);
  return (
    <HistoryChartView
      {...props}
      activeTab={activeTab}
      setActiveTab={setActiveTab}
      currentData={currentData}
      visibleData={visibleData}
      maxAmount={maxAmount}
      visibleCount={visibleCount}
      startIndex={clampedStartIndex}
      setStartIndex={setStartIndex}
      activeDataKey={activeDataKey}
    />
  );
 }
--- a/src/components/HistoryChart/HistoryChart.utils.ts
+++ b/src/components/HistoryChart/HistoryChart.utils.ts
@@ -0,0 +1,27 @@
 import { ChartDataPoint } from "./HistoryChart.models";
 export const formatDisplay = (
  point: ChartDataPoint,
  tab: string,
  comparison: boolean
 ) => {
  const base = point.amount;
  const cmp = point.compare?.amount ?? 0;
  const formatShort = (val: number) => {
    if (tab === "monthly" && val >= 100000) {
      return `${(val / 100000).toFixed(2)}L`;
    }
    if (tab === "weekly" && val >= 1000) {
      return `${(val / 1000).toFixed(1)}K`;
    }
    return val.toLocaleString("en-IN");
  };
  if (!comparison) return `₹ ${formatShort(base)}`;
  const diff = base - cmp;
  const sign = diff >= 0 ? "+" : "-";
  return `₹ ${formatShort(base)} (${sign}${formatShort(Math.abs(diff))})`;
 };
--- a/src/components/HistoryChart/HistoryChart.view.tsx
+++ b/src/components/HistoryChart/HistoryChart.view.tsx
@@ -0,0 +1,205 @@
 import * as React from "react";
 import {
  Box,
  Typography,
  ToggleButtonGroup,
  ToggleButton,
  Paper
 } from "@mui/material";
 import { useTheme, alpha } from "@mui/material/styles";
 import IconButton from "@mui/material/IconButton";
 import ChevronLeftIcon from "@mui/icons-material/ChevronLeft";
 import ChevronRightIcon from "@mui/icons-material/ChevronRight";
 import {
  HistoryChartViewProps,
 } from "./HistoryChart.props";
 import { formatDisplay } from "./HistoryChart.utils";
 export default function HistoryChartView({
  title,
  summary,
  settings,
  state,
  stateSetters,
  isFetching,
  colorScheme,
  activeTab,
  setActiveTab,
  currentData,
  visibleData,
  maxAmount,
  visibleCount,
  startIndex,
  setStartIndex,
  activeDataKey,
 }: HistoryChartViewProps) {
  const { flow, periodType, selectedPeriodId, comparison } = state;
  const { togglePeriodType, setSelectedPeriodId, toggleComparison } = stateSetters;
  const theme = useTheme();
  const isDark = theme.palette.mode === "dark";
  const total = currentData.length;
  const maxStartIndex = Math.max(total - visibleCount, 0);
  const clampedStartIndex = Math.min(startIndex, maxStartIndex);
  const handleTabChange = (_: React.MouseEvent<HTMLElement>, newTab: string | null) => {
    if (newTab !== null) setActiveTab(newTab);
  };
  const canGoLeft = clampedStartIndex > 0;
  const canGoRight = clampedStartIndex < maxStartIndex;
  const handlePrev = () => {
    if (!canGoLeft) return;
    setStartIndex((prev) => Math.max(prev - visibleCount, 0));
  };
  const handleNext = () => {
    if (!canGoRight) return;
    setStartIndex((prev) => {
      const next = prev + visibleCount;
      return Math.min(next, maxStartIndex);
    });
  };
  return (
    <Paper
      sx={{
        p: { xs: 2.5, sm: 4 },
        borderRadius: 4,
        width: "100%",
        boxShadow: "none",
        border: "1px solid",
        borderColor: "divider",
        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>
        {title}
      </Typography>
      {summary && (
        <Typography variant="body2" color="text.secondary" sx={{ mb: 3 }}>
          {summary}
        </Typography>
      )}
      <ToggleButtonGroup value={activeTab} exclusive onChange={handleTabChange} fullWidth sx={{ mb: 4 }}>
        {settings.tabs.map((tab) => (
          <ToggleButton key={tab} value={tab}>
            {tab}
          </ToggleButton>
        ))}
      </ToggleButtonGroup>
      <Box sx={{ display: "flex", justifyContent: "space-between", mb: 3 }}>
        <ToggleButtonGroup value={periodType} exclusive onChange={togglePeriodType} size="small">
          <ToggleButton value="rolling">Rolling</ToggleButton>
          <ToggleButton value="calendar">Calendar</ToggleButton>
        </ToggleButtonGroup>
        <ToggleButton
          value="compare"
          selected={comparison}
          onChange={toggleComparison}
          size="small"
        >
          Compare
        </ToggleButton>
      </Box>
      {currentData.length > 0 ? (
        <Box sx={{ position: "relative", mt: 4 }}>
          {canGoLeft && (
            <IconButton onClick={handlePrev} size="small" sx={{ position: "absolute", left: 0, top: "50%" }}>
              <ChevronLeftIcon fontSize="small" />
            </IconButton>
          )}
          <Box sx={{ display: "flex", alignItems: "flex-end", height: 220, mt: 4 }}>
            {visibleData.map((point) => {
              const currentHeight = (point.amount / maxAmount) * 100;
              const compareHeight = comparison
                ? ((point.compare?.amount ?? 0) / maxAmount) * 100
                : 0;
              const isSelected = selectedPeriodId === point.id;
              const display = formatDisplay(point, activeDataKey, comparison);
              return (
                <Box
                  key={point.id}
                  onClick={() =>
                    setSelectedPeriodId(isSelected ? null : point.id)
                  }
                  sx={{
                    flex: 1,
                    display: "flex",
                    flexDirection: "column",
                    alignItems: "center",
                    cursor: "pointer",
                    height: "100%"
                  }}
                >
                  <Box sx={{ display: "flex", alignItems: "flex-end", gap: 1, height: "100%" }}>
                    {comparison && (
                      <Box
                        sx={{
                          width: 8,
                          height: `${compareHeight}%`,
                          bgcolor: alpha(colorScheme.primary, 0.4),
                          borderRadius: "4px 4px 0 0"
                        }}
                      />
                    )}
                    <Box
                      sx={{
                        width: 12,
                        height: `${currentHeight}%`,
                        bgcolor: isSelected ? "warning.main" : colorScheme.primary,
                        borderRadius: "4px 4px 0 0"
                      }}
                    />
                  </Box>
                  <Typography variant="caption">
                    {point.label}
                  </Typography>
                  {comparison && point.compare && (
                    <Typography variant="caption" color="text.secondary">
                      {point.compare.label}
                    </Typography>
                  )}
                  <Typography variant="caption">
                    {display}
                  </Typography>
                </Box>
              );
            })}
          </Box>
          {canGoRight && (
            <IconButton onClick={handleNext} size="small" sx={{ position: "absolute", right: 0, top: "50%" }}>
              <ChevronRightIcon fontSize="small" />
            </IconButton>
          )}
        </Box>
      ) : (
        <Box sx={{ height: 200, display: "flex", alignItems: "center", justifyContent: "center" }}>
          <Typography color="text.secondary">No Data Available</Typography>
        </Box>
      )}
    </Paper>
  );
 }
--- a/src/components/HistoryChart/index.ts
+++ b/src/components/HistoryChart/index.ts
@@ -0,0 +1,2 @@
 export { default } from "./HistoryChart";
 export * from "./HistoryChart.models";
--- a/src/components/LatestItems/LatestItems.adapter.ts
+++ b/src/components/LatestItems/LatestItems.adapter.ts
@@ -0,0 +1,31 @@
 import { ReportData, GroupKey } from "../../features/report";
 import {
  formatCurrency,
  extractFilteredTransactions,
 } from "../report.helpers";
 import { LatestItem } from "./LatestItems.models";
 // ─── Main adapter ────────────────────────────────────────────
 export function buildLatestItems(
  reportData: ReportData,
  selectedPeriodId: string | null | undefined,
  selectedGroupKey: GroupKey | null | undefined,
  flow: "outflows" | "inflows"
 ): LatestItem[] {
  const txns = extractFilteredTransactions(reportData, selectedPeriodId, selectedGroupKey);
  return txns
    .sort(
      (a, b) =>
        new Date(b.occurred_at).getTime() -
        new Date(a.occurred_at).getTime()
    )
    .map((t, index) => ({
      id: index + 1,
      title: t.payee.name,
      subtitle: t.tags.map((tag) => tag.name).join(", "),
      amount: formatCurrency(t.amount),
      timeAgo: new Date(t.occurred_at).toLocaleDateString("en-IN"),
    }));
 }
--- a/src/components/LatestItems/LatestItems.models.ts
+++ b/src/components/LatestItems/LatestItems.models.ts
@@ -0,0 +1,7 @@
 export interface LatestItem {
  id: string | number;
  title: string;
  subtitle: string;
  amount: string;
  timeAgo: string;
 }
--- 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
@@ -0,0 +1,40 @@
 import * as React from "react";
 import { buildLatestItems } from "./LatestItems.adapter";
 import LatestItemsView from "./LatestItems.view";
 import { LatestItemsProps } from "./LatestItems.props";
 export default function LatestItems(props: LatestItemsProps) {
  const {
    reportData,
    state,
    stateSetters,
    isFetching,
  } = props;
  const { flow, selectedPeriodId, selectedGroupKey } = state;
  const [visibleCount, setVisibleCount] = React.useState(5);
  // Reset count when flow changes to start clean
  React.useEffect(() => {
    setVisibleCount(5);
  }, [flow]);
  const allItems = React.useMemo(() => {
    return buildLatestItems(reportData, selectedPeriodId, selectedGroupKey, flow);
  }, [reportData, selectedPeriodId, selectedGroupKey, flow]);
  const visibleItems = React.useMemo(() => {
    return allItems.slice(0, visibleCount);
  }, [allItems, visibleCount]);
  const canExpand = visibleCount < allItems.length;
  return (
    <LatestItemsView
      {...props}
      items={visibleItems}
      canExpand={canExpand}
      onExpand={() => setVisibleCount((prev) => prev + 5)}
    />
  );
 }
--- a/src/components/LatestItems/LatestItems.view.tsx
+++ b/src/components/LatestItems/LatestItems.view.tsx
@@ -7,51 +7,30 @@ import {
  Avatar,
  Typography,
  Box,
-  Button,
+  IconButton,
 } from "@mui/material";
 import { alpha } from "@mui/material/styles";
 import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
 import { LatestItemsViewProps } from "./LatestItems.props";
-export interface LatestItem {
+export default function LatestItemsView({
  id: string | number;
  icon: React.ReactNode;
  iconBgColor?: string;
  title: string;
  subtitle: string;
  amount: string;
  timeAgo: string;
 }
 export interface LatestItemsListProps {
  title?: string;
  items: LatestItem[];
  onViewAll?: () => void;
 }
 export default function LatestItemsList({
  title = "Recent Transactions",
  items,
-  onViewAll,
+  title,
-}: LatestItemsListProps) {
+  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" }}>
-      {/* Header */}
+      <Box sx={{ mb: 2, px: 2 }}>
      <Box sx={{ display: "flex", justifyContent: "space-between", alignItems: "center", mb: 2, px: 2 }}>
        <Typography variant="h6" fontWeight="bold">
          {title}
        </Typography>
        {onViewAll && (
          <Button
            variant="text"
            color="inherit"
            size="small"
            sx={{ textTransform: "none", color: "text.secondary", fontWeight: "medium" }}
            onClick={onViewAll}
          >
            view all
          </Button>
        )}
      </Box>
      {/* List */}
      <List disablePadding>
        {items.map((item, index) => (
          <ListItem
@@ -62,28 +41,24 @@ export default function LatestItemsList({
              mb: index !== items.length - 1 ? 1 : 0,
              borderRadius: 3,
              "&:hover": { bgcolor: "action.hover" },
              transition: "background-color 0.2s ease",
            }}
          >
            <ListItemAvatar>
              <Avatar
                variant="rounded"
                sx={{
-                  bgcolor: item.iconBgColor || "grey.200",
+                  bgcolor: alpha(accentColor, 0.13),
                  color: "inherit",
                  width: 48,
                  height: 48,
                  borderRadius: 3,
                  mr: 2,
                }}
-              >
+              />
                {item.icon}
              </Avatar>
            </ListItemAvatar>
-            
+
            <ListItemText
              primary={
-                <Typography variant="subtitle1" fontWeight={600} color="text.primary">
+                <Typography variant="subtitle1" fontWeight={600}>
                  {item.title}
                </Typography>
              }
@@ -95,15 +70,23 @@ export default function LatestItemsList({
            />
            <Box sx={{ textAlign: "right" }}>
-              <Typography variant="subtitle1" fontWeight={700} color="text.primary">
+              <Typography variant="subtitle1" fontWeight={700}>
                {item.amount}
              </Typography>
-              <Typography variant="caption" color="text.secondary" sx={{ display: 'block', mt: 0.5 }}>
+              <Typography variant="caption" color="text.secondary">
                {item.timeAgo}
              </Typography>
            </Box>
          </ListItem>
        ))}
        {canExpand && (
          <Box sx={{ display: "flex", justifyContent: "center", mt: 2 }}>
            <IconButton size="small" onClick={onExpand}>
              <ExpandMoreIcon />
            </IconButton>
          </Box>
        )}
      </List>
    </Box>
  );
--- a/src/components/LatestItems/index.ts
+++ b/src/components/LatestItems/index.ts
@@ -0,0 +1,2 @@
 export { default } from "./LatestItems";
 export * from "./LatestItems.models";
--- a/src/components/ProgressCard.tsx
+++ b/src/components/ProgressCard.tsx
@@ -1,80 +0,0 @@
 import * as React from "react";
 import { Box, Typography, Paper, LinearProgress, linearProgressClasses } from "@mui/material";
 export interface ProgressCardProps {
  header: string;
  summary?: string;
  progressAmount: number;
  totalAmount: number;
  colorTheme?: "primary" | "secondary" | "error" | "info" | "success" | "warning";
 }
 export default function ProgressCard({
  header,
  summary,
  progressAmount,
  totalAmount,
  colorTheme = "info",
 }: ProgressCardProps) {
  const percentage = Math.min(100, Math.max(0, (progressAmount / totalAmount) * 100)) || 0;
  const displaySummary = summary ?? `Rs ${progressAmount} / Rs ${totalAmount}`;
  const parts = displaySummary.split('/');
  const prefixAmount = parts[0]?.trim() || '';
  const suffixString = parts.length > 1 ? `/ ${parts.slice(1).join('/').trim()}` : '';
  return (
    <Paper
      elevation={4}
      sx={{
        width: "100%",
        p: { xs: 3, md: 4 },
        borderRadius: 4,
        background: (theme) =>
          colorTheme === "info"
            ? "linear-gradient(135deg, #0284c7 0%, #06b6d4 100%)"
            : `linear-gradient(135deg, ${theme.palette[colorTheme].main} 0%, ${theme.palette[colorTheme].light} 100%)`,
        color: "#fff",
        display: "flex",
        flexDirection: "column",
        alignItems: "center",
        justifyContent: "center",
        position: 'relative',
        overflow: 'hidden',
        boxShadow: (theme) => `0 12px 24px -10px ${theme.palette.mode === 'dark' ? '#000' : theme.palette[colorTheme].main}`,
      }}
    >
      <Typography variant="subtitle1" fontWeight={600} sx={{ opacity: 0.9, mb: 1 }}>
        {header}
      </Typography>
      <Typography variant="h3" fontWeight={800} sx={{ mb: 3 }}>
        {prefixAmount}{" "}
        {suffixString && (
          <Typography component="span" variant="subtitle1" sx={{ opacity: 0.7, fontWeight: 500 }}>
            {suffixString}
          </Typography>
        )}
      </Typography>
      <Box sx={{ width: "85%" }}>
        <LinearProgress
          variant="determinate"
          value={percentage}
          sx={{
            height: 10,
            borderRadius: 5,
            [`&.${linearProgressClasses.colorPrimary}`]: {
              backgroundColor: "rgba(0, 0, 0, 0.2)",
            },
            [`& .${linearProgressClasses.bar}`]: {
              borderRadius: 5,
              backgroundColor: "#fff", 
            },
          }}
        />
      </Box>
    </Paper>
  );
 }
--- 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.view.tsx
+++ b/src/components/ProgressCard/ProgressCard.view.tsx
@@ -0,0 +1,129 @@
 import * as React from "react";
 import {
  Box,
  Typography,
  Paper,
  LinearProgress,
  Divider,
  linearProgressClasses
 } from "@mui/material";
 import { useTheme, alpha } from "@mui/material/styles";
 import { getPercentage, formatCurrency } from "../report.helpers";
 import { ProgressCardViewProps } from "./ProgressCard.props";
 export default function ProgressCardView({
  title,
  settings,
  isFetching,
  colorScheme,
  progressAmount,
  totalAmount,
  selected,
  onClick,
 }: ProgressCardViewProps) {
  const theme = useTheme();
  const percentage = getPercentage(progressAmount, totalAmount);
  const formattedProgress = formatCurrency(progressAmount);
  const formattedTotal = formatCurrency(totalAmount);
  return (
    <Paper
      elevation={settings.compact ? 2 : 4}
      onClick={onClick}
      sx={{
        width: "100%",
        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",
        bgcolor: colorScheme.surface,
        color: colorScheme.text,
        display: "flex",
        flexDirection: "column",
        alignItems: settings.compact ? "flex-start" : "center",
        justifyContent: "center",
        position: "relative",
        overflow: "hidden",
        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={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,
        }}
      >
        {title}
      </Typography>
      <Box sx={{ mb: settings.compact ? 2 : 3, width: "100%" }}>
        <Typography
          variant={settings.compact ? "h5" : "h3"}
          fontWeight={900}
          sx={{
            mb: 0.5,
            lineHeight: 1.2,
          }}
        >
          {formattedProgress}
        </Typography>
        <Divider
          sx={{
            my: 1,
            borderColor: "divider",
            width: "100%",
          }}
        />
        <Typography
          variant={settings.compact ? "caption" : "body2"}
          sx={{
            opacity: 0.85,
            fontWeight: 500,
            display: "block",
            color: alpha(colorScheme.text, 0.85),
          }}
        >
          of {formattedTotal}
        </Typography>
      </Box>
      <Box sx={{ width: "100%", mt: "auto" }}>
        <LinearProgress
          variant="determinate"
          value={percentage}
          sx={{
            height: settings.compact ? 6 : 10,
            borderRadius: 5,
            [`&.${linearProgressClasses.colorPrimary}`]: {
              backgroundColor: alpha(theme.palette.divider, 0.5),
            },
            [`& .${linearProgressClasses.bar}`]: {
              borderRadius: 5,
              backgroundColor: colorScheme.primary,
              boxShadow: `0 0 8px ${alpha(colorScheme.primary, 0.4)}`,
            },
          }}
        />
      </Box>
    </Paper>
  );
 }
--- 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
@@ -0,0 +1,31 @@
 import { ReportData, GroupKey } from "../../features/report";
 import {
  extractFilteredTransactions,
  aggregateTransactions,
 } from "../report.helpers";
 export interface TagItem {
  tag: string;
  amount: number;
 }
 export function extractTopTags(
  reportData: ReportData,
  flow: "outflows" | "inflows",
  selectedPeriodId?: string | null,
  selectedGroupKey?: GroupKey | null
 ): { items: TagItem[]; total: number } {
  const txns = extractFilteredTransactions(reportData, selectedPeriodId, selectedGroupKey);
  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"];
  });
  return {
    items: items.map((item) => ({ tag: item.name, amount: item.amount })),
    total,
  };
 }
--- a/src/components/ProgressCard/TopTags.tsx
+++ b/src/components/ProgressCard/TopTags.tsx
@@ -0,0 +1,83 @@
 import * as React from "react";
 import { Box, Paper, Typography } from "@mui/material";
 import ProgressCardView from "./ProgressCard.view";
 import { extractTopTags } from "./TopTags.adapter";
 import { ProgressCardProps } from "./ProgressCard.props";
 export default function TopTags(props: ProgressCardProps) {
  const {
    title,
    reportData,
    state,
    stateSetters,
    isFetching,
  } = props
  const { flow, selectedPeriodId, selectedGroupKey } = state;
  const { setSelectedGroupKey } = stateSetters;
  const { items, total } = React.useMemo(() => {
    return extractTopTags(reportData, flow, selectedPeriodId, selectedGroupKey);
  }, [reportData, flow, selectedPeriodId, selectedGroupKey]);
  return (
    <Paper
      sx={{
        p: { xs: 2.5, sm: 4 },
        borderRadius: 4,
        width: "100%",
        boxShadow: "none",
        border: "1px solid",
        borderColor: "divider",
        bgcolor: "background.paper",
        opacity: isFetching ? 0.6 : 1,
        transition: "opacity 0.3s ease",
        pointerEvents: isFetching ? "none" : "auto",
      }}
    >
      <Typography variant="h6" fontWeight={700} gutterBottom>
        {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
@@ -0,0 +1,2 @@
 export { default } from "./ProgressCard.view";
 export * from "./ProgressCard.props";
--- a/src/components/report.helpers.ts
+++ b/src/components/report.helpers.ts
@@ -0,0 +1,230 @@
 import {
  ReportPeriod,
  ReportBucket,
  GroupKey,
  PeriodType,
  ReportData,
  Transaction,
 } from "../features/report";
 // ─── Types ────────────────────────────────────────────────────
 export type PeriodKey = PeriodType;
 export type DecoratedPeriod = ReportPeriod & {
  id: string;
  label: string;
 };
 // ─── Period helpers ───────────────────────────────────────────
 const PREFIX_TO_KEY: Record<string, PeriodKey> = {
  D: "daily",
  W: "weekly",
  M: "monthly",
  ALL: "all",
 };
 /**
 * Derive the period key from a decorated-period id.
 * E.g. `"W:2026-04-28_2026-05-04"` → `"weekly"`
 */
 export function periodIdToKey(periodId: string): PeriodKey {
  const prefix = periodId.split(":")[0];
  return PREFIX_TO_KEY[prefix] ?? "all";
 }
 // ─── Metric helpers ───────────────────────────────────────────
 export function getAmount(period: ReportPeriod): number {
  return period.metric.sum;
 }
 function mergeMetric(a: ReportPeriod["metric"], b: ReportPeriod["metric"]) {
  const sum = a.sum + b.sum;
  const count = a.count + b.count;
  return {
    ...a,
    sum,
    count,
    average: count > 0 ? sum / count : 0,
    transactions:
      a.transactions || b.transactions
        ? [...(a.transactions || []), ...(b.transactions || [])]
        : undefined,
  };
 }
 /**
 * Merge periods with the same id across all buckets, summing
 * their metrics and concatenating transactions.
 *
 * Returns sorted by start date ascending.
 */
 export function mergeBucketPeriods(
  buckets: ReportBucket[],
  key: PeriodKey
 ): DecoratedPeriod[] {
  const map = new Map<string, DecoratedPeriod>();
  for (const bucket of buckets) {
    const periods = (bucket.periods[key] || []) as DecoratedPeriod[];
    for (const p of periods) {
      const existing = map.get(p.id);
      if (!existing) {
        map.set(p.id, {
          ...p,
          metric: { ...p.metric },
        });
      } else {
        map.set(p.id, {
          ...existing,
          metric: mergeMetric(existing.metric, p.metric),
        });
      }
    }
  }
  return Array.from(map.values()).sort(
    (a, b) => new Date(a.start).getTime() - new Date(b.start).getTime()
  );
 }
 // ─── Formatting ───────────────────────────────────────────────
 export const formatCurrency = (val: number) => {
  const absVal = Math.abs(val);
  if (absVal >= 100000) {
    return `₹ ${(val / 100000).toFixed(2)}L`;
  }
  if (absVal >= 1000) {
    return `₹ ${(val / 1000).toFixed(2)}k`;
  }
  return `₹ ${val.toFixed(2)}`;
 };
 export const getPercentage = (progressAmount: number, totalAmount: number) => {
  if (!totalAmount) return 0;
  return Math.min(100, Math.max(0, (progressAmount / totalAmount) * 100));
 };
 // ─── Group filtering ──────────────────────────────────────────
 /**
 * Check if a bucket's group_key matches the selected GroupKey.
 * Every dimension present in `selected` must exist in the bucket
 * and contain all the selected values.
 */
 export function matchesGroupKey(
  bucket: ReportBucket,
  selected: GroupKey
 ): boolean {
  for (const [dim, values] of Object.entries(selected)) {
    const bucketValues = bucket.group_key[dim];
    if (!bucketValues) return false;
    if (!(values as string[]).every((v) => bucketValues.includes(v)))
      return false;
  }
  return true;
 }
 /**
 * Return only buckets matching the selected group key,
 * or all buckets if no selection.
 */
 export function filterBuckets(
  buckets: ReportBucket[],
  selectedGroupKey: GroupKey | null
 ): ReportBucket[] {
  if (!selectedGroupKey) return buckets;
  return buckets.filter((b) => matchesGroupKey(b, selectedGroupKey));
 }
 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
@@ -0,0 +1,40 @@
 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: [
    {
      id: "breakdown",
      title: "Breakdown",
      summary: "Interactive chronological tracking",
      component: HistoryChart,
      settings: {
        tabs: ["Weekly", "Monthly"],
      },
    },
    {
      id: "top-categories",
      title: 'Top Categories',
      component: TopTags,
      settings: {
        compact: true,
      },
    },
    {
      id: "top-payees",
      title: 'Top Payees',
      component: TopPayees,
      settings: {
        compact: true,
      },
    },
    {
      id: "items",
      title: 'Recent Transactions',
      component: LatestItems,
    },
  ],
 };
--- 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
@@ -0,0 +1,15 @@
 export {
  useReport
 } from './useReport'
 export type {
  Transaction,
  ReportData,
  ReportBucket,
  ReportPeriod,
  ReportQuery,
  GroupKey,
  PeriodType,
 } from './report.models'
 export {
  prepareReport
 } from './report.utils'
--- a/src/features/report/report.models.ts
+++ b/src/features/report/report.models.ts
@@ -0,0 +1,112 @@
 export interface Payor {
  id?: string;
  name: string;
  username: string;
  email: string;
 }
 export interface Payee {
  type: "merchant" | "person" | "transfer" | "other";
  name: string;
 }
 export interface Account {
  id: string;
  name: string;
  number: string;
  type: "cash" | "bank" | "credit_card" | "wallet" | "other";
  currency: string;
  is_active?: boolean;
 }
 export interface Tag {
  id: string;
  name: string;
  icon: string;
  parent_id?: string | null;
 }
 export interface Transaction {
  id: string;
  payor: Payor;
  payee: Payee;
  amount: number;
  account: Account;
  tags: Tag[];
  occurred_at: string;
  created_at: string;
 }
 // -----------------------------
 // Metrics
 // -----------------------------
 export interface ReportMetric {
  sum: number;
  count: number;
  average: number;
  transactions?: Transaction[];
 }
 // -----------------------------
 // Period
 // -----------------------------
 export type PeriodType = "daily" | "weekly" | "monthly" | "all";
 export interface ReportPeriod {
  start: string;
  end: string;
  metric: ReportMetric;
 }
 // -----------------------------
 // Group (bucket)
 // -----------------------------
 export type GroupKey = {
  [dimension: string]: string[];
 };
 export interface ReportBucket {
  group_key: GroupKey;
  periods: {
    daily?: ReportPeriod[];
    weekly?: ReportPeriod[];
    monthly?: ReportPeriod[];
    all?: ReportPeriod[];
  };
 }
 // -----------------------------
 // Report Query
 // -----------------------------
 export interface ReportQuery {
  accounts?: string[] | null;
  ignore_self?: boolean | null;
  start_date?: string | null;
  end_date?: string | null;
  min_amount?: number | null;
  max_amount?: number | null;
 }
 // -----------------------------
 // Final Report
 // -----------------------------
 export interface ReportData {
  snapshot_id?: string | null;
  flow?: "inflows" | "outflows" | null;
  periods: PeriodType[];
  tags?: string[] | null;
  payee?: string[] | null;
  buckets: ReportBucket[];
  query: ReportQuery;
 }
--- a/src/features/report/report.utils.ts
+++ b/src/features/report/report.utils.ts
@@ -0,0 +1,117 @@
 import {
  ReportData,
  ReportPeriod,
  PeriodType,
 } from "./report.models";
 /* ---------- ID BUILDING ---------- */
 function formatDate(d: Date): string {
  const y = d.getUTCFullYear();
  const m = String(d.getUTCMonth() + 1).padStart(2, "0");
  const day = String(d.getUTCDate()).padStart(2, "0");
  return `${y}-${m}-${day}`;
 }
 function buildPeriodId(
  type: PeriodType,
  start: Date,
  end: Date
 ): string {
  const s = formatDate(start);
  const e = formatDate(end);
  switch (type) {
    case "daily":
      return `D:${s}_${e}`;
    case "weekly":
      return `W:${s}_${e}`;
    case "monthly":
      return `M:${s}_${e}`;
    case "all":
      return `ALL:${s}_${e}`;
    default:
      return `${s}_${e}`;
  }
 }
 /* ---------- LABEL BUILDING ---------- */
 const dayFmt = new Intl.DateTimeFormat("en-GB", {
  day: "numeric",
  month: "short",
  timeZone: "UTC",
 });
 const monthDayFmt = new Intl.DateTimeFormat("en-GB", {
  month: "short",
  day: "numeric",
  timeZone: "UTC",
 });
 const monthFmt = new Intl.DateTimeFormat("en-GB", {
  month: "short",
  timeZone: "UTC",
 });
 const yearFmt = new Intl.DateTimeFormat("en-GB", {
  year: "numeric",
  timeZone: "UTC",
 });
 function buildLabel(
  type: PeriodType,
  start: Date,
  end: Date
 ): string {
  switch (type) {
    case "daily":
      return dayFmt.format(start);
    case "weekly": {
      const sDay = start.getUTCDate();
      const m = monthFmt.format(start);
      return `${sDay} ${m}`;
    }
    case "monthly":
      return `${monthFmt.format(start)} ${yearFmt.format(start)}`;
    default:
      return `${monthDayFmt.format(start)} - ${monthDayFmt.format(end)}`;
  }
 }
 /* ---------- MAIN ---------- */
 function decoratePeriods(
  type: PeriodType,
  periods: ReportPeriod[]
 ): (ReportPeriod & { id: string; label: string })[] {
  return periods.map((p) => ({
    ...p,
    id: buildPeriodId(type, new Date(p.start + "Z"), new Date(p.end + "Z")),
    label: buildLabel(type, new Date(p.start + "Z"), new Date(p.end + "Z")),
  }));
 }
 export function prepareReport(reportData: ReportData): ReportData {
  return {
    ...reportData,
    buckets: reportData.buckets.map((bucket) => {
      const newPeriods: typeof bucket.periods = {};
      for (const type of reportData.periods) {
        const arr = bucket.periods[type];
        if (arr) {
          newPeriods[type] = decoratePeriods(type, arr);
        }
      }
      return {
        ...bucket,
        periods: newPeriods,
      };
    }),
  };
 }
--- a/src/features/report/useReport.ts
+++ b/src/features/report/useReport.ts
@@ -0,0 +1,21 @@
 import { useResourceByName } from "../../../react-openapi";
 export interface ReportParams {
  snapshot_id?: string;
  periods?: ("daily" | "weekly" | "monthly" | "all")[];
  flow?: "inflows" | "outflows";
  payee?: string[];
  tags?: string[];
 }
 export function useReport(params: ReportParams) {
  const { useRead } = useResourceByName("reports");
  return useRead(
    params.snapshot_id ? params.snapshot_id : "latest",
    {
      ...params,
      periods: params.periods,
    }
  );
 }
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -12,64 +12,67 @@ import {
 } from "@mui/material";
 import Home from './Home';
 import Dashboard from './Dashboard';
-import { Admin, initializeApiClients } from '../react-openapi';
+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';
 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';
 // Polyfill Node.js globals for browser environment (needed by SwaggerParser)
 window.Buffer = Buffer;
 window.process = process;
 const rootElement = document.getElementById('root');
 const root = createRoot(rootElement);
 const API_BASE = import.meta.env.VITE_API_BASE_URL;
 const AUTH_BASE = import.meta.env.VITE_AUTH_BASE_URL;
-// Initialize global API clients so all components across khata-ui have generic API access
+const AUTH_BASE = import.meta.env.VITE_AUTH_BASE_URL;
 initializeApiClients(API_BASE, AUTH_BASE);
 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" },
 ];
 root.render(
-  <BrowserRouter>
+  <AppProvider resourceOverrides={configuration} profileConfig={profileConfiguration}>
-    <AuthProvider authBaseUrl={AUTH_BASE}>
+    <BrowserRouter>
-      <AppTheme>
+      <AuthProvider authBaseUrl={AUTH_BASE}>
-        <CssBaseline enableColorScheme />
+        <AppTheme>
-        <Header routerMapping={routerMapping} />
+          <CssBaseline enableColorScheme />
          <Header routerMapping={routerMapping} />
-        <Box sx={{ pb: 8 }}>
+          <Box sx={{ pb: 8 }}>
-          <Toolbar />
+            <Toolbar />
-          <Routes>
+            <Routes>
-            {routerMapping.map(({ path, component: Component }) => (
+              {routerMapping.map(({ path, component: Component }) => (
-              <Route
+                <Route
-                key={path}
+                  key={path}
-                path={path}
+                  path={path}
-                element={
+                  element={
-                  path.startsWith("/admin") ? (
+                    path.startsWith("/admin") ? (
-                    <Component basePath="/admin" resourceOverrides={configuration} profileConfig={profileConfiguration} />
+                      <Component basePath="/admin" />
-                  ) : (
+                    ) : (
-                    <Component />
+                      <Component />
-                  )
+                    )
-                }
+                  }
-              />
+                />
-            ))}
+              ))}
-          </Routes>
+            </Routes>
          </Box>
-        </Box>
+          <Footer />
-
+        </AppTheme>
-        <Footer />
+      </AuthProvider>
-      </AppTheme>
+    </BrowserRouter>
-    </AuthProvider>
+  </AppProvider>
  </BrowserRouter>
 );
--- 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,11 +42,13 @@ export const configuration: Record<string, ResourceOverride> = {
            return `${day}${suffix(day)} ${month} ${year}`;
        }
      },
      amount: {
        filterType: "number-range",
      },
      created_at: {
        display: false
      }
    },
    pagination: true,
  },
 };
--- a/src/shared-theme/AppTheme.tsx
+++ b/src/shared-theme/AppTheme.tsx
@@ -1,53 +1,103 @@
-import * as React from 'react';
+import * as React from "react";
-import { ThemeProvider, createTheme } from '@mui/material/styles';
+import {
-import type { ThemeOptions } from '@mui/material/styles';
+  ThemeProvider,
-import { inputsCustomizations } from './customizations/inputs';
+  createTheme,
-import { dataDisplayCustomizations } from './customizations/dataDisplay';
+  CssBaseline,
-import { feedbackCustomizations } from './customizations/feedback';
+  Box,
-import { navigationCustomizations } from './customizations/navigation';
+} from "@mui/material";
 import { surfacesCustomizations } from './customizations/surfaces';
 import { colorSchemes, typography, shadows, shape } from './themePrimitives';
-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;
-  /**
+  defaultMode?: ColorMode;
-   * This is for the docs site. You can ignore it or remove it.
+};
-   */
+
-  disableCustomTheme?: boolean;
+export default function AppTheme({
-  themeComponents?: ThemeOptions['components'];
+  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>
+    <ColorModeContext.Provider value={contextValue}>
-      {children}
+      <ThemeProvider theme={theme}>
-    </ThemeProvider>
+        <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)}`,
+          backgroundColor: alpha(orange[900], 0.35),
-          border: `1px solid ${alpha(orange[800], 0.5)}`,
+          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],
+                backgroundColor: 'hsla(0, 0%, 100%, 0.06)',
-                borderColor: gray[700],
+                borderColor: (theme.vars || theme).palette.divider,
                '&:hover': {
-                  backgroundColor: gray[900],
+                  backgroundColor: 'hsla(0, 0%, 100%, 0.1)',
-                  borderColor: gray[600],
+                  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],
+          backgroundColor: 'hsla(0, 0%, 100%, 0.06)',
-          borderColor: gray[700],
+          borderColor: (theme.vars || theme).palette.divider,
          '&:hover': {
-            backgroundColor: gray[900],
+            backgroundColor: 'hsla(0, 0%, 100%, 0.1)',
-            borderColor: gray[600],
+            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],
+          background: (theme.vars || theme).palette.background.paper,
-          boxShadow:
+          boxShadow: '0 4px 16px rgba(0, 0, 0, 0.4), 0 8px 24px rgba(0, 0, 0, 0.3)',
            'hsla(220, 30%, 5%, 0.7) 0px 4px 16px 0px, hsla(220, 25%, 10%, 0.8) 0px 8px 16px -5px',
        }),
      }),
    },
@@ -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],
+            backgroundColor: alpha((theme.vars || theme).palette.common.white, 0.08),
-            borderColor: gray[700],
+            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],
+          light: 'hsl(210, 50%, 65%)',
-          main: brand[400],
+          main: 'hsl(210, 55%, 55%)',
-          dark: brand[700],
+          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],
+          contrastText: 'hsl(210, 30%, 80%)',
-          light: brand[500],
+          light: 'hsl(210, 40%, 50%)',
-          main: brand[700],
+          main: 'hsl(210, 35%, 40%)',
-          dark: brand[900],
+          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],
+          light: 'hsl(45, 60%, 55%)',
-          main: orange[500],
+          main: 'hsl(45, 55%, 45%)',
-          dark: orange[700],
+          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],
+          light: 'hsl(0, 55%, 60%)',
-          main: red[500],
+          main: 'hsl(0, 55%, 50%)',
-          dark: red[700],
+          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],
+          light: 'hsl(120, 40%, 55%)',
-          main: green[500],
+          main: 'hsl(120, 40%, 45%)',
-          dark: green[700],
+          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),
+          hover: 'hsla(0, 0%, 100%, 0.06)',
-          selected: alpha(gray[600], 0.3),
+          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],
+        light: 'hsl(210, 50%, 65%)',
-        main: brand[400],
+        main: 'hsl(210, 55%, 55%)',
-        dark: brand[700],
+        dark: 'hsl(210, 50%, 35%)',
      },
      info: {
-        contrastText: brand[300],
+        contrastText: 'hsl(210, 30%, 80%)',
-        light: brand[500],
+        light: 'hsl(210, 40%, 50%)',
-        main: brand[700],
+        main: 'hsl(210, 35%, 40%)',
-        dark: brand[900],
+        dark: 'hsl(210, 30%, 25%)',
      },
      warning: {
-        light: orange[400],
+        light: 'hsl(45, 60%, 55%)',
-        main: orange[500],
+        main: 'hsl(45, 55%, 45%)',
-        dark: orange[700],
+        dark: 'hsl(45, 50%, 30%)',
      },
      error: {
-        light: red[400],
+        light: 'hsl(0, 55%, 60%)',
-        main: red[500],
+        main: 'hsl(0, 55%, 50%)',
-        dark: red[700],
+        dark: 'hsl(0, 50%, 35%)',
      },
      success: {
-        light: green[400],
+        light: 'hsl(120, 40%, 55%)',
-        main: green[500],
+        main: 'hsl(120, 40%, 45%)',
-        dark: green[700],
+        dark: 'hsl(120, 35%, 30%)',
      },
      grey: {
        ...gray,
      },
-      divider: alpha(gray[700], 0.6),
+      divider: 'hsla(0, 0%, 100%, 0.08)',
      background: {
-        default: gray[900],
+        default: darkBg,
-        paper: 'hsl(220, 30%, 7%)',
+        paper: darkPaper,
      },
      text: {
-        primary: 'hsl(0, 0%, 100%)',
+        primary: 'hsl(0, 0%, 92%)',
-        secondary: gray[400],
+        secondary: 'hsl(0, 0%, 60%)',
      },
      action: {
-        hover: alpha(gray[600], 0.2),
+        hover: 'hsla(0, 0%, 100%, 0.06)',
-        selected: alpha(gray[600], 0.3),
+        selected: 'hsla(0, 0%, 100%, 0.1)',
      },
-      baseShadow:
+      flows: {
-        'hsla(220, 30%, 5%, 0.7) 0px 4px 16px 0px, hsla(220, 25%, 10%, 0.8) 0px 8px 16px -5px',
+        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)',
    },
  },
 };
--- a/src/utils/dashboardLoader.ts
+++ b/src/utils/dashboardLoader.ts
@@ -1,238 +0,0 @@
 import { api } from "../../react-openapi";
 import { LatestItem } from "../components/LatestItemsList";
 import { ChartDataPoint } from "../components/HistoryChart";
 import * as React from "react";
 import MonetizationOnIcon from "@mui/icons-material/MonetizationOn";
 // ---------------- ICON ----------------
 const DEFAULT_ICON = React.createElement(MonetizationOnIcon, {
  sx: { color: "#388e3c" }
 });
 // ---------------- HELPERS ----------------
 const format = (d: Date) =>
  `${d.getDate()} ${d.toLocaleString("default", { month: "short" })}`;
 const startOfDay = (d: Date) => {
  const x = new Date(d);
  x.setHours(0, 0, 0, 0);
  return x;
 };
 const endOfDay = (d: Date) => {
  const x = new Date(d);
  x.setHours(23, 59, 59, 999);
  return x;
 };
 const getStartOfWeek = (d: Date) => {
  const date = new Date(d);
  const day = date.getDay() || 7;
  if (day !== 1) date.setDate(date.getDate() - (day - 1));
  return startOfDay(date);
 };
 // ---------------- LATEST ----------------
 export async function fetchLatestTransactions(
  type: "expense" | "income"
 ): Promise<LatestItem[]> {
  const res = await api.get("/expenses", {
    params: { limit: 100, sort: "-occurred_at" }
  });
  const items = res.data?.items || res.data || [];
  const isValid = (amt: number) =>
    type === "expense" ? amt < 0 : amt > 0;
  return items
    .filter((item: any) => isValid(Number(item.amount) || 0))
    .slice(0, 5)
    .map((exp: any, index: number) => {
      const time = new Date(
        exp.occurred_at || exp.created_at || Date.now()
      ).getTime();
      const diffDays = Math.floor(
        Math.abs(Date.now() - time) / (1000 * 60 * 60 * 24)
      );
      return {
        id: exp.id || index,
        icon: DEFAULT_ICON,
        iconBgColor:
          type === "expense" ? "#ffebee" : "#e8f5e9",
        title: exp.payee?.name || exp.payee || "Unknown Payee",
        subtitle: exp.category?.name || exp.account?.name || "Transaction",
        amount: `Rs ${Math.abs(exp.amount || 0)}`,
        timeAgo: diffDays === 0 ? "Today" : `${diffDays} days ago`
      };
    });
 }
 // ---------------- TYPES ----------------
 export interface AggregatedDashboardData {
  chartData: Record<string, ChartDataPoint[]>;
  totalAmount: number;
  topPayees: Array<{ payeeName: string; amount: number }>;
 }
 // ---------------- AGGREGATION ----------------
 // ---------------- AGGREGATION ----------------
 export async function fetchAggregatedData(
  type: "expense" | "income"
 ): Promise<AggregatedDashboardData> {
  const res = await api.get("/expenses", { params: { limit: 0 } });
  const all: any[] = res.data?.items || res.data || [];
  const now = new Date();
  let totalAmount = 0;
  const payeeMap: Record<string, number> = {};
  const isValid = (amt: number) =>
    type === "expense" ? amt < 0 : amt > 0;
  const normalize = (amt: number) => Math.abs(amt);
  // ---------------- WEEK ----------------
  const weekBuckets: Record<string, number> = {
    Mon: 0, Tue: 0, Wed: 0, Thu: 0,
    Fri: 0, Sat: 0, Sun: 0
  };
  const weekStart = getStartOfWeek(now);
  const weekEnd = endOfDay(new Date(weekStart.getTime() + 6 * 86400000));
  // ---------------- MONTH (rolling 5 weeks, Mon–Sun aligned) ----------------
  const monthBuckets: {
    label: string;
    start: Date;
    end: Date;
    amount: number;
  }[] = [];
  const currentWeekStart = getStartOfWeek(now);
  for (let i = 0; i < 5; i++) {
    const start = new Date(currentWeekStart.getTime() - i * 7 * 86400000);
    const end = endOfDay(new Date(start.getTime() + 6 * 86400000));
    monthBuckets.push({
      label: `${format(start)} - ${format(end)}`,
      start,
      end,
      amount: 0
    });
  }
  // ---------------- YEAR (rolling 12 months) ----------------
  const yearBuckets: {
    label: string;
    start: Date;
    end: Date;
    amount: number;
  }[] = [];
  for (let i = 0; i < 12; i++) {
    const d = new Date(now);
    d.setMonth(d.getMonth() - i);
    const start = new Date(d.getFullYear(), d.getMonth(), 1);
    const end =
      i === 0
        ? endOfDay(now) // current month → till now
        : endOfDay(new Date(d.getFullYear(), d.getMonth() + 1, 0));
    const label = `${d.toLocaleString("default", {
      month: "short"
    })}-${String(d.getFullYear()).slice(2)}`;
    yearBuckets.push({
      label,
      start,
      end,
      amount: 0
    });
  }
  // ---------------- LOOP ----------------
  for (const item of all) {
    const d = new Date(
      item.occurred_at || item.created_at || Date.now()
    );
    const amtRaw = Number(item.amount) || 0;
    if (!isValid(amtRaw)) continue;
    const amt = normalize(amtRaw);
    totalAmount += amt;
    const payee = item.payee?.name || item.payee || "Unknown";
    payeeMap[payee] = (payeeMap[payee] || 0) + amt;
    // WEEK
    if (d >= weekStart && d <= weekEnd) {
      const day = ["Sun","Mon","Tue","Wed","Thu","Fri","Sat"][d.getDay()];
      if (weekBuckets[day] !== undefined) {
        weekBuckets[day] += amt;
      }
    }
    // MONTH (rolling weeks)
    for (const b of monthBuckets) {
      if (d >= b.start && d <= b.end) {
        b.amount += amt;
      }
    }
    // YEAR (rolling months)
    for (const b of yearBuckets) {
      if (d >= b.start && d <= b.end) {
        b.amount += amt;
      }
    }
  }
  const toPoints = (b: any): ChartDataPoint[] =>
    Array.isArray(b)
      ? b.map((x) => ({
          id: x.label,
          amount: x.amount
        }))
      : Object.entries(b).map(([k, v]: any) => ({
          id: k,
          amount: v
        }));
  const chartData = {
    week: toPoints(weekBuckets),
    month: toPoints(monthBuckets),
    year: toPoints(yearBuckets)
  };
  // highlight max
  Object.values(chartData).forEach(group => {
    let max = group[0];
    for (const g of group) {
      if (g.amount > max.amount) max = g;
    }
    if (max.amount > 0) max.highlighted = true;
  });
  const topPayees = Object.entries(payeeMap)
    .map(([name, amt]) => ({ payeeName: name, amount: amt }))
    .sort((a, b) => b.amount - a.amount)
    .slice(0, 5);
  return { chartData, totalAmount, topPayees };
 }
 // ---------------- EXPORTS ----------------
 export const fetchAggregatedExpenses = () =>
  fetchAggregatedData("expense");
 export const fetchAggregatedIncome = () =>
  fetchAggregatedData("income");
		`@@ -0,0 +1,2 @@`
							`export { default } from "./Dashboard.view";`
							`export * from "./Dashboard.models";`
		`@@ -0,0 +1,2 @@`
							`export { default } from "./HistoryChart";`
							`export * from "./HistoryChart.models";`
		`@@ -0,0 +1,2 @@`
							`export { default } from "./LatestItems";`
							`export * from "./LatestItems.models";`
		`@@ -0,0 +1,2 @@`
							`export { default } from "./ProgressCard.view";`
							`export * from "./ProgressCard.props";`