From 41f165c310a2037a03eeeeefcc3545e99206db41 Mon Sep 17 00:00:00 2001
From: oncecelll <oncecell@outlook.com>
Date: Sat, 10 Jan 2026 17:36:39 +0800
Subject: [PATCH 1/4] chore: fix some typos in comments

Signed-off-by: oncecelll <oncecell@outlook.com>
---
 VALIDATOR_JOURNEY_ARCHITECTURE_v3.md | 2 +-
 frontend/src/routes/Overview.svelte  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VALIDATOR_JOURNEY_ARCHITECTURE_v3.md b/VALIDATOR_JOURNEY_ARCHITECTURE_v3.md
index 4bf2c662..9fbebab4 100644
--- a/VALIDATOR_JOURNEY_ARCHITECTURE_v3.md
+++ b/VALIDATOR_JOURNEY_ARCHITECTURE_v3.md
@@ -212,7 +212,7 @@ def update_user_leaderboard_entries(user):
     for leaderboard_type in qualified_leaderboards:
         update_leaderboard_type_ranks(leaderboard_type)
     
-    # Also update waitlist ranks if user graduated (they were removed) FIX: with the fix above this is not necesarry
+    # Also update waitlist ranks if user graduated (they were removed) FIX: with the fix above this is not necessary
     if 'validator-waitlist-graduation' in qualified_leaderboards:
         update_leaderboard_type_ranks('validator-waitlist')
 
diff --git a/frontend/src/routes/Overview.svelte b/frontend/src/routes/Overview.svelte
index decfa4c2..8aa0487d 100644
--- a/frontend/src/routes/Overview.svelte
+++ b/frontend/src/routes/Overview.svelte
@@ -173,7 +173,7 @@ contribution.
       <!-- Content -->
       <div class="p-6 space-y-3">
         <p class="text-gray-700">
-          Stewards review submited contributions, evaluating them on technical quality, originality, and ecosystem impact. Stewards assign points transparently and may request revisions or offer feedback to improve contributions. Their role ensures fairness, consistency, and alignment with GenLayer's long-term vision as the ecosystem grows.
+          Stewards review submitted contributions, evaluating them on technical quality, originality, and ecosystem impact. Stewards assign points transparently and may request revisions or offer feedback to improve contributions. Their role ensures fairness, consistency, and alignment with GenLayer's long-term vision as the ecosystem grows.
         </p>
         <button
           onclick={() => push('/stewards')}

From abebe2dbbf8d09b118bdb48ebe1c7fd093efe835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iva=CC=81n=20Raskovsky?= <raskovsky+git@gmail.com>
Date: Thu, 29 Jan 2026 15:37:30 -0300
Subject: [PATCH 2/4] Fix duplicate API calls and optimize steward submissions
 page

- Add missionsStore.js to cache and deduplicate /missions/ API requests
- Update ContributionSelection to use cached getMissions() instead of direct API
- Prefetch missions in StewardSubmissions to warm cache before cards mount
- Use bulk_create() for evidence items when accepting submissions
- Fix URL mismatch in updateURL() (/steward/ -> /stewards/) that caused 404 on refresh

Reduces 10+ duplicate missions calls to 2-3 cached calls, and N evidence
INSERT queries to 1 bulk INSERT.
---
 backend/contributions/views.py                |   8 +-
 .../components/ContributionSelection.svelte   |   6 +-
 frontend/src/lib/missionsStore.js             | 103 ++++++++++++++++++
 frontend/src/routes/StewardSubmissions.svelte |  11 +-
 4 files changed, 121 insertions(+), 7 deletions(-)
 create mode 100644 frontend/src/lib/missionsStore.js

diff --git a/backend/contributions/views.py b/backend/contributions/views.py
index f328a0d5..1c67161d 100644
--- a/backend/contributions/views.py
+++ b/backend/contributions/views.py
@@ -1018,14 +1018,16 @@ def review(self, request, pk=None):
                 # Manually update leaderboard since ensure_builder_status uses bulk_create (no signals)
                 update_user_leaderboard_entries(contribution_user)
 
