diff --git a/app/api/bounties/[id]/submit/route.ts b/app/api/bounties/[id]/submit/route.ts
index 2ef4cf7..a870603 100644
--- a/app/api/bounties/[id]/submit/route.ts
+++ b/app/api/bounties/[id]/submit/route.ts
@@ -1,55 +1,96 @@
-import { NextResponse } from 'next/server';
-import { BountyStore } from '@/lib/store';
-import { Submission } from '@/types/participation';
+import { NextResponse } from "next/server";
+import { BountyStore } from "@/lib/store";
+import { Submission } from "@/types/participation";
+import { submissionFormSchema } from "@/components/bounty/forms/schemas";
+import { getCurrentUser } from "@/lib/server-auth";
 
 const generateId = () => crypto.randomUUID();
 
 export async function POST(
-    request: Request,
-    { params }: { params: Promise<{ id: string }> }
+  request: Request,
+  { params }: { params: Promise<{ id: string }> },
 ) {
-    const { id: bountyId } = await params;
+  const { id: bountyId } = await params;
 
-    try {
-        const body = await request.json();
-        const { contributorId, content } = body;
+  try {
+    const user = await getCurrentUser();
+    if (!user) {
+      return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+    }
+    const contributorId = user.id;
 
-        if (!contributorId || !content) {
-            return NextResponse.json({ error: 'Missing required fields' }, { status: 400 });
-        }
+    const body = await request.json();
+    const { contributorId: _clientContributorId, ...formData } = body;
 
-        const bounty = BountyStore.getBountyById(bountyId);
-        if (!bounty) {
-            return NextResponse.json({ error: 'Bounty not found' }, { status: 404 });
-        }
+    const parsed = submissionFormSchema.safeParse(formData);
+    if (!parsed.success) {
+      const fieldErrors = parsed.error.flatten().fieldErrors;
+      return NextResponse.json(
+        { error: "Validation failed", fieldErrors },
+        { status: 400 },
+      );
+    }
 
-        const allowedModels = ['single-claim', 'competition', 'multi-winner', 'application'];
-        if (!allowedModels.includes(bounty.claimingModel)) {
-            return NextResponse.json({ error: 'Submission not allowed for this bounty type' }, { status: 400 });
-        }
+    const bounty = BountyStore.getBountyById(bountyId);
+    if (!bounty) {
+      return NextResponse.json({ error: "Bounty not found" }, { status: 404 });
+    }
 
-        const existingSubmission = BountyStore.getSubmissionsByBounty(bountyId).find(
-            s => s.contributorId === contributorId
-        );
+    if (bounty.status !== "open") {
+      return NextResponse.json(
+        { error: "Submissions are not accepted for this bounty" },
+        { status: 400 },
+      );
+    }
 
-        if (existingSubmission) {
-            return NextResponse.json({ error: 'Duplicate submission' }, { status: 409 });
-        }
+    const allowedModels = [
+      "single-claim",
+      "competition",
+      "multi-winner",
+      "application",
+    ];
+    if (!allowedModels.includes(bounty.claimingModel)) {
+      return NextResponse.json(
+        { error: "Submission not allowed for this bounty type" },
+        { status: 400 },
+      );
+    }
 
-        const submission: Submission = {
-            id: generateId(),
-            bountyId,
-            contributorId,
-            content,
-            status: 'pending',
-            submittedAt: new Date().toISOString(),
-        };
+    const existingSubmission = BountyStore.getSubmissionsByBounty(
+      bountyId,
+    ).find((s) => s.contributorId === contributorId);
 
-        BountyStore.addSubmission(submission);
+    if (existingSubmission) {
+      return NextResponse.json(
+        { error: "Duplicate submission" },
+        { status: 409 },
+      );
+    }
 
-        return NextResponse.json({ success: true, data: submission });
+    const { explanation, walletAddress, githubUrl, demoUrl, attachments } =
+      parsed.data;
 
-    } catch {
-        return NextResponse.json({ error: 'Internal Server Error' }, { status: 500 });
-    }
+    const submission: Submission = {
+      id: generateId(),
+      bountyId,
+      contributorId,
+      content: explanation,
+      explanation,
+      walletAddress,
+      githubUrl: githubUrl || undefined,
+      demoUrl: demoUrl || undefined,
+      attachments: attachments?.length ? attachments : undefined,
+      status: "pending",
+      submittedAt: new Date().toISOString(),
+    };
+
+    BountyStore.addSubmission(submission);
+
+    return NextResponse.json({ success: true, data: submission });
+  } catch {
+    return NextResponse.json(
+      { error: "Internal Server Error" },
+      { status: 500 },
+    );
+  }
 }
diff --git a/app/api/reputation/[userId]/completion-history/route.ts b/app/api/reputation/[userId]/completion-history/route.ts
new file mode 100644
index 0000000..d98b87b
--- /dev/null
+++ b/app/api/reputation/[userId]/completion-history/route.ts
@@ -0,0 +1,77 @@
+import { NextRequest, NextResponse } from "next/server";
+import { BountyStore } from "@/lib/store";
+import type { BountyCompletionRecord } from "@/types/reputation";
+import type { Bounty } from "@/types/bounty";
+
+const DIFFICULTY_MAP = {
+  beginner: "BEGINNER" as const,
+  intermediate: "INTERMEDIATE" as const,
+  advanced: "ADVANCED" as const,
+};
+
+function bountyToCompletionRecord(
+  bounty: Bounty,
+  index: number,
+): BountyCompletionRecord {
+  const difficulty = bounty.difficulty
+    ? (DIFFICULTY_MAP[bounty.difficulty] ?? "BEGINNER")
+    : "BEGINNER";
+  const reward = bounty.rewardAmount ?? 0;
+  const claimedAt = bounty.claimedAt ?? bounty.createdAt;
+  const completedAt = bounty.updatedAt;
+
+  return {
+    id: `completion-${bounty.id}-${index}`,
+    bountyId: bounty.id,
+    bountyTitle: bounty.issueTitle,
+    projectName: bounty.projectName,
+    projectLogoUrl: bounty.projectLogoUrl,
+    difficulty,
+    rewardAmount: reward,
+    rewardCurrency: bounty.rewardCurrency,
+    claimedAt,
+    completedAt,
+    completionTimeHours: 0,
+    maintainerRating: null,
+    maintainerFeedback: null,
+    pointsEarned: reward,
+  };
+}
+
+export async function GET(
+  request: NextRequest,
+  context: { params: Promise<{ userId: string }> },
+) {
+  try {
+    const { userId } = await context.params;
+    const { searchParams } = new URL(request.url);
+    const limit = Math.min(
+      Math.max(1, Number(searchParams.get("limit")) || 50),
+      100,
+    );
+    const offset = Math.max(0, Number(searchParams.get("offset")) || 0);
+
+    const bounties = BountyStore.getBounties();
+    const completed = bounties.filter(
+      (b) => b.status === "closed" && b.claimedBy === userId,
+    );
+
+    const totalCount = completed.length;
+    const paginated = completed.slice(offset, offset + limit);
+    const records: BountyCompletionRecord[] = paginated.map((b, i) =>
+      bountyToCompletionRecord(b, offset + i),
+    );
+
+    return NextResponse.json({
+      records,
+      totalCount,
+      hasMore: offset + records.length < totalCount,
+    });
+  } catch (error) {
+    console.error("Error fetching completion history:", error);
+    return NextResponse.json(
+      { error: "Internal Server Error" },
+      { status: 500 },
+    );
+  }
+}
diff --git a/app/api/transparency/payouts/route.ts b/app/api/transparency/payouts/route.ts
index d74dc48..4ef5581 100644
--- a/app/api/transparency/payouts/route.ts
+++ b/app/api/transparency/payouts/route.ts
@@ -1,19 +1,19 @@
 import { NextRequest, NextResponse } from "next/server";
 
 export async function GET(request: NextRequest) {
-    const { searchParams } = new URL(request.url);
-    const limit = Number(searchParams.get("limit")) || 10;
+  const { searchParams } = new URL(request.url);
+  const limit = Number(searchParams.get("limit")) || 10;
 
-    // TODO: Replace with real DB queries when backend is ready
-    const payouts: {
-        id: string;
-        contributorName: string;
-        contributorAvatar: string | null;
-        amount: number;
-        currency: string;
-        projectName: string;
-        paidAt: string;
-    }[] = [];
+  // TODO: Replace with real DB queries when backend is ready
+  const payouts: {
+    id: string;
+    contributorName: string;
+    contributorAvatar: string | null;
+    amount: number;
+    currency: string;
+    projectName: string;
+    paidAt: string;
+  }[] = [];
 
-    return NextResponse.json(payouts.slice(0, limit));
-}
\ No newline at end of file
+  return NextResponse.json(payouts.slice(0, limit));
+}
diff --git a/app/api/transparency/stats/route.ts b/app/api/transparency/stats/route.ts
index baf83b3..2c2e815 100644
--- a/app/api/transparency/stats/route.ts
+++ b/app/api/transparency/stats/route.ts
@@ -1,13 +1,13 @@
 import { NextResponse } from "next/server";
 
 export async function GET() {
-    // TODO: Replace with real DB queries when backend is ready
-    const stats = {
-        totalFundsDistributed: 0,
-        totalContributorsPaid: 0,
-        totalProjectsFunded: 0,
-        averagePayoutTimeDays: 0,
-    };
+  // TODO: Replace with real DB queries when backend is ready
+  const stats = {
+    totalFundsDistributed: 0,
+    totalContributorsPaid: 0,
+    totalProjectsFunded: 0,
+    averagePayoutTimeDays: 0,
+  };
 
-    return NextResponse.json(stats);
-}
\ No newline at end of file
+  return NextResponse.json(stats);
+}
diff --git a/app/profile/[userId]/page.tsx b/app/profile/[userId]/page.tsx
index 743a525..00ad8ba 100644
--- a/app/profile/[userId]/page.tsx
+++ b/app/profile/[userId]/page.tsx
@@ -1,6 +1,9 @@
 "use client";
 
-import { useContributorReputation } from "@/hooks/use-reputation";
+import {
+  useContributorReputation,
+  useCompletionHistory,
+} from "@/hooks/use-reputation";
 import { useBounties } from "@/hooks/use-bounties";
 import { ReputationCard } from "@/components/reputation/reputation-card";
 import { CompletionHistory } from "@/components/reputation/completion-history";
