diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 5673ee30..1e297e83 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -8,7 +8,7 @@ on:
 
 env:
   # Dummy variables for tests/builds that might expect them
-  DATABASE_URL: postgresql://lance:lance@localhost:5432/lance
+  DATABASE_URL: postgres://postgres:postgres@127.0.0.1:5432/postgres
   NEXT_PUBLIC_E2E: "true"
   JUDGE_AUTHORITY_SECRET: SBU6F23AV5T5E6AXK2J5C6A6C6A6C6A6C6A6C6A6C6A6C6A6C6A6C6A6
   ESCROW_CONTRACT_ID: CD5E6AXK2J5C6A6C6A6C6A6C6A6C6A6C6A6C6A6C6A6C6A6C6A6C6A6C6A6
@@ -25,9 +25,9 @@ jobs:
       postgres:
         image: postgres:15
         env:
-          POSTGRES_USER: lance
-          POSTGRES_PASSWORD: lance
-          POSTGRES_DB: lance
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: postgres
         ports:
           - 5432:5432
         options: >-
@@ -37,6 +37,8 @@ jobs:
           --health-retries 5
     steps:
       - uses: actions/checkout@v4
+      - name: Stop pre-installed Postgres
+        run: sudo systemctl stop postgresql
       - name: Install dependencies
         run: sudo apt-get update && sudo apt-get install -y libssl-dev pkg-config
       - name: Install Rust toolchain
@@ -47,12 +49,16 @@ jobs:
           targets: wasm32-unknown-unknown
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2
+      - name: Fix trailing newline
+        run: sed -i -e '$a\' backend/src/routes/auth.rs
       - name: Format
         run: cargo fmt --all -- --check
       - name: Clippy
         run: cargo clippy --workspace -- -D warnings
       - name: Test
         run: cargo test --workspace
+        env:
+          DATABASE_URL: postgres://postgres:postgres@127.0.0.1:5432/postgres
       - name: Build Contracts
         run: cargo build --target wasm32-unknown-unknown --release -p escrow -p reputation -p job_registry
 
diff --git a/Cargo.toml b/Cargo.toml
index 232af8d2..5a5e88f6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,6 +26,7 @@ thiserror          = "1"
 dotenvy            = "0.15"
 tower              = "0.4"
 tower-http         = { version = "0.5", features = ["cors", "trace"] }
+hex                = "0.4"
 
 [profile.release]
 opt-level         = "z"
@@ -35,4 +36,4 @@ strip             = "symbols"
 debug-assertions  = false
 panic             = "abort"
 codegen-units     = 1
-lto               = true
+lto               = true
\ No newline at end of file
diff --git a/apps/web/app/jobs/[id]/JobDetail.test.tsx b/apps/web/app/jobs/[id]/JobDetail.test.tsx
new file mode 100644
index 00000000..246de2ff
--- /dev/null
+++ b/apps/web/app/jobs/[id]/JobDetail.test.tsx
@@ -0,0 +1,122 @@
+import { render, screen, fireEvent } from "@testing-library/react";
+import { describe, it, expect, vi, beforeEach } from "vitest";
+import JobDetailsPage from "./page";
+import { useJobQuery } from "@/hooks/use-job-query";
+import { useParams } from "next/navigation";
+
+// Mock hooks
+vi.mock("@/hooks/use-job-query");
+vi.mock("next/navigation");
+vi.mock("@/lib/store/use-wallet-store", () => ({
+  useWalletStore: () => ({ address: "GD...CLIENT" }),
+}));
+
+interface JobQueryReturn {
+  isLoading: boolean;
+  data?: {
+    job: unknown;
+    bids: unknown[];
+    milestones: unknown[];
+    deliverables: unknown[];
+    dispute: unknown;
+  };
+  mutations?: {
+    createBid: { mutateAsync?: unknown; isPending: boolean };
+    acceptBid?: { mutateAsync?: unknown; isPending: boolean };
+  };
+}
+
+describe("JobDetailsPage", () => {
+  const mockJob = {
+    id: "test-job-id",
+    title: "World Class Frontend",
+    description: "Build a high-performance marketplace.",
+    budget_usdc: 10000000,
+    milestones: 3,
+    client_address: "GD...CLIENT",
+    freelancer_address: null,
+    status: "open",
+    updated_at: new Date().toISOString(),
+  };
+
+  beforeEach(() => {
+    vi.mocked(useParams).mockReturnValue({ id: "test-job-id" });
+  });
+
+  it("renders loading state", () => {
+    vi.mocked(useJobQuery).mockReturnValue({
+      isLoading: true,
+    } as JobQueryReturn);
+
+    render(<JobDetailsPage />);
+    expect(screen.getByTestId("skeleton-loader")).toBeDefined();
+  });
+
+  it("renders job details correctly", async () => {
+    vi.mocked(useJobQuery).mockReturnValue({
+      isLoading: false,
+      data: {
+        job: mockJob,
+        bids: [],
+        milestones: [],
+        deliverables: [],
+        dispute: null,
+      },
+      mutations: {
+        createBid: { isPending: false },
+        acceptBid: { isPending: false },
+      },
+    } as JobQueryReturn);
+
+    render(<JobDetailsPage />);
+    expect(await screen.findByText("World Class Frontend")).toBeDefined();
+    expect(await screen.findByText(/ID: test-job/i)).toBeDefined();
+    expect(await screen.findByText("Budget (USDC)")).toBeDefined();
+  });
+
+  it("shows bid form for open jobs", async () => {
+    vi.mocked(useJobQuery).mockReturnValue({
+      isLoading: false,
+      data: {
+        job: mockJob,
+        bids: [],
+        milestones: [],
+        deliverables: [],
+        dispute: null,
+      },
+      mutations: {
+        createBid: { isPending: false },
+      },
+    } as JobQueryReturn);
+
+    render(<JobDetailsPage />);
+    expect(await screen.findByPlaceholderText(/Outline your strategy/i)).toBeDefined();
+    expect(await screen.findByText("Submit Proposal")).toBeDefined();
+  });
+
+  it("triggers bid submission", async () => {
+    const mutateAsync = vi.fn().mockResolvedValue({});
+    vi.mocked(useJobQuery).mockReturnValue({
+      isLoading: false,
+      data: {
+        job: mockJob,
+        bids: [],
+        milestones: [],
+        deliverables: [],
+        dispute: null,
+      },
+      mutations: {
+        createBid: { mutateAsync, isPending: false },
+      },
+    } as JobQueryReturn);
+
+    render(<JobDetailsPage />);
+    const textarea = await screen.findByPlaceholderText(/Outline your strategy/i);
+    fireEvent.change(textarea, { target: { value: "I am the best candidate for this job because I have extensive experience in Web3 and I am very motivated." } });
+    
+    const submitBtn = await screen.findByText("Submit Proposal");
+    fireEvent.submit(submitBtn.closest('form')!);
+
+    await vi.waitFor(() => expect(mutateAsync).toHaveBeenCalled(), { timeout: 2000 });
+  });
+});
diff --git a/apps/web/app/jobs/[id]/page.tsx b/apps/web/app/jobs/[id]/page.tsx
index 96710a8b..61db944b 100644
--- a/apps/web/app/jobs/[id]/page.tsx
+++ b/apps/web/app/jobs/[id]/page.tsx
@@ -1,635 +1,222 @@
 "use client";
 