-            # Copy evidence items
-            for evidence in submission.evidence_items.all():
-                Evidence.objects.create(
+            # Copy evidence items using bulk_create for better performance
+            Evidence.objects.bulk_create([
+                Evidence(
                     contribution=contribution,
                     description=evidence.description,
                     url=evidence.url,
                     file=evidence.file
                 )
+                for evidence in submission.evidence_items.all()
+            ])
             
             # Create highlight if requested
             if serializer.validated_data.get('create_highlight'):
diff --git a/frontend/src/lib/components/ContributionSelection.svelte b/frontend/src/lib/components/ContributionSelection.svelte
index 81febe1a..7f1bd3f9 100644
--- a/frontend/src/lib/components/ContributionSelection.svelte
+++ b/frontend/src/lib/components/ContributionSelection.svelte
@@ -1,9 +1,9 @@
 <script>
 	import { onMount } from 'svelte';
 	import { getContributionTypes } from '../api/contributions.js';
-	import { contributionsAPI } from '../api.js';
 	import Badge from '../../components/Badge.svelte';
 	import { showError } from '../toastStore';
+	import { getMissions } from '../missionsStore.js';
 
 	let {
 		selectedCategory = $bindable('validator'),
@@ -126,12 +126,12 @@
 
 	async function loadMissions() {
 		try {
-			const response = await contributionsAPI.getMissions({
+			// Use the missions store which caches and deduplicates requests
+			missions = await getMissions({
 				is_active: true,
 				// If we have a defaultMission, load all missions to find it regardless of category
 				category: defaultMission ? undefined : selectedCategory
 			});
-			missions = response.data.results || response.data || [];
 		} catch (error) {
 			missions = [];
 		}
diff --git a/frontend/src/lib/missionsStore.js b/frontend/src/lib/missionsStore.js
new file mode 100644
index 00000000..456edd05
--- /dev/null
+++ b/frontend/src/lib/missionsStore.js
@@ -0,0 +1,103 @@
+import { contributionsAPI } from './api.js';
+
+// Cache TTL: 5 minutes
+const CACHE_TTL = 5 * 60 * 1000;
+
+// Store for cached missions by query key
+const cache = new Map();
+
+// Store for in-flight requests to deduplicate concurrent calls
+const pendingRequests = new Map();
+
+/**
+ * Normalize params to a consistent cache key
+ * @param {Object} params - Query parameters
+ * @returns {string} - Normalized cache key
+ */
+function getCacheKey(params = {}) {
+  // Sort params alphabetically and convert to string
+  const sortedEntries = Object.entries(params)
+    .filter(([_, v]) => v !== undefined && v !== null)
+    .sort(([a], [b]) => a.localeCompare(b));
+  return JSON.stringify(sortedEntries);
+}
+
+/**
+ * Check if cached entry is still valid
+ * @param {Object} entry - Cache entry with data and timestamp
+ * @returns {boolean} - Whether the cache entry is still valid
+ */
+function isCacheValid(entry) {
+  if (!entry) return false;
+  return Date.now() - entry.timestamp < CACHE_TTL;
+}
+
+/**
+ * Get missions with caching and request deduplication
+ * @param {Object} params - Query parameters (is_active, category, etc.)
+ * @returns {Promise<Array>} - Array of missions
+ */
+export async function getMissions(params = {}) {
+  const cacheKey = getCacheKey(params);
+
+  // Check cache first
+  const cached = cache.get(cacheKey);
+  if (isCacheValid(cached)) {
+    return cached.data;
+  }
+
+  // Check if there's already a pending request for this key
+  const pending = pendingRequests.get(cacheKey);
+  if (pending) {
+    // Wait for the existing request instead of making a new one
+    return pending;
+  }
+
+  // Create new request and store the promise
+  const requestPromise = (async () => {
+    try {
+      const response = await contributionsAPI.getMissions(params);
+      const missions = response.data.results || response.data || [];
+
+      // Store in cache
+      cache.set(cacheKey, {
+        data: missions,
+        timestamp: Date.now()
+      });
+
+      return missions;
+    } finally {
+      // Remove from pending requests when done
+      pendingRequests.delete(cacheKey);
+    }
+  })();
+
+  pendingRequests.set(cacheKey, requestPromise);
+  return requestPromise;
+}
+
+/**
+ * Prefetch missions for common queries to warm the cache
+ * Call this in parent components to avoid duplicate requests from children
+ * @param {Array<Object>} paramsList - Array of param objects to prefetch
+ */
+export async function prefetchMissions(paramsList) {
+  await Promise.all(paramsList.map(params => getMissions(params)));
+}
+
+/**
+ * Clear the missions cache
+ * Useful when missions might have changed (e.g., after admin updates)
+ */
+export function clearMissionsCache() {
+  cache.clear();
+}
+
+/**
+ * Invalidate a specific cache entry
+ * @param {Object} params - Query parameters to invalidate
+ */
+export function invalidateMissionsCache(params = {}) {
+  const cacheKey = getCacheKey(params);
+  cache.delete(cacheKey);
+}
diff --git a/frontend/src/routes/StewardSubmissions.svelte b/frontend/src/routes/StewardSubmissions.svelte
index 9bcf611d..9b34de6c 100644
--- a/frontend/src/routes/StewardSubmissions.svelte
+++ b/frontend/src/routes/StewardSubmissions.svelte
@@ -10,6 +10,7 @@
   import { showSuccess, showError } from '../lib/toastStore';
   import { parseSearch } from '../lib/searchParser.js';
   import { searchToParams } from '../lib/searchToParams.js';
+  import { prefetchMissions } from '../lib/missionsStore.js';
 
   let submissions = $state([]);
   let contributionTypes = $state([]);
@@ -48,6 +49,14 @@
     if (params.has('status')) stateFilter = params.get('status');
     if (params.has('q')) searchQuery = params.get('q');
 
+    // Prefetch missions for both categories to warm the cache
+    // This prevents duplicate API calls from individual SubmissionCard components
+    prefetchMissions([
+      { is_active: true, category: 'validator' },
+      { is_active: true, category: 'builder' },
+      { is_active: true }  // Also prefetch all missions (for defaultMission lookups)
+    ]);
+
     await loadContributionTypes();
     await loadUsers();
     await loadStewards();
@@ -125,7 +134,7 @@
     if (stateFilter) urlParams.set('status', stateFilter);
     if (searchQuery) urlParams.set('q', searchQuery);
     const newUrl = urlParams.toString() ? `?${urlParams.toString()}` : '';
-    window.history.replaceState({}, '', `#/steward/submissions${newUrl}`);
+    window.history.replaceState({}, '', `#/stewards/submissions${newUrl}`);
   }
 
   async function loadSubmissions() {

From 48fd28c414054548d0ed41b1d8a9d840e526350b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iva=CC=81n=20Raskovsky?= <raskovsky+git@gmail.com>
Date: Thu, 29 Jan 2026 15:46:36 -0300
Subject: [PATCH 3/4] Fix extra space after tag suggestions in steward search
 bar

When selecting a tag like "type:" from autocomplete, don't add a space
after the colon since the user needs to type the value immediately.
Only add space after complete suggestions like "type:builder".
---
 frontend/src/components/StewardSearchBar.svelte | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/StewardSearchBar.svelte b/frontend/src/components/StewardSearchBar.svelte
index e8a6cb09..363e1941 100644
--- a/frontend/src/components/StewardSearchBar.svelte
+++ b/frontend/src/components/StewardSearchBar.svelte
@@ -95,13 +95,16 @@
     const before = value.slice(0, start);
     const after = value.slice(end);
 
-    value = before + suggestion + (after.startsWith(' ') ? after : ' ' + after.trimStart());
+    // Don't add space if suggestion ends with ':' (user needs to type value)
+    const needsSpace = !suggestion.endsWith(':');
+    const spacer = needsSpace ? ' ' : '';
+    value = before + suggestion + (after.startsWith(' ') || !needsSpace ? after.trimStart() : spacer + after.trimStart());
     showAutocomplete = false;
 
     // Focus input and move cursor
     if (inputRef) {
       inputRef.focus();
-      const newPos = before.length + suggestion.length + 1;
+      const newPos = before.length + suggestion.length + (needsSpace ? 1 : 0);
       setTimeout(() => inputRef.setSelectionRange(newPos, newPos), 0);
     }
 

From 6047ae3ff61f8e180e703dcdf37ea6c3b5a63635 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iva=CC=81n=20Raskovsky?= <raskovsky+git@gmail.com>
Date: Thu, 29 Jan 2026 22:30:49 -0300
Subject: [PATCH 4/4] Add comprehensive metrics dashboard for submissions and
 participants

- Add daily_metrics endpoint to track submission flow over time
  (ingress, accepted, rejected, more_info_requested, points_awarded)
- Add participants-growth endpoint for validators, waitlist, and builders
- Support day/week/month grouping with configurable date range
- Replace old metrics charts with new participants growth chart
- Add submissions flow bar chart and cumulative totals line chart
- Add page-wide filters at top applying to all charts
- Use category-consistent colors (sky for validators, orange for builders)
---
 backend/CLAUDE.md                  |   4 +
 backend/api/metrics_views.py       |  94 +++++-
 backend/api/urls.py                |   3 +-
 backend/contributions/views.py     | 213 ++++++++++++-
 frontend/src/routes/Metrics.svelte | 463 ++++++++++++++++++++++-------
 5 files changed, 647 insertions(+), 130 deletions(-)

diff --git a/backend/CLAUDE.md b/backend/CLAUDE.md
index c9a02b9d..57b1ea5e 100644
--- a/backend/CLAUDE.md
+++ b/backend/CLAUDE.md
@@ -186,6 +186,10 @@ GET    /api/v1/leaderboard/user_stats/by-address/{address}/
 # Multipliers
 GET    /api/v1/multipliers/
 GET    /api/v1/multiplier-periods/
+
+# Steward Submissions (public metrics)
+GET    /api/v1/steward-submissions/stats/           (public - aggregate stats)
+GET    /api/v1/steward-submissions/daily-metrics/   (public - time-series data)
 ```
 
 ## Environment Variables
diff --git a/backend/api/metrics_views.py b/backend/api/metrics_views.py
index 76455e2e..fabf23e3 100644
--- a/backend/api/metrics_views.py
+++ b/backend/api/metrics_views.py
@@ -85,11 +85,11 @@ class ContributionTypesStatsView(APIView):
     """
     Get time series data showing how many contribution types have been assigned on each date.
     """
-    
+
     def get(self, request):
         from django.db.models.functions import TruncDate
         from datetime import date, timedelta
-        
+
         # Get contributions grouped by date and contribution type
         daily_contributions = (
             Contribution.objects
@@ -101,51 +101,119 @@ def get(self, request):
             )
             .order_by('date')
         )
-        
+
         # Build cumulative data
         data = []
         cumulative_types = set()
-        
+
         # Get all contributions to track cumulative unique types
         all_contributions = (
             Contribution.objects
             .values('contribution_date', 'contribution_type')
             .order_by('contribution_date')
         )
-        
+
         # Group by date and count cumulative types
         from collections import defaultdict
         contributions_by_date = defaultdict(set)
-        
+
         for contrib in all_contributions:
             date_key = contrib['contribution_date'].date()
             contributions_by_date[date_key].add(contrib['contribution_type'])
-        
+
         if contributions_by_date:
             # Get date range
             start_date = min(contributions_by_date.keys())
             end_date = max(contributions_by_date.keys())
-            
+
             # Extend to today if needed
             today = date.today()
             if end_date < today:
                 end_date = today
-            
+
             # Build continuous time series with cumulative count
             current_date = start_date
-            
+
             while current_date <= end_date:
                 # Add new types for this date
                 if current_date in contributions_by_date:
                     cumulative_types.update(contributions_by_date[current_date])
-                
+
                 data.append({
                     'date': current_date.isoformat(),
                     'count': len(cumulative_types),
                     'new_types': len(contributions_by_date.get(current_date, set()))
                 })
-                
+
                 # Move to next day
                 current_date += timedelta(days=1)
-        
+
+        return Response({'data': data})
+
+
+class ParticipantsGrowthView(APIView):
+    """
+    Get time series data for validators, waitlist users, and builders growth over time.
+    """
+
+    def get(self, request):
+        from django.db.models.functions import TruncDate
+        from datetime import date, timedelta
+        from collections import defaultdict
+        from validators.models import Validator
+        from builders.models import Builder
+
+        # Get validators by creation date
+        validators_by_date = defaultdict(int)
+        for v in Validator.objects.all():
+            date_key = v.created_at.date()
+            validators_by_date[date_key] += 1
+
+        # Get waitlist users by contribution date (users with validator-waitlist contribution)
+        waitlist_by_date = defaultdict(int)
+        try:
+            waitlist_type = ContributionType.objects.get(slug='validator-waitlist')
+            for c in Contribution.objects.filter(contribution_type=waitlist_type):
+                date_key = c.contribution_date.date()
+                waitlist_by_date[date_key] += 1
+        except ContributionType.DoesNotExist:
+            pass
+
+        # Get builders by creation date
+        builders_by_date = defaultdict(int)
+        for b in Builder.objects.all():
+            date_key = b.created_at.date()
+            builders_by_date[date_key] += 1
+
+        # Find date range across all sources
+        all_dates = set(validators_by_date.keys()) | set(waitlist_by_date.keys()) | set(builders_by_date.keys())
+
+        if not all_dates:
+            return Response({'data': []})
+
+        start_date = min(all_dates)
+        end_date = max(max(all_dates), date.today())
+
+        # Build cumulative time series
+        data = []
+        cum_validators = 0
+        cum_waitlist = 0
+        cum_builders = 0
+
+        current_date = start_date
+        while current_date <= end_date:
+            cum_validators += validators_by_date.get(current_date, 0)
+            cum_waitlist += waitlist_by_date.get(current_date, 0)
+            cum_builders += builders_by_date.get(current_date, 0)
+
+            data.append({
+                'date': current_date.isoformat(),
+                'validators': cum_validators,
+                'waitlist': cum_waitlist,
+                'builders': cum_builders,
+                'total': cum_validators + cum_waitlist + cum_builders
+            })
+
+            current_date += timedelta(days=1)
+
         return Response({'data': data})
\ No newline at end of file
diff --git a/backend/api/urls.py b/backend/api/urls.py
index 883e1e0f..aa95b351 100644
--- a/backend/api/urls.py
+++ b/backend/api/urls.py
@@ -4,7 +4,7 @@
 from contributions.views import ContributionTypeViewSet, ContributionViewSet, EvidenceViewSet, SubmittedContributionViewSet, StewardSubmissionViewSet, MissionViewSet, StartupRequestViewSet
 from leaderboard.views import GlobalLeaderboardMultiplierViewSet, LeaderboardViewSet
 from rest_framework_simplejwt.views import TokenObtainPairView, TokenRefreshView, TokenVerifyView
-from .metrics_views import ActiveValidatorsView, ContributionTypesStatsView
+from .metrics_views import ActiveValidatorsView, ContributionTypesStatsView, ParticipantsGrowthView
 
 # Create a router and register our viewsets with it
 router = DefaultRouter()
@@ -37,4 +37,5 @@
     # Metrics endpoints
     path('metrics/active-validators/', ActiveValidatorsView.as_view(), name='active-validators'),
     path('metrics/contribution-types/', ContributionTypesStatsView.as_view(), name='contribution-types-stats'),
+    path('metrics/participants-growth/', ParticipantsGrowthView.as_view(), name='participants-growth'),
 ]
\ No newline at end of file
diff --git a/backend/contributions/views.py b/backend/contributions/views.py
index 1c67161d..70a59ee7 100644
--- a/backend/contributions/views.py
+++ b/backend/contributions/views.py
@@ -4,7 +4,8 @@
 from django_filters.rest_framework import DjangoFilterBackend
 from django_filters import FilterSet, CharFilter, BooleanFilter, NumberFilter
 from django.utils import timezone
-from django.db.models import Count, Max, F, Q, Exists, OuterRef, Subquery
+from django.db.models import Count, Max, F, Q, Exists, OuterRef, Subquery, Sum
+from django.db.models.functions import TruncDate, TruncWeek, TruncMonth
 from django.db.models.functions import Coalesce
 from django.db.models.functions import Coalesce
 from django.shortcuts import render, redirect, get_object_or_404
@@ -939,9 +940,9 @@ class StewardSubmissionViewSet(viewsets.ModelViewSet):
     def get_permissions(self):
         """
         Instantiates and returns the list of permissions that this view requires.
-        Stats endpoint is public, all others require steward permission.
+        Stats and daily_metrics endpoints are public, all others require steward permission.
         """
-        if self.action == 'stats':
+        if self.action in ['stats', 'daily_metrics']:
             return [permissions.AllowAny()]
         return super().get_permissions()
 
@@ -1112,7 +1113,211 @@ def stats(self, request):
             'total_rejected': total_rejected,
             'total_info_requested': total_info_requested
         })
-    
+
+    @action(detail=False, methods=['get'], url_path='daily-metrics')
+    def daily_metrics(self, request):
+        """
+        Get time-series metrics for submissions.
+
+        Query parameters:
+        - start_date: Start date (YYYY-MM-DD), defaults to first submission date
+        - end_date: End date (YYYY-MM-DD), defaults to today
+        - group_by: Grouping period - 'day', 'week', or 'month' (default: 'week')
+        - category: Filter by category slug (validator, builder, steward, creator)
+        - contribution_type: Filter by contribution type ID
+
+        Returns counts grouped by period for:
+        - ingress: New submissions created
+        - accepted: Submissions accepted
+        - rejected: Submissions rejected
+        - more_info_requested: Submissions requesting more info
+        - points_awarded: Total points from accepted contributions
+        """
+        from datetime import datetime, timedelta
+        from django.db.models import Min, Max
+        import calendar
+
+        # Build base queryset with optional filters first (needed for date detection)
+        base_qs = SubmittedContribution.objects.all()
+
+        category = request.query_params.get('category')
+        if category:
+            base_qs = base_qs.filter(contribution_type__category__slug=category)
+
+        contribution_type_id = request.query_params.get('contribution_type')
+        if contribution_type_id:
+            base_qs = base_qs.filter(contribution_type_id=contribution_type_id)
+
+        # Get grouping parameter (default to week)
+        group_by = request.query_params.get('group_by', 'week')
+        if group_by not in ['day', 'week', 'month']:
+            group_by = 'week'
+
+        # Select truncation function based on grouping
+        trunc_func = {
+            'day': TruncDate,
+            'week': TruncWeek,
+            'month': TruncMonth
+        }[group_by]
+
+        # Parse date range from query params, or auto-detect from data
+        end_date = None
+        start_date = None
+
+        if request.query_params.get('start_date'):
+            try:
+                start_date = datetime.strptime(
+                    request.query_params['start_date'], '%Y-%m-%d'
+                ).date()
+            except ValueError:
+                pass
+
+        if request.query_params.get('end_date'):
+            try:
+                end_date = datetime.strptime(
+                    request.query_params['end_date'], '%Y-%m-%d'
+                ).date()
+            except ValueError:
+                pass
+
+        # Auto-detect date range from data if not provided
+        if start_date is None or end_date is None:
+            date_range = base_qs.aggregate(
+                min_date=Min('created_at'),
+                max_date=Max('created_at')
+            )
+            if start_date is None:
+                start_date = date_range['min_date'].date() if date_range['min_date'] else timezone.now().date()
+            if end_date is None:
+                end_date = timezone.now().date()
+
+        # Get ingress (new submissions by created_at)
+        ingress = (
+            base_qs
+            .filter(created_at__date__gte=start_date, created_at__date__lte=end_date)
+            .annotate(period=trunc_func('created_at'))
+            .values('period')
+            .annotate(count=Count('id'))
+            .order_by('period')
+        )
+
+        # Get reviews by outcome (by reviewed_at date)
+        reviews_base = base_qs.filter(
+            reviewed_at__date__gte=start_date,
+            reviewed_at__date__lte=end_date
+        )
+
+        accepted = (
+            reviews_base
+            .filter(state='accepted')
+            .annotate(period=trunc_func('reviewed_at'))
+            .values('period')
+            .annotate(count=Count('id'))
+            .order_by('period')
+        )
+
+        rejected = (
+            reviews_base
+            .filter(state='rejected')
+            .annotate(period=trunc_func('reviewed_at'))
+            .values('period')
+            .annotate(count=Count('id'))
+            .order_by('period')
+        )
+
+        more_info = (
+            reviews_base
+            .filter(state='more_info_needed')
+            .annotate(period=trunc_func('reviewed_at'))
+            .values('period')
+            .annotate(count=Count('id'))
+            .order_by('period')
+        )
+
+        # Get points awarded (from converted contributions)
+        points_qs = Contribution.objects.filter(
+            created_at__date__gte=start_date,
+            created_at__date__lte=end_date,
+            source_submission__isnull=False  # Only from submissions
+        )
+
+        # Apply category/type filters to points query if specified
+        if category:
+            points_qs = points_qs.filter(contribution_type__category__slug=category)
+        if contribution_type_id:
+            points_qs = points_qs.filter(contribution_type_id=contribution_type_id)
+
+        points = (
+            points_qs
+            .annotate(period=trunc_func('created_at'))
+            .values('period')
+            .annotate(total_points=Sum('frozen_global_points'))
+            .order_by('period')
+        )
+
+        # Convert querysets to dict for easier lookup (handle both date and datetime)
+        def to_date(val):
+            if hasattr(val, 'date'):
+                return val.date()
+            return val
+
+        ingress_dict = {to_date(item['period']): item['count'] for item in ingress}
+        accepted_dict = {to_date(item['period']): item['count'] for item in accepted}
+        rejected_dict = {to_date(item['period']): item['count'] for item in rejected}
+        more_info_dict = {to_date(item['period']): item['count'] for item in more_info}
+        points_dict = {to_date(item['period']): item['total_points'] for item in points}
+
+        # Build response with all periods in range
+        data = []
+        current_date = start_date
+
+        # Align to period start
+        if group_by == 'week':
+            # Align to Monday
+            current_date = current_date - timedelta(days=current_date.weekday())
+        elif group_by == 'month':
+            # Align to first of month
+            current_date = current_date.replace(day=1)
+
+        while current_date <= end_date:
+            data.append({
+                'period': current_date.isoformat(),
+                'ingress': ingress_dict.get(current_date, 0),
+                'accepted': accepted_dict.get(current_date, 0),
+                'rejected': rejected_dict.get(current_date, 0),
+                'more_info_requested': more_info_dict.get(current_date, 0),
+                'points_awarded': points_dict.get(current_date, 0) or 0
+            })
+
+            # Advance to next period
+            if group_by == 'day':
+                current_date += timedelta(days=1)
+            elif group_by == 'week':
+                current_date += timedelta(weeks=1)
+            else:  # month
+                # Add one month
+                if current_date.month == 12:
+                    current_date = current_date.replace(year=current_date.year + 1, month=1)
+                else:
+                    current_date = current_date.replace(month=current_date.month + 1)
+
+        # Calculate totals for the period
+        totals = {
+            'ingress': sum(d['ingress'] for d in data),
+            'accepted': sum(d['accepted'] for d in data),
+            'rejected': sum(d['rejected'] for d in data),
+            'more_info_requested': sum(d['more_info_requested'] for d in data),
+            'points_awarded': sum(d['points_awarded'] for d in data)
+        }
+
+        return Response({
+            'start_date': start_date.isoformat(),
+            'end_date': end_date.isoformat(),
+            'group_by': group_by,
+            'totals': totals,
+            'data': data
+        })
+
     @action(detail=False, methods=['get'], url_path='users')
     def users(self, request):
         """Get all users sorted alphabetically by name for steward dropdown."""
diff --git a/frontend/src/routes/Metrics.svelte b/frontend/src/routes/Metrics.svelte
index b256b232..7ad99c14 100644
--- a/frontend/src/routes/Metrics.svelte
+++ b/frontend/src/routes/Metrics.svelte
@@ -2,128 +2,282 @@
   import { onMount, onDestroy } from 'svelte';
   import { Chart, registerables } from 'chart.js';
   import api from '../lib/api.js';
-  
+
   Chart.register(...registerables);
-  
-  let activeValidatorsChart;
-  let contributionTypesChart;
+
+  let participantsChart;
+  let submissionsChart;
+  let cumulativeChart;
   let loading = $state(true);
   let error = $state(null);
-  
-  let activeValidatorsData = $state([]);
-  let contributionTypesData = $state([]);
-  
+
+  let participantsData = $state([]);
+  let submissionsData = $state({ data: [], totals: {}, group_by: 'week' });
+
+  // Filters
+  let groupBy = $state('week');
+  let startDate = $state('');
+  let endDate = $state('');
+
   onMount(async () => {
     await fetchMetricsData();
     if (!error) {
-      // Use nextTick to ensure DOM is ready
       setTimeout(() => {
         createCharts();
       }, 0);
     }
-    
+
     return () => {
-      // Cleanup charts on unmount
-      if (activeValidatorsChart) activeValidatorsChart.destroy();
-      if (contributionTypesChart) contributionTypesChart.destroy();
+      if (participantsChart) participantsChart.destroy();
+      if (submissionsChart) submissionsChart.destroy();
+      if (cumulativeChart) cumulativeChart.destroy();
     };
   });
-  
+
   async function fetchMetricsData() {
     try {
       loading = true;
-      
-      // Fetch active validators data
-      const validatorsResponse = await api.get('/metrics/active-validators/');
-      activeValidatorsData = validatorsResponse.data.data || [];
-      
-      // Fetch contribution types data
-      const typesResponse = await api.get('/metrics/contribution-types/');
-      contributionTypesData = typesResponse.data.data || [];
-      
+
+      const participantsResponse = await api.get('/metrics/participants-growth/');
+      participantsData = participantsResponse.data.data || [];
+
+      await fetchSubmissionsData();
+
       loading = false;
     } catch (err) {
       error = err.message || 'Failed to load metrics data';
       loading = false;
     }
   }
-  
+
+  async function fetchSubmissionsData() {
+    let url = `/steward-submissions/daily-metrics/?group_by=${groupBy}`;
+    if (startDate) url += `&start_date=${startDate}`;
+    if (endDate) url += `&end_date=${endDate}`;
+
+    const submissionsResponse = await api.get(url);
+    submissionsData = submissionsResponse.data || { data: [], totals: {} };
+
+    // Set date inputs from response if not already set
+    if (!startDate && submissionsData.start_date) {
+      startDate = submissionsData.start_date;
+    }
+    if (!endDate && submissionsData.end_date) {
+      endDate = submissionsData.end_date;
+    }
+  }
+
+  async function applyFilters() {
+    await fetchSubmissionsData();
+    recreateAllCharts();
+  }
+
+  function recreateAllCharts() {
+    if (participantsChart) participantsChart.destroy();
+    if (submissionsChart) submissionsChart.destroy();
+    if (cumulativeChart) cumulativeChart.destroy();
+    createCharts();
+  }
+
   function createCharts() {
-    // Active Validators Chart
-    const validatorsCanvas = document.getElementById('activeValidatorsChart');
-    if (validatorsCanvas) {
-      const validatorsCtx = validatorsCanvas.getContext('2d');
-      activeValidatorsChart = new Chart(validatorsCtx, {
+    createParticipantsChart();
+    createSubmissionsChart();
+    createCumulativeChart();
+  }
+
+  function createParticipantsChart() {
+    const participantsCanvas = document.getElementById('participantsChart');
+    if (participantsCanvas && participantsData.length > 0) {
+      const participantsCtx = participantsCanvas.getContext('2d');
+      participantsChart = new Chart(participantsCtx, {
         type: 'line',
         data: {
-          labels: activeValidatorsData.map(d => new Date(d.date).toLocaleDateString()),
-          datasets: [{
-            label: 'Active Validators',
-            data: activeValidatorsData.map(d => d.count),
-            borderColor: 'rgb(59, 130, 246)',
-            backgroundColor: 'rgba(59, 130, 246, 0.1)',
-            tension: 0.1
-          }]
+          labels: participantsData.map(d => new Date(d.date).toLocaleDateString()),
+          datasets: [
+            {
+              label: 'Validators',
+              data: participantsData.map(d => d.validators),
+              borderColor: 'rgb(2, 132, 199)',      // sky-600
+              backgroundColor: 'rgba(2, 132, 199, 0.1)',
+              tension: 0.2,
+              fill: true
+            },
+            {
+              label: 'Waitlist',
+              data: participantsData.map(d => d.waitlist),
+              borderColor: 'rgb(125, 211, 252)',    // sky-300
+              backgroundColor: 'rgba(125, 211, 252, 0.1)',
+              tension: 0.2,
+              fill: true
+            },
+            {
+              label: 'Builders',
+              data: participantsData.map(d => d.builders),
+              borderColor: 'rgb(234, 88, 12)',      // orange-600
+              backgroundColor: 'rgba(234, 88, 12, 0.1)',
+              tension: 0.2,
+              fill: true
+            }
+          ]
         },
         options: {
           responsive: true,
           maintainAspectRatio: false,
           plugins: {
-            legend: {
-              display: false
+            legend: { position: 'top' },
+            title: { display: true, text: 'Participants Growth Over Time' }
+          },
+          scales: {
+            y: { beginAtZero: true }
+          }
+        }
+      });
+    }
+  }
+
+  function formatPeriodLabel(dateStr, groupBy) {
+    const date = new Date(dateStr);
+    if (groupBy === 'month') {
+      return date.toLocaleDateString('en-US', { month: 'short', year: 'numeric' });
+    } else if (groupBy === 'week') {
+      return date.toLocaleDateString('en-US', { month: 'short', day: 'numeric' });
+    }
+    return date.toLocaleDateString();
+  }
+
+  function createSubmissionsChart() {
+    const submissionsCanvas = document.getElementById('submissionsChart');
+    if (submissionsCanvas && submissionsData.data && submissionsData.data.length > 0) {
+      const submissionsCtx = submissionsCanvas.getContext('2d');
+      const groupLabel = groupBy === 'day' ? 'Daily' : groupBy === 'week' ? 'Weekly' : 'Monthly';
+
+      submissionsChart = new Chart(submissionsCtx, {
+        type: 'bar',
+        data: {
+          labels: submissionsData.data.map(d => formatPeriodLabel(d.period, groupBy)),
+          datasets: [
+            {
+              label: 'New Submissions',
+              data: submissionsData.data.map(d => d.ingress),
+              backgroundColor: 'rgba(99, 102, 241, 0.7)',
+              borderColor: 'rgb(99, 102, 241)',
+              borderWidth: 1
+            },
+            {
+              label: 'Accepted',
+              data: submissionsData.data.map(d => d.accepted),
+              backgroundColor: 'rgba(16, 185, 129, 0.7)',
+              borderColor: 'rgb(16, 185, 129)',
+              borderWidth: 1
             },
-            title: {
-              display: true,
-              text: 'Active Validators Over Time'
+            {
+              label: 'Rejected',
+              data: submissionsData.data.map(d => d.rejected),
+              backgroundColor: 'rgba(239, 68, 68, 0.7)',
+              borderColor: 'rgb(239, 68, 68)',
+              borderWidth: 1
+            },
+            {
+              label: 'More Info Requested',
+              data: submissionsData.data.map(d => d.more_info_requested),
+              backgroundColor: 'rgba(245, 158, 11, 0.7)',
+              borderColor: 'rgb(245, 158, 11)',
+              borderWidth: 1
             }
+          ]
+        },
+        options: {
+          responsive: true,
+          maintainAspectRatio: false,
+          plugins: {
+            legend: { position: 'top' },
+            title: { display: true, text: `${groupLabel} Submissions Flow` }
           },
           scales: {
-            y: {
-              beginAtZero: true,
-              ticks: {
-                stepSize: 1
-              }
-            }
+            x: { stacked: false },
+            y: { beginAtZero: true, stacked: false }
           }
         }
       });
     }
-    
-    // Contribution Types Chart
-    const typesCanvas = document.getElementById('contributionTypesChart');
-    if (typesCanvas) {
-      const typesCtx = typesCanvas.getContext('2d');
-      contributionTypesChart = new Chart(typesCtx, {
+  }
+
+  function createCumulativeChart() {
+    const cumulativeCanvas = document.getElementById('cumulativeChart');
+    if (cumulativeCanvas && submissionsData.data && submissionsData.data.length > 0) {
+      const cumulativeCtx = cumulativeCanvas.getContext('2d');
+
+      // Calculate cumulative values
+      let cumAccepted = 0;
+      let cumRejected = 0;
+      let cumPending = 0;
+      let cumMoreInfo = 0;
+
+      const cumulativeAccepted = [];
+      const cumulativeRejected = [];
+      const queueDepth = [];
+      const moreInfoQueue = [];
+
+      for (const d of submissionsData.data) {
+        cumAccepted += d.accepted;
+        cumRejected += d.rejected;
+        cumMoreInfo += d.more_info_requested;
+        cumPending += d.ingress - d.accepted - d.rejected;
+
+        cumulativeAccepted.push(cumAccepted);
+        cumulativeRejected.push(cumRejected);
+        queueDepth.push(Math.max(0, cumPending));
+        moreInfoQueue.push(cumMoreInfo);
+      }
+
+      cumulativeChart = new Chart(cumulativeCtx, {
         type: 'line',
         data: {
-          labels: contributionTypesData.map(d => new Date(d.date).toLocaleDateString()),
-          datasets: [{
-            label: 'Cumulative Contribution Types',
-            data: contributionTypesData.map(d => d.count),
-            borderColor: 'rgb(16, 185, 129)',
-            backgroundColor: 'rgba(16, 185, 129, 0.1)',
-            tension: 0.1
-          }]
+          labels: submissionsData.data.map(d => formatPeriodLabel(d.period, groupBy)),
+          datasets: [
+            {
+              label: 'Cumulative Accepted',
+              data: cumulativeAccepted,
+              borderColor: 'rgb(16, 185, 129)',
+              backgroundColor: 'rgba(16, 185, 129, 0.1)',
+              fill: true,
+              tension: 0.2
+            },
+            {
+              label: 'Cumulative Rejected',
+              data: cumulativeRejected,
+              borderColor: 'rgb(239, 68, 68)',
+              backgroundColor: 'rgba(239, 68, 68, 0.1)',
+              fill: true,
+              tension: 0.2
+            },
+            {
+              label: 'Pending Queue',
+              data: queueDepth,
+              borderColor: 'rgb(99, 102, 241)',
+              backgroundColor: 'rgba(99, 102, 241, 0.1)',
+              fill: true,
+              tension: 0.2
+            },
+            {
+              label: 'Awaiting More Info',
+              data: moreInfoQueue,
+              borderColor: 'rgb(245, 158, 11)',
+              backgroundColor: 'rgba(245, 158, 11, 0.1)',
+              fill: true,
+              tension: 0.2
+            }
+          ]
         },
         options: {
           responsive: true,
           maintainAspectRatio: false,
           plugins: {
-            legend: {
-              display: false
-            },
-            title: {
-              display: true,
-              text: 'Contribution Types Assigned Over Time'
-            }
+            legend: { position: 'top' },
+            title: { display: true, text: 'Cumulative Totals & Queue Depth' }
           },
           scales: {
-            y: {
-              beginAtZero: true,
-              ticks: {
-                stepSize: 1
-              }
-            }
+            y: { beginAtZero: true }
           }
         }
       });
@@ -133,10 +287,10 @@
 
 <div class="container mx-auto px-4 py-8">
   <h1 class="text-2xl font-bold mb-6">Metrics Dashboard</h1>
-  
+
   {#if loading}
     <div class="flex justify-center items-center h-64">
-      <div class="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-500"></div>
+      <div class="animate-spin rounded-full h-12 w-12 border-b-2 border-sky-500"></div>
     </div>
   {:else if error}
     <div class="bg-red-50 border border-red-200 text-red-700 px-4 py-3 rounded relative">
@@ -144,52 +298,137 @@
       <span class="block sm:inline"> {error}</span>
     </div>
   {:else}
-    <div class="grid grid-cols-1 lg:grid-cols-2 gap-6">
-      <!-- Active Validators Chart -->
-      <div class="bg-white rounded-lg shadow p-6">
-        <h2 class="text-xl font-semibold mb-4">Active Validators</h2>
-        <div class="h-64">
-          <canvas id="activeValidatorsChart"></canvas>
+    <!-- Filters - Page Wide at Top -->
+    <div class="bg-white rounded-lg shadow p-4 mb-6">
+      <div class="flex flex-wrap items-end gap-4">
+        <div class="flex-1 min-w-[150px]">
+          <label class="block text-sm font-medium text-gray-700 mb-1">Start Date</label>
+          <input
+            type="date"
+            bind:value={startDate}
+            class="w-full px-3 py-2 border border-gray-300 rounded-md text-sm focus:outline-none focus:ring-2 focus:ring-sky-500"
+          />
+        </div>
+        <div class="flex-1 min-w-[150px]">
+          <label class="block text-sm font-medium text-gray-700 mb-1">End Date</label>
+          <input
+            type="date"
+            bind:value={endDate}
+            class="w-full px-3 py-2 border border-gray-300 rounded-md text-sm focus:outline-none focus:ring-2 focus:ring-sky-500"
+          />
         </div>
-        <p class="text-sm text-gray-600 mt-4">
-          Shows the number of active validators based on their first uptime contribution.
+        <div class="flex-1 min-w-[120px]">
+          <label class="block text-sm font-medium text-gray-700 mb-1">Group By</label>
+          <select
+            bind:value={groupBy}
+            class="w-full px-3 py-2 border border-gray-300 rounded-md text-sm focus:outline-none focus:ring-2 focus:ring-sky-500"
+          >
+            <option value="day">Daily</option>
+            <option value="week">Weekly</option>
+            <option value="month">Monthly</option>
+          </select>
+        </div>
+        <div>
+          <button
+            onclick={applyFilters}
+            class="px-4 py-2 bg-sky-600 text-white rounded-md text-sm hover:bg-sky-700 focus:outline-none focus:ring-2 focus:ring-sky-500"
+          >
+            Apply Filters
+          </button>
+        </div>
+      </div>
+    </div>
+
+    <!-- Participants Growth Section -->
+    <div class="bg-white rounded-lg shadow p-6 mb-6">
+      <h2 class="text-xl font-semibold mb-4">Participants Growth</h2>
+      <div class="h-72">
+        <canvas id="participantsChart"></canvas>
+      </div>
+    </div>
+
+    <!-- Participants Summary Stats -->
+    <div class="grid grid-cols-2 md:grid-cols-4 gap-4 mb-8">
+      <div class="bg-white rounded-lg shadow p-4">
+        <h3 class="text-sm font-medium text-gray-500">Validators</h3>
+        <p class="text-2xl font-bold text-sky-600 mt-1">
+          {participantsData.length > 0 ? participantsData[participantsData.length - 1].validators : 0}
         </p>
       </div>
-      
-      <!-- Contribution Types Chart -->
-      <div class="bg-white rounded-lg shadow p-6">
-        <h2 class="text-xl font-semibold mb-4">Contribution Types Growth</h2>
-        <div class="h-64">
-          <canvas id="contributionTypesChart"></canvas>
-        </div>
-        <p class="text-sm text-gray-600 mt-4">
-          Shows how many different contribution types have been assigned over time.
+      <div class="bg-white rounded-lg shadow p-4">
+        <h3 class="text-sm font-medium text-gray-500">Waitlist</h3>
+        <p class="text-2xl font-bold text-sky-300 mt-1">
+          {participantsData.length > 0 ? participantsData[participantsData.length - 1].waitlist : 0}
+        </p>
+      </div>
+      <div class="bg-white rounded-lg shadow p-4">
+        <h3 class="text-sm font-medium text-gray-500">Builders</h3>
+        <p class="text-2xl font-bold text-orange-600 mt-1">
+          {participantsData.length > 0 ? participantsData[participantsData.length - 1].builders : 0}
+        </p>
+      </div>
+      <div class="bg-white rounded-lg shadow p-4">
+        <h3 class="text-sm font-medium text-gray-500">Total Participants</h3>
+        <p class="text-2xl font-bold text-gray-900 mt-1">
+          {participantsData.length > 0 ? participantsData[participantsData.length - 1].total : 0}
         </p>
       </div>
     </div>
-    
-    <!-- Summary Stats -->
-    <div class="grid grid-cols-1 md:grid-cols-3 gap-6 mt-8">
-      <div class="bg-white rounded-lg shadow p-6">
-        <h3 class="text-lg font-semibold text-gray-700">Total Active Validators</h3>
-        <p class="text-3xl font-bold text-blue-600 mt-2">
-          {activeValidatorsData.length > 0 ? activeValidatorsData[activeValidatorsData.length - 1].count : 0}
+
+    <!-- Submissions Section -->
+    <h2 class="text-xl font-semibold mb-4">Submissions Analytics</h2>
+
+    <!-- Submissions Summary Stats -->
+    <div class="grid grid-cols-2 md:grid-cols-5 gap-4 mb-6">
+      <div class="bg-white rounded-lg shadow p-4">
+        <h3 class="text-sm font-medium text-gray-500">New Submissions</h3>
+        <p class="text-2xl font-bold text-indigo-600 mt-1">
+          {submissionsData.totals?.ingress || 0}
         </p>
       </div>
-      
-      <div class="bg-white rounded-lg shadow p-6">
-        <h3 class="text-lg font-semibold text-gray-700">Total Contribution Types</h3>
-        <p class="text-3xl font-bold text-green-600 mt-2">
-          {contributionTypesData.length > 0 ? contributionTypesData[contributionTypesData.length - 1].count : 0}
+      <div class="bg-white rounded-lg shadow p-4">
+        <h3 class="text-sm font-medium text-gray-500">Accepted</h3>
+        <p class="text-2xl font-bold text-green-600 mt-1">
+          {submissionsData.totals?.accepted || 0}
         </p>
       </div>
-      
-      <div class="bg-white rounded-lg shadow p-6">
-        <h3 class="text-lg font-semibold text-gray-700">Latest Date</h3>
-        <p class="text-xl font-bold text-purple-600 mt-2">
-          {contributionTypesData.length > 0 ? new Date(contributionTypesData[contributionTypesData.length - 1].date).toLocaleDateString() : 'N/A'}
+      <div class="bg-white rounded-lg shadow p-4">
+        <h3 class="text-sm font-medium text-gray-500">Rejected</h3>
+        <p class="text-2xl font-bold text-red-600 mt-1">
+          {submissionsData.totals?.rejected || 0}
+        </p>
+      </div>
+      <div class="bg-white rounded-lg shadow p-4">
+        <h3 class="text-sm font-medium text-gray-500">More Info Requested</h3>
+        <p class="text-2xl font-bold text-amber-600 mt-1">
+          {submissionsData.totals?.more_info_requested || 0}
         </p>
       </div>
+      <div class="bg-white rounded-lg shadow p-4">
+        <h3 class="text-sm font-medium text-gray-500">Points Awarded</h3>
+        <p class="text-2xl font-bold text-purple-600 mt-1">
+          {(submissionsData.totals?.points_awarded || 0).toLocaleString()}
+        </p>
+      </div>
+    </div>
+
+    <!-- Charts Grid -->
+    <div class="grid grid-cols-1 lg:grid-cols-2 gap-6">
+      <!-- Submissions Flow Chart -->
+      <div class="bg-white rounded-lg shadow p-6">
+        <h3 class="text-lg font-semibold mb-4">Submissions Flow</h3>
+        <div class="h-80">
+          <canvas id="submissionsChart"></canvas>
+        </div>
+      </div>
+
+      <!-- Cumulative Chart -->
+      <div class="bg-white rounded-lg shadow p-6">
+        <h3 class="text-lg font-semibold mb-4">Cumulative Totals & Queue</h3>
+        <div class="h-80">
+          <canvas id="cumulativeChart"></canvas>
+        </div>
+      </div>
     </div>
   {/if}
-</div>
\ No newline at end of file
+</div>