@@ -14,184 +17,186 @@ import { useParams } from "next/navigation";
 import { useMemo } from "react";
 
 export default function ProfilePage() {
-    const params = useParams();
-    const userId = params.userId as string;
-    const { data: reputation, isLoading, error } = useContributorReputation(userId);
-    const { data: bountyResponse } = useBounties();
-
-    const MAX_MOCK_HISTORY = 50;
-
-    const mockHistory = useMemo(() => {
-        if (!reputation) return [];
-        const count = Math.min(reputation.stats.totalCompleted ?? 0, MAX_MOCK_HISTORY);
-        return Array(count).fill(null).map((_, i) => ({
-            id: `bounty-${i}`,
-            bountyId: `b-${i}`,
-            bountyTitle: `Implemented feature #${100 + i}`,
-            projectName: "Drips Protocol",
-            projectLogoUrl: null,
-            difficulty: ["BEGINNER", "INTERMEDIATE", "ADVANCED"][i % 3] as "BEGINNER" | "INTERMEDIATE" | "ADVANCED",
-            rewardAmount: 500,
-            rewardCurrency: "USDC",
-            claimedAt: "2023-01-01T00:00:00Z",
-            completedAt: "2024-01-15T12:00:00Z",
-            completionTimeHours: 48,
-            maintainerRating: 5,
-            maintainerFeedback: "Great work!",
-            pointsEarned: 150
-        }));
-    }, [reputation]);
-
-    const myClaims = useMemo<MyClaim[]>(() => {
-        const bounties = bountyResponse?.data ?? [];
-
-        return bounties
-            .filter((bounty) => bounty.claimedBy === userId)
-            .map((bounty) => {
-                let status = "active";
-
-                if (bounty.status === "closed") {
-                    status = "completed";
-                } else if (bounty.status === "claimed" && bounty.claimExpiresAt) {
-                    const claimExpiry = new Date(bounty.claimExpiresAt);
-                    if (!Number.isNaN(claimExpiry.getTime()) && claimExpiry < new Date()) {
-                        status = "in-review";
-                    }
-                }
-
-                return {
-                    bountyId: bounty.id,
-                    title: bounty.issueTitle,
-                    status,
-                    rewardAmount: bounty.rewardAmount ?? undefined,
-                };
-            });
-    }, [bountyResponse?.data, userId]);
-
-    if (isLoading) {
-        return (
-            <div className="container mx-auto py-8">
-                <Skeleton className="h-10 w-32 mb-8" />
-                <div className="grid grid-cols-1 md:grid-cols-3 gap-8">
-                    <Skeleton className="h-100 md:col-span-1" />
-                    <Skeleton className="h-100 md:col-span-2" />
-                </div>
-            </div>
-        );
-    }
-
-    if (error) {
-        // Check if it's a 404 (Not Found)
-        const apiError = error as { status?: number; message?: string };
-        const isNotFound = apiError?.status === 404 || apiError?.message?.includes("404");
-
-        if (isNotFound) {
-            return (
-                <div className="container mx-auto py-16 text-center">
-                    <AlertCircle className="w-12 h-12 mx-auto text-muted-foreground mb-4" />
-                    <h1 className="text-2xl font-bold mb-2">Profile Not Found</h1>
-                    <p className="text-muted-foreground mb-6">
-                        We could not find a reputation profile for this user.
-                    </p>
-                    <Button asChild variant="outline">
-                        <Link href="/">Return Home</Link>
-                    </Button>
-                </div>
-            );
+  const params = useParams();
+  const userId = params.userId as string;
+  const {
+    data: reputation,
+    isLoading,
+    error,
+  } = useContributorReputation(userId);
+  const { data: bountyResponse } = useBounties();
+  const { data: completionData, isLoading: completionLoading } =
+    useCompletionHistory(userId);
+
+  const completionRecords = completionData?.records ?? [];
+
+  const myClaims = useMemo<MyClaim[]>(() => {
+    const bounties = bountyResponse?.data ?? [];
+
+    return bounties
+      .filter((bounty) => bounty.claimedBy === userId)
+      .map((bounty) => {
+        let status = "active";
+
+        if (bounty.status === "closed") {
+          status = "completed";
+        } else if (bounty.status === "claimed" && bounty.claimExpiresAt) {
+          const claimExpiry = new Date(bounty.claimExpiresAt);
+          if (
+            !Number.isNaN(claimExpiry.getTime()) &&
+            claimExpiry < new Date()
+          ) {
+            status = "expired";
+          }
         }
 
-        // Generic Error
-        return (
-            <div className="container mx-auto py-16 text-center">
-                <AlertCircle className="w-12 h-12 mx-auto text-destructive mb-4" />
-                <h1 className="text-2xl font-bold mb-2">Something went wrong</h1>
-                <p className="text-muted-foreground mb-6">
-                    We encountered an error while loading the profile.
-                </p>
-                <Button variant="outline" onClick={() => window.location.reload()}>
-                    Try Again
-                </Button>
-            </div>
-        );
-    }
+        return {
+          bountyId: bounty.id,
+          title: bounty.issueTitle,
+          status,
+          rewardAmount: bounty.rewardAmount ?? undefined,
+        };
+      });
+  }, [bountyResponse?.data, userId]);
 
-    if (!reputation) {
-        return (
-            <div className="container mx-auto py-16 text-center">
-                <AlertCircle className="w-12 h-12 mx-auto text-muted-foreground mb-4" />
-                <h1 className="text-2xl font-bold mb-2">Profile Not Found</h1>
-                <p className="text-muted-foreground mb-6">
-                    We could not find a reputation profile for this user.
-                </p>
-                <Button asChild variant="outline">
-                    <Link href="/">Return Home</Link>
-                </Button>
-            </div>
-        );
+  if (isLoading) {
+    return (
+      <div className="container mx-auto py-8">
+        <Skeleton className="h-10 w-32 mb-8" />
+        <div className="grid grid-cols-1 md:grid-cols-3 gap-8">
+          <Skeleton className="h-100 md:col-span-1" />
+          <Skeleton className="h-100 md:col-span-2" />
+        </div>
+      </div>
+    );
+  }
+
+  if (error) {
+    // Check if it's a 404 (Not Found)
+    const apiError = error as { status?: number; message?: string };
+    const isNotFound =
+      apiError?.status === 404 || apiError?.message?.includes("404");
+
+    if (isNotFound) {
+      return (
+        <div className="container mx-auto py-16 text-center">
+          <AlertCircle className="w-12 h-12 mx-auto text-muted-foreground mb-4" />
+          <h1 className="text-2xl font-bold mb-2">Profile Not Found</h1>
+          <p className="text-muted-foreground mb-6">
+            We could not find a reputation profile for this user.
+          </p>
+          <Button asChild variant="outline">
+            <Link href="/">Return Home</Link>
+          </Button>
+        </div>
+      );
     }
 
+    // Generic Error
     return (
-        <div className="container max-w-6xl mx-auto py-8 px-4">
-            <Button asChild variant="ghost" size="sm" className="mb-6 -ml-2 text-muted-foreground">
-                <Link href="/">
-                    <ChevronLeft className="w-4 h-4 mr-1" />
-                    Back to Home
-                </Link>
-            </Button>
-
-            <div className="grid grid-cols-1 lg:grid-cols-12 gap-8">
-                {/* Left Sidebar: Reputation Card */}
-                <div className="lg:col-span-4 space-y-6">
-                    <ReputationCard reputation={reputation} />
-
-                    {/* Additional Sidebar Info could go here */}
-                </div>
-
-                {/* Main Content: Activity & History */}
-                <div className="lg:col-span-8">
-                    <Tabs defaultValue="history" className="w-full">
-                        <TabsList className="w-full justify-start border-b rounded-none h-auto p-0 bg-transparent">
-                            <TabsTrigger
-                                value="history"
-                                className="rounded-none border-b-2 border-transparent data-[state=active]:border-primary data-[state=active]:bg-transparent px-4 py-3"
-                            >
-                                Bounty History
-                            </TabsTrigger>
-                            <TabsTrigger
-                                value="analytics"
-                                className="rounded-none border-b-2 border-transparent data-[state=active]:border-primary data-[state=active]:bg-transparent px-4 py-3"
-                            >
-                                Analytics
-                            </TabsTrigger>
-                            <TabsTrigger
-                                value="claims"
-                                className="rounded-none border-b-2 border-transparent data-[state=active]:border-primary data-[state=active]:bg-transparent px-4 py-3"
-                            >
-                                My Claims
-                            </TabsTrigger>
-                        </TabsList>
-
-                        <TabsContent value="history" className="mt-6">
-                            <h2 className="text-xl font-bold mb-4">Activity History</h2>
-                            <CompletionHistory
-                                records={mockHistory}
-                                description={`Showing the last ${mockHistory.length} completed bounties.`}
-                            />
-                        </TabsContent>
-
-                        <TabsContent value="analytics" className="mt-6">
-                            <div className="p-8 border rounded-lg text-center text-muted-foreground bg-secondary/5">
-                                Detailed analytics coming soon.
-                            </div>
-                        </TabsContent>
-
-                        <TabsContent value="claims" className="mt-6">
-                            <h2 className="text-xl font-bold mb-4">My Claims</h2>
-                            <MyClaims claims={myClaims} />
-                        </TabsContent>
-                    </Tabs>
-                </div>
-            </div>
-        </div>
+      <div className="container mx-auto py-16 text-center">
+        <AlertCircle className="w-12 h-12 mx-auto text-destructive mb-4" />
+        <h1 className="text-2xl font-bold mb-2">Something went wrong</h1>
+        <p className="text-muted-foreground mb-6">
+          We encountered an error while loading the profile.
+        </p>
+        <Button variant="outline" onClick={() => window.location.reload()}>
+          Try Again
+        </Button>
+      </div>
+    );
+  }
+
+  if (!reputation) {
+    return (
+      <div className="container mx-auto py-16 text-center">
+        <AlertCircle className="w-12 h-12 mx-auto text-muted-foreground mb-4" />
+        <h1 className="text-2xl font-bold mb-2">Profile Not Found</h1>
+        <p className="text-muted-foreground mb-6">
+          We could not find a reputation profile for this user.
+        </p>
+        <Button asChild variant="outline">
+          <Link href="/">Return Home</Link>
+        </Button>
+      </div>
     );
+  }
+
+  return (
+    <div className="container max-w-6xl mx-auto py-8 px-4">
+      <Button
+        asChild
+        variant="ghost"
+        size="sm"
+        className="mb-6 -ml-2 text-muted-foreground"
+      >
+        <Link href="/">
+          <ChevronLeft className="w-4 h-4 mr-1" />
+          Back to Home
+        </Link>
+      </Button>
+
+      <div className="grid grid-cols-1 lg:grid-cols-12 gap-8">
+        {/* Left Sidebar: Reputation Card */}
+        <div className="lg:col-span-4 space-y-6">
+          <ReputationCard reputation={reputation} />
+
+          {/* Additional Sidebar Info could go here */}
+        </div>
+
+        {/* Main Content: Activity & History */}
+        <div className="lg:col-span-8">
+          <Tabs defaultValue="history" className="w-full">
+            <TabsList className="w-full justify-start border-b rounded-none h-auto p-0 bg-transparent">
+              <TabsTrigger
+                value="history"
+                className="rounded-none border-b-2 border-transparent data-[state=active]:border-primary data-[state=active]:bg-transparent px-4 py-3"
+              >
+                Bounty History
+              </TabsTrigger>
+              <TabsTrigger
+                value="analytics"
+                className="rounded-none border-b-2 border-transparent data-[state=active]:border-primary data-[state=active]:bg-transparent px-4 py-3"
+              >
+                Analytics
+              </TabsTrigger>
+              <TabsTrigger
+                value="claims"
+                className="rounded-none border-b-2 border-transparent data-[state=active]:border-primary data-[state=active]:bg-transparent px-4 py-3"
+              >
+                My Claims
+              </TabsTrigger>
+            </TabsList>
+
+            <TabsContent value="history" className="mt-6">
+              <h2 className="text-xl font-bold mb-4">Activity History</h2>
+              {completionLoading ? (
+                <Skeleton className="h-[400px] w-full" />
+              ) : (
+                <CompletionHistory
+                  records={completionRecords}
+                  description={
+                    completionRecords.length > 0
+                      ? `Showing the last ${completionRecords.length} completed bounties.`
+                      : undefined
+                  }
+                />
+              )}
+            </TabsContent>
+
+            <TabsContent value="analytics" className="mt-6">
+              <div className="p-8 border rounded-lg text-center text-muted-foreground bg-secondary/5">
+                Detailed analytics coming soon.
+              </div>
+            </TabsContent>
+
+            <TabsContent value="claims" className="mt-6">
+              <h2 className="text-xl font-bold mb-4">My Claims</h2>
+              <MyClaims claims={myClaims} />
+            </TabsContent>
+          </Tabs>
+        </div>
+      </div>
+    </div>
+  );
 }
diff --git a/app/transparency/page.tsx b/app/transparency/page.tsx
index d75abd6..39dc2f6 100644
--- a/app/transparency/page.tsx
+++ b/app/transparency/page.tsx
@@ -1,7 +1,14 @@
 "use client";
 
+import type { ElementType } from "react";
 import { usePlatformStats, useRecentPayouts } from "@/hooks/use-transparency";
-import { AlertCircle, DollarSign, Users, FolderOpen, Clock } from "lucide-react";
+import {
+  AlertCircle,
+  DollarSign,
+  Users,
+  FolderOpen,
+  Clock,
+} from "lucide-react";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
@@ -10,221 +17,235 @@ import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 import { Badge } from "@/components/ui/badge";
 import type { RecentPayout } from "@/lib/api/transparency";
 
-// Stat Card 
+// Stat Card
 
 function StatCard({
-    title,
-    value,
-    icon: Icon,
-    isLoading,
+  title,
+  value,
+  icon: Icon,
+  isLoading,
 }: {
-    title: string;
-    value: string;
-    icon: React.ElementType;
-    isLoading: boolean;
+  title: string;
+  value: string;
+  icon: ElementType;
+  isLoading: boolean;
 }) {
-    return (
-        <Card>
-            <CardHeader className="flex flex-row items-center justify-between pb-2">
-                <CardTitle className="text-sm font-medium text-muted-foreground">
-                    {title}
-                </CardTitle>
-                <Icon className="h-4 w-4 text-muted-foreground" />
-            </CardHeader>
-            <CardContent>
-                {isLoading ? (
-                    <Skeleton className="h-8 w-32" />
-                ) : (
-                    <p className="text-2xl font-bold text-foreground">{value}</p>
-                )}
-            </CardContent>
-        </Card>
-    );
+  return (
+    <Card>
+      <CardHeader className="flex flex-row items-center justify-between pb-2">
+        <CardTitle className="text-sm font-medium text-muted-foreground">
+          {title}
+        </CardTitle>
+        <Icon className="h-4 w-4 text-muted-foreground" />
+      </CardHeader>
+      <CardContent>
+        {isLoading ? (
+          <Skeleton className="h-8 w-32" />
+        ) : (
+          <p className="text-2xl font-bold text-foreground">{value}</p>
+        )}
+      </CardContent>
+    </Card>
+  );
 }
 
-// Payout Row 
+// Payout Row
 
 function PayoutRow({ payout }: { payout: RecentPayout }) {
-    return (
-        <div className="flex items-center justify-between py-3 border-b border-border/50 last:border-0">
-            <div className="flex items-center gap-3">
-                <Avatar className="h-8 w-8">
-                    <AvatarImage src={payout.contributorAvatar ?? undefined} />
-                    <AvatarFallback>
-                        {payout.contributorName.slice(0, 2).toUpperCase()}
-                    </AvatarFallback>
-                </Avatar>
-                <div>
-                    <p className="text-sm font-medium text-foreground">
-                        {payout.contributorName}
-                    </p>
-                    <p className="text-xs text-muted-foreground">{payout.projectName}</p>
-                </div>
-            </div>
-            <div className="flex items-center gap-2">
-                <Badge variant="secondary" className="font-mono">
-                    {payout.amount.toLocaleString()} {payout.currency}
-                </Badge>
-                <span className="text-xs text-muted-foreground hidden sm:block">
-                    {new Date(payout.paidAt).toLocaleDateString()}
-                </span>
-            </div>
+  return (
+    <div className="flex items-center justify-between py-3 border-b border-border/50 last:border-0">
+      <div className="flex items-center gap-3">
+        <Avatar className="h-8 w-8">
+          <AvatarImage src={payout.contributorAvatar ?? undefined} />
+          <AvatarFallback>
+            {payout.contributorName.slice(0, 2).toUpperCase()}
+          </AvatarFallback>
+        </Avatar>
+        <div>
+          <p className="text-sm font-medium text-foreground">
+            {payout.contributorName}
+          </p>
+          <p className="text-xs text-muted-foreground">{payout.projectName}</p>
         </div>
-    );
+      </div>
+      <div className="flex items-center gap-2">
+        <Badge variant="secondary" className="font-mono">
+          {payout.amount.toLocaleString()} {payout.currency}
+        </Badge>
+        <span className="text-xs text-muted-foreground hidden sm:block">
+          {new Date(payout.paidAt).toLocaleDateString()}
+        </span>
+      </div>
+    </div>
+  );
 }
 
-// Page 
+// Page
 
 export default function TransparencyPage() {
-    const {
-        data: stats,
-        isLoading: statsLoading,
-        isError: statsError,
-        error: statsErr,
-        refetch: refetchStats,
-    } = usePlatformStats();
+  const {
+    data: stats,
+    isLoading: statsLoading,
+    isError: statsError,
+    error: statsErr,
+    refetch: refetchStats,
+  } = usePlatformStats();
 
-    const {
-        data: payouts,
-        isLoading: payoutsLoading,
-        isError: payoutsError,
-        refetch: refetchPayouts,
-    } = useRecentPayouts(10);
+  const {
+    data: payouts,
+    isLoading: payoutsLoading,
+    isError: payoutsError,
+    refetch: refetchPayouts,
+  } = useRecentPayouts(10);
 
-    const statCards = [
-        {
-            title: "Total Funds Distributed",
-            value: stats
-                ? `$${stats.totalFundsDistributed.toLocaleString()}`
-                : "$0",
-            icon: DollarSign,
-        },
-        {
-            title: "Contributors Paid",
-            value: stats ? stats.totalContributorsPaid.toLocaleString() : "0",
-            icon: Users,
-        },
-        {
-            title: "Projects Funded",
-            value: stats ? stats.totalProjectsFunded.toLocaleString() : "0",
-            icon: FolderOpen,
-        },
-        {
-            title: "Avg. Payout Time",
-            value: stats ? `${stats.averagePayoutTimeDays} days` : "0 days",
-            icon: Clock,
-        },
-    ];
+  const statCards = [
+    {
+      title: "Total Funds Distributed",
+      value: statsError
+        ? "—"
+        : stats
+          ? `$${stats.totalFundsDistributed.toLocaleString()}`
+          : "$0",
+      icon: DollarSign,
+    },
+    {
+      title: "Contributors Paid",
+      value: statsError
+        ? "—"
+        : stats
+          ? stats.totalContributorsPaid.toLocaleString()
+          : "0",
+      icon: Users,
+    },
+    {
+      title: "Projects Funded",
+      value: statsError
+        ? "—"
+        : stats
+          ? stats.totalProjectsFunded.toLocaleString()
+          : "0",
+      icon: FolderOpen,
+    },
+    {
+      title: "Avg. Payout Time",
+      value: statsError
+        ? "—"
+        : stats
+          ? `${stats.averagePayoutTimeDays} days`
+          : "0 days",
+      icon: Clock,
+    },
+  ];
 
-    return (
-        <div className="min-h-screen bg-background pb-12">
-            {/* Hero Header */}
-            <div className="border-b border-border/40">
-                <div className="container mx-auto px-4 py-12">
-                    <h1 className="text-3xl md:text-4xl font-bold text-foreground tracking-tight mb-3">
-                        Transparency
-                    </h1>
-                    <p className="text-lg text-muted-foreground max-w-2xl">
-                        A real-time look at platform funding activity, contributor payouts,
-                        and ecosystem growth.
-                    </p>
-                </div>
-            </div>
-
-            <div className="container mx-auto px-4 py-8 space-y-10">
+  return (
+    <div className="min-h-screen bg-background pb-12">
+      {/* Hero Header */}
+      <div className="border-b border-border/40">
+        <div className="container mx-auto px-4 py-12">
+          <h1 className="text-3xl md:text-4xl font-bold text-foreground tracking-tight mb-3">
+            Transparency
+          </h1>
+          <p className="text-lg text-muted-foreground max-w-2xl">
+            A real-time look at platform funding activity, contributor payouts,
+            and ecosystem growth.
+          </p>
+        </div>
+      </div>
 
-                {/* Stats Error */}
-                {statsError && (
-                    <Alert variant="destructive">
-                        <AlertCircle className="h-4 w-4" />
-                        <AlertTitle>Error</AlertTitle>
-                        <AlertDescription className="flex flex-col gap-2">
-                            <p>
-                                Failed to load platform stats.{" "}
-                                {(statsErr as Error)?.message}
-                            </p>
-                            <Button
-                                variant="outline"
-                                size="sm"
-                                onClick={() => refetchStats()}
-                                className="w-fit bg-background text-foreground border-border hover:bg-muted"
-                            >
-                                Try Again
-                            </Button>
-                        </AlertDescription>
-                    </Alert>
-                )}
+      <div className="container mx-auto px-4 py-8 space-y-10">
+        {/* Stats Error */}
+        {statsError && (
+          <Alert variant="destructive">
+            <AlertCircle className="h-4 w-4" />
+            <AlertTitle>Error</AlertTitle>
+            <AlertDescription className="flex flex-col gap-2">
+              <p>
+                Failed to load platform stats. {(statsErr as Error)?.message}
+              </p>
+              <Button
+                variant="outline"
+                size="sm"
+                onClick={() => refetchStats()}
+                className="w-fit bg-background text-foreground border-border hover:bg-muted"
+              >
+                Try Again
+              </Button>
+            </AlertDescription>
+          </Alert>
+        )}
 
-                {/* Stats Grid */}
-                <section>
-                    <h2 className="text-xl font-semibold text-foreground mb-4">
-                        Platform Overview
-                    </h2>
-                    <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4">
-                        {statCards.map((card) => (
-                            <StatCard
-                                key={card.title}
-                                title={card.title}
-                                value={card.value}
-                                icon={card.icon}
-                                isLoading={statsLoading}
-                            />
-                        ))}
-                    </div>
-                </section>
+        {/* Stats Grid - hidden when error so zeros aren't shown */}
+        {!statsError && (
+          <section>
+            <h2 className="text-xl font-semibold text-foreground mb-4">
+              Platform Overview
+            </h2>
+            <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4">
+              {statCards.map((card) => (
+                <StatCard
+                  key={card.title}
+                  title={card.title}
+                  value={card.value}
+                  icon={card.icon}
+                  isLoading={statsLoading}
+                />
+              ))}
+            </div>
+          </section>
+        )}
 
-                {/* Recent Payouts */}
-                <section>
-                    <h2 className="text-xl font-semibold text-foreground mb-4">
-                        Recent Payouts
-                    </h2>
+        {/* Recent Payouts */}
+        <section>
+          <h2 className="text-xl font-semibold text-foreground mb-4">
+            Recent Payouts
+          </h2>
 
-                    {payoutsError ? (
-                        <Alert variant="destructive">
-                            <AlertCircle className="h-4 w-4" />
-                            <AlertTitle>Error</AlertTitle>
-                            <AlertDescription className="flex flex-col gap-2">
-                                <p>Failed to load recent payouts.</p>
-                                <Button
-                                    variant="outline"
-                                    size="sm"
-                                    onClick={() => refetchPayouts()}
-                                    className="w-fit bg-background text-foreground border-border hover:bg-muted"
-                                >
-                                    Try Again
-                                </Button>
-                            </AlertDescription>
-                        </Alert>
-                    ) : (
-                        <Card>
-                            <CardContent className="pt-4">
-                                {payoutsLoading ? (
-                                    <div className="space-y-3">
-                                        {Array.from({ length: 5 }).map((_, i) => (
-                                            <div key={i} className="flex items-center gap-3">
-                                                <Skeleton className="h-8 w-8 rounded-full" />
-                                                <div className="space-y-1 flex-1">
-                                                    <Skeleton className="h-4 w-32" />
-                                                    <Skeleton className="h-3 w-20" />
-                                                </div>
-                                                <Skeleton className="h-6 w-20" />
-                                            </div>
-                                        ))}
-                                    </div>
-                                ) : !payouts || payouts.length === 0 ? (
-                                    <p className="text-sm text-muted-foreground text-center py-8">
-                                        No payouts recorded yet.
-                                    </p>
-                                ) : (
-                                    payouts.map((payout) => (
-                                        <PayoutRow key={payout.id} payout={payout} />
-                                    ))
-                                )}
-                            </CardContent>
-                        </Card>
-                    )}
-                </section>
-            </div>
-        </div>
-    );
-}
\ No newline at end of file
+          {payoutsError ? (
+            <Alert variant="destructive">
+              <AlertCircle className="h-4 w-4" />
+              <AlertTitle>Error</AlertTitle>
+              <AlertDescription className="flex flex-col gap-2">
+                <p>Failed to load recent payouts.</p>
+                <Button
+                  variant="outline"
+                  size="sm"
+                  onClick={() => refetchPayouts()}
+                  className="w-fit bg-background text-foreground border-border hover:bg-muted"
+                >
+                  Try Again
+                </Button>
+              </AlertDescription>
+            </Alert>
+          ) : (
+            <Card>
+              <CardContent className="pt-4">
+                {payoutsLoading ? (
+                  <div className="space-y-3">
+                    {Array.from({ length: 5 }).map((_, i) => (
+                      <div key={i} className="flex items-center gap-3">
+                        <Skeleton className="h-8 w-8 rounded-full" />
+                        <div className="space-y-1 flex-1">
+                          <Skeleton className="h-4 w-32" />
+                          <Skeleton className="h-3 w-20" />
+                        </div>
+                        <Skeleton className="h-6 w-20" />
+                      </div>
+                    ))}
+                  </div>
+                ) : !payouts || payouts.length === 0 ? (
+                  <p className="text-sm text-muted-foreground text-center py-8">
+                    No payouts recorded yet.
+                  </p>
+                ) : (
+                  payouts.map((payout) => (
+                    <PayoutRow key={payout.id} payout={payout} />
+                  ))
+                )}
+              </CardContent>
+            </Card>
+          )}
+        </section>
+      </div>
+    </div>
+  );
+}
diff --git a/components/bounty-detail/bounty-detail-sidebar-cta.tsx b/components/bounty-detail/bounty-detail-sidebar-cta.tsx
index a26cf5d..730f5a4 100644
--- a/components/bounty-detail/bounty-detail-sidebar-cta.tsx
+++ b/components/bounty-detail/bounty-detail-sidebar-cta.tsx
@@ -8,9 +8,11 @@ import { Separator } from "@/components/ui/separator";
 import type { Bounty } from "@/lib/api";
 import { DifficultyBadge, StatusBadge } from "./bounty-badges";
 import { CLAIMING_MODEL_CONFIG } from "@/lib/bounty-config";
+import { SubmissionDialog } from "./submission-dialog";
 
 export function SidebarCTA({ bounty }: { bounty: Bounty }) {
   const [copied, setCopied] = useState(false);
+  const [dialogOpen, setDialogOpen] = useState(false);
   const canAct = bounty.status === "open";
   const claimCfg = CLAIMING_MODEL_CONFIG[bounty.claimingModel];
   const ClaimIcon = claimCfg.icon;
@@ -102,14 +104,18 @@ export function SidebarCTA({ bounty }: { bounty: Bounty }) {
         className="w-full h-11 font-bold tracking-wide"
         disabled={!canAct}
         size="lg"
-        onClick={() =>
-          canAct &&
-          window.open(bounty.githubIssueUrl, "_blank", "noopener,noreferrer")
-        }
+        onClick={() => canAct && setDialogOpen(true)}
       >
         {ctaLabel()}
       </Button>
 
+      <SubmissionDialog
+        bountyId={bounty.id}
+        bountyTitle={bounty.issueTitle}
+        open={dialogOpen}
+        onOpenChange={setDialogOpen}
+      />
+
       {!canAct && (
         <p className="flex items-center gap-1.5 text-xs text-gray-500 justify-center text-center">
           <AlertCircle className="size-3 shrink-0" />
@@ -169,8 +175,8 @@ export function ClaimModelInfo({
 }
 
 export function MobileCTA({ bounty }: { bounty: Bounty }) {
+  const [dialogOpen, setDialogOpen] = useState(false);
   const canAct = bounty.status === "open";
-  // const claimCfg = CLAIMING_MODEL_CONFIG[bounty.claimingModel];
 
   const label = () => {
     if (!canAct)
@@ -193,13 +199,17 @@ export function MobileCTA({ bounty }: { bounty: Bounty }) {
         className="w-full h-11 font-bold tracking-wide"
         disabled={!canAct}
         size="lg"
-        onClick={() =>
-          canAct &&
-          window.open(bounty.githubIssueUrl, "_blank", "noopener,noreferrer")
-        }
+        onClick={() => canAct && setDialogOpen(true)}
       >
         {label()}
       </Button>
+
+      <SubmissionDialog
+        bountyId={bounty.id}
+        bountyTitle={bounty.issueTitle}
+        open={dialogOpen}
+        onOpenChange={setDialogOpen}
+      />
     </div>
   );
 }
diff --git a/components/bounty-detail/submission-dialog.tsx b/components/bounty-detail/submission-dialog.tsx
new file mode 100644
index 0000000..bb6c007
--- /dev/null
+++ b/components/bounty-detail/submission-dialog.tsx
@@ -0,0 +1,354 @@
+"use client";
+
+import { useCallback, useEffect, useRef, useState } from "react";
+import { useForm, useFieldArray } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { toast } from "sonner";
+import { Plus, Trash2, Save, Send, Loader2 } from "lucide-react";
+
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Textarea } from "@/components/ui/textarea";
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+  FormDescription,
+} from "@/components/ui/form";
+import {
+  submissionFormSchema,
+  type SubmissionFormValue,
+} from "@/components/bounty/forms/schemas";
+import { useLocalStorage } from "@/hooks/use-local-storage";
+import { bountiesApi } from "@/lib/api/bounties";
+import { authClient } from "@/lib/auth-client";
+import { mockWalletInfo } from "@/lib/mock-wallet";
+
+interface SubmissionDialogProps {
+  bountyId: string;
+  bountyTitle: string;
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+}
+
+const getBaseDefaults = (): SubmissionFormValue => ({
+  githubUrl: "",
+  demoUrl: "",
+  explanation: "",
+  attachments: [],
+  walletAddress: mockWalletInfo.address,
+});
+
+export function SubmissionDialog({
+  bountyId,
+  bountyTitle,
+  open,
+  onOpenChange,
+}: SubmissionDialogProps) {
+  const [submitting, setSubmitting] = useState(false);
+  const [submitted, setSubmitted] = useState(false);
+  const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const { data: session } = authClient.useSession();
+  const storageKey = `submission-draft-${bountyId}`;
+  const [draft, setDraft] = useLocalStorage<SubmissionFormValue | null>(
+    storageKey,
+    null,
+  );
+
+  const baseDefaults = getBaseDefaults();
+
+  const form = useForm<SubmissionFormValue>({
+    resolver: zodResolver(submissionFormSchema),
+    defaultValues: draft
+      ? { ...draft, walletAddress: baseDefaults.walletAddress }
+      : baseDefaults,
+  });
+
+  useEffect(() => {
+    return () => {
+      if (timeoutRef.current) clearTimeout(timeoutRef.current);
+    };
+  }, []);
+
+  const { fields, append, remove } = useFieldArray({
+    control: form.control,
+    name: "attachments" as never,
+  });
+
+  useEffect(() => {
+    if (open && draft) {
+      form.reset({ ...draft, walletAddress: baseDefaults.walletAddress });
+    } else if (open) {
+      form.reset(baseDefaults);
+    }
+    if (open) {
+      setSubmitted(false);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [open]);
+
+  const saveDraft = useCallback(() => {
+    const values = form.getValues();
+    setDraft(values);
+    toast.success("Draft saved");
+    onOpenChange(false);
+  }, [form, setDraft, onOpenChange]);
+
+  const clearDraft = useCallback(() => {
+    setDraft(null);
+  }, [setDraft]);
+
+  const onSubmit = async (data: SubmissionFormValue) => {
+    const contributorId = session?.user?.id;
+    if (!contributorId) {
+      toast.error("You must be signed in to submit.");
+      return;
+    }
+
+    setSubmitting(true);
+    try {
+      const payload = {
+        ...data,
+        githubUrl: data.githubUrl || undefined,
+        demoUrl: data.demoUrl || undefined,
+        attachments: data.attachments?.filter(Boolean),
+        contributorId,
+      };
+
+      await bountiesApi.submit(bountyId, payload);
+
+      clearDraft();
+      form.reset(baseDefaults);
+      setSubmitted(true);
+      toast.success("Submission sent successfully!");
+
+      if (timeoutRef.current) clearTimeout(timeoutRef.current);
+      timeoutRef.current = setTimeout(() => {
+        timeoutRef.current = null;
+        onOpenChange(false);
+        setSubmitted(false);
+      }, 2000);
+    } catch (err) {
+      const message =
+        err instanceof Error
+          ? err.message
+          : "Failed to submit. Please try again.";
+      toast.error(message);
+    } finally {
+      setSubmitting(false);
+    }
+  };
+
+  if (submitted) {
+    return (
+      <Dialog open={open} onOpenChange={onOpenChange}>
+        <DialogContent className="sm:max-w-lg bg-background border-border">
+          <div className="flex flex-col items-center justify-center gap-4 py-8 text-center">
+            <div className="size-16 rounded-full bg-emerald-500/10 flex items-center justify-center">
+              <Send className="size-7 text-emerald-400" />
+            </div>
+            <h3 className="text-lg font-bold text-foreground">
+              Submission Sent!
+            </h3>
+            <p className="text-sm text-muted-foreground max-w-xs">
+              Your work for &quot;{bountyTitle}&quot; has been submitted and is
+              pending review.
+            </p>
+          </div>
+        </DialogContent>
+      </Dialog>
+    );
+  }
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent className="sm:max-w-lg bg-background border-border max-h-[85vh] overflow-y-auto">
+        <DialogHeader>
+          <DialogTitle>Submit Work</DialogTitle>
+          <DialogDescription>
+            Submit your work for &quot;{bountyTitle}&quot;
+          </DialogDescription>
+        </DialogHeader>
+
+        <Form {...form}>
+          <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-5">
+            <FormField
+              control={form.control}
+              name="walletAddress"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>
+                    Wallet Address <span className="text-destructive">*</span>
+                  </FormLabel>
+                  <FormControl>
+                    <Input
+                      placeholder="G... or 0x..."
+                      readOnly
+                      className="bg-muted cursor-default"
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormDescription>
+                    Your connected wallet (rewards will be sent here)
+                  </FormDescription>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name="explanation"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>
+                    Explanation <span className="text-destructive">*</span>
+                  </FormLabel>
+                  <FormControl>
+                    <Textarea
+                      placeholder="Describe your implementation, approach, and any relevant details..."
+                      className="min-h-[120px]"
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormDescription>
+                    {field.value?.length ?? 0}/5,000 characters (min 20)
+                  </FormDescription>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name="githubUrl"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>GitHub URL</FormLabel>
+                  <FormControl>
+                    <Input placeholder="https://github.com/..." {...field} />
+                  </FormControl>
+                  <FormDescription>
+                    Link to your pull request or repository
+                  </FormDescription>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name="demoUrl"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Demo URL</FormLabel>
+                  <FormControl>
+                    <Input placeholder="https://..." {...field} />
+                  </FormControl>
+                  <FormDescription>
+                    Link to a live demo or recording
+                  </FormDescription>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            {/* Attachments - dynamic list */}
+            <div className="space-y-3">
+              <div className="flex items-center justify-between">
+                <label className="text-sm font-medium leading-none">
+                  Attachments
+                </label>
+                <Button
+                  type="button"
+                  variant="ghost"
+                  size="sm"
+                  className="h-7 text-xs gap-1"
+                  onClick={() => append("" as never)}
+                >
+                  <Plus className="size-3" />
+                  Add URL
+                </Button>
+              </div>
+              {fields.length === 0 && (
+                <p className="text-xs text-muted-foreground">
+                  No attachments added. Click &quot;Add URL&quot; to include
+                  supporting links.
+                </p>
+              )}
+              {fields.map((field, index) => (
+                <FormField
+                  key={field.id}
+                  control={form.control}
+                  name={`attachments.${index}`}
+                  render={({ field: inputField }) => (
+                    <FormItem>
+                      <div className="flex items-center gap-2">
+                        <FormControl>
+                          <Input placeholder="https://..." {...inputField} />
+                        </FormControl>
+                        <Button
+                          type="button"
+                          variant="ghost"
+                          size="icon"
+                          className="shrink-0 size-9 text-muted-foreground hover:text-destructive"
+                          onClick={() => remove(index)}
+                        >
+                          <Trash2 className="size-4" />
+                        </Button>
+                      </div>
+                      <FormMessage />
+                    </FormItem>
+                  )}
+                />
+              ))}
+            </div>
+
+            {draft && (
+              <p className="text-xs text-muted-foreground flex items-center gap-1.5">
+                <Save className="size-3" />
+                Draft restored from previous session
+              </p>
+            )}
+
+            <DialogFooter className="gap-2 sm:gap-2">
+              <Button
+                type="button"
+                variant="outline"
+                onClick={saveDraft}
+                disabled={submitting || !session?.user?.id}
+                className="gap-1.5"
+              >
+                <Save className="size-4" />
+                Save Draft
+              </Button>
+              <Button
+                type="submit"
+                disabled={submitting || !session?.user?.id}
+                className="gap-1.5"
+              >
+                {submitting ? (
+                  <Loader2 className="size-4 animate-spin" />
+                ) : (
+                  <Send className="size-4" />
+                )}
+                {submitting ? "Submitting..." : "Submit"}
+              </Button>
+            </DialogFooter>
+          </form>
+        </Form>
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/components/bounty/forms/schemas.ts b/components/bounty/forms/schemas.ts
index 9658b2e..623d9cf 100644
--- a/components/bounty/forms/schemas.ts
+++ b/components/bounty/forms/schemas.ts
@@ -1,4 +1,4 @@
-import { z } from 'zod'
+import { z } from "zod";
 
 // Schema para BudgetInput
 export const budgetSchema = z.object({
@@ -6,65 +6,76 @@ export const budgetSchema = z.object({
     .number({
       error: (issue) =>
         issue.input === undefined
-          ? 'Amount is required'
-          : 'Amount must be a number',
+          ? "Amount is required"
+          : "Amount must be a number",
     })
-    .positive('Amount must be greater than 0')
-    .max(1_000_000_000, 'Amount exceeds maximum'),
-  asset: z.enum(['XLM', 'USDC', 'AQUA'], {
-    error: 'Please select an asset',
+    .positive("Amount must be greater than 0")
+    .max(1_000_000_000, "Amount exceeds maximum"),
+  asset: z.enum(["XLM", "USDC", "AQUA"], {
+    error: "Please select an asset",
   }),
-})
+});
 
-export type BudgetValue = z.infer<typeof budgetSchema>
+export type BudgetValue = z.infer<typeof budgetSchema>;
 
 // Schema para DeadlineInput
 export const deadlineSchema = z
   .date({
     error: (issue) =>
-      issue.input === undefined
-        ? 'Please select a deadline'
-        : 'Invalid date',
+      issue.input === undefined ? "Please select a deadline" : "Invalid date",
   })
-  .refine((date) => date > new Date(), 'Deadline must be in the future')
+  .refine((date) => date > new Date(), "Deadline must be in the future");
 
-export type DeadlineValue = z.infer<typeof deadlineSchema>
+export type DeadlineValue = z.infer<typeof deadlineSchema>;
 
 // Schema para Milestone individual
 export const milestoneSchema = z.object({
-  title: z.string().min(1, 'Title is required').max(100, 'Title is too long'),
-  description: z.string().max(500, 'Description is too long').optional(),
+  title: z.string().min(1, "Title is required").max(100, "Title is too long"),
+  description: z.string().max(500, "Description is too long").optional(),
   percentage: z
     .number({
       error: (issue) =>
         issue.input === undefined
-          ? 'Percentage is required'
-          : 'Percentage must be a number',
+          ? "Percentage is required"
+          : "Percentage must be a number",
     })
-    .min(1, 'Percentage must be at least 1%')
-    .max(100, 'Percentage cannot exceed 100%'),
-})
+    .min(1, "Percentage must be at least 1%")
+    .max(100, "Percentage cannot exceed 100%"),
+});
 
-export type MilestoneValue = z.infer<typeof milestoneSchema>
+export type MilestoneValue = z.infer<typeof milestoneSchema>;
 
 // Schema para array de Milestones
 export const milestonesSchema = z
   .array(milestoneSchema)
-  .min(1, 'At least one milestone is required')
+  .min(1, "At least one milestone is required")
   .refine(
     (milestones) => {
-      const total = milestones.reduce((sum, m) => sum + m.percentage, 0)
-      return total === 100
+      const total = milestones.reduce((sum, m) => sum + m.percentage, 0);
+      return total === 100;
     },
-    { message: 'Milestone percentages must total 100%' }
-  )
+    { message: "Milestone percentages must total 100%" },
+  );
 
-export type MilestonesValue = z.infer<typeof milestonesSchema>
+export type MilestonesValue = z.infer<typeof milestonesSchema>;
 
 // Schema para descripción markdown
 export const markdownContentSchema = z
   .string()
-  .min(10, 'Content must be at least 10 characters')
-  .max(10000, 'Content must not exceed 10,000 characters')
+  .min(10, "Content must be at least 10 characters")
+  .max(10000, "Content must not exceed 10,000 characters");
 
-export type MarkdownContentValue = z.infer<typeof markdownContentSchema>
+export type MarkdownContentValue = z.infer<typeof markdownContentSchema>;
+
+export const submissionFormSchema = z.object({
+  githubUrl: z.string().url("Must be a valid URL").optional().or(z.literal("")),
+  demoUrl: z.string().url("Must be a valid URL").optional().or(z.literal("")),
+  explanation: z
+    .string()
+    .min(20, "Explanation must be at least 20 characters")
+    .max(5000, "Explanation must not exceed 5,000 characters"),
+  attachments: z.array(z.string().url("Must be a valid URL")).optional(),
+  walletAddress: z.string().min(1, "Wallet address is required"),
+});
+
+export type SubmissionFormValue = z.infer<typeof submissionFormSchema>;
diff --git a/components/global-navbar.tsx b/components/global-navbar.tsx
index ef50d75..d521514 100644
--- a/components/global-navbar.tsx
+++ b/components/global-navbar.tsx
@@ -61,8 +61,8 @@ export function GlobalNavbar() {
               href="/transparency"
               className={`transition-colors hover:text-foreground/80 ${
                 pathname.startsWith("/transparency")
-                ? "text-foreground"
-                : "text-foreground/60"
+                  ? "text-foreground"
+                  : "text-foreground/60"
               }`}
             >
               Transparency
diff --git a/components/login/sign-in.tsx b/components/login/sign-in.tsx
index 2d859f1..6884ac1 100644
--- a/components/login/sign-in.tsx
+++ b/components/login/sign-in.tsx
@@ -34,7 +34,9 @@ export default function SignIn({
         callbackURL: "/bounty",
       });
       if (error) {
-        toast.error(error.message ?? "Failed to send magic link. Please try again.");
+        toast.error(
+          error.message ?? "Failed to send magic link. Please try again.",
+        );
         console.error(error);
       } else {
         toast.success("Magic link sent to your email!");
@@ -87,8 +89,14 @@ export default function SignIn({
                 />
               </Field>
               <Field>
-                <Button type="submit" className="w-full" disabled={isMagicLinkLoading}>
-                  {isMagicLinkLoading && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
+                <Button
+                  type="submit"
+                  className="w-full"
+                  disabled={isMagicLinkLoading}
+                >
+                  {isMagicLinkLoading && (
+                    <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+                  )}
                   Login with Magic Link
                 </Button>
               </Field>
@@ -144,8 +152,9 @@ export default function SignIn({
         </CardContent>
       </Card>
       <FieldDescription className="px-6 text-center">
-        By clicking continue, you agree to our <a href="https://www.boundlessfi.xyz/terms">Terms of Service</a>{" "}
-        and <a href="https://www.boundlessfi.xyz/privacy">Privacy Policy</a>.
+        By clicking continue, you agree to our{" "}
+        <a href="https://www.boundlessfi.xyz/terms">Terms of Service</a> and{" "}
+        <a href="https://www.boundlessfi.xyz/privacy">Privacy Policy</a>.
       </FieldDescription>
     </div>
   );
diff --git a/components/reputation/__tests__/my-claims.test.ts b/components/reputation/__tests__/my-claims.test.ts
index 92d6022..1a21b81 100644
--- a/components/reputation/__tests__/my-claims.test.ts
+++ b/components/reputation/__tests__/my-claims.test.ts
@@ -1,37 +1,59 @@
-import { CLAIM_SECTIONS, getClaimsBySection, normalizeStatus, type MyClaim } from "@/components/reputation/my-claims";
+import {
+  CLAIM_SECTIONS,
+  getClaimsBySection,
+  normalizeStatus,
+  type MyClaim,
+} from "@/components/reputation/my-claims";
 import { describe, expect, it } from "@jest/globals";
 
 describe("My Claims helpers", () => {
-    it("normalizes status values consistently", () => {
-        expect(normalizeStatus(" In Review ")).toBe("in-review");
-        expect(normalizeStatus("UNDER_REVIEW")).toBe("under-review");
-        expect(normalizeStatus("in_review")).toBe("in-review");
-    });
+  it("normalizes status values consistently", () => {
+    expect(normalizeStatus(" In Review ")).toBe("in-review");
+    expect(normalizeStatus("UNDER_REVIEW")).toBe("under-review");
+    expect(normalizeStatus("in_review")).toBe("in-review");
+  });
 
-    it("groups claims into Active Claims, In Review, and Completed by status", () => {
-        const claims: MyClaim[] = [
-            { bountyId: "1", title: "Active A", status: "active" },
-            { bountyId: "2", title: "Active B", status: "claimed" },
-            { bountyId: "3", title: "Review A", status: "in review" },
-            { bountyId: "4", title: "Review B", status: "UNDER_REVIEW" },
-            { bountyId: "5", title: "Completed A", status: "completed" },
-            { bountyId: "6", title: "Completed B", status: "closed" },
-            { bountyId: "7", title: "Unknown", status: "queued" },
-        ];
+  it("groups claims into Active Claims, In Review, and Completed by status", () => {
+    const claims: MyClaim[] = [
+      { bountyId: "1", title: "Active A", status: "active" },
+      { bountyId: "2", title: "Active B", status: "claimed" },
+      { bountyId: "3", title: "Review A", status: "in review" },
+      { bountyId: "4", title: "Review B", status: "UNDER_REVIEW" },
+      { bountyId: "5", title: "Completed A", status: "completed" },
+      { bountyId: "6", title: "Completed B", status: "closed" },
+      { bountyId: "7", title: "Unknown", status: "queued" },
+    ];
 
-        const groups = getClaimsBySection(claims);
+    const groups = getClaimsBySection(claims);
 
-        expect(groups).toHaveLength(CLAIM_SECTIONS.length);
+    expect(groups).toHaveLength(CLAIM_SECTIONS.length);
 
-        const activeGroup = groups.find((group) => group.section.title === "Active Claims");
-        const reviewGroup = groups.find((group) => group.section.title === "In Review");
-        const completedGroup = groups.find((group) => group.section.title === "Completed");
+    const activeGroup = groups.find(
+      (group) => group.section.title === "Active Claims",
+    );
+    const reviewGroup = groups.find(
+      (group) => group.section.title === "In Review",
+    );
+    const completedGroup = groups.find(
+      (group) => group.section.title === "Completed",
+    );
 
-        expect(activeGroup?.claims.map((claim) => claim.bountyId)).toEqual(["1", "2"]);
-        expect(reviewGroup?.claims.map((claim) => claim.bountyId)).toEqual(["3", "4"]);
-        expect(completedGroup?.claims.map((claim) => claim.bountyId)).toEqual(["5", "6"]);
+    expect(activeGroup?.claims.map((claim) => claim.bountyId)).toEqual([
+      "1",
+      "2",
+    ]);
+    expect(reviewGroup?.claims.map((claim) => claim.bountyId)).toEqual([
+      "3",
+      "4",
+    ]);
+    expect(completedGroup?.claims.map((claim) => claim.bountyId)).toEqual([
+      "5",
+      "6",
+    ]);
 
-        const groupedIds = new Set(groups.flatMap((group) => group.claims.map((claim) => claim.bountyId)));
-        expect(groupedIds.has("7")).toBe(false);
-    });
+    const groupedIds = new Set(
+      groups.flatMap((group) => group.claims.map((claim) => claim.bountyId)),
+    );
+    expect(groupedIds.has("7")).toBe(false);
+  });
 });
diff --git a/components/reputation/my-claims.tsx b/components/reputation/my-claims.tsx
index f6ed931..87d7e1c 100644
--- a/components/reputation/my-claims.tsx
+++ b/components/reputation/my-claims.tsx
@@ -1,103 +1,131 @@
 import Link from "next/link";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from "@/components/ui/card";
 import { formatCurrency } from "@/helpers/format.helper";
 
 export type MyClaim = {
-    bountyId: string;
-    title: string;
-    status: string;
-    nextMilestone?: string;
-    rewardAmount?: number;
+  bountyId: string;
+  title: string;
+  status: string;
+  nextMilestone?: string;
+  rewardAmount?: number;
 };
 
 interface MyClaimsProps {
-    claims: MyClaim[];
+  claims: MyClaim[];
 }
 
 export const CLAIM_SECTIONS: { title: string; statuses: string[] }[] = [
-    { title: "Active Claims", statuses: ["active", "claimed", "in-progress"] },
-    { title: "In Review", statuses: ["in-review", "in review", "review", "pending", "under-review"] },
-    { title: "Completed", statuses: ["completed", "closed", "accepted", "done"] },
+  { title: "Active Claims", statuses: ["active", "claimed", "in-progress"] },
+  {
+    title: "In Review",
+    statuses: ["in-review", "in review", "review", "pending", "under-review"],
+  },
+  { title: "Completed", statuses: ["completed", "closed", "accepted", "done"] },
+  { title: "Expired", statuses: ["expired", "forfeited", "overdue"] },
 ];
 
 export function normalizeStatus(status: string) {
-    return status.trim().toLowerCase().replace(/[\s_]+/g, "-");
+  return status
+    .trim()
+    .toLowerCase()
+    .replace(/[\s_]+/g, "-");
 }
 
 function formatStatusLabel(status: string) {
-    return status
-        .replace(/[-_]+/g, " ")
-        .replace(/\b\w/g, (char) => char.toUpperCase());
+  return status
+    .replace(/[-_]+/g, " ")
+    .replace(/\b\w/g, (char) => char.toUpperCase());
 }
 
 export function getClaimsBySection(claims: MyClaim[]) {
-    return CLAIM_SECTIONS.map((section) => ({
-        section,
-        claims: claims.filter((claim) => {
-            const normalizedClaimStatus = normalizeStatus(claim.status);
-            return section.statuses.some((status) => normalizeStatus(status) === normalizedClaimStatus);
-        }),
-    }));
+  return CLAIM_SECTIONS.map((section) => ({
+    section,
+    claims: claims.filter((claim) => {
+      const normalizedClaimStatus = normalizeStatus(claim.status);
+      return section.statuses.some(
+        (status) => normalizeStatus(status) === normalizedClaimStatus,
+      );
+    }),
+  }));
 }
 
 export function MyClaims({ claims }: MyClaimsProps) {
-    return (
-        <div className="space-y-6">
-            {getClaimsBySection(claims).map(({ section, claims: sectionClaims }) => {
-
-                return (
-                    <Card key={section.title} className="gap-4 py-5">
-                        <CardHeader className="px-5">
-                            <CardTitle className="text-lg">{section.title}</CardTitle>
-                            <CardDescription>
-                                {sectionClaims.length === 0
-                                    ? "No claims in this section."
-                                    : `${sectionClaims.length} claim${sectionClaims.length === 1 ? "" : "s"}`}
-                            </CardDescription>
-                        </CardHeader>
-                        <CardContent className="px-5">
-                            {sectionClaims.length === 0 ? (
-                                <p className="text-sm text-muted-foreground">No opportunities yet.</p>
-                            ) : (
-                                <div className="space-y-3">
-                                    {sectionClaims.map((claim) => (
-                                        <div
-                                            key={`${section.title}-${claim.bountyId}`}
-                                            className="rounded-lg border border-border/60 bg-secondary/5 p-4"
-                                        >
-                                            <div className="flex items-start justify-between gap-3">
-                                                <div className="min-w-0 space-y-2">
-                                                    <h4 className="truncate text-sm font-semibold" title={claim.title}>
-                                                        {claim.title}
-                                                    </h4>
-                                                    <div className="flex flex-wrap items-center gap-2">
-                                                        <Badge variant="outline">{formatStatusLabel(claim.status)}</Badge>
-                                                        {typeof claim.rewardAmount === "number" && (
-                                                            <span className="text-sm text-muted-foreground">
-                                                                {formatCurrency(claim.rewardAmount, "$")}
-                                                            </span>
-                                                        )}
-                                                    </div>
-                                                    {claim.nextMilestone && (
-                                                        <p className="text-xs text-muted-foreground">
-                                                            Next milestone: {claim.nextMilestone}
-                                                        </p>
-                                                    )}
-                                                </div>
-                                                <Button asChild variant="outline" size="sm" className="shrink-0">
-                                                    <Link href={`/bounty/${claim.bountyId}`}>View Opportunity</Link>
-                                                </Button>
-                                            </div>
-                                        </div>
-                                    ))}
-                                </div>
+  return (
+    <div className="space-y-6">
+      {getClaimsBySection(claims).map(({ section, claims: sectionClaims }) => {
+        return (
+          <Card key={section.title} className="gap-4 py-5">
+            <CardHeader className="px-5">
+              <CardTitle className="text-lg">{section.title}</CardTitle>
+              <CardDescription>
+                {sectionClaims.length === 0
+                  ? "No claims in this section."
+                  : `${sectionClaims.length} claim${sectionClaims.length === 1 ? "" : "s"}`}
+              </CardDescription>
+            </CardHeader>
+            <CardContent className="px-5">
+              {sectionClaims.length === 0 ? (
+                <p className="text-sm text-muted-foreground">
+                  No opportunities yet.
+                </p>
+              ) : (
+                <div className="space-y-3">
+                  {sectionClaims.map((claim) => (
+                    <div
+                      key={`${section.title}-${claim.bountyId}`}
+                      className="rounded-lg border border-border/60 bg-secondary/5 p-4"
+                    >
+                      <div className="flex items-start justify-between gap-3">
+                        <div className="min-w-0 space-y-2">
+                          <h4
+                            className="truncate text-sm font-semibold"
+                            title={claim.title}
+                          >
+                            {claim.title}
+                          </h4>
+                          <div className="flex flex-wrap items-center gap-2">
+                            <Badge variant="outline">
+                              {formatStatusLabel(claim.status)}
+                            </Badge>
+                            {typeof claim.rewardAmount === "number" && (
+                              <span className="text-sm text-muted-foreground">
+                                {formatCurrency(claim.rewardAmount, "$")}
+                              </span>
                             )}
-                        </CardContent>
-                    </Card>
-                );
-            })}
-        </div>
-    );
+                          </div>
+                          {claim.nextMilestone && (
+                            <p className="text-xs text-muted-foreground">
+                              Next milestone: {claim.nextMilestone}
+                            </p>
+                          )}
+                        </div>
+                        <Button
+                          asChild
+                          variant="outline"
+                          size="sm"
+                          className="shrink-0"
+                        >
+                          <Link href={`/bounty/${claim.bountyId}`}>
+                            View Opportunity
+                          </Link>
+                        </Button>
+                      </div>
+                    </div>
+                  ))}
+                </div>
+              )}
+            </CardContent>
+          </Card>
+        );
+      })}
+    </div>
+  );
 }
diff --git a/hooks/use-reputation.ts b/hooks/use-reputation.ts
index 0c27a33..33c277d 100644
--- a/hooks/use-reputation.ts
+++ b/hooks/use-reputation.ts
@@ -1,71 +1,91 @@
-import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
-import { reputationApi } from '@/lib/api/reputation';
-import { RateContributorInput } from '@/types/reputation';
+import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
+import { reputationApi } from "@/lib/api/reputation";
+import { RateContributorInput } from "@/types/reputation";
 
 export const REPUTATION_KEYS = {
-    all: ['reputation'] as const,
-    user: (userId: string) => [...REPUTATION_KEYS.all, 'user', userId] as const,
-    wallet: (address: string) => [...REPUTATION_KEYS.all, 'wallet', address] as const,
-    me: () => [...REPUTATION_KEYS.all, 'me'] as const,
+  all: ["reputation"] as const,
+  user: (userId: string) => [...REPUTATION_KEYS.all, "user", userId] as const,
+  wallet: (address: string) =>
+    [...REPUTATION_KEYS.all, "wallet", address] as const,
+  me: () => [...REPUTATION_KEYS.all, "me"] as const,
+  completionHistory: (userId: string, limit?: number) =>
+    [...REPUTATION_KEYS.all, "completion-history", userId, limit] as const,
 };
 
 export const useContributorReputation = (userId: string) => {
-    return useQuery({
-        queryKey: REPUTATION_KEYS.user(userId),
-        queryFn: () => reputationApi.fetchContributorReputation(userId),
-        enabled: !!userId,
-        staleTime: 1000 * 60 * 5, // 5 minutes
-    });
+  return useQuery({
+    queryKey: REPUTATION_KEYS.user(userId),
+    queryFn: () => reputationApi.fetchContributorReputation(userId),
+    enabled: !!userId,
+    staleTime: 1000 * 60 * 5, // 5 minutes
+  });
+};
+
+const DEFAULT_COMPLETION_HISTORY_LIMIT = 50;
+
+export const useCompletionHistory = (
+  userId: string,
+  limit = DEFAULT_COMPLETION_HISTORY_LIMIT,
+) => {
+  return useQuery({
+    queryKey: REPUTATION_KEYS.completionHistory(userId, limit),
+    queryFn: () => reputationApi.fetchCompletionHistory(userId, { limit }),
+    enabled: !!userId,
+    staleTime: 1000 * 60 * 5,
+  });
 };
 
 export const useReputationByWallet = (address: string) => {
-    return useQuery({
-        queryKey: REPUTATION_KEYS.wallet(address),
-        queryFn: () => reputationApi.fetchContributorByWallet(address),
-        enabled: !!address,
-        staleTime: 1000 * 60 * 5, // 5 minutes
-    });
+  return useQuery({
+    queryKey: REPUTATION_KEYS.wallet(address),
+    queryFn: () => reputationApi.fetchContributorByWallet(address),
+    enabled: !!address,
+    staleTime: 1000 * 60 * 5, // 5 minutes
+  });
 };
 
 export const useMyReputation = () => {
-    return useQuery({
-        queryKey: REPUTATION_KEYS.me(),
-        queryFn: () => reputationApi.fetchMyReputation(),
-        staleTime: 1000 * 60 * 5,
-    });
+  return useQuery({
+    queryKey: REPUTATION_KEYS.me(),
+    queryFn: () => reputationApi.fetchMyReputation(),
+    staleTime: 1000 * 60 * 5,
+  });
 };
 
 export const useRateContributor = () => {
-    const queryClient = useQueryClient();
+  const queryClient = useQueryClient();
 
-    return useMutation({
-        mutationFn: (data: RateContributorInput) => reputationApi.rateContributor(data),
-        onSuccess: (_, variables) => {
-            // Invalidate the contributor's reputation to reflect changes
-            queryClient.invalidateQueries({ queryKey: REPUTATION_KEYS.user(variables.contributorId) });
-        }
-    });
+  return useMutation({
+    mutationFn: (data: RateContributorInput) =>
+      reputationApi.rateContributor(data),
+    onSuccess: (_, variables) => {
+      // Invalidate the contributor's reputation to reflect changes
+      queryClient.invalidateQueries({
+        queryKey: REPUTATION_KEYS.user(variables.contributorId),
+      });
+    },
+  });
 };
 
 export const useLinkWallet = () => {
-    const queryClient = useQueryClient();
+  const queryClient = useQueryClient();
 
-    return useMutation({
-        mutationFn: reputationApi.linkWalletToReputation,
-        onSuccess: () => {
-            queryClient.invalidateQueries({ queryKey: REPUTATION_KEYS.me() });
-        }
-    });
+  return useMutation({
+    mutationFn: reputationApi.linkWalletToReputation,
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: REPUTATION_KEYS.me() });
+    },
+  });
 };
 
 export const usePrefetchReputation = () => {
-    const queryClient = useQueryClient();
+  const queryClient = useQueryClient();
 
-    return (userId: string) => {
-        queryClient.prefetchQuery({
-            queryKey: REPUTATION_KEYS.user(userId),
-            queryFn: () => reputationApi.fetchContributorReputation(userId),
-            staleTime: 1000 * 60 * 5,
-        });
-    };
+  return (userId: string) => {
+    queryClient.prefetchQuery({
+      queryKey: REPUTATION_KEYS.user(userId),
+      queryFn: () => reputationApi.fetchContributorReputation(userId),
+      staleTime: 1000 * 60 * 5,
+    });
+  };
 };
diff --git a/hooks/use-transparency.ts b/hooks/use-transparency.ts
index bcf46ab..369459b 100644
--- a/hooks/use-transparency.ts
+++ b/hooks/use-transparency.ts
@@ -1,24 +1,25 @@
-import { useQuery } from '@tanstack/react-query';
-import { transparencyApi } from '@/lib/api/transparency';
+import { useQuery } from "@tanstack/react-query";
+import { transparencyApi } from "@/lib/api/transparency";
 
 export const TRANSPARENCY_KEYS = {
-    all: ['transparency'] as const,
-    stats: () => [...TRANSPARENCY_KEYS.all, 'stats'] as const,
-    payouts: (limit: number) => [...TRANSPARENCY_KEYS.all, 'payouts', limit] as const,
+  all: ["transparency"] as const,
+  stats: () => [...TRANSPARENCY_KEYS.all, "stats"] as const,
+  payouts: (limit: number) =>
+    [...TRANSPARENCY_KEYS.all, "payouts", limit] as const,
 };
 
 export const usePlatformStats = () => {
-    return useQuery({
-        queryKey: TRANSPARENCY_KEYS.stats(),
-        queryFn: () => transparencyApi.getStats(),
-        staleTime: 1000 * 60 * 10, // 10 minutes
-    });
+  return useQuery({
+    queryKey: TRANSPARENCY_KEYS.stats(),
+    queryFn: () => transparencyApi.getStats(),
+    staleTime: 1000 * 60 * 10, // 10 minutes
+  });
 };
 
 export const useRecentPayouts = (limit = 10) => {
-    return useQuery({
-        queryKey: TRANSPARENCY_KEYS.payouts(limit),
-        queryFn: () => transparencyApi.getRecentPayouts(limit),
-        staleTime: 1000 * 60 * 5,
-    });
-};
\ No newline at end of file
+  return useQuery({
+    queryKey: TRANSPARENCY_KEYS.payouts(limit),
+    queryFn: () => transparencyApi.getRecentPayouts(limit),
+    staleTime: 1000 * 60 * 5,
+  });
+};
diff --git a/lib/api/bounties.ts b/lib/api/bounties.ts
index 0f9f801..45db3cc 100644
--- a/lib/api/bounties.ts
+++ b/lib/api/bounties.ts
@@ -1,40 +1,53 @@
-import { z } from 'zod';
-import { get, post, put, del } from './client';
-import type { PaginatedResponse, PaginationParams, SortParams } from './types';
+import { z } from "zod";
+import { get, post, put, del } from "./client";
+import type { PaginatedResponse, PaginationParams, SortParams } from "./types";
+import type { SubmissionFormValue } from "@/components/bounty/forms/schemas";
+import type { Submission } from "@/types/participation";
 
 // Bounty schemas
-const bountyTypeSchema = z.enum(['feature', 'bug', 'documentation', 'refactor', 'other']);
-const bountyStatusSchema = z.enum(['open', 'claimed', 'closed']);
-const difficultySchema = z.enum(['beginner', 'intermediate', 'advanced']);
-const claimingModelSchema = z.enum(['single-claim', 'application', 'competition', 'multi-winner']);
+const bountyTypeSchema = z.enum([
+  "feature",
+  "bug",
+  "documentation",
+  "refactor",
+  "other",
+]);
+const bountyStatusSchema = z.enum(["open", "claimed", "closed"]);
+const difficultySchema = z.enum(["beginner", "intermediate", "advanced"]);
+const claimingModelSchema = z.enum([
+  "single-claim",
+  "application",
+  "competition",
+  "multi-winner",
+]);
 
 export const bountySchema = z.object({
-    id: z.string(),
-    type: bountyTypeSchema,
-    projectId: z.string(),
-    projectName: z.string(),
-    projectLogoUrl: z.string().nullable(),
-    issueTitle: z.string(),
-    issueNumber: z.number(),
-    githubRepo: z.string(),
-    githubIssueUrl: z.string().url(),
-    description: z.string(),
-    rewardAmount: z.number().nullable(),
-    rewardCurrency: z.string(),
-    claimingModel: claimingModelSchema,
-    difficulty: difficultySchema.nullable(),
-    tags: z.array(z.string()),
-    status: bountyStatusSchema,
-    createdAt: z.string(),
-    updatedAt: z.string(),
-    claimedAt: z.string().optional(),
-    claimedBy: z.string().optional(),
-    lastActivityAt: z.string().optional(),
-    claimExpiresAt: z.string().optional(),
-    submissionsEndDate: z.string().optional(),
-
-    requirements: z.array(z.string()).optional(),
-    scope: z.string().optional(),
+  id: z.string(),
+  type: bountyTypeSchema,
+  projectId: z.string(),
+  projectName: z.string(),
+  projectLogoUrl: z.string().nullable(),
+  issueTitle: z.string(),
+  issueNumber: z.number(),
+  githubRepo: z.string(),
+  githubIssueUrl: z.string().url(),
+  description: z.string(),
+  rewardAmount: z.number().nullable(),
+  rewardCurrency: z.string(),
+  claimingModel: claimingModelSchema,
+  difficulty: difficultySchema.nullable(),
+  tags: z.array(z.string()),
+  status: bountyStatusSchema,
+  createdAt: z.string(),
+  updatedAt: z.string(),
+  claimedAt: z.string().optional(),
+  claimedBy: z.string().optional(),
+  lastActivityAt: z.string().optional(),
+  claimExpiresAt: z.string().optional(),
+  submissionsEndDate: z.string().optional(),
+
+  requirements: z.array(z.string()).optional(),
+  scope: z.string().optional(),
 });
 
 export type Bounty = z.infer<typeof bountySchema>;
@@ -45,20 +58,20 @@ export type ClaimingModel = z.infer<typeof claimingModelSchema>;
 
 // Query params
 export interface BountyListParams extends PaginationParams, SortParams {
-    status?: BountyStatus;
-    type?: BountyType;
-    difficulty?: DifficultyLevel;
-    projectId?: string;
-    tags?: string | string[];
-    search?: string;
+  status?: BountyStatus;
+  type?: BountyType;
+  difficulty?: DifficultyLevel;
+  projectId?: string;
+  tags?: string | string[];
+  search?: string;
 }
 
 // Create bounty input
 export const createBountySchema = bountySchema.omit({
-    id: true,
-    createdAt: true,
-    updatedAt: true,
-    status: true,
+  id: true,
+  createdAt: true,
+  updatedAt: true,
+  status: true,
 });
 
 export type CreateBountyInput = z.infer<typeof createBountySchema>;
@@ -69,39 +82,50 @@ export const updateBountySchema = createBountySchema.partial();
 export type UpdateBountyInput = z.infer<typeof updateBountySchema>;
 
 // API endpoints
-const BOUNTIES_ENDPOINT = '/api/bounties';
+const BOUNTIES_ENDPOINT = "/api/bounties";
 
 export const bountiesApi = {
-    list: (params?: BountyListParams): Promise<PaginatedResponse<Bounty>> => {
-        // Convert tags array to comma-separated string for query params
-        const queryParams: Record<string, unknown> = { ...params };
-        if (queryParams.tags && Array.isArray(queryParams.tags)) {
-            queryParams.tags = queryParams.tags.join(',');
-        }
-        return get<PaginatedResponse<Bounty>>(BOUNTIES_ENDPOINT, { params: queryParams });
-    },
-
-    getById: (id: string): Promise<Bounty> =>
-        get<Bounty>(`${BOUNTIES_ENDPOINT}/${id}`),
-
-    create: (data: CreateBountyInput): Promise<Bounty> =>
-        post<Bounty>(BOUNTIES_ENDPOINT, data),
-
-    update: (id: string, data: UpdateBountyInput): Promise<Bounty> =>
-        put<Bounty>(`${BOUNTIES_ENDPOINT}/${id}`, data),
-
-    delete: (id: string): Promise<void> =>
-        del<void>(`${BOUNTIES_ENDPOINT}/${id}`),
-
-    claim: (id: string): Promise<Bounty> =>
-        post<Bounty>(`${BOUNTIES_ENDPOINT}/${id}/claim`),
+  list: (params?: BountyListParams): Promise<PaginatedResponse<Bounty>> => {
+    // Convert tags array to comma-separated string for query params
+    const queryParams: Record<string, unknown> = { ...params };
+    if (queryParams.tags && Array.isArray(queryParams.tags)) {
+      queryParams.tags = queryParams.tags.join(",");
+    }
+    return get<PaginatedResponse<Bounty>>(BOUNTIES_ENDPOINT, {
+      params: queryParams,
+    });
+  },
+
+  getById: (id: string): Promise<Bounty> =>
+    get<Bounty>(`${BOUNTIES_ENDPOINT}/${id}`),
+
+  create: (data: CreateBountyInput): Promise<Bounty> =>
+    post<Bounty>(BOUNTIES_ENDPOINT, data),
+
+  update: (id: string, data: UpdateBountyInput): Promise<Bounty> =>
+    put<Bounty>(`${BOUNTIES_ENDPOINT}/${id}`, data),
+
+  delete: (id: string): Promise<void> =>
+    del<void>(`${BOUNTIES_ENDPOINT}/${id}`),
+
+  claim: (id: string): Promise<Bounty> =>
+    post<Bounty>(`${BOUNTIES_ENDPOINT}/${id}/claim`),
+
+  submit: (
+    id: string,
+    data: SubmissionFormValue & { contributorId: string },
+  ): Promise<{ success: boolean; data: Submission }> =>
+    post<{ success: boolean; data: Submission }>(
+      `${BOUNTIES_ENDPOINT}/${id}/submit`,
+      data,
+    ),
 };
 
 // Parse and validate response (use when strict validation needed)
 export function parseBounty(data: unknown): Bounty {
-    return bountySchema.parse(data);
+  return bountySchema.parse(data);
 }
 
 export function parseBountyList(data: unknown): Bounty[] {
-    return z.array(bountySchema).parse(data);
+  return z.array(bountySchema).parse(data);
 }
diff --git a/lib/api/reputation.ts b/lib/api/reputation.ts
index 83e3bb7..c13919a 100644
--- a/lib/api/reputation.ts
+++ b/lib/api/reputation.ts
@@ -1,29 +1,59 @@
-import { get, post } from './client';
+import { get, post } from "./client";
 import {
-    ContributorReputation,
-    RateContributorInput
-} from '@/types/reputation';
+  ContributorReputation,
+  RateContributorInput,
+  ReputationHistoryParams,
+  ReputationHistoryResponse,
+} from "@/types/reputation";
 
-const REPUTATION_ENDPOINT = '/api/reputation';
+const REPUTATION_ENDPOINT = "/api/reputation";
 
 export const reputationApi = {
-    fetchContributorReputation: async (userId: string): Promise<ContributorReputation> => {
-        return get<ContributorReputation>(`${REPUTATION_ENDPOINT}/${userId}`);
-    },
+  fetchContributorReputation: async (
+    userId: string,
+  ): Promise<ContributorReputation> => {
+    return get<ContributorReputation>(`${REPUTATION_ENDPOINT}/${userId}`);
+  },
 
-    fetchContributorByWallet: async (address: string): Promise<ContributorReputation> => {
-        return get<ContributorReputation>(`${REPUTATION_ENDPOINT}/wallet/${address}`);
-    },
+  fetchCompletionHistory: async (
+    userId: string,
+    params?: Pick<ReputationHistoryParams, "limit" | "offset">,
+  ): Promise<ReputationHistoryResponse> => {
+    const queryParams: Record<string, string> = {};
+    if (params?.limit != null) queryParams.limit = String(params.limit);
+    if (params?.offset != null) queryParams.offset = String(params.offset);
+    return get<ReputationHistoryResponse>(
+      `${REPUTATION_ENDPOINT}/${userId}/completion-history`,
+      { params: Object.keys(queryParams).length ? queryParams : undefined },
+    );
+  },
 
-    fetchMyReputation: async (): Promise<ContributorReputation> => {
-        return get<ContributorReputation>(`${REPUTATION_ENDPOINT}/me`);
-    },
+  fetchContributorByWallet: async (
+    address: string,
+  ): Promise<ContributorReputation> => {
+    return get<ContributorReputation>(
+      `${REPUTATION_ENDPOINT}/wallet/${address}`,
+    );
+  },
 
-    rateContributor: async (data: RateContributorInput): Promise<{ success: boolean }> => {
-        return post<{ success: boolean }>(`${REPUTATION_ENDPOINT}/rate`, data);
-    },
+  fetchMyReputation: async (): Promise<ContributorReputation> => {
+    return get<ContributorReputation>(`${REPUTATION_ENDPOINT}/me`);
+  },
 
-    linkWalletToReputation: async (data: { userId: string, address: string, signature: string }): Promise<{ success: boolean }> => {
-        return post<{ success: boolean }>(`${REPUTATION_ENDPOINT}/link-wallet`, data);
-    }
+  rateContributor: async (
+    data: RateContributorInput,
+  ): Promise<{ success: boolean }> => {
+    return post<{ success: boolean }>(`${REPUTATION_ENDPOINT}/rate`, data);
+  },
+
+  linkWalletToReputation: async (data: {
+    userId: string;
+    address: string;
+    signature: string;
+  }): Promise<{ success: boolean }> => {
+    return post<{ success: boolean }>(
+      `${REPUTATION_ENDPOINT}/link-wallet`,
+      data,
+    );
+  },
 };
diff --git a/lib/api/transparency.ts b/lib/api/transparency.ts
index 114d04d..54cfb7d 100644
--- a/lib/api/transparency.ts
+++ b/lib/api/transparency.ts
@@ -1,33 +1,35 @@
-import { z } from 'zod';
-import { get } from './client';
+import { z } from "zod";
+import { get } from "./client";
 
 // Schema
 export const platformStatsSchema = z.object({
-    totalFundsDistributed: z.number(),
-    totalContributorsPaid: z.number(),
-    totalProjectsFunded: z.number(),
-    averagePayoutTimeDays: z.number(),
+  totalFundsDistributed: z.number(),
+  totalContributorsPaid: z.number(),
+  totalProjectsFunded: z.number(),
+  averagePayoutTimeDays: z.number(),
 });
 
 export const recentPayoutSchema = z.object({
-    id: z.string(),
-    contributorName: z.string(),
-    contributorAvatar: z.string().nullable(),
-    amount: z.number(),
-    currency: z.string(),
-    projectName: z.string(),
-    paidAt: z.string(),
+  id: z.string(),
+  contributorName: z.string(),
+  contributorAvatar: z.string().nullable(),
+  amount: z.number(),
+  currency: z.string(),
+  projectName: z.string(),
+  paidAt: z.string(),
 });
 
 export type PlatformStats = z.infer<typeof platformStatsSchema>;
 export type RecentPayout = z.infer<typeof recentPayoutSchema>;
 
-const TRANSPARENCY_ENDPOINT = '/api/transparency';
+const TRANSPARENCY_ENDPOINT = "/api/transparency";
 
 export const transparencyApi = {
-    getStats: (): Promise<PlatformStats> =>
-        get<PlatformStats>(`${TRANSPARENCY_ENDPOINT}/stats`),
+  getStats: (): Promise<PlatformStats> =>
+    get<PlatformStats>(`${TRANSPARENCY_ENDPOINT}/stats`),
 
-    getRecentPayouts: (limit = 10): Promise<RecentPayout[]> =>
-        get<RecentPayout[]>(`${TRANSPARENCY_ENDPOINT}/payouts`, { params: { limit } }),
-};
\ No newline at end of file
+  getRecentPayouts: (limit = 10): Promise<RecentPayout[]> =>
+    get<RecentPayout[]>(`${TRANSPARENCY_ENDPOINT}/payouts`, {
+      params: { limit },
+    }),
+};
diff --git a/package-lock.json b/package-lock.json
index afb4fe7..2de2cc5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -227,6 +227,7 @@
       "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.29.0",
         "@babel/generator": "^7.29.0",
@@ -721,6 +722,7 @@
       "version": "1.4.18",
       "resolved": "https://registry.npmjs.org/@better-auth/core/-/core-1.4.18.tgz",
       "integrity": "sha512-q+awYgC7nkLEBdx2sW0iJjkzgSHlIxGnOpsN1r/O1+a4m7osJNHtfK2mKJSL1I+GfNyIlxJF8WvD/NLuYMpmcg==",
+      "peer": true,
       "dependencies": {
         "@standard-schema/spec": "^1.0.0",
         "zod": "^4.3.5"
@@ -750,12 +752,14 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/@better-auth/utils/-/utils-0.3.0.tgz",
       "integrity": "sha512-W+Adw6ZA6mgvnSnhOki270rwJ42t4XzSK6YWGF//BbVXL6SwCLWfyzBc1lN2m/4RM28KubdBKQ4X5VMoLRNPQw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@better-fetch/fetch": {
       "version": "1.1.21",
       "resolved": "https://registry.npmjs.org/@better-fetch/fetch/-/fetch-1.1.21.tgz",
-      "integrity": "sha512-/ImESw0sskqlVR94jB+5+Pxjf+xBwDZF/N5+y2/q4EqD7IARUTSpPfIo8uf39SYpCxyOCtbyYpUrZ3F/k0zT4A=="
+      "integrity": "sha512-/ImESw0sskqlVR94jB+5+Pxjf+xBwDZF/N5+y2/q4EqD7IARUTSpPfIo8uf39SYpCxyOCtbyYpUrZ3F/k0zT4A==",
+      "peer": true
     },
     "node_modules/@cspotcode/source-map-support": {
       "version": "0.8.1",
@@ -869,6 +873,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -892,6 +897,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -7188,6 +7194,7 @@
       "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.90.21.tgz",
       "integrity": "sha512-0Lu6y5t+tvlTJMTO7oh5NSpJfpg/5D41LlThfepTixPYkJ0sE2Jj0m0f6yYqujBwIXlId87e234+MxG3D3g7kg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@tanstack/query-core": "5.90.20"
       },
@@ -7222,6 +7229,7 @@
       "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
@@ -7608,6 +7616,7 @@
       "integrity": "sha512-Rs1bVAIdBs5gbTIKza/tgpMuG1k3U/UMJLWecIMxNdJFDMzcM5LOiLVRYh3PilWEYDIeUDv7bpiHPLPsbydGcw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "undici-types": "~6.21.0"
       }
@@ -7617,6 +7626,7 @@
       "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.14.tgz",
       "integrity": "sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "csstype": "^3.2.2"
       }
@@ -7627,6 +7637,7 @@
       "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "peerDependencies": {
         "@types/react": "^19.2.0"
       }
@@ -7723,6 +7734,7 @@
       "integrity": "sha512-IgSWvLobTDOjnaxAfDTIHaECbkNlAlKv2j5SjpB2v7QHKv1FIfjwMy8FsDbVfDX/KjmCmYICcw7uGaXLhtsLNg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.56.0",
         "@typescript-eslint/types": "8.56.0",
@@ -8457,6 +8469,7 @@
       "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -9109,6 +9122,7 @@
       "resolved": "https://registry.npmjs.org/better-call/-/better-call-1.1.8.tgz",
       "integrity": "sha512-XMQ2rs6FNXasGNfMjzbyroSwKwYbZ/T3IxruSS6U2MJRsSYh3wYtG3o6H00ZlKZ/C/UPOAD97tqgQJNsxyeTXw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@better-auth/utils": "^0.3.0",
         "@better-fetch/fetch": "^1.1.4",
@@ -9168,6 +9182,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -10421,7 +10436,8 @@
       "version": "8.6.0",
       "resolved": "https://registry.npmjs.org/embla-carousel/-/embla-carousel-8.6.0.tgz",
       "integrity": "sha512-SjWyZBHJPbqxHOzckOfo8lHisEaJWmwd23XppYFYVh10bU66/Pn5tkVkbkCMZVdbUE5eTCI2nD8OyIP4Z+uwkA==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/embla-carousel-react": {
       "version": "8.6.0",
@@ -10819,6 +10835,7 @@
       "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -11020,6 +11037,7 @@
       "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.9",
@@ -12026,6 +12044,7 @@
       "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.12.0.tgz",
       "integrity": "sha512-DKKrynuQRne0PNpEbzuEdHlYOMksHSUI8Zc9Unei5gTsMNA2/vMpoMz/yKba50pejK56qj98qM0SjYxAKi13gQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
       }
@@ -12350,6 +12369,7 @@
       "integrity": "sha512-yoLRW+KRlDmnnROdAu7sX77VNLC0bsFoZyGQJLy1cF+X/SkLg/fWkRGrEEYQK8o2cafJ2wmEaMqMEZB3U3DYDg==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=20"
       },
@@ -14516,6 +14536,7 @@
       "resolved": "https://registry.npmjs.org/jose/-/jose-6.1.3.tgz",
       "integrity": "sha512-0TpaTfihd4QMNwrz/ob2Bp7X04yuxJkjRGi4aKmOqwhov54i6u79oCv7T+C7lo70MKH6BesI3vscD1yb/yzKXQ==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/panva"
       }
@@ -14545,6 +14566,7 @@
       "integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "cssstyle": "^4.2.1",
         "data-urls": "^5.0.0",
@@ -14678,6 +14700,7 @@
       "resolved": "https://registry.npmjs.org/kysely/-/kysely-0.28.11.tgz",
       "integrity": "sha512-zpGIFg0HuoC893rIjYX1BETkVWdDnzTzF5e0kWXJFg5lE0k1/LfNWBejrcnOFu8Q2Rfq/hTDTU7XLUM8QOrpzg==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=20.0.0"
       }
@@ -16464,6 +16487,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": "^20.0.0 || >=22.0.0"
       }
@@ -16496,6 +16520,7 @@
       "resolved": "https://registry.npmjs.org/next/-/next-16.1.6.tgz",
       "integrity": "sha512-hkyRkcu5x/41KoqnROkfTm2pZVbKxvbZRuNvKXLRXxs3VfyO0WhY50TQS40EuKO9SW3rBj/sF3WbVwDACeMZyw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@next/env": "16.1.6",
         "@swc/helpers": "0.5.15",
@@ -17734,6 +17759,7 @@
       "resolved": "https://registry.npmjs.org/react/-/react-19.2.3.tgz",
       "integrity": "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -17764,6 +17790,7 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.3.tgz",
       "integrity": "sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "scheduler": "^0.27.0"
       },
@@ -17776,6 +17803,7 @@
       "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.71.1.tgz",
       "integrity": "sha512-9SUJKCGKo8HUSsCO+y0CtqkqI5nNuaDqTxyqPsZPqIwudpj4rCrAz/jZV+jn57bx5gtZKOh3neQu94DXMc+w5w==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18.0.0"
       },
@@ -19354,7 +19382,8 @@
       "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.2.0.tgz",
       "integrity": "sha512-yYzTZ4++b7fNYxFfpnberEEKu43w44aqDMNM9MHMmcKuCH7lL8jJ4yJ7LGHv7rSwiqM0nkiobF9I6cLlpS2P7Q==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/tapable": {
       "version": "2.3.0",
@@ -19481,6 +19510,7 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -19620,6 +19650,7 @@
       "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@cspotcode/source-map-support": "^0.8.0",
         "@tsconfig/node10": "^1.0.7",
@@ -19830,6 +19861,7 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -20291,6 +20323,7 @@
       "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.27.0",
         "fdir": "^6.5.0",
@@ -20384,6 +20417,7 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -20397,6 +20431,7 @@
       "integrity": "sha512-hOQuK7h0FGKgBAas7v0mSAsnvrIgAvWmRFjmzpJ7SwFHH3g1k2u37JtYwOwmEKhK6ZO3v9ggDBBm0La1LCK4uQ==",
       "devOptional": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@vitest/expect": "4.0.18",
         "@vitest/mocker": "4.0.18",
@@ -20859,6 +20894,7 @@
       "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10.0.0"
       },
@@ -21048,6 +21084,7 @@
       "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz",
       "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/types/participation.ts b/types/participation.ts
index 184bda5..83e25ff 100644
--- a/types/participation.ts
+++ b/types/participation.ts
@@ -20,7 +20,13 @@ export interface Submission {
   bountyId: string;
   contributorId: string;
   contributorName?: string;
-  content: string; // URL or text description
+  /** @deprecated Use explanation. Kept for backward compatibility with consumers that expect a generic content field. */
+  content: string;
+  githubUrl?: string;
+  demoUrl?: string;
+  explanation: string;
+  attachments?: string[];
+  walletAddress: string;
   status: SubmissionStatus;
   submittedAt: string;
   reviewedAt?: string;