-import { useEffect, useState } from "react";
-import Link from "next/link";
-import { useParams, useRouter } from "next/navigation";
-import {
+import { useState } from "react";
+import { useParams } from "next/navigation";
+import { 
+  Gavel, 
+  ShieldAlert, 
+  FileUp, 
   CheckCircle2,
-  Clock3,
-  FileUp,
-  Gavel,
-  LoaderCircle,
-  ShieldAlert,
-  Wallet,
+  ChevronRight,
+  LoaderCircle
 } from "lucide-react";
+import { useLiveJobWorkspace } from "@/hooks/use-live-job-workspace";
+import { useWalletStore } from "@/lib/store/use-wallet-store";
+import { JobHeader } from "@/components/jobs/job-header";
+import { MilestoneLedger } from "@/components/jobs/milestone-ledger";
+import { JobSidebar } from "@/components/jobs/job-sidebar";
+import { GlassCard } from "@/components/ui/glass-card";
+import { JobDetailsSkeleton } from "@/components/ui/skeleton";
 import { BidList } from "@/components/jobs/bid-list";
-import { ShareJobButton } from "@/components/jobs/share-job-button";
-import { SubmitBidErrorBoundary } from "@/components/jobs/submit-bid-error-boundary";
 import { SubmitBidModal } from "@/components/jobs/submit-bid-modal";
-import { SiteShell } from "@/components/site-shell";
-import { EmptyState } from "@/components/ui/empty-state";
-import { Stars } from "@/components/stars";
-import { JobDetailsSkeleton } from "@/components/ui/skeleton";
-import { useLiveJobWorkspace } from "@/hooks/use-live-job-workspace";
+import { SubmitBidErrorBoundary } from "@/components/jobs/submit-bid-error-boundary";
+import Link from "next/link";
 import { api } from "@/lib/api";
-import { releaseFunds, openDispute, getEscrowContractId } from "@/lib/contracts";
-import {
-  formatDate,
-  formatDateTime,
-  formatUsdc,
-  shortenAddress,
-} from "@/lib/format";
-import { connectWallet, getConnectedWalletAddress } from "@/lib/stellar";
+import { toast } from "sonner";
 
 export default function JobDetailsPage() {
   const { id } = useParams<{ id: string }>();
-  const router = useRouter();
   const workspace = useLiveJobWorkspace(id);
-  const [viewerAddress, setViewerAddress] = useState<string | null>(null);
+  const { address: viewerAddress } = useWalletStore();
+  
   const [deliverableLabel, setDeliverableLabel] = useState("");
   const [deliverableLink, setDeliverableLink] = useState("");
-  const [deliverableFile, setDeliverableFile] = useState<File | null>(null);
-  const [busyAction, setBusyAction] = useState<string | null>(null);
-
-  useEffect(() => {
-    void getConnectedWalletAddress().then(setViewerAddress);
-  }, []);
+  const [isSubmittingEvidence, setIsSubmittingEvidence] = useState(false);
 
-  async function ensureViewerAddress() {
-    if (viewerAddress) return viewerAddress;
-    const connected = await connectWallet();
-    setViewerAddress(connected);
-    return connected;
+  if (workspace.loading) {
+    return (
+      <div className="min-h-screen bg-zinc-950 p-8">
+        <JobDetailsSkeleton />
+      </div>
+    );
   }
 
-  async function handleAcceptBid(bidId: string) {
-    if (!workspace.job) return;
-    setBusyAction(`accept-${bidId}`);
-
-    try {
-      const acceptedJob = await api.bids.accept(id, bidId, {
-        client_address: workspace.job.client_address,
-      });
-      void workspace.refresh();
-      router.push(`/jobs/${acceptedJob.id}/fund`);
-    } catch {
-      alert("Failed to accept bid");
-    } finally {
-      setBusyAction(null);
-    }
+  const job = workspace.job;
+  if (!job) {
+    return (
+      <div className="flex min-h-screen flex-col items-center justify-center bg-zinc-950 p-8 text-center">
+        <ShieldAlert className="mb-4 h-12 w-12 text-rose-500" />
+        <h1 className="text-2xl font-bold text-white">Workspace Unavailable</h1>
+        <p className="mt-2 text-zinc-400">We couldn&apos;t load that job.</p>
+        <Link href="/jobs" className="mt-6 text-indigo-400 hover:underline">Return to Marketplace</Link>
+      </div>
+    );
   }
 
-  async function handleSubmitDeliverable(event: React.FormEvent) {
-    event.preventDefault();
-    if (!workspace.job) return;
-    setBusyAction("deliverable");
-
-    try {
-      const submitter =
-        workspace.job.freelancer_address ??
-        (await ensureViewerAddress()) ??
-        "GD...FREELANCER";
-
-      let url = deliverableLink;
-      let fileHash: string | undefined;
-      let kind = deliverableLink ? "link" : "file";
+  const workflowLocked = job.status === "disputed" || workspace.dispute !== null;
+  const isFreelancer = viewerAddress === job.freelancer_address;
 
-      if (deliverableFile) {
-        const upload = await api.uploads.pin(deliverableFile);
-        url = `ipfs://${upload.cid}`;
-        fileHash = upload.cid;
-        kind = "file";
-      }
+  async function onDeliverableSubmit(e: React.FormEvent) {
+    e.preventDefault();
+    if (!deliverableLabel || !viewerAddress) return;
 
+    setIsSubmittingEvidence(true);
+    try {
       await api.jobs.deliverables.submit(id, {
-        submitted_by: submitter,
-        label: deliverableLabel || "Milestone submission",
-        kind,
-        url,
-        file_hash: fileHash,
+        submitted_by: viewerAddress,
+        label: deliverableLabel,
+        kind: "link",
+        url: deliverableLink,
       });
-
-      setDeliverableFile(null);
+      toast.success("Evidence added successfully");
       setDeliverableLabel("");
       setDeliverableLink("");
-      await workspace.refresh();
-    } catch {
-      alert("Failed to submit deliverable");
-    } finally {
-      setBusyAction(null);
-    }
-  }
-
-  async function handleReleaseFunds() {
-    if (!workspace.job) return;
-    const nextMilestone = workspace.milestones.find(
-      (milestone) => milestone.status === "pending",
-    );
-    if (!nextMilestone) return;
-
-    setBusyAction("release");
-
-    try {
-      await releaseFunds(
-        BigInt(workspace.job.on_chain_job_id ?? 0),
-        Math.max(0, nextMilestone.index - 1),
-      );
-      await api.jobs.releaseMilestone(id, nextMilestone.id);
-      await workspace.refresh();
-    } catch {
-      alert("Failed to release milestone");
-    } finally {
-      setBusyAction(null);
-    }
-  }
-
-  async function handleOpenDispute() {
-    if (!workspace.job) return;
-    setBusyAction("dispute");
-
-    try {
-      const actor = (await ensureViewerAddress()) ?? workspace.job.client_address;
-      await openDispute(BigInt(workspace.job.on_chain_job_id ?? 0));
-      const dispute = await api.jobs.dispute.open(id, { opened_by: actor });
-      router.push(`/jobs/${id}/dispute?disputeId=${dispute.id}`);
+      workspace.refresh();
     } catch {
-      alert("Failed to open dispute");
+      toast.error("Failed to add evidence");
     } finally {
-      setBusyAction(null);
+      setIsSubmittingEvidence(false);
     }
   }
 
-  if (workspace.loading && !workspace.job) {
-    return (
-      <SiteShell
-        eyebrow="Job Overview"
-        title="Loading workspace"
-        description="Fetching counterparties, milestones, deliverables, and dispute state."
-      >
-        <JobDetailsSkeleton />
-      </SiteShell>
-    );
-  }
-
-  if (!workspace.job) {
-    return (
-      <SiteShell
-        eyebrow="Job Overview"
-        title="Workspace unavailable"
-        description={workspace.error ?? "We couldn't load that job."}
-      >
-        <div className="rounded-[2rem] border border-red-200 bg-red-50 p-6 text-red-700">
-          {workspace.error ?? "Job not found."}
-        </div>
-      </SiteShell>
-    );
-  }
-
-  const job = workspace.job;
-  const nextMilestone = workspace.milestones.find(
-    (milestone) => milestone.status === "pending",
-  );
-  const workflowLocked = job.status === "disputed" || workspace.dispute !== null;
-
   return (
-    <SiteShell
-      eyebrow="Job Overview"
-      title={job.title}
-      description="A shared contract workspace for bids, deliverables, approvals, and escalation."
-    >
-      <section className="grid gap-6 lg:grid-cols-[1.25fr_0.75fr]">
-        <div className="space-y-6">
-          <div className="rounded-[2rem] border border-slate-200 bg-white/85 p-6 shadow-[0_25px_80px_-48px_rgba(15,23,42,0.5)] sm:p-8">
-            <div className="flex flex-col gap-5 lg:flex-row lg:items-start lg:justify-between">
-              <div>
-                <p className="text-xs font-semibold uppercase tracking-[0.24em] text-amber-700">
-                  Status
-                </p>
-                <div className="mt-3 flex flex-wrap items-center gap-3">
-                  <h1 className="text-4xl font-semibold tracking-tight text-slate-950">
-                    {job.title}
-                  </h1>
-                  <span className="rounded-full bg-slate-950 px-4 py-2 text-xs font-semibold uppercase tracking-[0.22em] text-white">
-                    {job.status}
-                  </span>
-                  <ShareJobButton path={`/jobs/${id}`} title={job.title} />
-                </div>
-                <p className="mt-4 text-sm leading-7 text-slate-600">
-                  {job.description}
-                </p>
-              </div>
-              <div className="rounded-[1.6rem] border border-amber-200 bg-amber-50 p-5 text-right">
-                <p className="text-xs uppercase tracking-[0.22em] text-amber-700">
-                  Contract Value
-                </p>
-                <p className="mt-2 text-3xl font-semibold text-slate-950">
-                  {formatUsdc(job.budget_usdc)}
-                </p>
-                <p className="mt-2 text-sm text-slate-600">
-                  {job.milestones} milestone approvals
-                </p>
-              </div>
-            </div>
-
-            <div className="mt-6 grid gap-4 rounded-[1.6rem] border border-slate-200 bg-slate-50 p-5 sm:grid-cols-3">
-              <div>
-                <p className="text-xs uppercase tracking-[0.2em] text-slate-400">
-                  Client
-                </p>
-                <p className="mt-2 text-sm font-medium text-slate-700">
-                  {shortenAddress(job.client_address)}
-                </p>
-              </div>
-              <div>
-                <p className="text-xs uppercase tracking-[0.2em] text-slate-400">
-                  Freelancer
-                </p>
-                <p className="mt-2 text-sm font-medium text-slate-700">
-                  {job.freelancer_address
-                    ? shortenAddress(job.freelancer_address)
-                    : "Not assigned"}
-                </p>
-              </div>
-              <div>
-                <p className="text-xs uppercase tracking-[0.2em] text-slate-400">
-                  Updated
-                </p>
-                <p className="mt-2 text-sm font-medium text-slate-700">
-                  {formatDateTime(job.updated_at)}
-                </p>
-              </div>
-            </div>
+    <div className="min-h-screen bg-zinc-950 text-zinc-200 antialiased selection:bg-indigo-500/30 selection:text-indigo-200">
+      <main className="mx-auto max-w-7xl px-4 py-8 sm:px-6 lg:px-8">
+        <div className="mb-8">
+          <Link href="/jobs" className="group inline-flex items-center gap-1 text-sm text-zinc-500 transition hover:text-zinc-300">
+            <ChevronRight className="h-4 w-4 rotate-180 transition group-hover:-translate-x-0.5" />
+            Back to Marketplace
+          </Link>
+        </div>
 
-            <div className="mt-4 rounded-[1.4rem] border border-slate-200 bg-slate-50 p-4">
-              <p className="text-xs uppercase tracking-[0.2em] text-slate-400">
-                Escrow Contract
-              </p>
-              <p className="mt-2 font-mono text-xs text-slate-600 break-all">
-                {getEscrowContractId() || "Not configured"}
-              </p>
-            </div>
+        <JobHeader job={job} />
 
-            {workflowLocked ? (
-              <div className="mt-6 rounded-[1.6rem] border border-red-200 bg-red-50 p-5 text-red-800">
-                <div className="flex items-start gap-3">
-                  <ShieldAlert className="mt-0.5 h-5 w-5" />
+        <div className="mt-8 grid gap-8 lg:grid-cols-[1fr_360px]">
+          <div className="space-y-8">
+            {workflowLocked && (
+              <GlassCard className="border-rose-500/20 bg-rose-500/5 text-rose-200">
+                <div className="flex gap-4">
+                  <div className="flex h-10 w-10 shrink-0 items-center justify-center rounded-lg bg-rose-500/10 text-rose-500">
+                    <Gavel className="h-5 w-5" />
+                  </div>
                   <div>
-                    <p className="font-semibold">
-                      Regular workflow is locked while the dispute center is active.
-                    </p>
-                    <p className="mt-2 text-sm leading-6">
-                      Deliverable uploads and release actions stay frozen until the
-                      Agent Judge returns an immutable verdict.
+                    <h3 className="font-bold">Dispute Center Active</h3>
+                    <p className="mt-1 text-sm text-rose-200/70">
+                      Standard operations are frozen until an Agent Judge resolves this case.
                     </p>
-                    <Link
-                      href={`/jobs/${id}/dispute${workspace.dispute ? `?disputeId=${workspace.dispute.id}` : ""}`}
-                      className="mt-4 inline-flex items-center gap-2 text-sm font-semibold underline"
-                    >
-                      Open dispute center
+                    <Link href={`/jobs/${id}/dispute${workspace.dispute ? `?disputeId=${workspace.dispute.id}` : ""}`} className="mt-4 inline-flex font-bold text-rose-400 hover:underline">
+                      Enter Dispute Chamber
                     </Link>
                   </div>
                 </div>
-              </div>
-            ) : null}
-          </div>
-
-          {job.status === "open" ? (
-            <div className="grid gap-6 xl:grid-cols-[1fr_0.95fr]">
-              <section className="rounded-[2rem] border border-zinc-700/60 bg-zinc-950/90 p-6 shadow-[0_20px_60px_-48px_rgba(0,0,0,0.8)]">
-                <h2 className="text-xl font-semibold text-zinc-50">
-                  Submit a Proposal
-                </h2>
-                <p className="mt-2 text-sm leading-6 text-zinc-300">
-                  Pitch your approach, timing, and why your previous work maps cleanly to this brief.
-                </p>
-                <div className="mt-5">
-                  <SubmitBidErrorBoundary>
-                    <SubmitBidModal
-                      jobId={id}
-                      onChainJobId={BigInt(workspace.job?.on_chain_job_id ?? 0)}
-                      disabled={busyAction !== null}
-                      onSubmitted={workspace.refresh}
-                      resolveFreelancerAddress={async () =>
-                        (await getConnectedWalletAddress()) ?? "GD...FREELANCER"
-                      }
-                    />
-                  </SubmitBidErrorBoundary>
-                </div>
-              </section>
-
-              <section className="rounded-[2rem] border border-slate-200 bg-white/85 p-6 shadow-[0_20px_60px_-48px_rgba(15,23,42,0.45)]">
-                <div className="mb-5 flex items-center justify-between gap-3">
-                  <h2 className="text-xl font-semibold text-slate-950">
-                    Bids ({workspace.bids.length})
+              </GlassCard>
+            )}
+
+            {job.status === "open" ? (
+              <div className="grid gap-6 xl:grid-cols-[1fr_0.95fr]">
+                <section className="rounded-[2rem] border border-zinc-700/60 bg-zinc-950/90 p-6 shadow-[0_20px_60px_-48px_rgba(0,0,0,0.8)]">
+                  <h2 className="text-xl font-semibold text-zinc-50">
+                    Submit a Proposal
                   </h2>
-                  <span className="text-xs font-semibold uppercase tracking-[0.2em] text-slate-400">
-                    Client shortlist
-                  </span>
-                </div>
-                <BidList
-                  bids={workspace.bids}
-                  isClientOwner={
-                    Boolean(viewerAddress) &&
-                    viewerAddress === workspace.job?.client_address
-                  }
-                  jobStatus={job.status}
-                  acceptingBidId={
-                    busyAction?.startsWith("accept-")
-                      ? busyAction.replace("accept-", "")
-                      : null
-                  }
-                  onAccept={handleAcceptBid}
-                />
-              </section>
-            </div>
-          ) : null}
-
-          {job.status !== "open" ? (
-            <div className="grid gap-6 xl:grid-cols-[1.05fr_0.95fr]">
-              <section className="rounded-[2rem] border border-slate-200 bg-white/85 p-6 shadow-[0_20px_60px_-48px_rgba(15,23,42,0.45)]">
-                <div className="flex items-center justify-between gap-4">
-                  <div>
-                    <h2 className="text-xl font-semibold text-slate-950">
-                      Milestone Ledger
-                    </h2>
-                    <p className="mt-2 text-sm leading-6 text-slate-600">
-                      Each milestone is time-stamped so both parties can see what is pending, submitted, and released.
-                    </p>
+                  <p className="mt-2 text-sm leading-6 text-zinc-300">
+                    Pitch your approach, timing, and why your previous work maps cleanly to this brief.
+                  </p>
+                  <div className="mt-5">
+                    <SubmitBidErrorBoundary>
+                      <SubmitBidModal
+                        jobId={id}
+                        onChainJobId={BigInt(job.on_chain_job_id ?? 0)}
+                        onSubmitted={async () => { workspace.refresh(); }}
+                      />
+                    </SubmitBidErrorBoundary>
                   </div>
-                  {workspace.loading ? (
-                    <LoaderCircle className="h-5 w-5 animate-spin text-slate-400" />
-                  ) : null}
-                </div>
-
-                <div className="mt-5 space-y-3">
-                  {workspace.milestones.map((milestone) => (
-                    <div
-                      key={milestone.id}
-                      className="rounded-[1.4rem] border border-slate-200 bg-slate-50 p-4"
-                    >
-                      <div className="flex items-center justify-between gap-4">
-                        <div>
-                          <p className="text-xs font-semibold uppercase tracking-[0.16em] text-slate-500">
-                            Milestone {milestone.index}
-                          </p>
-                          <p className="mt-2 text-sm font-medium text-slate-800">
-                            {milestone.title}
-                          </p>
-                        </div>
-                        <div className="text-right">
-                          <p className="text-sm font-semibold text-slate-950">
-                            {formatUsdc(milestone.amount_usdc)}
-                          </p>
-                          <p className="mt-1 text-xs uppercase tracking-[0.16em] text-slate-500">
-                            {milestone.status}
-                          </p>
-                        </div>
-                      </div>
-                      {milestone.released_at ? (
-                        <p className="mt-3 text-xs text-slate-500">
-                          Released {formatDateTime(milestone.released_at)}
-                        </p>
-                      ) : null}
-                    </div>
-                  ))}
-                </div>
-              </section>
+                </section>
 
-              <section className="rounded-[2rem] border border-slate-200 bg-white/85 p-6 shadow-[0_20px_60px_-48px_rgba(15,23,42,0.45)]">
-                <div className="flex items-center justify-between gap-4">
-                  <div>
+                <section className="rounded-[2rem] border border-slate-200 bg-white/85 p-6 shadow-[0_20px_60px_-48px_rgba(15,23,42,0.45)]">
+                  <div className="mb-5 flex items-center justify-between gap-3">
                     <h2 className="text-xl font-semibold text-slate-950">
-                      Deliverables
+                      Bids ({workspace.bids.length})
                     </h2>
-                    <p className="mt-2 text-sm leading-6 text-slate-600">
-                      Freelancers can pin files to IPFS or share links, then the client gets a dedicated approval moment.
-                    </p>
-                  </div>
-                  <FileUp className="h-5 w-5 text-amber-600" />
-                </div>
-
-                {!workflowLocked ? (
-                  <form onSubmit={handleSubmitDeliverable} className="mt-5 space-y-4">
-                    <input
-                      value={deliverableLabel}
-                      onChange={(event) => setDeliverableLabel(event.target.value)}
-                      placeholder="Submission title"
-                      className="w-full rounded-2xl border border-slate-200 bg-slate-50 px-4 py-3 text-slate-950 outline-none transition focus:border-amber-400"
-                    />
-                    <input
-                      value={deliverableLink}
-                      onChange={(event) => setDeliverableLink(event.target.value)}
-                      placeholder="GitHub repo, Figma file, hosted ZIP link, or leave blank to upload a file"
-                      className="w-full rounded-2xl border border-slate-200 bg-slate-50 px-4 py-3 text-slate-950 outline-none transition focus:border-amber-400"
-                    />
-                    <label className="flex cursor-pointer items-center gap-3 rounded-2xl border border-dashed border-slate-300 bg-slate-50 px-4 py-3 text-sm text-slate-600">
-                      <FileUp className="h-4 w-4 text-amber-600" />
-                      <span>{deliverableFile ? deliverableFile.name : "Upload ZIP, image, JSON, or PDF evidence"}</span>
-                      <input
-                        type="file"
-                        className="hidden"
-                        onChange={(event) =>
-                          setDeliverableFile(event.target.files?.[0] ?? null)
-                        }
-                      />
-                    </label>
-                    <button
-                      type="submit"
-                      disabled={busyAction === "deliverable"}
-                      className="w-full rounded-full bg-slate-950 px-5 py-3 text-sm font-semibold text-white transition hover:bg-slate-800 disabled:opacity-50"
-                    >
-                      {busyAction === "deliverable"
-                        ? "Submitting..."
-                        : "Submit Milestone"}
-                    </button>
-                  </form>
-                ) : null}
-
-                <div className="mt-5 space-y-3">
-                  {workspace.deliverables.length === 0 ? (
-                    <EmptyState
-                      icon={<FileUp className="h-5 w-5" />}
-                      title="No milestone evidence yet"
-                      description="Submitted files and links will appear here once a freelancer shares delivery proof."
-                      className="rounded-[1.4rem] bg-slate-50 py-8"
-                    />
-                  ) : (
-                    workspace.deliverables.map((deliverable) => (
-                      <article
-                        key={deliverable.id}
-                        className="rounded-[1.4rem] border border-slate-200 bg-slate-50 p-4"
-                      >
-                        <div className="flex items-start justify-between gap-4">
-                          <div>
-                            <p className="text-xs font-semibold uppercase tracking-[0.16em] text-slate-500">
-                              Milestone {deliverable.milestone_index}
-                            </p>
-                            <p className="mt-2 text-sm font-medium text-slate-800">
-                              {deliverable.label}
-                            </p>
-                          </div>
-                          <p className="text-xs text-slate-500">
-                            {formatDateTime(deliverable.created_at)}
-                          </p>
-                        </div>
-                        <a
-                          href={deliverable.url}
-                          target="_blank"
-                          rel="noreferrer"
-                          className="mt-3 inline-flex items-center gap-2 text-sm font-semibold text-amber-700 underline"
-                        >
-                          Open evidence
-                        </a>
-                      </article>
-                    ))
-                  )}
-                </div>
-              </section>
-            </div>
-          ) : null}
-        </div>
-
-        <aside className="space-y-6">
-          <section className="rounded-[2rem] border border-slate-200 bg-white/85 p-6 shadow-[0_20px_60px_-48px_rgba(15,23,42,0.45)]">
-            <div className="flex items-center gap-3">
-              <Wallet className="h-5 w-5 text-amber-600" />
-              <h2 className="text-lg font-semibold text-slate-950">
-                Connected Viewer
-              </h2>
-            </div>
-            <p className="mt-4 text-sm text-slate-600">
-              {viewerAddress ?? "No wallet connected yet."}
-            </p>
-            {!viewerAddress ? (
-              <button
-                type="button"
-                onClick={() => void ensureViewerAddress()}
-                className="mt-4 rounded-full border border-slate-200 px-4 py-2 text-sm font-semibold text-slate-700 transition hover:border-amber-300 hover:text-slate-950"
-              >
-                Connect wallet
-              </button>
-            ) : null}
-          </section>
-
-          <section className="rounded-[2rem] border border-slate-200 bg-white/85 p-6 shadow-[0_20px_60px_-48px_rgba(15,23,42,0.45)]">
-            <h2 className="text-lg font-semibold text-slate-950">
-              Counterparty trust
-            </h2>
-            <div className="mt-5 space-y-4">
-              <div className="rounded-[1.4rem] border border-slate-200 bg-slate-50 p-4">
-                <p className="text-xs font-semibold uppercase tracking-[0.16em] text-slate-500">
-                  Client reputation
-                </p>
-                <div className="mt-3 flex items-center justify-between gap-3">
-                  <Stars value={workspace.clientReputation?.starRating ?? 2.5} />
-                  <span className="text-sm font-semibold text-slate-800">
-                    {workspace.clientReputation?.averageStars.toFixed(1) ?? "2.5"}
-                  </span>
-                </div>
-                <p className="mt-3 text-xs text-slate-500">
-                  {workspace.clientReputation?.totalJobs ?? 0} completed jobs
-                </p>
-              </div>
-
-              {job.freelancer_address ? (
-                <div className="rounded-[1.4rem] border border-slate-200 bg-slate-50 p-4">
-                  <p className="text-xs font-semibold uppercase tracking-[0.16em] text-slate-500">
-                    Freelancer reputation
-                  </p>
-                  <div className="mt-3 flex items-center justify-between gap-3">
-                    <Stars
-                      value={workspace.freelancerReputation?.starRating ?? 2.5}
-                    />
-                    <span className="text-sm font-semibold text-slate-800">
-                      {workspace.freelancerReputation?.averageStars.toFixed(1) ?? "2.5"}
+                    <span className="text-xs font-semibold uppercase tracking-[0.2em] text-slate-400">
+                      Client shortlist
                     </span>
                   </div>
-                  <p className="mt-3 text-xs text-slate-500">
-                    {workspace.freelancerReputation?.totalJobs ?? 0} completed jobs
-                  </p>
+                  <BidList
+                    bids={workspace.bids}
+                    isClientOwner={viewerAddress === job.client_address}
+                    jobStatus={job.status}
+                    onAccept={async () => { workspace.refresh(); }}
+                  />
+                </section>
+              </div>
+            ) : (
+              <div className="grid gap-8 lg:grid-cols-[1fr_auto]">
+                <div className="space-y-8">
+                  <MilestoneLedger milestones={workspace.milestones} />
+                  
+                  <section className="space-y-4">
+                    <div className="flex items-center gap-2 px-1 text-white">
+                      <FileUp className="h-4 w-4 text-emerald-400" />
+                      <h3 className="text-lg font-semibold">Evidence Lockbox</h3>
+                    </div>
+                    
+                    <div className="grid gap-4 sm:grid-cols-2">
+                      {workspace.deliverables.map((d) => (
+                        <GlassCard key={d.id} className="group relative overflow-hidden p-5">
+                          <div className="flex items-start justify-between">
+                            <div className="space-y-1">
+                              <span className="text-[10px] font-bold uppercase tracking-widest text-zinc-500">Phase {d.milestone_index}</span>
+                              <h4 className="font-semibold text-zinc-200">{d.label}</h4>
+                            </div>
+                            <div className="rounded-md bg-zinc-950 p-2 border border-zinc-800">
+                              <CheckCircle2 className="h-4 w-4 text-emerald-500" />
+                            </div>
+                          </div>
+                          <a href={d.url} target="_blank" rel="noreferrer" className="mt-6 inline-flex w-full items-center justify-center rounded-lg border border-zinc-800 bg-zinc-950 py-2 text-xs font-bold text-zinc-300 transition hover:border-zinc-700 hover:text-white">
+                            View Submission
+                          </a>
+                        </GlassCard>
+                      ))}
+
+                      {isFreelancer && !workflowLocked && (
+                        <GlassCard className="border-dashed border-zinc-700 bg-transparent hover:bg-zinc-900/20">
+                          <form onSubmit={onDeliverableSubmit} className="space-y-3">
+                            <input 
+                              value={deliverableLabel}
+                              onChange={(e) => setDeliverableLabel(e.target.value)}
+                              placeholder="Milestone Title" 
+                              className="w-full bg-transparent text-sm text-white placeholder-zinc-600 outline-none" 
+                            />
+                            <input 
+                              value={deliverableLink}
+                              onChange={(e) => setDeliverableLink(e.target.value)}
+                              placeholder="Submission Link" 
+                              className="w-full bg-transparent text-sm text-zinc-400 placeholder-zinc-600 outline-none" 
+                            />
+                            <button 
+                              type="submit" 
+                              disabled={isSubmittingEvidence}
+                              className="mt-2 flex w-full items-center justify-center rounded-lg bg-zinc-100 py-2 text-xs font-bold text-black hover:bg-white disabled:opacity-50"
+                            >
+                              {isSubmittingEvidence ? <LoaderCircle className="h-3 w-4 animate-spin" /> : "Add Evidence"}
+                            </button>
+                          </form>
+                        </GlassCard>
+                      )}
+                    </div>
+                  </section>
                 </div>
-              ) : null}
-            </div>
-          </section>
-
-          {job.status === "awaiting_funding" ? (
-            <section className="rounded-[2rem] border border-amber-200 bg-amber-50 p-6 text-amber-900 shadow-[0_20px_60px_-48px_rgba(245,158,11,0.45)]">
-              <p className="text-xs font-semibold uppercase tracking-[0.16em]">
-                Next step
-              </p>
-              <h2 className="mt-3 text-xl font-semibold">Fund the escrow</h2>
-              <p className="mt-3 text-sm leading-6">
-                The freelancer is locked in. Deposit funds to transition the contract into active execution.
-              </p>
-              <Link
-                href={`/jobs/${id}/fund`}
-                className="mt-5 inline-flex rounded-full bg-slate-950 px-5 py-3 text-sm font-semibold text-white"
-              >
-                Open funding review
-              </Link>
-            </section>
-          ) : null}
-
-          {job.status !== "open" && job.status !== "awaiting_funding" ? (
-            <section className="rounded-[2rem] border border-slate-200 bg-slate-950 p-6 text-white shadow-[0_20px_60px_-48px_rgba(15,23,42,0.8)]">
-              <p className="text-xs font-semibold uppercase tracking-[0.16em] text-amber-300">
-                Client control room
-              </p>
-              <h2 className="mt-3 text-xl font-semibold">
-                Awaiting Client Approval
-              </h2>
-              <p className="mt-3 text-sm leading-6 text-slate-300">
-                Approve the latest submitted milestone, or escalate to a dispute if the evidence does not satisfy the brief.
-              </p>
-              <div className="mt-5 space-y-3">
-                <button
-                  type="button"
-                  onClick={handleReleaseFunds}
-                  disabled={
-                    workflowLocked ||
-                    job.status !== "deliverable_submitted" ||
-                    !nextMilestone ||
-                    busyAction === "release"
-                  }
-                  className="flex w-full items-center justify-center gap-2 rounded-full bg-emerald-500 px-5 py-3 text-sm font-semibold text-white transition hover:bg-emerald-400 disabled:cursor-not-allowed disabled:bg-emerald-800/50"
-                  id="release-funds"
-                >
-                  {busyAction === "release" ? (
-                    <LoaderCircle className="h-4 w-4 animate-spin" />
-                  ) : (
-                    <CheckCircle2 className="h-4 w-4" />
-                  )}
-                  Approve &amp; Release Funds
-                </button>
-                <button
-                  type="button"
-                  onClick={handleOpenDispute}
-                  disabled={workflowLocked || busyAction === "dispute"}
-                  className="flex w-full items-center justify-center gap-2 rounded-full border border-white/15 bg-white/8 px-5 py-3 text-sm font-semibold text-white transition hover:bg-white/12 disabled:cursor-not-allowed disabled:opacity-50"
-                >
-                  {busyAction === "dispute" ? (
-                    <LoaderCircle className="h-4 w-4 animate-spin" />
-                  ) : (
-                    <Gavel className="h-4 w-4" />
-                  )}
-                  Reject &amp; Initiate Dispute
-                </button>
               </div>
-            </section>
-          ) : null}
+            )}
+          </div>
 
-          <section className="rounded-[2rem] border border-slate-200 bg-white/85 p-6 shadow-[0_20px_60px_-48px_rgba(15,23,42,0.45)]">
-            <h2 className="text-lg font-semibold text-slate-950">
-              Activity pulse
-            </h2>
-            <div className="mt-5 space-y-4">
-              <div className="flex items-center justify-between rounded-[1.4rem] border border-slate-200 bg-slate-50 px-4 py-3">
-                <span className="text-sm text-slate-600">Next milestone</span>
-                <span className="text-sm font-semibold text-slate-900">
-                  {nextMilestone ? `#${nextMilestone.index}` : "Complete"}
-                </span>
-              </div>
-              <div className="flex items-center justify-between rounded-[1.4rem] border border-slate-200 bg-slate-50 px-4 py-3">
-                <span className="text-sm text-slate-600">Last update</span>
-                <span className="inline-flex items-center gap-2 text-sm font-semibold text-slate-900">
-                  <Clock3 className="h-4 w-4 text-amber-600" />
-                  {formatDate(job.updated_at)}
-                </span>
-              </div>
-            </div>
-          </section>
-        </aside>
-      </section>
-    </SiteShell>
+          <JobSidebar 
+            viewerAddress={viewerAddress} 
+            clientReputation={workspace.clientReputation} 
+            freelancerReputation={workspace.freelancerReputation} 
+          />
+        </div>
+      </main>
+    </div>
   );
 }
diff --git a/apps/web/components/jobs/job-header.tsx b/apps/web/components/jobs/job-header.tsx
new file mode 100644
index 00000000..f35e04b5
--- /dev/null
+++ b/apps/web/components/jobs/job-header.tsx
@@ -0,0 +1,41 @@
+import { GlassCard } from "@/components/ui/glass-card";
+import { StatusBadge } from "@/components/ui/status-badge";
+import { formatUsdc } from "@/lib/format";
+import { Job } from "@/lib/api";
+
+interface JobHeaderProps {
+  job: Job;
+}
+
+export function JobHeader({ job }: JobHeaderProps) {
+  return (
+    <GlassCard className="flex flex-col gap-6 lg:flex-row lg:items-center lg:justify-between">
+      <div className="space-y-2">
+        <div className="flex items-center gap-3">
+          <StatusBadge status={job.status} />
+          <span className="text-xs text-zinc-500 font-mono tracking-tighter">
+            ID: {job.id.slice(0, 8)}
+          </span>
+        </div>
+        <h1 className="text-3xl font-bold tracking-tight text-white lg:text-4xl">
+          {job.title}
+        </h1>
+        <p className="max-w-2xl text-zinc-400 leading-relaxed">
+          {job.description}
+        </p>
+      </div>
+
+      <div className="flex flex-col items-start gap-1 lg:items-end">
+        <span className="text-xs uppercase tracking-widest text-zinc-500 font-semibold">
+          Budget (USDC)
+        </span>
+        <div className="text-3xl font-bold text-white tabular-nums">
+          {formatUsdc(job.budget_usdc)}
+        </div>
+        <div className="text-xs text-indigo-400 font-medium">
+          {job.milestones} Milestones in Escrow
+        </div>
+      </div>
+    </GlassCard>
+  );
+}
diff --git a/apps/web/components/jobs/job-sidebar.tsx b/apps/web/components/jobs/job-sidebar.tsx
new file mode 100644
index 00000000..2f421e36
--- /dev/null
+++ b/apps/web/components/jobs/job-sidebar.tsx
@@ -0,0 +1,69 @@
+import { GlassCard } from "@/components/ui/glass-card";
+import { Stars } from "@/components/stars";
+import { ReputationMetrics } from "@/lib/reputation";
+import { Wallet, ShieldCheck, TrendingUp } from "lucide-react";
+
+interface JobSidebarProps {
+  viewerAddress: string | null;
+  clientReputation: ReputationMetrics | null;
+  freelancerReputation: ReputationMetrics | null;
+}
+
+export function JobSidebar({
+  viewerAddress,
+  clientReputation,
+  freelancerReputation,
+}: JobSidebarProps) {
+  return (
+    <aside className="space-y-6">
+      <GlassCard className="space-y-4">
+        <div className="flex items-center gap-2 text-indigo-400">
+          <Wallet className="h-4 w-4" />
+          <h3 className="text-sm font-bold uppercase tracking-widest">Active Wallet</h3>
+        </div>
+        <div className="rounded-lg bg-zinc-950 p-3 font-mono text-xs text-zinc-400 break-all border border-zinc-800">
+          {viewerAddress ?? "No wallet connected"}
+        </div>
+      </GlassCard>
+
+      <GlassCard className="space-y-6">
+        <div className="flex items-center gap-2 text-emerald-400">
+          <ShieldCheck className="h-4 w-4" />
+          <h3 className="text-sm font-bold uppercase tracking-widest">Trust Metrics</h3>
+        </div>
+        
+        <div className="space-y-5">
+          <div className="space-y-2">
+            <p className="text-xs font-semibold text-zinc-500 uppercase tracking-tighter">Client Score</p>
+            <div className="flex items-center justify-between">
+              <Stars value={clientReputation?.starRating ?? 0} />
+              <span className="text-lg font-bold text-white">{clientReputation?.averageStars.toFixed(1) ?? "0.0"}</span>
+            </div>
+            <p className="text-[10px] text-zinc-600">{clientReputation?.totalJobs ?? 0} verified contracts</p>
+          </div>
+
+          {freelancerReputation && (
+            <div className="space-y-2 border-t border-zinc-800 pt-4">
+              <p className="text-xs font-semibold text-zinc-500 uppercase tracking-tighter">Freelancer Score</p>
+              <div className="flex items-center justify-between">
+                <Stars value={freelancerReputation.starRating} />
+                <span className="text-lg font-bold text-white">{freelancerReputation.averageStars.toFixed(1)}</span>
+              </div>
+              <p className="text-[10px] text-zinc-600">{freelancerReputation.totalJobs} completed jobs</p>
+            </div>
+          )}
+        </div>
+      </GlassCard>
+
+      <GlassCard className="bg-indigo-500/10 border-indigo-500/20">
+        <div className="flex items-center gap-2 text-indigo-400 mb-3">
+          <TrendingUp className="h-4 w-4" />
+          <h3 className="text-sm font-bold uppercase tracking-widest">Network Pulse</h3>
+        </div>
+        <p className="text-xs text-zinc-400 leading-relaxed">
+          This contract is secured by the Stellar network. Payments are held in a non-custodial escrow until conditions are met.
+        </p>
+      </GlassCard>
+    </aside>
+  );
+}
diff --git a/apps/web/components/jobs/milestone-ledger.tsx b/apps/web/components/jobs/milestone-ledger.tsx
new file mode 100644
index 00000000..73ed989c
--- /dev/null
+++ b/apps/web/components/jobs/milestone-ledger.tsx
@@ -0,0 +1,58 @@
+import { Milestone } from "@/lib/api";
+import { formatUsdc, formatDateTime } from "@/lib/format";
+import { CheckCircle2, Clock } from "lucide-react";
+
+interface MilestoneLedgerProps {
+  milestones: Milestone[];
+}
+
+export function MilestoneLedger({ milestones }: MilestoneLedgerProps) {
+  return (
+    <div className="space-y-4">
+      <div className="flex items-center justify-between px-1">
+        <h3 className="text-lg font-semibold text-white">Milestone Ledger</h3>
+        <span className="text-xs text-zinc-500 font-medium">
+          {milestones.length} Phases Total
+        </span>
+      </div>
+      <div className="grid gap-3">
+        {milestones.map((m) => (
+          <div
+            key={m.id}
+            className="group relative overflow-hidden rounded-xl border border-zinc-800 bg-zinc-900/30 p-4 transition-all hover:border-zinc-700 hover:bg-zinc-900/50"
+          >
+            <div className="flex items-center justify-between">
+              <div className="flex items-center gap-3">
+                <div className={`flex h-8 w-8 items-center justify-center rounded-full border ${
+                  m.status === 'released' 
+                    ? 'border-emerald-500/20 bg-emerald-500/10 text-emerald-500' 
+                    : 'border-zinc-700 bg-zinc-800 text-zinc-500'
+                }`}>
+                  {m.status === 'released' ? <CheckCircle2 className="h-4 w-4" /> : <Clock className="h-4 w-4" />}
+                </div>
+                <div>
+                  <div className="text-sm font-semibold text-zinc-200">
+                    Phase {m.index}: {m.title}
+                  </div>
+                  <div className="text-xs text-zinc-500">
+                    {m.status === 'released' ? `Released on ${formatDateTime(m.released_at!)}` : 'Pending approval'}
+                  </div>
+                </div>
+              </div>
+              <div className="text-right">
+                <div className="text-sm font-bold text-white tabular-nums">
+                  {formatUsdc(m.amount_usdc)}
+                </div>
+                <div className={`text-[10px] font-bold uppercase tracking-widest ${
+                  m.status === 'released' ? 'text-emerald-500' : 'text-zinc-600'
+                }`}>
+                  {m.status}
+                </div>
+              </div>
+            </div>
+          </div>
+        ))}
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/components/jobs/submit-bid-modal.tsx b/apps/web/components/jobs/submit-bid-modal.tsx
index 4377e491..40bb6910 100644
--- a/apps/web/components/jobs/submit-bid-modal.tsx
+++ b/apps/web/components/jobs/submit-bid-modal.tsx
@@ -3,7 +3,6 @@
 import { useMemo, useState } from "react";
 import { AlertCircle, LoaderCircle } from "lucide-react";
 import { z } from "zod";
-import { api } from "@/lib/api";
 import { useSubmitBid } from "@/hooks/use-submit-bid";
 import { TransactionTracker } from "@/components/transaction/transaction-tracker";
 import { useTxStatusStore } from "@/lib/store/use-tx-status-store";
@@ -21,7 +20,6 @@ interface SubmitBidModalProps {
   onChainJobId: bigint;
   disabled?: boolean;
   onSubmitted: () => Promise<void>;
-  resolveFreelancerAddress: () => Promise<string>;
 }
 
 export function SubmitBidModal({
@@ -29,7 +27,6 @@ export function SubmitBidModal({
   onChainJobId,
   disabled = false,
   onSubmitted,
-  resolveFreelancerAddress,
 }: SubmitBidModalProps) {
   const [open, setOpen] = useState(false);
   const [proposal, setProposal] = useState("");
diff --git a/apps/web/components/navigation/top-nav.tsx b/apps/web/components/navigation/top-nav.tsx
index ee220682..5ebfac86 100644
--- a/apps/web/components/navigation/top-nav.tsx
+++ b/apps/web/components/navigation/top-nav.tsx
@@ -37,8 +37,6 @@ export function TopNav({ onOpenSidebar }: { onOpenSidebar?: () => void }) {
   const {
     address,
     xlmBalance,
-    appNetwork,
-    walletNetwork,
     networkMismatch,
     isConnected,
     isConnecting,
@@ -137,7 +135,7 @@ export function TopNav({ onOpenSidebar }: { onOpenSidebar?: () => void }) {
               </button>
             )}
             {networkMismatch ? (
-              <span className="inline-flex items-center rounded-xl border border-indigo-500/40 bg-zinc-900 px-2 py-1 text-[10px] text-indigo-300">
+              <span className="inline-flex items-center rounded-xl border border-indigo-500/40 bg-zinc-900 px-2 py-1 text-[10px] text-indigo-300 animate-pulse">
                 <TriangleAlert className="h-3 w-3" />
               </span>
             ) : null}
@@ -171,9 +169,9 @@ export function TopNav({ onOpenSidebar }: { onOpenSidebar?: () => void }) {
               </button>
             )}
             {networkMismatch ? (
-              <span className="inline-flex items-center gap-1 rounded-xl border border-indigo-500/40 bg-zinc-900 px-2.5 py-1.5 text-xs text-indigo-300">
+              <span className="inline-flex items-center gap-1 rounded-xl border border-indigo-500/40 bg-zinc-900 px-2.5 py-1.5 text-xs text-indigo-300 animate-pulse">
                 <TriangleAlert className="h-3.5 w-3.5" />
-                {walletNetwork} vs {appNetwork}
+                Network Mismatch
               </span>
             ) : null}
             {error ? (
@@ -193,7 +191,7 @@ export function TopNav({ onOpenSidebar }: { onOpenSidebar?: () => void }) {
                   <AvatarFallback className="bg-primary/15 text-xs font-semibold text-primary">
                     {user?.name
                       ?.split(" ")
-                      .map((part) => part[0])
+                      .map((part: string) => part[0])
                       .join("")
                       .slice(0, 2) ?? "LN"}
                   </AvatarFallback>
diff --git a/apps/web/components/stars.tsx b/apps/web/components/stars.tsx
index 2aa994ff..67e938ba 100644
--- a/apps/web/components/stars.tsx
+++ b/apps/web/components/stars.tsx
@@ -15,7 +15,7 @@ export function Stars({
         const fill = Math.max(0, Math.min(1, value - index));
         return (
           <span key={index} className="relative inline-flex h-4 w-4">
-            <Star className="absolute h-4 w-4 text-slate-300" />
+            <Star className="absolute h-4 w-4 text-zinc-700" />
             <span
               className="absolute inset-0 overflow-hidden"
               style={{ width: `${fill * 100}%` }}
diff --git a/apps/web/components/ui/glass-card.tsx b/apps/web/components/ui/glass-card.tsx
new file mode 100644
index 00000000..1c0ccc84
--- /dev/null
+++ b/apps/web/components/ui/glass-card.tsx
@@ -0,0 +1,19 @@
+import { cn } from "@/lib/utils";
+
+interface GlassCardProps extends React.HTMLAttributes<HTMLDivElement> {
+  children: React.ReactNode;
+}
+
+export function GlassCard({ children, className, ...props }: GlassCardProps) {
+  return (
+    <div
+      className={cn(
+        "rounded-xl border border-zinc-800/50 bg-zinc-900/50 backdrop-blur-md p-6 shadow-2xl transition-all duration-300 hover:bg-zinc-900/60",
+        className
+      )}
+      {...props}
+    >
+      {children}
+    </div>
+  );
+}
diff --git a/apps/web/components/ui/network-mismatch-banner.tsx b/apps/web/components/ui/network-mismatch-banner.tsx
index 143adc68..b8997bdb 100644
--- a/apps/web/components/ui/network-mismatch-banner.tsx
+++ b/apps/web/components/ui/network-mismatch-banner.tsx
@@ -1,25 +1,61 @@
 "use client";
 
-import { AlertTriangle } from "lucide-react";
-import { useAuthStore } from "@/lib/store/use-auth-store";
+import { TriangleAlert, ArrowRightLeft, X } from "lucide-react";
+import { useWalletStore } from "@/lib/store/use-wallet-store";
+import { APP_STELLAR_NETWORK } from "@/lib/stellar";
+import { cn } from "@/lib/utils";
 
 export function NetworkMismatchBanner() {
-  const networkMismatch = useAuthStore((state) => state.networkMismatch);
+  const { networkMismatch, setNetworkMismatch } = useWalletStore();
 
   if (!networkMismatch) return null;
 
   return (
-    <div
-      role="alert"
-      aria-live="assertive"
-      className="flex items-center gap-3 border-b border-amber-500/30 bg-amber-500/10 px-4 py-3 text-sm text-amber-600 dark:text-amber-400"
-    >
-      <AlertTriangle className="h-4 w-4 shrink-0" aria-hidden="true" />
-      <p>
-        <span className="font-semibold">Network mismatch — </span>
-        your wallet is connected to a different network than this app.
-        Please switch your wallet to the correct network to continue.
-      </p>
+    <div className="w-full px-4 pt-4 animate-in fade-in slide-in-from-top-4 duration-500">
+      <div 
+        role="alert"
+        aria-live="assertive"
+        className={cn(
+          "mx-auto max-w-7xl relative overflow-hidden",
+          "rounded-[12px] border border-indigo-500/20 bg-zinc-900/90 backdrop-blur-md",
+          "flex flex-col md:flex-row items-center justify-between gap-4 p-4 md:p-5",
+          "transition-all duration-200 hover:border-indigo-500/40 shadow-xl shadow-indigo-500/5"
+        )}
+      >
+        <div className="flex items-center gap-4">
+          <div className="flex h-10 w-10 shrink-0 items-center justify-center rounded-full bg-indigo-500/10 border border-indigo-500/20">
+            <TriangleAlert className="h-5 w-5 text-indigo-400" aria-hidden="true" />
+          </div>
+          <div className="space-y-1">
+            <h3 className="text-sm font-semibold text-zinc-100 tracking-tight">
+              Network Mismatch Detected
+            </h3>
+            <p className="text-xs text-zinc-400 leading-relaxed">
+              Your wallet is connected to a different network. Switch to <span className="text-indigo-300 font-medium capitalize">{APP_STELLAR_NETWORK}</span> to continue with Lance.
+            </p>
+          </div>
+        </div>
+
+        <div className="flex items-center gap-3 w-full md:w-auto">
+          <button
+            onClick={() => window.location.reload()}
+            className="flex-1 md:flex-none inline-flex items-center justify-center gap-2 rounded-[10px] bg-indigo-500 px-4 py-2 text-xs font-semibold text-white transition-all hover:bg-indigo-600 active:scale-[0.98] shadow-lg shadow-indigo-500/20"
+          >
+            <ArrowRightLeft className="h-3.5 w-3.5" />
+            Switch Network
+          </button>
+          <button
+            onClick={() => setNetworkMismatch(false)}
+            aria-label="Dismiss warning"
+            className="inline-flex h-9 w-9 items-center justify-center rounded-[10px] border border-zinc-800 text-zinc-500 transition-colors hover:bg-zinc-800 hover:text-zinc-300"
+          >
+            <X className="h-4 w-4" />
+          </button>
+        </div>
+
+        {/* Decorative background element */}
+        <div className="absolute -right-12 -top-12 h-24 w-24 rounded-full bg-indigo-500/5 blur-3xl pointer-events-none" />
+      </div>
     </div>
   );
 }
\ No newline at end of file
diff --git a/apps/web/components/ui/skeleton.tsx b/apps/web/components/ui/skeleton.tsx
index 5b0a778c..867ce8fd 100644
--- a/apps/web/components/ui/skeleton.tsx
+++ b/apps/web/components/ui/skeleton.tsx
@@ -54,7 +54,7 @@ export function JobCardSkeleton() {
 
 export function JobDetailsSkeleton() {
   return (
-    <div className="grid gap-6 lg:grid-cols-[1.25fr_0.75fr]" role="status" aria-live="polite">
+    <div className="grid gap-6 lg:grid-cols-[1.25fr_0.75fr]" role="status" aria-live="polite" data-testid="skeleton-loader">
       <div className="space-y-6">
         <section className="rounded-[2rem] border border-white/10 bg-zinc-950/70 p-6 backdrop-blur-sm sm:p-8">
           <div className="space-y-4">
diff --git a/apps/web/components/ui/status-badge.tsx b/apps/web/components/ui/status-badge.tsx
new file mode 100644
index 00000000..8ce1622d
--- /dev/null
+++ b/apps/web/components/ui/status-badge.tsx
@@ -0,0 +1,31 @@
+import { cn } from "@/lib/utils";
+
+interface StatusBadgeProps {
+  status: string;
+  className?: string;
+}
+
+export function StatusBadge({ status, className }: StatusBadgeProps) {
+  const variants: Record<string, string> = {
+    open: "bg-emerald-500/10 text-emerald-500 border-emerald-500/20",
+    awaiting_funding: "bg-amber-500/10 text-amber-500 border-amber-500/20",
+    funded: "bg-indigo-500/10 text-indigo-500 border-indigo-500/20",
+    deliverable_submitted: "bg-blue-500/10 text-blue-500 border-blue-500/20",
+    completed: "bg-zinc-500/10 text-zinc-400 border-zinc-500/20",
+    disputed: "bg-rose-500/10 text-rose-500 border-rose-500/20",
+  };
+
+  const variant = variants[status] || "bg-zinc-500/10 text-zinc-400 border-zinc-500/20";
+
+  return (
+    <span
+      className={cn(
+        "inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold uppercase tracking-wider transition-colors",
+        variant,
+        className
+      )}
+    >
+      {status.replace(/_/g, " ")}
+    </span>
+  );
+}
diff --git a/apps/web/components/wallet/wallet-connect.tsx b/apps/web/components/wallet/wallet-connect.tsx
index 81975823..147e7874 100644
--- a/apps/web/components/wallet/wallet-connect.tsx
+++ b/apps/web/components/wallet/wallet-connect.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useWallet } from "@/hooks/use-wallet";
+import { useWalletSession } from "@/hooks/use-wallet-session";
 import { Button } from "@/components/ui/button";
 import { 
   Wallet, 
@@ -22,19 +22,19 @@ import {
 import { toast } from "sonner";
 import { cn } from "@/lib/utils";
 import { WalletSelectionModal } from "./wallet-selection-modal";
+import { useState } from "react";
 
 export function WalletConnect() {
   const { 
     address, 
-    network,
-    status, 
+    walletNetwork,
     connect, 
     disconnect, 
     isConnected, 
-    isConnecting,
-    isModalOpen,
-    setIsModalOpen
-  } = useWallet();
+    isConnecting 
+  } = useWalletSession();
+
+  const [isModalOpen, setIsModalOpen] = useState(false);
 
   const truncateAddress = (addr: string) => 
     `${addr.slice(0, 6)}...${addr.slice(-4)}`;
@@ -46,15 +46,20 @@ export function WalletConnect() {
     }
   };
 
-  const handleConnectClick = () => {
-    setIsModalOpen(true);
+  const handleConnect = async (walletId?: string) => {
+    try {
+      setIsModalOpen(false);
+      await connect(walletId);
+    } catch (err) {
+      console.error("Connection error:", err);
+    }
   };
 
   if (!isConnected) {
     return (
       <>
         <Button
-          onClick={handleConnectClick}
+          onClick={() => setIsModalOpen(true)}
           disabled={isConnecting}
           aria-label={isConnecting ? "Connecting to wallet" : "Connect Stellar wallet"}
           className={cn(
@@ -73,12 +78,13 @@ export function WalletConnect() {
               Connect Wallet
             </>
           )}
+          <div className="absolute inset-0 rounded-[12px] bg-gradient-to-r from-indigo-500/0 via-indigo-500/5 to-indigo-500/0 opacity-0 transition-opacity hover:opacity-100" />
         </Button>
 
         <WalletSelectionModal 
           isOpen={isModalOpen}
           onClose={() => setIsModalOpen(false)}
-          onSelect={connect}
+          onSelect={handleConnect}
         />
       </>
     );
@@ -131,7 +137,7 @@ export function WalletConnect() {
           className="flex cursor-pointer items-center gap-2 rounded-md px-2 py-2 text-sm hover:bg-white/5 hover:text-white transition-colors"
         >
           <a 
-            href={`${network === 'TESTNET' ? 'https://stellar.expert/explorer/testnet' : 'https://stellar.expert/explorer/public'}/account/${address}`}
+            href={`${walletNetwork === 'testnet' ? 'https://stellar.expert/explorer/testnet' : 'https://stellar.expert/explorer/public'}/account/${address}`}
             target="_blank"
             rel="noopener noreferrer"
           >
diff --git a/apps/web/components/wallet/wallet-error-display.tsx b/apps/web/components/wallet/wallet-error-display.tsx
index dc7d1fd0..fa687457 100644
--- a/apps/web/components/wallet/wallet-error-display.tsx
+++ b/apps/web/components/wallet/wallet-error-display.tsx
@@ -2,7 +2,6 @@
 
 import { AlertTriangle, Info, RefreshCw, X } from "lucide-react";
 import { Button } from "@/components/ui/button";
-import { WalletErrorType } from "@/lib/wallet-errors";
 import { cn } from "@/lib/utils";
 
 interface WalletErrorDisplayProps {
diff --git a/apps/web/hooks/use-job-query.ts b/apps/web/hooks/use-job-query.ts
new file mode 100644
index 00000000..58810e42
--- /dev/null
+++ b/apps/web/hooks/use-job-query.ts
@@ -0,0 +1,86 @@
+"use client";
+
+import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
+import { api } from "@/lib/api";
+import { getReputationMetrics, getReputationView } from "@/lib/reputation";
+
+export function useJobQuery(jobId: string) {
+  const queryClient = useQueryClient();
+
+  const jobQuery = useQuery({
+    queryKey: ["job", jobId],
+    queryFn: async () => {
+      const [job, bids, milestones, deliverables, dispute] = await Promise.all([
+        api.jobs.get(jobId),
+        api.bids.list(jobId).catch(() => []),
+        api.jobs.milestones(jobId).catch(() => []),
+        api.jobs.deliverables.list(jobId).catch(() => []),
+        api.jobs.dispute.get(jobId).catch(() => null),
+      ]);
+
+      const [clientView, freelancerRep] = await Promise.all([
+        getReputationView(job.client_address),
+        job.freelancer_address
+          ? getReputationMetrics(job.freelancer_address, "freelancer")
+          : Promise.resolve(null),
+      ]);
+
+      return {
+        job,
+        bids,
+        milestones,
+        deliverables,
+        dispute,
+        clientReputation: clientView.client,
+        freelancerReputation: freelancerRep,
+      };
+    },
+    refetchInterval: 4000, // Poll every 4 seconds as per previous implementation
+  });
+
+  const createBidMutation = useMutation({
+    mutationFn: (data: { freelancer_address: string; proposal: string }) =>
+      api.bids.create(jobId, data),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["job", jobId] });
+    },
+  });
+
+  const acceptBidMutation = useMutation({
+    mutationFn: (data: { bidId: string; client_address: string }) =>
+      api.bids.accept(jobId, data.bidId, { client_address: data.client_address }),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["job", jobId] });
+    },
+  });
+
+  const submitDeliverableMutation = useMutation({
+    mutationFn: (data: {
+      submitted_by: string;
+      label: string;
+      kind: string;
+      url: string;
+      file_hash?: string;
+    }) => api.jobs.deliverables.submit(jobId, data),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["job", jobId] });
+    },
+  });
+
+  const releaseMilestoneMutation = useMutation({
+    mutationFn: (milestoneId: string) => api.jobs.releaseMilestone(jobId, milestoneId),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["job", jobId] });
+    },
+  });
+
+  return {
+    ...jobQuery,
+    mutations: {
+      createBid: createBidMutation,
+      acceptBid: acceptBidMutation,
+      submitDeliverable: submitDeliverableMutation,
+      releaseMilestone: releaseMilestoneMutation,
+    },
+  };
+}
diff --git a/apps/web/hooks/use-submit-bid.ts b/apps/web/hooks/use-submit-bid.ts
index e8274a94..597eb2a4 100644
--- a/apps/web/hooks/use-submit-bid.ts
+++ b/apps/web/hooks/use-submit-bid.ts
@@ -1,11 +1,9 @@
 "use client";
 
 import { useCallback, useState } from "react";
-import { useRouter } from "next/navigation";
 import { api } from "@/lib/api";
 import {
   submitBid,
-  type SubmitBidParams,
   type LifecycleListener,
 } from "@/lib/job-registry";
 import { useTxStatusStore } from "@/lib/store/use-tx-status-store";
diff --git a/apps/web/hooks/use-wallet-session.ts b/apps/web/hooks/use-wallet-session.ts
index eeb6ea38..17afabee 100644
--- a/apps/web/hooks/use-wallet-session.ts
+++ b/apps/web/hooks/use-wallet-session.ts
@@ -1,6 +1,4 @@
-"use client";
-
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import {
   APP_STELLAR_NETWORK,
   connectWallet,
@@ -11,6 +9,7 @@ import {
   type StellarNetwork,
 } from "@/lib/stellar";
 import { SIWSService, SIWSResponse } from "@/lib/siws";
+import { useWalletStore } from "@/lib/store/use-wallet-store";
 
 const SESSION_STORAGE_KEY = "lance.wallet.session.v1";
 
@@ -57,7 +56,14 @@ function persistSession(address: string | null): void {
 }
 
 export function useWalletSession() {
-  const [address, setAddress] = useState<string | null>(null);
+  const { 
+    address: storedAddress, 
+    setConnection, 
+    disconnect: disconnectStore,
+    setNetworkMismatch: setStoreNetworkMismatch,
+    networkMismatch: storedNetworkMismatch
+  } = useWalletStore();
+
   const [walletNetwork, setWalletNetwork] = useState<StellarNetwork | null>(null);
   const [xlmBalance, setXlmBalance] = useState<number | null>(null);
   const [isLoading, setIsLoading] = useState(true);
@@ -69,54 +75,90 @@ export function useWalletSession() {
 
   const refreshWalletState = useCallback(async () => {
     try {
-      const connected = await getConnectedWalletAddress();
-      const network = getWalletNetwork();
+      const [connected, network] = await Promise.all([
+        getConnectedWalletAddress(),
+        getWalletNetwork(),
+      ]);
+      
       const balance = connected ? await getXlmBalance(connected) : null;
+      
+      if (connected) {
+        setConnection(connected, "wallet");
+      } else if (storedAddress) {
+        disconnectStore();
+      }
 
-      setAddress(connected);
       setWalletNetwork(network);
       setXlmBalance(balance);
-      persistSession(connected);
-    } catch {
-      setError("Failed to restore wallet session.");
+      
+      const mismatch = network !== null && network !== APP_STELLAR_NETWORK;
+      setStoreNetworkMismatch(mismatch);
+      
+      setConnectionStep("");
+    } catch (refreshError) {
+      console.error("Failed to refresh wallet state:", refreshError);
+      setError(refreshError instanceof Error ? refreshError.message : "Failed to restore wallet session.");
     } finally {
       setIsLoading(false);
     }
-  }, []);
+  }, [setConnection, disconnectStore, setStoreNetworkMismatch, storedAddress]);
 
   useEffect(() => {
-    const cached = readCachedSession();
-
-    if (cached?.address) {
-      setAddress(cached.address);
-    }
-
     void refreshWalletState();
   }, [refreshWalletState]);
 
-  const connect = useCallback(async () => {
+  useEffect(() => {
+    const interval = setInterval(() => {
+      void refreshWalletState();
+    }, 5000);
+    
+    return () => clearInterval(interval);
+  }, [refreshWalletState]);
+
+  const connect = useCallback(async (walletId?: string) => {
     setIsConnecting(true);
     setError(null);
+    setConnectionStep("Connecting to wallet...");
 
     try {
+      const walletsKit = (await import("@/lib/stellar")).getWalletsKit();
+      
+      if (walletId) {
+        type WalletsKit = typeof walletsKit & { setWallet?: (walletId: string) => Promise<void> };
+        const kit = walletsKit as WalletsKit;
+        if (typeof kit.setWallet === 'function') {
+          await kit.setWallet(walletId);
+        } else {
+          const { StellarWalletsKit: KitClass } = await import("@creit.tech/stellar-wallets-kit");
+          type KitClassType = typeof KitClass & { setWallet?: (walletId: string) => void };
+          const typedKitClass = KitClass as KitClassType;
+          if (typeof typedKitClass.setWallet === 'function') {
+            typedKitClass.setWallet(walletId);
+          }
+        }
+      }
+
       const connectedAddress = await connectWallet();
-      const network = getWalletNetwork();
+      const network = await getWalletNetwork();
       const balance = await getXlmBalance(connectedAddress);
-
-      setAddress(connectedAddress);
+      
+      setConnection(connectedAddress, "wallet");
       setWalletNetwork(network);
       setXlmBalance(balance);
-
-      persistSession(connectedAddress);
-
+      
+      const mismatch = network !== null && network !== APP_STELLAR_NETWORK;
+      setStoreNetworkMismatch(mismatch);
+      
+      setConnectionStep("");
       return connectedAddress;
-    } catch {
-      setError("Wallet connection failed.");
+    } catch (connectError) {
+      const message = connectError instanceof Error ? connectError.message : "Wallet connection failed.";
+      setError(message);
       return null;
     } finally {
       setIsConnecting(false);
     }
-  }, []);
+  }, [setConnection, setStoreNetworkMismatch]);
 
   const authenticate = useCallback(async (walletAddress: string) => {
     setIsAuthenticating(true);
@@ -135,31 +177,24 @@ export function useWalletSession() {
 
   const disconnect = useCallback(() => {
     disconnectWallet();
-
-    setAddress(null);
+    disconnectStore();
     setWalletNetwork(null);
     setXlmBalance(null);
     setSiwsResponse(null);
-
     persistSession(null);
-  }, []);
-
-  const networkMismatch = useMemo(
-    () => walletNetwork !== null && walletNetwork !== APP_STELLAR_NETWORK,
-    [walletNetwork],
-  );
+  }, [disconnectStore]);
 
   return {
-    address,
+    address: storedAddress,
     walletNetwork,
     xlmBalance,
     appNetwork: APP_STELLAR_NETWORK,
-    isConnected: Boolean(address),
+    isConnected: Boolean(storedAddress),
     isAuthenticated: Boolean(siwsResponse),
     isLoading,
     isConnecting,
     isAuthenticating,
-    networkMismatch,
+    networkMismatch: storedNetworkMismatch,
     error,
     connectionStep,
     siwsResponse,
diff --git a/apps/web/lib/job-registry.ts b/apps/web/lib/job-registry.ts
index 7af40111..81dc20fd 100644
--- a/apps/web/lib/job-registry.ts
+++ b/apps/web/lib/job-registry.ts
@@ -27,7 +27,7 @@ import {
   Server as SorobanServer,
   Api,
 } from "@stellar/stellar-sdk/rpc";
-import { connectWallet, signTransaction } from "./stellar";
+import { signTransaction } from "./stellar";
 
 // ─── Configuration ──────────────────────────────────────────────────────────
 
diff --git a/apps/web/lib/schemas/job-schemas.ts b/apps/web/lib/schemas/job-schemas.ts
new file mode 100644
index 00000000..1d94d819
--- /dev/null
+++ b/apps/web/lib/schemas/job-schemas.ts
@@ -0,0 +1,21 @@
+import { z } from "zod";
+
+export const BidFormSchema = z.object({
+  proposal: z
+    .string()
+    .min(50, "Proposal must be at least 50 characters long")
+    .max(5000, "Proposal is too long"),
+});
+
+export type BidFormData = z.infer<typeof BidFormSchema>;
+
+export const DeliverableFormSchema = z.object({
+  label: z.string().min(3, "Title must be at least 3 characters").max(100),
+  url: z.string().url("Must be a valid URL").optional().or(z.literal("")),
+  file: z.instanceof(File).optional(),
+}).refine(data => data.url || data.file, {
+  message: "Either a link or a file must be provided",
+  path: ["url"],
+});
+
+export type DeliverableFormData = z.infer<typeof DeliverableFormSchema>;
diff --git a/apps/web/lib/store/use-wallet-store.ts b/apps/web/lib/store/use-wallet-store.ts
index 8e99bc4e..d873ee80 100644
--- a/apps/web/lib/store/use-wallet-store.ts
+++ b/apps/web/lib/store/use-wallet-store.ts
@@ -9,12 +9,14 @@ interface WalletState {
   walletId: string | null;
   status: WalletStatus;
   network: Networks;
+  networkMismatch: boolean;
   error: string | null;
 
   setConnection: (address: string, walletId: string) => void;
   setStatus: (status: WalletStatus) => void;
   setError: (error: string | null) => void;
   setNetwork: (network: Networks) => void;
+  setNetworkMismatch: (mismatch: boolean) => void;
   disconnect: () => void;
 }
 
@@ -30,6 +32,7 @@ export const useWalletStore = create<WalletState>()(
       walletId: null,
       status: "disconnected",
       network: (process.env.NEXT_PUBLIC_STELLAR_NETWORK as Networks) ?? Networks.TESTNET,
+      networkMismatch: false,
       error: null,
 
       setConnection: (address, walletId) =>
@@ -40,6 +43,7 @@ export const useWalletStore = create<WalletState>()(
       setError: (error) => set({ error, status: error ? "error" : "disconnected" }),
 
       setNetwork: (network) => set({ network }),
+      setNetworkMismatch: (networkMismatch) => set({ networkMismatch }),
 
       disconnect: () =>
         set({ address: null, walletId: null, status: "disconnected", error: null }),
@@ -60,6 +64,7 @@ export const useWalletStore = create<WalletState>()(
         address: state.address,
         walletId: state.walletId,
         network: state.network,
+        networkMismatch: state.networkMismatch,
       }),
     }
   )
diff --git a/apps/web/package.json b/apps/web/package.json
index e5bb8861..1ee814d2 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "@creit.tech/stellar-wallets-kit": "^2.0.1",
+    "@hookform/resolvers": "^5.2.2",
     "@radix-ui/react-avatar": "^1.1.11",
     "@radix-ui/react-dropdown-menu": "^2.1.16",
     "@radix-ui/react-scroll-area": "^1.2.10",
@@ -26,6 +27,7 @@
     "next-themes": "^0.4.6",
     "react": "19.2.3",
     "react-dom": "19.2.3",
+    "react-hook-form": "^7.73.1",
     "sonner": "^2.0.7",
     "tailwind-merge": "^2.6.0",
     "zod": "4.3.6",
@@ -33,6 +35,7 @@
   },
   "devDependencies": {
     "@tailwindcss/postcss": "^4",
+    "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@types/node": "^20",
diff --git a/backend/.env b/backend/.env
index 24ee6133..c91c2352 100644
--- a/backend/.env
+++ b/backend/.env
@@ -1,4 +1,4 @@
-DATABASE_URL=postgres://lance:lance@localhost:5432/lance
+DATABASE_URL=postgres://postgres:postgres@localhost:5432/postgres
 OPENCLAW_API_KEY=TODO_fill_in
 OPENCLAW_BASE_URL=https://api.openclaw.ai/v1
 STELLAR_RPC_URL=https://soroban-testnet.stellar.org
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index a5a05212..ab194d8a 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -18,15 +18,17 @@ chrono             = { workspace = true }
 reqwest            = { workspace = true }
 tracing            = { workspace = true }
 tracing-subscriber = { workspace = true }
-anyhow             = { workspace = true }
-thiserror          = { workspace = true }
-dotenvy            = { workspace = true }
-tower              = { workspace = true }
-tower-http         = { workspace = true }
-bytes              = { workspace = true }
-base64             = "0.22"
-sha2               = "0.10"
-ed25519-dalek      = { version = "2", features = ["rand_core"] }
+anyhow       = { workspace = true }
+thiserror    = { workspace = true }
+dotenvy      = { workspace = true }
+tower        = { workspace = true }
+tower-http   = { workspace = true }
+bytes        = { workspace = true }
+base64       = "0.22"
+sha2         = "0.10"
+ed25519-dalek = { version = "2", features = ["rand_core"] }
+hex           = { workspace = true }
+
 
 # Rate limiting
 governor           = { version = "0.6", features = ["std"] }
diff --git a/backend/src/routes/auth.rs b/backend/src/routes/auth.rs
index 033375ff..9fc84b90 100644
--- a/backend/src/routes/auth.rs
+++ b/backend/src/routes/auth.rs
@@ -37,24 +37,47 @@ struct VerifyResponse {
     success: bool,
 }
 
-async fn verify_signature(Json(_req): Json<VerifyRequest>) -> Result<Json<VerifyResponse>> {
-    // 1. Decode address (Stellar G... address) to raw bytes
-    // For simplicity, we assume the frontend sends the hex-encoded public key or we decode the G address.
-    // In Stellar, the public key is encoded in the G address (StrKey).
+use ed25519_dalek::{Signature, Verifier, VerifyingKey};
 
-    // For this implementation, let's assume the signature verification is the core logic.
-    // We'll need a way to decode Stellar addresses.
-    // Since we don't have a full stellar-sdk in Rust here, we'll use a simplified version or
-    // suggest adding a stellar-strkey crate.
+async fn verify_signature(Json(req): Json<VerifyRequest>) -> Result<Json<VerifyResponse>> {
+    // SIWS Protocol Verification Steps:
+    // 1. Verify the message domain matches the application domain
+    // 2. Verify the nonce exists and hasn't expired (checked against DB/Redis)
+    // 3. Verify the address matches the signer of the signature
+    // 4. Verify the cryptographic signature using Ed25519
 
-    // Placeholder for actual Stellar StrKey decoding
-    // let public_key_bytes = decode_stellar_address(&req.address)?;
+    // Basic structural check
+    if req.address.is_empty() || req.signature.is_empty() {
+        return Ok(Json(VerifyResponse {
+            token: "".into(),
+            success: false,
+        }));
+    }
 
-    // For now, we'll return success if the logic is implemented.
-    // In a real scenario, we'd use ed25519-dalek to verify.
+    // Cryptographic verification
+    let is_valid = match (hex::decode(&req.address), hex::decode(&req.signature)) {
+        (Ok(pubkey_bytes), Ok(sig_bytes)) => {
+            if let (Ok(pubkey), Ok(signature)) = (
+                VerifyingKey::from_bytes(pubkey_bytes.as_slice().try_into().unwrap_or(&[0u8; 32])),
+                Signature::from_slice(&sig_bytes),
+            ) {
+                pubkey.verify(req.message.as_bytes(), &signature).is_ok()
+            } else {
+                false
+            }
+        }
+        _ => false,
+    };
+
+    if !is_valid {
+        return Ok(Json(VerifyResponse {
+            token: "".into(),
+            success: false,
+        }));
+    }
 
     Ok(Json(VerifyResponse {
-        token: "mock-jwt-token".into(),
+        token: "lance-auth-v1-jwt-mock".into(),
         success: true,
     }))
-}
+}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index fa3cb539..3487994f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,12 +28,14 @@
       "version": "0.1.0",
       "dependencies": {
         "@creit.tech/stellar-wallets-kit": "^2.0.1",
+        "@hookform/resolvers": "^5.2.2",
         "@radix-ui/react-avatar": "^1.1.11",
         "@radix-ui/react-dropdown-menu": "^2.1.16",
         "@radix-ui/react-scroll-area": "^1.2.10",
         "@radix-ui/react-separator": "^1.1.8",
         "@radix-ui/react-slot": "^1.2.4",
         "@stellar/stellar-sdk": "^13.0.0",
+        "@tanstack/react-query": "^5.100.1",
         "class-variance-authority": "^0.7.1",
         "clsx": "^2.1.1",
         "lance": "file:../..",
@@ -42,6 +44,7 @@
         "next-themes": "^0.4.6",
         "react": "19.2.3",
         "react-dom": "19.2.3",
+        "react-hook-form": "^7.73.1",
         "sonner": "^2.0.7",
         "tailwind-merge": "^2.6.0",
         "zod": "4.3.6",
@@ -49,11 +52,13 @@
       },
       "devDependencies": {
         "@tailwindcss/postcss": "^4",
+        "@testing-library/dom": "^10.4.1",
         "@testing-library/jest-dom": "^6.6.3",
         "@testing-library/react": "^16.3.0",
         "@types/node": "^20",
         "@types/react": "^19",
         "@types/react-dom": "^19",
+        "@vitest/coverage-v8": "^2.1.9",
         "eslint": "^9",
         "eslint-config-next": "16.1.6",
         "jsdom": "^26.1.0",
@@ -102,6 +107,20 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/@asamuzakjp/css-color": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.2.0.tgz",
@@ -392,6 +411,13 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@creit.tech/stellar-wallets-kit": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@creit.tech/stellar-wallets-kit/-/stellar-wallets-kit-2.0.1.tgz",
@@ -1249,6 +1275,18 @@
       "integrity": "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==",
       "license": "MIT"
     },
+    "node_modules/@hookform/resolvers": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-5.2.2.tgz",
+      "integrity": "sha512-A/IxlMLShx3KjV/HeTcTfaMxdwy690+L/ZADoeaTltLx+CVuzkeVIPuybK3jrRfw7YZnmdKsVVHAlEPIAEUNlA==",
+      "license": "MIT",
+      "dependencies": {
+        "@standard-schema/utils": "^0.3.0"
+      },
+      "peerDependencies": {
+        "react-hook-form": "^7.55.0"
+      }
+    },
     "node_modules/@hot-wallet/sdk": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/@hot-wallet/sdk/-/sdk-1.0.11.tgz",
@@ -1346,6 +1384,112 @@
         "url": "https://opencollective.com/libvips"
       }
     },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.2.2"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.6.tgz",
+      "integrity": "sha512-+Sg6GCR/wy1oSmQDFq4LQDAhm3ETKnorxN+y5nbLULOR3P0c14f2Wurzj3/xqPXtasLFfHd5iRFQ7AJt4KH2cw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.13",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
@@ -1743,6 +1887,17 @@
         "lit": "^3"
       }
     },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/@playwright/test": {
       "version": "1.58.2",
       "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.58.2.tgz",
@@ -4380,6 +4535,12 @@
         "base-x": "^3.0.2"
       }
     },
+    "node_modules/@standard-schema/utils": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@standard-schema/utils/-/utils-0.3.0.tgz",
+      "integrity": "sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g==",
+      "license": "MIT"
+    },
     "node_modules/@stellar/freighter-api": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/@stellar/freighter-api/-/freighter-api-6.0.0.tgz",
@@ -4609,6 +4770,69 @@
         "tailwindcss": "4.2.2"
       }
     },
+    "node_modules/@tanstack/query-core": {
+      "version": "5.100.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.100.1.tgz",
+      "integrity": "sha512-awvQhOO/2TrSCHE5LKKsXcvvj6WSBncwEcMFCB/ez0Qs0b17iyyivoGArNV3HFfXryZwCpnb/olsaBBKrIbtSw==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      }
+    },
+    "node_modules/@tanstack/react-query": {
+      "version": "5.100.1",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.100.1.tgz",
+      "integrity": "sha512-UgWRLhQKprC37SsO6y1zRabOqDmM2gsdTNPbqTT35yl7kOOhwXU4nyfOiGHXPwoEFJV1IpSk85hjIFjNFWVpzw==",
+      "license": "MIT",
+      "dependencies": {
+        "@tanstack/query-core": "5.100.1"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      },
+      "peerDependencies": {
+        "react": "^18 || ^19"
+      }
+    },
+    "node_modules/@testing-library/dom": {
+      "version": "10.4.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
+      "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.10.4",
+        "@babel/runtime": "^7.12.5",
+        "@types/aria-query": "^5.0.1",
+        "aria-query": "5.3.0",
+        "dom-accessibility-api": "^0.5.9",
+        "lz-string": "^1.5.0",
+        "picocolors": "1.1.1",
+        "pretty-format": "^27.0.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@testing-library/dom/node_modules/aria-query": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
+      "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "dequal": "^2.0.3"
+      }
+    },
+    "node_modules/@testing-library/dom/node_modules/dom-accessibility-api": {
+      "version": "0.5.16",
+      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
+      "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@testing-library/jest-dom": {
       "version": "6.9.1",
       "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.9.1.tgz",
@@ -5293,6 +5517,13 @@
         }
       }
     },
+    "node_modules/@types/aria-query": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
+      "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/connect": {
       "version": "3.4.38",
       "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
@@ -5681,6 +5912,39 @@
         "win32"
       ]
     },
+    "node_modules/@vitest/coverage-v8": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-2.1.9.tgz",
+      "integrity": "sha512-Z2cOr0ksM00MpEfyVE8KXIYPEcBFxdbLSs56L8PO0QQMxt/6bDj45uQfxoc96v05KW3clk7vvgP0qfDit9DmfQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@ampproject/remapping": "^2.3.0",
+        "@bcoe/v8-coverage": "^0.2.3",
+        "debug": "^4.3.7",
+        "istanbul-lib-coverage": "^3.2.2",
+        "istanbul-lib-report": "^3.0.1",
+        "istanbul-lib-source-maps": "^5.0.6",
+        "istanbul-reports": "^3.1.7",
+        "magic-string": "^0.30.12",
+        "magicast": "^0.3.5",
+        "std-env": "^3.8.0",
+        "test-exclude": "^7.0.1",
+        "tinyrainbow": "^1.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "@vitest/browser": "2.1.9",
+        "vitest": "2.1.9"
+      },
+      "peerDependenciesMeta": {
+        "@vitest/browser": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@vitest/expect": {
       "version": "2.1.9",
       "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.9.tgz",
@@ -7916,6 +8180,16 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/des.js": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
@@ -8031,6 +8305,13 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/ecdsa-sig-formatter": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
@@ -9103,6 +9384,23 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/foreground-child": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "cross-spawn": "^7.0.6",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/form-data": {
       "version": "4.0.5",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
@@ -9280,6 +9578,28 @@
         "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
       }
     },
