diff --git a/app/api/bounties/[id]/route.ts b/app/api/bounties/[id]/route.ts
index cd82b52..b8c1f5c 100644
--- a/app/api/bounties/[id]/route.ts
+++ b/app/api/bounties/[id]/route.ts
@@ -1,24 +1,24 @@
-import { NextResponse } from "next/server";
-import { getBountyById } from "@/lib/mock-bounty";
-import { BountyLogic } from "@/lib/logic/bounty-logic";
-
-export async function GET(
-  request: Request,
-  { params }: { params: Promise<{ id: string }> },
-) {
-  // Simulate network delay in development only
-  if (process.env.NODE_ENV === "development") {
-    await new Promise((resolve) => setTimeout(resolve, 500));
-  }
-
-  const { id } = await params;
-  const bounty = getBountyById(id);
-
-  if (!bounty) {
-    return NextResponse.json({ error: "Bounty not found" }, { status: 404 });
-  }
-
-  const processed = BountyLogic.processBountyStatus(bounty);
-
-  return NextResponse.json(processed);
-}
+import { NextResponse } from "next/server";
+import { getBountyById } from "@/lib/mock-bounty";
+import { BountyLogic } from "@/lib/logic/bounty-logic";
+
+export async function GET(
+  request: Request,
+  { params }: { params: Promise<{ id: string }> },
+) {
+  // Simulate network delay in development only
+  if (process.env.NODE_ENV === "development") {
+    await new Promise((resolve) => setTimeout(resolve, 500));
+  }
+
+  const { id } = await params;
+  const bounty = getBountyById(id);
+
+  if (!bounty) {
+    return NextResponse.json({ error: "Bounty not found" }, { status: 404 });
+  }
+
+  const processed = BountyLogic.processBountyStatus(bounty);
+
+  return NextResponse.json(processed);
+}
diff --git a/app/bounty/[bountyId]/loading.tsx b/app/bounty/[bountyId]/loading.tsx
index 26b3ba0..23694dc 100644
--- a/app/bounty/[bountyId]/loading.tsx
+++ b/app/bounty/[bountyId]/loading.tsx
@@ -1,5 +1,5 @@
-import { BountySkeleton } from "@/components/bounty/bounty-skeleton"
+import { BountySkeleton } from "@/components/bounty/bounty-skeleton";
 
 export default function Loading() {
-  return <BountySkeleton />
+  return <BountySkeleton />;
 }
diff --git a/app/bounty/[bountyId]/not-found.tsx b/app/bounty/[bountyId]/not-found.tsx
index 9253642..5cb0e35 100644
--- a/app/bounty/[bountyId]/not-found.tsx
+++ b/app/bounty/[bountyId]/not-found.tsx
@@ -1,6 +1,6 @@
-import { Button } from "@/components/ui/button"
-import { FileQuestion } from "lucide-react"
-import Link from "next/link"
+import { Button } from "@/components/ui/button";
+import { FileQuestion } from "lucide-react";
+import Link from "next/link";
 
 export default function NotFound() {
   return (
@@ -10,13 +10,17 @@ export default function NotFound() {
         <div className="space-y-2">
           <h1 className="text-2xl font-bold text-gray-50">Bounty Not Found</h1>
           <p className="text-gray-400">
-            The bounty you&apos;re looking for doesn&apos;t exist or has been removed.
+            The bounty you&apos;re looking for doesn&apos;t exist or has been
+            removed.
           </p>
         </div>
-        <Button asChild className="bg-primary text-primary-foreground hover:bg-primary/90">
+        <Button
+          asChild
+          className="bg-primary text-primary-foreground hover:bg-primary/90"
+        >
           <Link href="/">Back to Home</Link>
         </Button>
       </div>
     </div>
-  )
+  );
 }
diff --git a/app/profile/[userId]/page.tsx b/app/profile/[userId]/page.tsx
index 77f8d29..743a525 100644
--- a/app/profile/[userId]/page.tsx
+++ b/app/profile/[userId]/page.tsx
@@ -1,8 +1,10 @@
 "use client";
 
 import { useContributorReputation } from "@/hooks/use-reputation";
+import { useBounties } from "@/hooks/use-bounties";
 import { ReputationCard } from "@/components/reputation/reputation-card";
 import { CompletionHistory } from "@/components/reputation/completion-history";
+import { MyClaims, type MyClaim } from "@/components/reputation/my-claims";
 import { Button } from "@/components/ui/button";
 import { Skeleton } from "@/components/ui/skeleton";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
@@ -15,6 +17,7 @@ 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;
 
@@ -39,13 +42,39 @@ export default function ProfilePage() {
         }));
     }, [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-[400px] md:col-span-1" />
-                    <Skeleton className="h-[400px] md:col-span-2" />
+                    <Skeleton className="h-100 md:col-span-1" />
+                    <Skeleton className="h-100 md:col-span-2" />
                 </div>
             </div>
         );
@@ -134,6 +163,12 @@ export default function ProfilePage() {
                             >
                                 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">
@@ -149,6 +184,11 @@ export default function ProfilePage() {
                                 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>
diff --git a/components/bounty-detail/bounty-badges.tsx b/components/bounty-detail/bounty-badges.tsx
index bbba268..30c8b15 100644
--- a/components/bounty-detail/bounty-badges.tsx
+++ b/components/bounty-detail/bounty-badges.tsx
@@ -1,31 +1,31 @@
-import { Zap } from "lucide-react";
-import type { Bounty } from "@/lib/api";
-import { DIFFICULTY_CONFIG, STATUS_CONFIG } from "@/lib/bounty-config";
-
-export function StatusBadge({ status }: { status: Bounty["status"] }) {
-  const cfg = STATUS_CONFIG[status];
-  return (
-    <span
-      className={`inline-flex items-center gap-1.5 px-3 py-1 rounded-full text-xs font-semibold ${cfg.className}`}
-    >
-      <span className={`size-1.5 rounded-full ${cfg.dot} animate-pulse`} />
-      {cfg.label}
-    </span>
-  );
-}
-
-export function DifficultyBadge({
-  difficulty,
-}: {
-  difficulty: NonNullable<Bounty["difficulty"]>;
-}) {
-  const cfg = DIFFICULTY_CONFIG[difficulty];
-  return (
-    <span
-      className={`inline-flex items-center gap-1.5 px-2.5 py-1 rounded-full text-xs font-medium capitalize ${cfg.className}`}
-    >
-      <Zap className="size-3" />
-      {cfg.label}
-    </span>
-  );
-}
+import { Zap } from "lucide-react";
+import type { Bounty } from "@/lib/api";
+import { DIFFICULTY_CONFIG, STATUS_CONFIG } from "@/lib/bounty-config";
+
+export function StatusBadge({ status }: { status: Bounty["status"] }) {
+  const cfg = STATUS_CONFIG[status];
+  return (
+    <span
+      className={`inline-flex items-center gap-1.5 px-3 py-1 rounded-full text-xs font-semibold ${cfg.className}`}
+    >
+      <span className={`size-1.5 rounded-full ${cfg.dot} animate-pulse`} />
+      {cfg.label}
+    </span>
+  );
+}
+
+export function DifficultyBadge({
+  difficulty,
+}: {
+  difficulty: NonNullable<Bounty["difficulty"]>;
+}) {
+  const cfg = DIFFICULTY_CONFIG[difficulty];
+  return (
+    <span
+      className={`inline-flex items-center gap-1.5 px-2.5 py-1 rounded-full text-xs font-medium capitalize ${cfg.className}`}
+    >
+      <Zap className="size-3" />
+      {cfg.label}
+    </span>
+  );
+}
diff --git a/components/bounty-detail/bounty-detail-bounty-detail-skeleton.tsx b/components/bounty-detail/bounty-detail-bounty-detail-skeleton.tsx
index 0d5ac3c..02eccfc 100644
--- a/components/bounty-detail/bounty-detail-bounty-detail-skeleton.tsx
+++ b/components/bounty-detail/bounty-detail-bounty-detail-skeleton.tsx
@@ -1,59 +1,59 @@
-import { Skeleton } from "@/components/ui/skeleton";
-
-export function BountyDetailSkeleton() {
-  return (
-    <div className="min-h-screen text-foreground pb-20 relative overflow-hidden">
-      <div className="fixed top-0 left-0 w-full h-125 bg-primary/5 rounded-full blur-[120px] -translate-y-1/2 pointer-events-none" />
-      <div className="container mx-auto px-4 py-10 relative z-10">
-        <Skeleton className="h-4 w-36 mb-8 bg-gray-800" />
-        <div className="flex flex-col lg:flex-row gap-10">
-          <div className="flex-1 space-y-6">
-            <div className="p-6 rounded-xl border border-gray-800 bg-background-card space-y-5">
-              <div className="flex gap-2">
-                <Skeleton className="h-6 w-16 rounded-full bg-gray-800" />
-                <Skeleton className="h-6 w-24 rounded-full bg-gray-800" />
-                <Skeleton className="h-6 w-20 rounded-full bg-gray-800" />
-              </div>
-              <Skeleton className="h-8 w-3/4 bg-gray-800" />
-              <Skeleton className="h-11 w-56 rounded-lg bg-gray-800" />
-              <div className="flex gap-2">
-                {[1, 2, 3].map((i) => (
-                  <Skeleton
-                    key={i}
-                    className="h-5 w-14 rounded-md bg-gray-800"
-                  />
-                ))}
-              </div>
-            </div>
-            <div className="p-6 rounded-xl border border-gray-800 bg-background-card space-y-3">
-              <Skeleton className="h-3 w-20 bg-gray-800 mb-5" />
-              {[1, 2, 3, 4, 5].map((i) => (
-                <Skeleton
-                  key={i}
-                  className={`h-4 bg-gray-800 ${i % 3 === 0 ? "w-2/3" : "w-full"}`}
-                />
-              ))}
-            </div>
-          </div>
-          <div className="w-full lg:w-72 shrink-0">
-            <div className="p-5 rounded-xl border border-gray-800 bg-background-card space-y-5">
-              <div className="flex justify-between">
-                <Skeleton className="h-3 w-12 bg-gray-800" />
-                <Skeleton className="h-8 w-20 bg-gray-800" />
-              </div>
-              <Skeleton className="h-px bg-gray-800" />
-              {[1, 2, 3].map((i) => (
-                <div key={i} className="flex justify-between">
-                  <Skeleton className="h-4 w-14 bg-gray-800" />
-                  <Skeleton className="h-4 w-20 bg-gray-800" />
-                </div>
-              ))}
-              <Skeleton className="h-px bg-gray-800" />
-              <Skeleton className="h-11 w-full rounded-lg bg-gray-800" />
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}
+import { Skeleton } from "@/components/ui/skeleton";
+
+export function BountyDetailSkeleton() {
+  return (
+    <div className="min-h-screen text-foreground pb-20 relative overflow-hidden">
+      <div className="fixed top-0 left-0 w-full h-125 bg-primary/5 rounded-full blur-[120px] -translate-y-1/2 pointer-events-none" />
+      <div className="container mx-auto px-4 py-10 relative z-10">
+        <Skeleton className="h-4 w-36 mb-8 bg-gray-800" />
+        <div className="flex flex-col lg:flex-row gap-10">
+          <div className="flex-1 space-y-6">
+            <div className="p-6 rounded-xl border border-gray-800 bg-background-card space-y-5">
+              <div className="flex gap-2">
+                <Skeleton className="h-6 w-16 rounded-full bg-gray-800" />
+                <Skeleton className="h-6 w-24 rounded-full bg-gray-800" />
+                <Skeleton className="h-6 w-20 rounded-full bg-gray-800" />
+              </div>
+              <Skeleton className="h-8 w-3/4 bg-gray-800" />
+              <Skeleton className="h-11 w-56 rounded-lg bg-gray-800" />
+              <div className="flex gap-2">
+                {[1, 2, 3].map((i) => (
+                  <Skeleton
+                    key={i}
+                    className="h-5 w-14 rounded-md bg-gray-800"
+                  />
+                ))}
+              </div>
+            </div>
+            <div className="p-6 rounded-xl border border-gray-800 bg-background-card space-y-3">
+              <Skeleton className="h-3 w-20 bg-gray-800 mb-5" />
+              {[1, 2, 3, 4, 5].map((i) => (
+                <Skeleton
+                  key={i}
+                  className={`h-4 bg-gray-800 ${i % 3 === 0 ? "w-2/3" : "w-full"}`}
+                />
+              ))}
+            </div>
+          </div>
+          <div className="w-full lg:w-72 shrink-0">
+            <div className="p-5 rounded-xl border border-gray-800 bg-background-card space-y-5">
+              <div className="flex justify-between">
+                <Skeleton className="h-3 w-12 bg-gray-800" />
+                <Skeleton className="h-8 w-20 bg-gray-800" />
+              </div>
+              <Skeleton className="h-px bg-gray-800" />
+              {[1, 2, 3].map((i) => (
+                <div key={i} className="flex justify-between">
+                  <Skeleton className="h-4 w-14 bg-gray-800" />
+                  <Skeleton className="h-4 w-20 bg-gray-800" />
+                </div>
+              ))}
+              <Skeleton className="h-px bg-gray-800" />
+              <Skeleton className="h-11 w-full rounded-lg bg-gray-800" />
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/components/bounty-detail/bounty-detail-description-card.tsx b/components/bounty-detail/bounty-detail-description-card.tsx
index 1424ec7..bedce3e 100644
--- a/components/bounty-detail/bounty-detail-description-card.tsx
+++ b/components/bounty-detail/bounty-detail-description-card.tsx
@@ -1,31 +1,31 @@
-"use client";
-
-import ReactMarkdown from "react-markdown";
-import remarkGfm from "remark-gfm";
-
-export function DescriptionCard({ description }: { description: string }) {
-  return (
-    <div className="p-6 rounded-xl border border-gray-800 bg-background-card backdrop-blur-xl shadow-sm">
-      <h2 className="text-xs font-bold uppercase tracking-wider text-gray-500 mb-5">
-        Description
-      </h2>
-      <div
-        className="prose prose-invert prose-sm max-w-none
-        prose-headings:font-bold prose-headings:text-gray-100
-        prose-h1:text-xl prose-h2:text-lg prose-h3:text-base
-        prose-p:text-gray-300 prose-p:leading-relaxed
-        prose-a:text-primary prose-a:no-underline hover:prose-a:underline
-        prose-strong:text-gray-100
-        prose-li:text-gray-300
-        prose-blockquote:border-primary/40 prose-blockquote:text-gray-400
-        prose-hr:border-gray-800
-        prose-code:text-primary prose-code:bg-primary/10 prose-code:px-1.5 prose-code:py-0.5 prose-code:rounded prose-code:text-xs prose-code:before:content-none prose-code:after:content-none
-        prose-pre:bg-gray-900 prose-pre:border prose-pre:border-gray-800 prose-pre:rounded-xl
-        prose-th:text-gray-300 prose-th:bg-gray-900/60
-        prose-td:border-gray-800 prose-table:text-sm"
-      >
-        <ReactMarkdown remarkPlugins={[remarkGfm]}>{description}</ReactMarkdown>
-      </div>
-    </div>
-  );
-}
+"use client";
+
+import ReactMarkdown from "react-markdown";
+import remarkGfm from "remark-gfm";
+
+export function DescriptionCard({ description }: { description: string }) {
+  return (
+    <div className="p-6 rounded-xl border border-gray-800 bg-background-card backdrop-blur-xl shadow-sm">
+      <h2 className="text-xs font-bold uppercase tracking-wider text-gray-500 mb-5">
+        Description
+      </h2>
+      <div
+        className="prose prose-invert prose-sm max-w-none
+        prose-headings:font-bold prose-headings:text-gray-100
+        prose-h1:text-xl prose-h2:text-lg prose-h3:text-base
+        prose-p:text-gray-300 prose-p:leading-relaxed
+        prose-a:text-primary prose-a:no-underline hover:prose-a:underline
+        prose-strong:text-gray-100
+        prose-li:text-gray-300
+        prose-blockquote:border-primary/40 prose-blockquote:text-gray-400
+        prose-hr:border-gray-800
+        prose-code:text-primary prose-code:bg-primary/10 prose-code:px-1.5 prose-code:py-0.5 prose-code:rounded prose-code:text-xs prose-code:before:content-none prose-code:after:content-none
+        prose-pre:bg-gray-900 prose-pre:border prose-pre:border-gray-800 prose-pre:rounded-xl
+        prose-th:text-gray-300 prose-th:bg-gray-900/60
+        prose-td:border-gray-800 prose-table:text-sm"
+      >
+        <ReactMarkdown remarkPlugins={[remarkGfm]}>{description}</ReactMarkdown>
+      </div>
+    </div>
+  );
+}
diff --git a/components/bounty-detail/bounty-detail-header-card.tsx b/components/bounty-detail/bounty-detail-header-card.tsx
index 8029ffd..5bc88cc 100644
--- a/components/bounty-detail/bounty-detail-header-card.tsx
+++ b/components/bounty-detail/bounty-detail-header-card.tsx
@@ -1,98 +1,98 @@
-import Link from "next/link";
-import { ExternalLink, Tag, GitBranch } from "lucide-react";
-import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
-import type { Bounty } from "@/lib/api";
-import { DifficultyBadge, StatusBadge } from "./bounty-badges";
-
-export function HeaderCard({ bounty }: { bounty: Bounty }) {
-  return (
-    <div className="p-6 rounded-xl border border-gray-800 bg-background-card backdrop-blur-xl shadow-sm">
-      {/* Badges */}
-      <div className="flex items-center gap-2 flex-wrap mb-4">
-        <StatusBadge status={bounty.status} />
-        {bounty.difficulty && (
-          <DifficultyBadge difficulty={bounty.difficulty} />
-        )}
-        <span className="inline-flex items-center px-2.5 py-1 rounded-full text-xs font-medium capitalize bg-gray-800 text-gray-300 border border-gray-700">
-          {bounty.type}
-        </span>
-      </div>
-
-      {/* Title */}
-      <h1 className="text-2xl md:text-3xl font-bold tracking-tight text-gray-50 leading-snug mb-2">
-        {bounty.issueTitle}
-      </h1>
-
-      {/* Repo + issue number */}
-      <div className="flex items-center gap-2 text-xs text-gray-500 mb-5">
-        <GitBranch className="size-3.5" />
-        <span>{bounty.githubRepo}</span>
-        <span>·</span>
-        <a
-          href={bounty.githubIssueUrl}
-          target="_blank"
-          rel="noopener noreferrer"
-          className="hover:text-primary transition-colors flex items-center gap-1"
-        >
-          #{bounty.issueNumber}
-          <ExternalLink className="size-3" />
-        </a>
-      </div>
-
-      {/* Reward – mobile only */}
-      <div className="flex items-center justify-between mb-5 lg:hidden p-3 rounded-lg bg-gray-900/50 border border-gray-800/60">
-        <span className="text-xs text-gray-500 uppercase tracking-wider font-medium">
-          Reward
-        </span>
-        <span className="text-xl font-black text-primary tabular-nums">
-          {bounty.rewardAmount != null
-            ? `$${bounty.rewardAmount.toLocaleString()}`
-            : "TBD"}
-          <span className="text-xs font-normal text-gray-500 ml-1">
-            {bounty.rewardCurrency}
-          </span>
-        </span>
-      </div>
-
-      {/* Project */}
-      <div className="flex items-center gap-3 p-3 rounded-lg bg-gray-900/50 border border-gray-800/60 w-fit mb-5">
-        <Avatar className="size-8 rounded-md border border-gray-700 shrink-0">
-          <AvatarImage
-            src={bounty.projectLogoUrl ?? undefined}
-            alt={bounty.projectName}
-          />
-          <AvatarFallback className="rounded-md text-xs font-bold bg-gray-800 text-gray-300">
-            {bounty.projectName.slice(0, 2).toUpperCase()}
-          </AvatarFallback>
-        </Avatar>
-        <div>
-          <p className="text-[10px] text-gray-500 uppercase tracking-wider leading-none mb-0.5">
-            Project
-          </p>
-          <Link
-            href={`/projects/${bounty.projectId}`}
-            className="text-sm font-semibold text-gray-200 hover:text-primary transition-colors flex items-center gap-1"
-          >
-            {bounty.projectName}
-            <ExternalLink className="size-3 text-gray-500" />
-          </Link>
-        </div>
-      </div>
-
-      {/* Tags */}
-      {bounty.tags.length > 0 && (
-        <div className="flex items-center gap-2 flex-wrap">
-          <Tag className="size-3.5 text-gray-600 shrink-0" />
-          {bounty.tags.map((tag) => (
-            <span
-              key={tag}
-              className="px-2 py-0.5 rounded-md text-xs font-medium bg-gray-800 text-gray-400 border border-gray-700/60 lowercase"
-            >
-              {tag}
-            </span>
-          ))}
-        </div>
-      )}
-    </div>
-  );
-}
+import Link from "next/link";
+import { ExternalLink, Tag, GitBranch } from "lucide-react";
+import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
+import type { Bounty } from "@/lib/api";
+import { DifficultyBadge, StatusBadge } from "./bounty-badges";
+
+export function HeaderCard({ bounty }: { bounty: Bounty }) {
+  return (
+    <div className="p-6 rounded-xl border border-gray-800 bg-background-card backdrop-blur-xl shadow-sm">
+      {/* Badges */}
+      <div className="flex items-center gap-2 flex-wrap mb-4">
+        <StatusBadge status={bounty.status} />
+        {bounty.difficulty && (
+          <DifficultyBadge difficulty={bounty.difficulty} />
+        )}
+        <span className="inline-flex items-center px-2.5 py-1 rounded-full text-xs font-medium capitalize bg-gray-800 text-gray-300 border border-gray-700">
+          {bounty.type}
+        </span>
+      </div>
+
+      {/* Title */}
+      <h1 className="text-2xl md:text-3xl font-bold tracking-tight text-gray-50 leading-snug mb-2">
+        {bounty.issueTitle}
+      </h1>
+
+      {/* Repo + issue number */}
+      <div className="flex items-center gap-2 text-xs text-gray-500 mb-5">
+        <GitBranch className="size-3.5" />
+        <span>{bounty.githubRepo}</span>
+        <span>·</span>
+        <a
+          href={bounty.githubIssueUrl}
+          target="_blank"
+          rel="noopener noreferrer"
+          className="hover:text-primary transition-colors flex items-center gap-1"
+        >
+          #{bounty.issueNumber}
+          <ExternalLink className="size-3" />
+        </a>
+      </div>
+
+      {/* Reward – mobile only */}
+      <div className="flex items-center justify-between mb-5 lg:hidden p-3 rounded-lg bg-gray-900/50 border border-gray-800/60">
+        <span className="text-xs text-gray-500 uppercase tracking-wider font-medium">
+          Reward
+        </span>
+        <span className="text-xl font-black text-primary tabular-nums">
+          {bounty.rewardAmount != null
+            ? `$${bounty.rewardAmount.toLocaleString()}`
+            : "TBD"}
+          <span className="text-xs font-normal text-gray-500 ml-1">
+            {bounty.rewardCurrency}
+          </span>
+        </span>
+      </div>
+
+      {/* Project */}
+      <div className="flex items-center gap-3 p-3 rounded-lg bg-gray-900/50 border border-gray-800/60 w-fit mb-5">
+        <Avatar className="size-8 rounded-md border border-gray-700 shrink-0">
+          <AvatarImage
+            src={bounty.projectLogoUrl ?? undefined}
+            alt={bounty.projectName}
+          />
+          <AvatarFallback className="rounded-md text-xs font-bold bg-gray-800 text-gray-300">
+            {bounty.projectName.slice(0, 2).toUpperCase()}
+          </AvatarFallback>
+        </Avatar>
+        <div>
+          <p className="text-[10px] text-gray-500 uppercase tracking-wider leading-none mb-0.5">
+            Project
+          </p>
+          <Link
+            href={`/projects/${bounty.projectId}`}
+            className="text-sm font-semibold text-gray-200 hover:text-primary transition-colors flex items-center gap-1"
+          >
+            {bounty.projectName}
+            <ExternalLink className="size-3 text-gray-500" />
+          </Link>
+        </div>
+      </div>
+
+      {/* Tags */}
+      {bounty.tags.length > 0 && (
+        <div className="flex items-center gap-2 flex-wrap">
+          <Tag className="size-3.5 text-gray-600 shrink-0" />
+          {bounty.tags.map((tag) => (
+            <span
+              key={tag}
+              className="px-2 py-0.5 rounded-md text-xs font-medium bg-gray-800 text-gray-400 border border-gray-700/60 lowercase"
+            >
+              {tag}
+            </span>
+          ))}
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/components/bounty-detail/bounty-detail-requirements-card.tsx b/components/bounty-detail/bounty-detail-requirements-card.tsx
index 59ac673..d6f99a1 100644
--- a/components/bounty-detail/bounty-detail-requirements-card.tsx
+++ b/components/bounty-detail/bounty-detail-requirements-card.tsx
@@ -1,36 +1,36 @@
-import type { Bounty } from "@/lib/api";
-
-export function RequirementsCard({
-  requirements,
-}: {
-  requirements: NonNullable<Bounty["requirements"]>;
-}) {
-  if (requirements.length === 0) return null;
-
-  return (
-    <div className="p-6 rounded-xl border border-gray-800 bg-background-card backdrop-blur-xl shadow-sm">
-      <h2 className="text-xs font-bold uppercase tracking-wider text-gray-500 mb-4">
-        Requirements
-      </h2>
-      <ul className="space-y-2.5">
-        {requirements.map((req, i) => (
-          <li key={i} className="flex items-start gap-3 text-sm text-gray-300">
-            <span className="mt-1.5 size-1.5 rounded-full bg-primary shrink-0" />
-            {req}
-          </li>
-        ))}
-      </ul>
-    </div>
-  );
-}
-
-export function ScopeCard({ scope }: { scope: string }) {
-  return (
-    <div className="p-6 rounded-xl border border-gray-800 bg-background-card backdrop-blur-xl shadow-sm">
-      <h2 className="text-xs font-bold uppercase tracking-wider text-gray-500 mb-4">
-        Scope
-      </h2>
-      <p className="text-sm text-gray-300 leading-relaxed">{scope}</p>
-    </div>
-  );
-}
+import type { Bounty } from "@/lib/api";
+
+export function RequirementsCard({
+  requirements,
+}: {
+  requirements: NonNullable<Bounty["requirements"]>;
+}) {
+  if (requirements.length === 0) return null;
+
+  return (
+    <div className="p-6 rounded-xl border border-gray-800 bg-background-card backdrop-blur-xl shadow-sm">
+      <h2 className="text-xs font-bold uppercase tracking-wider text-gray-500 mb-4">
+        Requirements
+      </h2>
+      <ul className="space-y-2.5">
+        {requirements.map((req, i) => (
+          <li key={i} className="flex items-start gap-3 text-sm text-gray-300">
+            <span className="mt-1.5 size-1.5 rounded-full bg-primary shrink-0" />
+            {req}
+          </li>
+        ))}
+      </ul>
+    </div>
+  );
+}
+
+export function ScopeCard({ scope }: { scope: string }) {
+  return (
+    <div className="p-6 rounded-xl border border-gray-800 bg-background-card backdrop-blur-xl shadow-sm">
+      <h2 className="text-xs font-bold uppercase tracking-wider text-gray-500 mb-4">
+        Scope
+      </h2>
+      <p className="text-sm text-gray-300 leading-relaxed">{scope}</p>
+    </div>
+  );
+}
diff --git a/components/bounty-detail/bounty-detail-sidebar-cta.tsx b/components/bounty-detail/bounty-detail-sidebar-cta.tsx
index a468597..a26cf5d 100644
--- a/components/bounty-detail/bounty-detail-sidebar-cta.tsx
+++ b/components/bounty-detail/bounty-detail-sidebar-cta.tsx
@@ -1,205 +1,205 @@
-"use client";
-
-import { useState } from "react";
-import { Github, Copy, Check, AlertCircle, Clock } from "lucide-react";
-import { Button } from "@/components/ui/button";
-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";
-
-export function SidebarCTA({ bounty }: { bounty: Bounty }) {
-  const [copied, setCopied] = useState(false);
-  const canAct = bounty.status === "open";
-  const claimCfg = CLAIMING_MODEL_CONFIG[bounty.claimingModel];
-  const ClaimIcon = claimCfg.icon;
-
-  const handleCopy = async () => {
-    try {
-      await navigator.clipboard.writeText(window.location.href);
-      setCopied(true);
-      setTimeout(() => setCopied(false), 2000);
-    } catch {
-      // clipboard write failed (e.g. non-HTTPS, permission denied)
-    }
-  };
-
-  const ctaLabel = () => {
-    if (!canAct)
-      return bounty.status === "claimed" ? "Already Claimed" : "Bounty Closed";
-    switch (bounty.claimingModel) {
-      case "single-claim":
-        return "Claim Bounty";
-      case "application":
-        return "Apply Now";
-      case "competition":
-        return "Submit Entry";
-      case "multi-winner":
-        return "Submit Work";
-    }
-  };
-
-  return (
-    <div className="p-5 rounded-xl border border-gray-800 bg-background-card backdrop-blur-xl shadow-sm space-y-5">
-      {/* Reward */}
-      <div className="flex items-start justify-between gap-2">
-        <span className="text-xs text-gray-500 uppercase tracking-wider font-medium mt-1">
-          Reward
-        </span>
-        <div className="text-right">
-          <p className="text-2xl font-black text-primary tabular-nums leading-tight">
-            {bounty.rewardAmount != null
-              ? `$${bounty.rewardAmount.toLocaleString()}`
-              : "TBD"}
-          </p>
-          <p className="text-[10px] text-gray-500 font-medium">
-            {bounty.rewardCurrency}
-          </p>
-        </div>
-      </div>
-
-      <Separator className="bg-gray-800/60" />
-
-      {/* Meta */}
-      <div className="space-y-3 text-sm">
-        <div className="flex items-center justify-between text-gray-400">
-          <span>Status</span>
-          <StatusBadge status={bounty.status} />
-        </div>
-        <div className="flex items-center justify-between text-gray-400">
-          <span>Model</span>
-          <span className="flex items-center gap-1.5 text-gray-200 font-medium">
-            <ClaimIcon className="size-3.5 text-gray-500" />
-            {claimCfg.label}
-          </span>
-        </div>
-        {bounty.difficulty && (
-          <div className="flex items-center justify-between text-gray-400">
-            <span>Difficulty</span>
-            <DifficultyBadge difficulty={bounty.difficulty} />
-          </div>
-        )}
-        {bounty.submissionsEndDate && (
-          <div className="flex items-center justify-between text-gray-400">
-            <span>Deadline</span>
-            <span className="flex items-center gap-1.5 text-gray-200 text-xs font-medium">
-              <Clock className="size-3.5 text-gray-500" />
-              {new Date(bounty.submissionsEndDate).toLocaleDateString("en-US", {
-                month: "short",
-                day: "numeric",
-                year: "numeric",
-              })}
-            </span>
-          </div>
-        )}
-      </div>
-
-      <Separator className="bg-gray-800/60" />
-
-      {/* CTA */}
-      <Button
-        className="w-full h-11 font-bold tracking-wide"
-        disabled={!canAct}
-        size="lg"
-        onClick={() =>
-          canAct &&
-          window.open(bounty.githubIssueUrl, "_blank", "noopener,noreferrer")
-        }
-      >
-        {ctaLabel()}
-      </Button>
-
-      {!canAct && (
-        <p className="flex items-center gap-1.5 text-xs text-gray-500 justify-center text-center">
-          <AlertCircle className="size-3 shrink-0" />
-          {bounty.status === "claimed"
-            ? "A contributor has already claimed this bounty."
-            : "This bounty is no longer accepting submissions."}
-        </p>
-      )}
-
-      {/* GitHub */}
-      <a
-        href={bounty.githubIssueUrl}
-        target="_blank"
-        rel="noopener noreferrer"
-        className="w-full flex items-center justify-center gap-1.5 text-xs text-gray-500 hover:text-gray-300 transition-colors py-1"
-      >
-        <Github className="size-3" />
-        View on GitHub
-      </a>
-
-      {/* Copy link */}
-      <button
-        onClick={handleCopy}
-        className="w-full flex items-center justify-center gap-1.5 text-xs text-gray-500 hover:text-gray-300 transition-colors py-1"
-      >
-        {copied ? (
-          <>
-            <Check className="size-3 text-emerald-400" />
-            <span className="text-emerald-400">Copied!</span>
-          </>
-        ) : (
-          <>
-            <Copy className="size-3" />
-            Copy link
-          </>
-        )}
-      </button>
-    </div>
-  );
-}
-
-export function ClaimModelInfo({
-  claimingModel,
-}: {
-  claimingModel: Bounty["claimingModel"];
-}) {
-  return (
-    <div className="p-4 rounded-xl border border-gray-800 bg-background-card/60 space-y-2">
-      <h3 className="text-xs font-bold uppercase tracking-wider text-gray-500">
-        Claim Model
-      </h3>
-      <p className="text-xs text-gray-400 leading-relaxed">
-        {CLAIMING_MODEL_CONFIG[claimingModel].description}
-      </p>
-    </div>
-  );
-}
-
-export function MobileCTA({ bounty }: { bounty: Bounty }) {
-  const canAct = bounty.status === "open";
-  // const claimCfg = CLAIMING_MODEL_CONFIG[bounty.claimingModel];
-
-  const label = () => {
-    if (!canAct)
-      return bounty.status === "claimed" ? "Already Claimed" : "Bounty Closed";
-    switch (bounty.claimingModel) {
-      case "single-claim":
-        return "Claim Bounty";
-      case "application":
-        return "Apply Now";
-      case "competition":
-        return "Submit Entry";
-      case "multi-winner":
-        return "Submit Work";
-    }
-  };
-
-  return (
-    <div className="lg:hidden fixed bottom-0 left-0 right-0 p-4 bg-background/90 backdrop-blur-xl border-t border-gray-800/60 z-20">
-      <Button
-        className="w-full h-11 font-bold tracking-wide"
-        disabled={!canAct}
-        size="lg"
-        onClick={() =>
-          canAct &&
-          window.open(bounty.githubIssueUrl, "_blank", "noopener,noreferrer")
-        }
-      >
-        {label()}
-      </Button>
-    </div>
-  );
-}
+"use client";
+
+import { useState } from "react";
+import { Github, Copy, Check, AlertCircle, Clock } from "lucide-react";
+import { Button } from "@/components/ui/button";
+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";
+
+export function SidebarCTA({ bounty }: { bounty: Bounty }) {
+  const [copied, setCopied] = useState(false);
+  const canAct = bounty.status === "open";
+  const claimCfg = CLAIMING_MODEL_CONFIG[bounty.claimingModel];
+  const ClaimIcon = claimCfg.icon;
+
+  const handleCopy = async () => {
+    try {
+      await navigator.clipboard.writeText(window.location.href);
+      setCopied(true);
+      setTimeout(() => setCopied(false), 2000);
+    } catch {
+      // clipboard write failed (e.g. non-HTTPS, permission denied)
+    }
+  };
+
+  const ctaLabel = () => {
+    if (!canAct)
+      return bounty.status === "claimed" ? "Already Claimed" : "Bounty Closed";
+    switch (bounty.claimingModel) {
+      case "single-claim":
+        return "Claim Bounty";
+      case "application":
+        return "Apply Now";
+      case "competition":
+        return "Submit Entry";
+      case "multi-winner":
+        return "Submit Work";
+    }
+  };
+
+  return (
+    <div className="p-5 rounded-xl border border-gray-800 bg-background-card backdrop-blur-xl shadow-sm space-y-5">
+      {/* Reward */}
+      <div className="flex items-start justify-between gap-2">
+        <span className="text-xs text-gray-500 uppercase tracking-wider font-medium mt-1">
+          Reward
+        </span>
+        <div className="text-right">
+          <p className="text-2xl font-black text-primary tabular-nums leading-tight">
+            {bounty.rewardAmount != null
+              ? `$${bounty.rewardAmount.toLocaleString()}`
+              : "TBD"}
+          </p>
+          <p className="text-[10px] text-gray-500 font-medium">
+            {bounty.rewardCurrency}
+          </p>
+        </div>
+      </div>
+
+      <Separator className="bg-gray-800/60" />
+
+      {/* Meta */}
+      <div className="space-y-3 text-sm">
+        <div className="flex items-center justify-between text-gray-400">
+          <span>Status</span>
+          <StatusBadge status={bounty.status} />
+        </div>
+        <div className="flex items-center justify-between text-gray-400">
+          <span>Model</span>
+          <span className="flex items-center gap-1.5 text-gray-200 font-medium">
+            <ClaimIcon className="size-3.5 text-gray-500" />
+            {claimCfg.label}
+          </span>
+        </div>
+        {bounty.difficulty && (
+          <div className="flex items-center justify-between text-gray-400">
+            <span>Difficulty</span>
+            <DifficultyBadge difficulty={bounty.difficulty} />
+          </div>
+        )}
+        {bounty.submissionsEndDate && (
+          <div className="flex items-center justify-between text-gray-400">
+            <span>Deadline</span>
+            <span className="flex items-center gap-1.5 text-gray-200 text-xs font-medium">
+              <Clock className="size-3.5 text-gray-500" />
+              {new Date(bounty.submissionsEndDate).toLocaleDateString("en-US", {
+                month: "short",
+                day: "numeric",
+                year: "numeric",
+              })}
+            </span>
+          </div>
+        )}
+      </div>
+
+      <Separator className="bg-gray-800/60" />
+
+      {/* CTA */}
+      <Button
+        className="w-full h-11 font-bold tracking-wide"
+        disabled={!canAct}
+        size="lg"
+        onClick={() =>
+          canAct &&
+          window.open(bounty.githubIssueUrl, "_blank", "noopener,noreferrer")
+        }
+      >
+        {ctaLabel()}
+      </Button>
+
+      {!canAct && (
+        <p className="flex items-center gap-1.5 text-xs text-gray-500 justify-center text-center">
+          <AlertCircle className="size-3 shrink-0" />
+          {bounty.status === "claimed"
+            ? "A contributor has already claimed this bounty."
+            : "This bounty is no longer accepting submissions."}
+        </p>
+      )}
+
+      {/* GitHub */}
+      <a
+        href={bounty.githubIssueUrl}
+        target="_blank"
+        rel="noopener noreferrer"
+        className="w-full flex items-center justify-center gap-1.5 text-xs text-gray-500 hover:text-gray-300 transition-colors py-1"
+      >
+        <Github className="size-3" />
+        View on GitHub
+      </a>
+
+      {/* Copy link */}
+      <button
+        onClick={handleCopy}
+        className="w-full flex items-center justify-center gap-1.5 text-xs text-gray-500 hover:text-gray-300 transition-colors py-1"
+      >
+        {copied ? (
+          <>
+            <Check className="size-3 text-emerald-400" />
+            <span className="text-emerald-400">Copied!</span>
+          </>
+        ) : (
+          <>
+            <Copy className="size-3" />
+            Copy link
+          </>
+        )}
+      </button>
+    </div>
+  );
+}
+
+export function ClaimModelInfo({
+  claimingModel,
+}: {
+  claimingModel: Bounty["claimingModel"];
+}) {
+  return (
+    <div className="p-4 rounded-xl border border-gray-800 bg-background-card/60 space-y-2">
+      <h3 className="text-xs font-bold uppercase tracking-wider text-gray-500">
+        Claim Model
+      </h3>
+      <p className="text-xs text-gray-400 leading-relaxed">
+        {CLAIMING_MODEL_CONFIG[claimingModel].description}
+      </p>
+    </div>
+  );
+}
+
+export function MobileCTA({ bounty }: { bounty: Bounty }) {
+  const canAct = bounty.status === "open";
+  // const claimCfg = CLAIMING_MODEL_CONFIG[bounty.claimingModel];
+
+  const label = () => {
+    if (!canAct)
+      return bounty.status === "claimed" ? "Already Claimed" : "Bounty Closed";
+    switch (bounty.claimingModel) {
+      case "single-claim":
+        return "Claim Bounty";
+      case "application":
+        return "Apply Now";
+      case "competition":
+        return "Submit Entry";
+      case "multi-winner":
+        return "Submit Work";
+    }
+  };
+
+  return (
+    <div className="lg:hidden fixed bottom-0 left-0 right-0 p-4 bg-background/90 backdrop-blur-xl border-t border-gray-800/60 z-20">
+      <Button
+        className="w-full h-11 font-bold tracking-wide"
+        disabled={!canAct}
+        size="lg"
+        onClick={() =>
+          canAct &&
+          window.open(bounty.githubIssueUrl, "_blank", "noopener,noreferrer")
+        }
+      >
+        {label()}
+      </Button>
+    </div>
+  );
+}
diff --git a/components/bounty/sponsor-review-dashboard.tsx b/components/bounty/sponsor-review-dashboard.tsx
index d6b8fe6..5118d19 100644
--- a/components/bounty/sponsor-review-dashboard.tsx
+++ b/components/bounty/sponsor-review-dashboard.tsx
@@ -1,98 +1,169 @@
-"use client"
+"use client";
 
-import * as React from "react"
-import { format, parseISO } from "date-fns"
-import { Avatar, AvatarImage, AvatarFallback } from "@/components/ui/avatar"
-import { Button } from "@/components/ui/button"
-import { ReviewSubmission } from "@/types/participation"
+import * as React from "react";
+import { format, parseISO } from "date-fns";
+import { Avatar, AvatarImage, AvatarFallback } from "@/components/ui/avatar";
+import { Button } from "@/components/ui/button";
+import { ReviewSubmission } from "@/types/participation";
 
-type Action = 'approve' | 'reject' | 'request_revision'
+type Action = "approve" | "reject" | "request_revision";
 
 interface SponsorReviewDashboardProps {
-  submissions: ReviewSubmission[]
-  onAction?: (submissionId: string, action: Action) => Promise<void> | void
+  submissions: ReviewSubmission[];
+  onAction?: (submissionId: string, action: Action) => Promise<void> | void;
 }
 
-export function SponsorReviewDashboard({ submissions, onAction }: SponsorReviewDashboardProps) {
-  const [items, setItems] = React.useState<ReviewSubmission[]>(() => submissions)
-  const [loadingIds, setLoadingIds] = React.useState<Record<string, boolean>>({})
+export function SponsorReviewDashboard({
+  submissions,
+  onAction,
+}: SponsorReviewDashboardProps) {
+  const [items, setItems] = React.useState<ReviewSubmission[]>(
+    () => submissions,
+  );
+  const [loadingIds, setLoadingIds] = React.useState<Record<string, boolean>>(
+    {},
+  );
 
   React.useEffect(() => {
-    setItems(curr => {
-      const currIdMap = new Map(curr.map(it => [it.submissionId, it]))
-      return submissions.map(sub => (currIdMap.get(sub.submissionId) ?? sub) as ReviewSubmission)
-    })
-  }, [submissions])
+    setItems((curr) => {
+      const currIdMap = new Map(curr.map((it) => [it.submissionId, it]));
+      return submissions.map(
+        (sub) => (currIdMap.get(sub.submissionId) ?? sub) as ReviewSubmission,
+      );
+    });
+  }, [submissions]);
 
   const handleAction = async (id: string, action: Action) => {
-    setLoadingIds(s => ({ ...s, [id]: true }))
-    let prevItem: ReviewSubmission | undefined
+    setLoadingIds((s) => ({ ...s, [id]: true }));
+    let prevItem: ReviewSubmission | undefined;
 
-    setItems(curr => curr.map(it => {
-      if (it.submissionId === id) {
-        prevItem = it
-        return {
-          ...it,
-          status: action === 'approve' ? 'approved' : action === 'reject' ? 'rejected' : 'revision_requested'
+    setItems((curr) =>
+      curr.map((it) => {
+        if (it.submissionId === id) {
+          prevItem = it;
+          return {
+            ...it,
+            status:
+              action === "approve"
+                ? "approved"
+                : action === "reject"
+                  ? "rejected"
+                  : "revision_requested",
+          };
         }
-      }
-      return it
-    }))
+        return it;
+      }),
+    );
 
     try {
-      const maybe = onAction && onAction(id, action)
-      if (maybe && maybe instanceof Promise) await maybe
-    } catch (err) {
+      const maybe = onAction && onAction(id, action);
+      if (maybe && maybe instanceof Promise) await maybe;
+    } catch {
       if (prevItem) {
-        setItems(curr => curr.map(it => (it.submissionId === id ? prevItem : it)) as ReviewSubmission[])
+        setItems(
+          (curr) =>
+            curr.map((it) =>
+              it.submissionId === id ? prevItem : it,
+            ) as ReviewSubmission[],
+        );
       }
     } finally {
-      setLoadingIds(s => {
-        const copy = { ...s }
-        delete copy[id]
-        return copy
-      })
+      setLoadingIds((s) => {
+        const copy = { ...s };
+        delete copy[id];
+        return copy;
+      });
     }
-  }
+  };
 
   return (
     <div className="space-y-4">
-      {items.length === 0 && <div className="text-sm text-muted-foreground">No submissions to review.</div>}
+      {items.length === 0 && (
+        <div className="text-sm text-muted-foreground">
+          No submissions to review.
+        </div>
+      )}
 
       <ul className="space-y-2">
-        {items.map(sub => (
-          <li key={sub.submissionId} className="flex flex-col sm:flex-row items-start sm:items-center justify-between gap-4 rounded-md border p-3">
+        {items.map((sub) => (
+          <li
+            key={sub.submissionId}
+            className="flex flex-col sm:flex-row items-start sm:items-center justify-between gap-4 rounded-md border p-3"
+          >
             <div className="flex items-center gap-3 min-w-0 w-full sm:w-auto">
               <Avatar className="shrink-0">
                 {sub.contributor.avatarUrl ? (
-                  <AvatarImage src={sub.contributor.avatarUrl} alt={sub.contributor.username} />
+                  <AvatarImage
+                    src={sub.contributor.avatarUrl}
+                    alt={sub.contributor.username}
+                  />
                 ) : (
-                  <AvatarFallback>{sub.contributor.username?.charAt(0).toUpperCase() ?? "?"}</AvatarFallback>
+                  <AvatarFallback>
+                    {sub.contributor.username?.charAt(0).toUpperCase() ?? "?"}
+                  </AvatarFallback>
                 )}
               </Avatar>
               <div className="min-w-0 flex-1">
-                <div className="font-medium truncate">{sub.contributor.username}</div>
-                <div className="text-xs text-muted-foreground">Submitted {format(parseISO(sub.submittedAt), 'MM/dd/yyyy, hh:mm aa')}</div>
-                {sub.milestoneId && <div className="text-xs text-muted-foreground">Milestone: {sub.milestoneId}</div>}
+                <div className="font-medium truncate">
+                  {sub.contributor.username}
+                </div>
+                <div className="text-xs text-muted-foreground">
+                  Submitted{" "}
+                  {format(parseISO(sub.submittedAt), "MM/dd/yyyy, hh:mm aa")}
+                </div>
+                {sub.milestoneId && (
+                  <div className="text-xs text-muted-foreground">
+                    Milestone: {sub.milestoneId}
+                  </div>
+                )}
               </div>
             </div>
 
             <div className="flex flex-col sm:flex-row items-start sm:items-center gap-3 w-full sm:w-auto">
               <div className="text-sm shrink-0">
-                {sub.status === 'pending' && <span className="text-yellow-600 font-medium">Pending</span>}
-                {sub.status === 'approved' && <span className="text-green-600 font-medium">Approved</span>}
-                {sub.status === 'rejected' && <span className="text-red-600 font-medium">Rejected</span>}
-                {sub.status === 'revision_requested' && <span className="text-blue-600 font-medium">Revision Requested</span>}
+                {sub.status === "pending" && (
+                  <span className="text-yellow-600 font-medium">Pending</span>
+                )}
+                {sub.status === "approved" && (
+                  <span className="text-green-600 font-medium">Approved</span>
+                )}
+                {sub.status === "rejected" && (
+                  <span className="text-red-600 font-medium">Rejected</span>
+                )}
+                {sub.status === "revision_requested" && (
+                  <span className="text-blue-600 font-medium">
+                    Revision Requested
+                  </span>
+                )}
               </div>
 
               <div className="flex flex-wrap gap-2 w-full sm:w-auto">
-                <Button size="sm" variant="ghost" onClick={() => handleAction(sub.submissionId, 'request_revision')} disabled={!!loadingIds[sub.submissionId]} className="flex-1 sm:flex-none">
+                <Button
+                  size="sm"
+                  variant="ghost"
+                  onClick={() =>
+                    handleAction(sub.submissionId, "request_revision")
+                  }
+                  disabled={!!loadingIds[sub.submissionId]}
+                  className="flex-1 sm:flex-none"
+                >
                   Request revision
                 </Button>
-                <Button size="sm" variant="outline" onClick={() => handleAction(sub.submissionId, 'reject')} disabled={!!loadingIds[sub.submissionId]} className="text-red-600 flex-1 sm:flex-none">
+                <Button
+                  size="sm"
+                  variant="outline"
+                  onClick={() => handleAction(sub.submissionId, "reject")}
+                  disabled={!!loadingIds[sub.submissionId]}
+                  className="text-red-600 flex-1 sm:flex-none"
+                >
                   Reject
                 </Button>
-                <Button size="sm" onClick={() => handleAction(sub.submissionId, 'approve')} disabled={!!loadingIds[sub.submissionId]} className="text-green-600 flex-1 sm:flex-none">
+                <Button
+                  size="sm"
+                  onClick={() => handleAction(sub.submissionId, "approve")}
+                  disabled={!!loadingIds[sub.submissionId]}
+                  className="text-green-600 flex-1 sm:flex-none"
+                >
                   Approve
                 </Button>
               </div>
@@ -101,7 +172,7 @@ export function SponsorReviewDashboard({ submissions, onAction }: SponsorReviewD
         ))}
       </ul>
     </div>
-  )
+  );
 }
 
-export default SponsorReviewDashboard
+export default SponsorReviewDashboard;
diff --git a/components/compliance/appeal-dialog.tsx b/components/compliance/appeal-dialog.tsx
index 9da687b..80b8788 100644
--- a/components/compliance/appeal-dialog.tsx
+++ b/components/compliance/appeal-dialog.tsx
@@ -82,7 +82,7 @@ export function AppealDialog({
             <Textarea
               id="reason"
               placeholder="Explain your situation..."
-              className="min-h-[100px]"
+              className="min-h-25"
               value={reason}
               onChange={(e) => setReason(e.target.value)}
               required
@@ -96,7 +96,7 @@ export function AppealDialog({
             <Textarea
               id="additionalInfo"
               placeholder="Any additional context..."
-              className="min-h-[80px]"
+              className="min-h-20"
               value={additionalInfo}
               onChange={(e) => setAdditionalInfo(e.target.value)}
             />
diff --git a/components/compliance/document-upload.tsx b/components/compliance/document-upload.tsx
index c4fa5fa..108d557 100644
--- a/components/compliance/document-upload.tsx
+++ b/components/compliance/document-upload.tsx
@@ -45,8 +45,8 @@ export function DocumentUpload({
     setUploading(true);
     try {
       await onUpload(selectedFile);
-    } catch (err) {
-      setError((err as Error).message || "Upload failed");
+    } catch {
+      setError("Upload failed. Please try again.");
     } finally {
       setUploading(false);
     }
diff --git a/components/reputation/__tests__/my-claims.test.ts b/components/reputation/__tests__/my-claims.test.ts
new file mode 100644
index 0000000..92d6022
--- /dev/null
+++ b/components/reputation/__tests__/my-claims.test.ts
@@ -0,0 +1,37 @@
+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("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);
+
+        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");
+
+        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);
+    });
+});
diff --git a/components/reputation/my-claims.tsx b/components/reputation/my-claims.tsx
new file mode 100644
index 0000000..f6ed931
--- /dev/null
+++ b/components/reputation/my-claims.tsx
@@ -0,0 +1,103 @@
+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 { formatCurrency } from "@/helpers/format.helper";
+
+export type MyClaim = {
+    bountyId: string;
+    title: string;
+    status: string;
+    nextMilestone?: string;
+    rewardAmount?: number;
+};
+
+interface MyClaimsProps {
+    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"] },
+];
+
+export function normalizeStatus(status: string) {
+    return status.trim().toLowerCase().replace(/[\s_]+/g, "-");
+}
+
+function formatStatusLabel(status: string) {
+    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);
+        }),
+    }));
+}
+
+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>
+                            )}
+                        </CardContent>
+                    </Card>
+                );
+            })}
+        </div>
+    );
+}
diff --git a/components/wallet/withdrawal-section.tsx b/components/wallet/withdrawal-section.tsx
index 5a85a9f..e4e8954 100644
--- a/components/wallet/withdrawal-section.tsx
+++ b/components/wallet/withdrawal-section.tsx
@@ -103,8 +103,8 @@ export function WithdrawalSection({ walletInfo }: WithdrawalSectionProps) {
       });
       toast.success("Withdrawal submitted successfully!");
       setAmount("");