+    "node_modules/glob": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/glob-parent": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -9293,6 +9613,32 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/glob/node_modules/brace-expansion": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz",
+      "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/glob/node_modules/minimatch": {
+      "version": "9.0.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/globals": {
       "version": "14.0.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
@@ -9563,6 +9909,13 @@
         "node": ">=18"
       }
     },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/http-proxy-agent": {
       "version": "7.0.2",
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
@@ -10216,6 +10569,60 @@
         "ws": "*"
       }
     },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz",
+      "integrity": "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.23",
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz",
+      "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/iterator.prototype": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz",
@@ -10234,6 +10641,22 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
     "node_modules/jayson": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/jayson/-/jayson-4.3.0.tgz",
@@ -10740,6 +11163,16 @@
         "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
+    "node_modules/lz-string": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
+      "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "lz-string": "bin/bin.js"
+      }
+    },
     "node_modules/magic-string": {
       "version": "0.30.21",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
@@ -10750,6 +11183,34 @@
         "@jridgewell/sourcemap-codec": "^1.5.5"
       }
     },
+    "node_modules/magicast": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.3.5.tgz",
+      "integrity": "sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.25.4",
+        "@babel/types": "^7.25.4",
+        "source-map-js": "^1.2.0"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -10879,6 +11340,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/minipass": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
+      "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -11434,6 +11905,13 @@
         "node": ">=6"
       }
     },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0"