-    } catch (error) {
-      toast.error((error as Error).message || "Withdrawal failed");
+    } catch {
+      toast.error("Withdrawal failed. Please try again.");
     }
   };
 
diff --git a/hooks/Use-bounty-detail.ts b/hooks/Use-bounty-detail.ts
index 60beb91..3bf88bf 100644
--- a/hooks/Use-bounty-detail.ts
+++ b/hooks/Use-bounty-detail.ts
@@ -1,11 +1,11 @@
-import { useQuery } from "@tanstack/react-query";
-import { bountiesApi, type Bounty } from "@/lib/api";
-import { bountyKeys } from "./use-bounties";
-
-export function useBountyDetail(id: string) {
-  return useQuery<Bounty>({
-    queryKey: bountyKeys.detail(id),
-    queryFn: () => bountiesApi.getById(id),
-    enabled: Boolean(id),
-  });
-}
+import { useQuery } from "@tanstack/react-query";
+import { bountiesApi, type Bounty } from "@/lib/api";
+import { bountyKeys } from "./use-bounties";
+
+export function useBountyDetail(id: string) {
+  return useQuery<Bounty>({
+    queryKey: bountyKeys.detail(id),
+    queryFn: () => bountiesApi.getById(id),
+    enabled: Boolean(id),
+  });
+}
diff --git a/lib/bounty-config.ts b/lib/bounty-config.ts
index 11f1fae..0112181 100644
--- a/lib/bounty-config.ts
+++ b/lib/bounty-config.ts
@@ -1,70 +1,70 @@
-import type { ElementType } from "react";
-import { User, Users, Trophy } from "lucide-react";
-import type { Bounty } from "@/lib/api";
-
-export const STATUS_CONFIG: Record<
-  Bounty["status"],
-  { label: string; dot: string; className: string }
-> = {
-  open: {
-    label: "Open",
-    dot: "bg-emerald-400",
-    className:
-      "bg-emerald-500/10 text-emerald-400 border border-emerald-500/20",
-  },
-  claimed: {
-    label: "Claimed",
-    dot: "bg-amber-400",
-    className: "bg-amber-500/10 text-amber-400 border border-amber-500/20",
-  },
-  closed: {
-    label: "Closed",
-    dot: "bg-gray-500",
-    className: "bg-gray-800/60 text-gray-400 border border-gray-700",
-  },
-};
-
-export const DIFFICULTY_CONFIG: Record<
-  NonNullable<Bounty["difficulty"]>,
-  { label: string; className: string }
-> = {
-  beginner: {
-    label: "Beginner",
-    className: "bg-teal-500/10 text-teal-400 border border-teal-500/20",
-  },
-  intermediate: {
-    label: "Intermediate",
-    className: "bg-violet-500/10 text-violet-400 border border-violet-500/20",
-  },
-  advanced: {
-    label: "Advanced",
-    className: "bg-rose-500/10 text-rose-400 border border-rose-500/20",
-  },
-};
-
-export const CLAIMING_MODEL_CONFIG: Record<
-  Bounty["claimingModel"],
-  { label: string; description: string; icon: ElementType }
-> = {
-  "single-claim": {
-    label: "Single Claim",
-    description: "One contributor can claim and complete this bounty.",
-    icon: User,
-  },
-  application: {
-    label: "Application",
-    description:
-      "Apply to work on this bounty. Maintainers pick a contributor.",
-    icon: Users,
-  },
-  competition: {
-    label: "Competition",
-    description: "Multiple contributors submit — best solution wins.",
-    icon: Trophy,
-  },
-  "multi-winner": {
-    label: "Multi-Winner",
-    description: "Multiple submissions can be rewarded.",
-    icon: Users,
-  },
-};
+import type { ElementType } from "react";
+import { User, Users, Trophy } from "lucide-react";
+import type { Bounty } from "@/lib/api";
+
+export const STATUS_CONFIG: Record<
+  Bounty["status"],
+  { label: string; dot: string; className: string }
+> = {
+  open: {
+    label: "Open",
+    dot: "bg-emerald-400",
+    className:
+      "bg-emerald-500/10 text-emerald-400 border border-emerald-500/20",
+  },
+  claimed: {
+    label: "Claimed",
+    dot: "bg-amber-400",
+    className: "bg-amber-500/10 text-amber-400 border border-amber-500/20",
+  },
+  closed: {
+    label: "Closed",
+    dot: "bg-gray-500",
+    className: "bg-gray-800/60 text-gray-400 border border-gray-700",
+  },
+};
+
+export const DIFFICULTY_CONFIG: Record<
+  NonNullable<Bounty["difficulty"]>,
+  { label: string; className: string }
+> = {
+  beginner: {
+    label: "Beginner",
+    className: "bg-teal-500/10 text-teal-400 border border-teal-500/20",
+  },
+  intermediate: {
+    label: "Intermediate",
+    className: "bg-violet-500/10 text-violet-400 border border-violet-500/20",
+  },
+  advanced: {
+    label: "Advanced",
+    className: "bg-rose-500/10 text-rose-400 border border-rose-500/20",
+  },
+};
+
+export const CLAIMING_MODEL_CONFIG: Record<
+  Bounty["claimingModel"],
+  { label: string; description: string; icon: ElementType }
+> = {
+  "single-claim": {
+    label: "Single Claim",
+    description: "One contributor can claim and complete this bounty.",
+    icon: User,
+  },
+  application: {
+    label: "Application",
+    description:
+      "Apply to work on this bounty. Maintainers pick a contributor.",
+    icon: Users,
+  },
+  competition: {
+    label: "Competition",
+    description: "Multiple contributors submit — best solution wins.",
+    icon: Trophy,
+  },
+  "multi-winner": {
+    label: "Multi-Winner",
+    description: "Multiple submissions can be rewarded.",
+    icon: Users,
+  },
+};
diff --git a/lib/mock-bounty.ts b/lib/mock-bounty.ts
index a4b3a72..50eb8ee 100644
--- a/lib/mock-bounty.ts
+++ b/lib/mock-bounty.ts
@@ -1,4 +1,4 @@
-import { Bounty } from "@/types/bounty"
+import { Bounty } from "@/types/bounty";
 
 export const mockBounties: Bounty[] = [
   {
@@ -71,7 +71,7 @@ Add a dark mode toggle to the application settings page that persists user prefe
     difficulty: "beginner",
     tags: ["ui", "theme", "settings", "dark-mode"],
     status: "claimed",
-    claimedBy: "dev_user_123",
+    claimedBy: "user-1",
     claimedAt: "2026-01-01T00:00:00Z",
     claimExpiresAt: "2026-01-15T00:00:00Z",
     createdAt: "2025-01-10T08:00:00Z",
@@ -326,12 +326,12 @@ Memory leaks detected in privacy protocol implementation during extended operati
     createdAt: "2025-01-19T16:00:00Z",
     updatedAt: "2025-01-23T12:45:00Z",
   },
-]
+];
 
 export function getBountyById(id: string): Bounty | undefined {
-  return mockBounties.find((bounty) => bounty.id === id)
+  return mockBounties.find((bounty) => bounty.id === id);
 }
 
 export function getAllBounties(): Bounty[] {
-  return mockBounties
+  return mockBounties;
 }
diff --git a/lib/services/geo-restriction.ts b/lib/services/geo-restriction.ts
index dc2b4a0..7fc9411 100644
--- a/lib/services/geo-restriction.ts
+++ b/lib/services/geo-restriction.ts
@@ -43,9 +43,6 @@ export class GeoRestrictionService {
     ip: string,
     override?: Partial<UserLocation>,
   ): Promise<UserLocation> {
-    // In production: call ipapi.co, MaxMind, or ip-api.com
-    // Example: const response = await fetch(`https://ipapi.co/${ip}/json/`)
-
     const mockLocation: UserLocation = {
       ip,
       countryCode: override?.countryCode ?? "US",
@@ -64,7 +61,6 @@ export class GeoRestrictionService {
       isRestricted: false,
     };
 
-    // Check country-level restrictions
     const countryRestriction = RESTRICTED.find(
       (r) => r.code === mockLocation.countryCode && r.type === "COUNTRY",
     );
@@ -73,7 +69,6 @@ export class GeoRestrictionService {
       mockLocation.restrictionReason = countryRestriction.reason;
     }
 
-    // Check state-level restrictions (generic support for any country)
     if (mockLocation.regionCode) {
       const reason = this.getRestrictionReason(
         mockLocation.countryCode,
@@ -89,32 +84,23 @@ export class GeoRestrictionService {
   }
 
   static async detectVPN(ip: string): Promise<boolean> {
-    /**
-     * NOTE: This is a placeholder mock for VPN detection.
-     * TODO: Integrate with a real VPN detection service like IPHub, IP2Proxy, or VPNApi.
-     */
-
-    // Mock: check against a small list of "VPN-like" public IPs (placeholder logic)
     const vpnIps = ["192.0.2.1", "198.51.100.1"];
     return vpnIps.includes(ip);
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  static async detectProxy(_ip: string): Promise<boolean> {
-    // In production: check proxy databases or use APIs
-    // For now, use similar logic as VPN detection
+  static async detectProxy(ip: string): Promise<boolean> {
+    // TODO: Integrate a real proxy detection provider before production rollout.
+    void ip;
     return false;
   }
 
   static isRestricted(countryCode: string, regionCode?: string): boolean {
-    // Check country restriction
     if (
       RESTRICTED.some((r) => r.code === countryCode && r.type === "COUNTRY")
     ) {
       return true;
     }
 
-    // Check state restriction
     if (regionCode) {
       const stateCode = `${countryCode}-${regionCode}`;
       return RESTRICTED.some((r) => r.code === stateCode && r.type === "STATE");
diff --git a/types/participation.ts b/types/participation.ts
index c091efb..184bda5 100644
--- a/types/participation.ts
+++ b/types/participation.ts
@@ -1,65 +1,73 @@
-export type ApplicationStatus = 'pending' | 'approved' | 'rejected'
+export type ApplicationStatus = "pending" | "approved" | "rejected";
 
 export interface Application {
-    id: string
-    bountyId: string
-    applicantId: string
-    applicantName?: string // Optional for UI convenience
-    coverLetter: string
-    portfolioUrl?: string
-    status: ApplicationStatus
-    submittedAt: string
-    reviewedAt?: string
-    feedback?: string
+  id: string;
+  bountyId: string;
+  applicantId: string;
+  applicantName?: string; // Optional for UI convenience
+  coverLetter: string;
+  portfolioUrl?: string;
+  status: ApplicationStatus;
+  submittedAt: string;
+  reviewedAt?: string;
+  feedback?: string;
 }
 
-export type SubmissionStatus = 'pending' | 'accepted' | 'rejected'
+export type SubmissionStatus = "pending" | "accepted" | "rejected";
 
 export interface Submission {
-    id: string
-    bountyId: string
-    contributorId: string
-    contributorName?: string
-    content: string // URL or text description
-    status: SubmissionStatus
-    submittedAt: string
-    reviewedAt?: string
-    feedback?: string
+  id: string;
+  bountyId: string;
+  contributorId: string;
+  contributorName?: string;
+  content: string; // URL or text description
+  status: SubmissionStatus;
+  submittedAt: string;
+  reviewedAt?: string;
+  feedback?: string;
 }
 
-export type ReviewStatus = 'pending' | 'approved' | 'rejected' | 'revision_requested'
+export type ReviewStatus =
+  | "pending"
+  | "approved"
+  | "rejected"
+  | "revision_requested";
 
 export type ReviewSubmission = {
-    submissionId: string
-    contributor: {
-        username: string
-        avatarUrl?: string
-    }
-    milestoneId?: string
-    submittedAt: string
-    status: ReviewStatus
-}
+  submissionId: string;
+  contributor: {
+    username: string;
+    avatarUrl?: string;
+  };
+  milestoneId?: string;
+  submittedAt: string;
+  status: ReviewStatus;
+};
 
-export type MilestoneStatus = 'active' | 'completed' | 'advanced'
+export type MilestoneStatus = "active" | "completed" | "advanced";
 
 export interface MilestoneParticipation {
-    id: string
-    bountyId: string
-    contributorId: string
-    contributorName?: string
-    currentMilestone: number // 1-based index
-    status: MilestoneStatus
-    joinedAt: string
-    lastUpdatedAt: string
-    totalMilestones?: number // Optional override or cached value
+  id: string;
+  bountyId: string;
+  contributorId: string;
+  contributorName?: string;
+  currentMilestone: number; // 1-based index
+  status: MilestoneStatus;
+  joinedAt: string;
+  lastUpdatedAt: string;
+  totalMilestones?: number; // Optional override or cached value
 }
 
-export type CompetitionStatus = 'registered' | 'qualified' | 'disqualified' | 'winner'
+export type CompetitionStatus =
+  | "registered"
+  | "qualified"
+  | "disqualified"
+  | "winner";
 
 export interface CompetitionParticipation {
-    id: string
-    bountyId: string
-    contributorId: string
-    status: CompetitionStatus
-    registeredAt: string
+  id: string;
+  bountyId: string;
+  contributorId: string;
+  status: CompetitionStatus;
+  registeredAt: string;
 }