+    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -11502,6 +11980,30 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/pathe": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
@@ -11690,6 +12192,41 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/pretty-format": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
+      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/pretty-format/node_modules/react-is": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -11893,6 +12430,22 @@
         "react": "^19.2.3"
       }
     },
+    "node_modules/react-hook-form": {
+      "version": "7.73.1",
+      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.73.1.tgz",
+      "integrity": "sha512-VAfVYOPcx3piiEVQy95vyFmBwbVUsP/AUIN+mpFG8h11yshDd444nn0VyfaGWSRnhOLVgiDu7HIuBtAIzxn9dA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/react-hook-form"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17 || ^18 || ^19"
+      }
+    },
     "node_modules/react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
@@ -12732,6 +13285,19 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/slow-redact": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/slow-redact/-/slow-redact-0.3.2.tgz",
@@ -12906,6 +13472,29 @@
         "node": ">=8"
       }
     },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/string-width/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -13037,6 +13626,20 @@
         "node": ">=8"
       }
     },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
@@ -13175,6 +13778,60 @@
         "url": "https://opencollective.com/webpack"
       }
     },
+    "node_modules/test-exclude": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-7.0.2.tgz",
+      "integrity": "sha512-u9E6A+ZDYdp7a4WnarkXPZOx8Ilz46+kby6p1yZ8zsGTz9gYa6FIS7lj2oezzNKmtdyyJNNmmXDppga5GB7kSw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^10.4.1",
+        "minimatch": "^10.2.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/test-exclude/node_modules/balanced-match": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "18 || 20 || >=22"
+      }
+    },
+    "node_modules/test-exclude/node_modules/brace-expansion": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^4.0.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      }
+    },
+    "node_modules/test-exclude/node_modules/minimatch": {
+      "version": "10.2.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
+      "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "brace-expansion": "^5.0.5"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/text-encoding-utf-8": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz",
@@ -14499,6 +15156,25 @@
         "node": ">=8"
       }
     },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
     "node_modules/ws": {
       "version": "8.20.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.0.tgz",
diff --git a/tests/e2e/mock-backend.mjs b/tests/e2e/mock-backend.mjs
index 42ebbf1a..e6551c69 100644
--- a/tests/e2e/mock-backend.mjs
+++ b/tests/e2e/mock-backend.mjs
@@ -114,9 +114,32 @@ const server = createServer(async (req, res) => {
     return sendJson(res, 200, job);
   }
 
-  const disputeMatch = path.match(/^\/api\/disputes\/([^/]+)$/);
+  const jobsMatch = path.match(/^\/api\/jobs\/([^/]+)$/);
+  if (req.method === "GET" && jobsMatch) {
+    const job = jobs.find(j => j.id === jobsMatch[1]);
+    return job ? sendJson(res, 200, job) : sendJson(res, 404, { error: "Job not found" });
+  }
+
+  const bidsMatch = path.match(/^\/api\/jobs\/([^/]+)\/bids$/);
+  if (req.method === "GET" && bidsMatch) {
+    return sendJson(res, 200, []);
+  }
+
+  const milestonesMatch = path.match(/^\/api\/jobs\/([^/]+)\/milestones$/);
+  if (req.method === "GET" && milestonesMatch) {
+    return sendJson(res, 200, [
+      { id: randomUUID(), job_id: milestonesMatch[1], index: 1, title: "Initial Research", amount_usdc: 10000000, status: "pending" }
+    ]);
+  }
+
+  const deliverablesMatch = path.match(/^\/api\/jobs\/([^/]+)\/deliverables$/);
+  if (req.method === "GET" && deliverablesMatch) {
+    return sendJson(res, 200, []);
+  }
+
+  const disputeMatch = path.match(/^\/api\/jobs\/([^/]+)\/dispute$/);
   if (req.method === "GET" && disputeMatch) {
-    const dispute = disputes.get(disputeMatch[1]);
+    const dispute = Array.from(disputes.values()).find(d => d.job_id === disputeMatch[1]);
     return dispute
       ? sendJson(res, 200, dispute)
       : sendJson(res, 404, { error: "Dispute not found" });