diff --git a/__tests__/contract/role-detection.test.ts b/__tests__/contract/role-detection.test.ts
new file mode 100644
index 0000000..2469984
--- /dev/null
+++ b/__tests__/contract/role-detection.test.ts
@@ -0,0 +1,164 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+
+const { mockServer } = vi.hoisted(() => {
+  const mockServer: any = {
+    getHealth: vi.fn(() => Promise.resolve({ status: 'healthy' })),
+    simulateTransaction: vi.fn(),
+  };
+  return { mockServer };
+});
+
+vi.mock('@stellar/stellar-sdk', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@stellar/stellar-sdk')>();
+  function MockRpcServer() {
+    return mockServer;
+  }
+  return {
+    ...actual,
+    rpc: {
+      Server: MockRpcServer,
+      Api: {
+        isSimulationSuccess: vi.fn((res: any) => Boolean(res?.result?.retval !== undefined)),
+      },
+    },
+    scValToNative: vi.fn((val: any) => val),
+    nativeToScVal: vi.fn((val: any) => val),
+    Address: {
+      fromString: vi.fn(() => ({
+        toScVal: vi.fn(() => ({})),
+      })),
+    },
+    TransactionBuilder: vi.fn(function (this: any) {
+      this.addOperation = vi.fn().mockReturnThis();
+      this.setTimeout = vi.fn().mockReturnThis();
+      this.build = vi.fn(() => ({}));
+    }),
+    Operation: {
+      invokeContractFunction: vi.fn(() => ({})),
+    },
+    Account: vi.fn(function (this: any, address: string) {
+      this.accountId = () => address;
+    }),
+    BASE_FEE: '100',
+  };
+});
+
+vi.mock('@/constants', () => ({
+  CONTRACT_ID: 'CCONTRACTIDTEST000000000000000000000000000000000000000000',
+  NETWORK_PASSPHRASE: 'Test SDF Network ; September 2015',
+  RPC_URL: 'https://soroban-testnet.stellar.org',
+  TESTNET_USDC_TOKEN_ID: 'CCW67TSZV3SSS2HXMBQ5JFGCKJNXKZM7UQUWUZPUTHXSTZLEO7SJMI75',
+  TESTNET_EURC_TOKEN_ID: 'CDTKPWPLOURQA2SGTKTUQOWRCBZEORB4BWBOMJ3D3ZTQQSGE5F6JBQLV',
+  TESTNET_XLM_TOKEN_ID: 'CDLZFC3SYJYDZT7K67VZ75HPJVIEUVNIXF47ZG2FB2RMQQVU2HHGCYSC',
+}));
+
+import {
+  getWalletRoles,
+  listInvoicesBySubmitter,
+  listInvoicesByPayer,
+  listInvoicesByLp,
+} from '@/utils/soroban';
+
+describe('Wallet Role Detection Integration Tests', () => {
+  const TEST_ADDR = 'GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWHF';
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('detects freelancer role when list_invoices_by_submitter returns invoices', async () => {
+    mockServer.simulateTransaction.mockImplementation(async () => {
+      return {
+        result: {
+          retval: [
+            {
+              id: 1n,
+              freelancer: TEST_ADDR,
+              payer: 'GPAYER123',
+              amount: 1000n,
+              due_date: 1700000000n,
+              discount_rate: 200,
+              status: { Pending: {} },
+            },
+          ],
+        },
+      };
+    });
+
+    const submitterInvoices = await listInvoicesBySubmitter(TEST_ADDR);
+    const payerInvoices = await listInvoicesByPayer(TEST_ADDR);
+    const lpInvoices = await listInvoicesByLp(TEST_ADDR);
+    expect(submitterInvoices.length).toBe(1);
+    expect(payerInvoices.length).toBe(1);
+    expect(lpInvoices.length).toBe(1);
+
+    const roles = await getWalletRoles(TEST_ADDR);
+    expect(roles).toContain('freelancer');
+  });
+
+  it('detects multiple roles (freelancer, payer, lp) when all view functions return invoices', async () => {
+    mockServer.simulateTransaction.mockImplementation(async () => {
+      return {
+        result: {
+          retval: [
+            {
+              id: 101n,
+              freelancer: TEST_ADDR,
+              payer: TEST_ADDR,
+              funder: TEST_ADDR,
+              amount: 5000n,
+              due_date: 1700000000n,
+              discount_rate: 150,
+              status: { Funded: {} },
+            },
+          ],
+        },
+      };
+    });
+
+    const roles = await getWalletRoles(TEST_ADDR);
+    expect(roles).toContain('freelancer');
+    expect(roles).toContain('payer');
+    expect(roles).toContain('lp');
+  });
+
+  it('returns empty roles array when user has no invoices across views', async () => {
+    mockServer.simulateTransaction.mockImplementation(async () => {
+      return {
+        result: {
+          retval: [],
+        },
+      };
+    });
+
+    const roles = await getWalletRoles('GUSERWITHNOINVOICES');
+    expect(roles).toEqual([]);
+  });
+
+  it('falls back gracefully to table scan if dedicated contract view functions fail', async () => {
+    let callCount = 0;
+    mockServer.simulateTransaction.mockImplementation(async () => {
+      callCount++;
+      if (callCount <= 4) {
+        return { result: null };
+      }
+      return {
+        result: {
+          retval: {
+            id: 1n,
+            freelancer: TEST_ADDR,
+            payer: 'GPAYER',
+            amount: 100n,
+            due_date: 1700000000n,
+            discount_rate: 100,
+            status: 'Pending',
+          },
+        },
+      };
+    });
+
+    const roles = await getWalletRoles(TEST_ADDR);
+    expect(roles).toContain('freelancer');
+  });
+});
diff --git a/__tests__/contract/soroban-extended.test.ts b/__tests__/contract/soroban-extended.test.ts
index 517a597..8c6cb27 100644
--- a/__tests__/contract/soroban-extended.test.ts
+++ b/__tests__/contract/soroban-extended.test.ts
@@ -180,11 +180,9 @@ describe('soroban – getWalletRoles', () => {
       due_date: 1n,
       discount_rate: 100,
     };
-    (scValToNative as any).mockReturnValueOnce(inv);
-    (rpc.Api.isSimulationSuccess as any).mockReturnValueOnce(true).mockReturnValueOnce(false);
-    mockServer.simulateTransaction
-      .mockResolvedValueOnce({ result: { retval: {} } })
-      .mockResolvedValueOnce({ error: 'fail' });
+    (scValToNative as any).mockReturnValue([inv]);
+    (rpc.Api.isSimulationSuccess as any).mockReturnValue(true);
+    mockServer.simulateTransaction.mockResolvedValue({ result: { retval: [inv] } });
     const roles = await getWalletRoles(ADDR);
     expect(roles).toContain('freelancer');
   });
@@ -730,11 +728,9 @@ describe('soroban – getWalletRoles extended', () => {
       due_date: 1n,
       discount_rate: 100,
     };
-    (scValToNative as any).mockReturnValueOnce(inv);
-    (rpc.Api.isSimulationSuccess as any).mockReturnValueOnce(true).mockReturnValueOnce(false);
-    mockServer.simulateTransaction
-      .mockResolvedValueOnce({ result: { retval: {} } })
-      .mockResolvedValueOnce({ error: 'fail' });
+    (scValToNative as any).mockReturnValue([inv]);
+    (rpc.Api.isSimulationSuccess as any).mockReturnValue(true);
+    mockServer.simulateTransaction.mockResolvedValue({ result: { retval: [inv] } });
     const roles = await getWalletRoles(ADDR);
     expect(roles).toContain('payer');
   });
@@ -751,11 +747,9 @@ describe('soroban – getWalletRoles extended', () => {
       due_date: 1n,
       discount_rate: 100,
     };
-    (scValToNative as any).mockReturnValueOnce(inv);
-    (rpc.Api.isSimulationSuccess as any).mockReturnValueOnce(true).mockReturnValueOnce(false);
-    mockServer.simulateTransaction
-      .mockResolvedValueOnce({ result: { retval: {} } })
-      .mockResolvedValueOnce({ error: 'fail' });
+    (scValToNative as any).mockReturnValue([inv]);
+    (rpc.Api.isSimulationSuccess as any).mockReturnValue(true);
+    mockServer.simulateTransaction.mockResolvedValue({ result: { retval: [inv] } });
     const roles = await getWalletRoles(ADDR);
     expect(roles).toContain('lp');
   });
diff --git a/__tests__/feature-flags-no-render.test.tsx b/__tests__/feature-flags-no-render.test.tsx
new file mode 100644
index 0000000..4f3b5ba
--- /dev/null
+++ b/__tests__/feature-flags-no-render.test.tsx
@@ -0,0 +1,59 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import OracleBadge from '../src/components/OracleBadge';
+import InvoiceNftCard from '../src/components/InvoiceNftCard';
+import InsurancePoolPanel from '../src/components/InsurancePoolPanel';
+
+vi.mock('../src/hooks/useInvoiceNft', () => ({
+  useInvoiceNft: vi.fn(() => ({ state: null, loading: false, reload: vi.fn() })),
+}));
+
+vi.mock('../src/hooks/useInsurance', () => ({
+  useInsurance: vi.fn(() => ({
+    poolInfo: null,
+    isEnrolled: false,
+    isLoading: false,
+    refresh: vi.fn(),
+  })),
+}));
+
+vi.mock('../src/hooks/useTransaction', () => ({
+  useTransaction: vi.fn(() => ({ execute: vi.fn() })),
+}));
+
+vi.mock('../src/hooks/useApprovedTokens', () => ({
+  useApprovedTokens: vi.fn(() => ({ defaultToken: { symbol: 'USDC', decimals: 7 } })),
+}));
+
+vi.mock('../src/context/WalletContext', () => ({
+  useWallet: () => ({ address: 'GCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC6' }),
+}));
+
+describe('Feature Flags Graceful No-Render Verification', () => {
+  beforeEach(() => {
+    vi.stubEnv('NEXT_PUBLIC_ORACLE_ENABLED', 'false');
+    vi.stubEnv('NEXT_PUBLIC_NFT_ENABLED', 'false');
+    vi.stubEnv('NEXT_PUBLIC_INSURANCE_POOL_ENABLED', 'false');
+  });
+
+  it('renders nothing when NEXT_PUBLIC_ORACLE_ENABLED is false', () => {
+    const { container } = render(<OracleBadge verified={true} />);
+    expect(container.firstChild).toBeNull();
+    expect(screen.queryByText(/Oracle Verified/i)).not.toBeInTheDocument();
+  });
+
+  it('renders nothing when NEXT_PUBLIC_NFT_ENABLED is false', () => {
+    const { container } = render(
+      <InvoiceNftCard invoiceId={1n} invoiceStatus="Pending" walletAddress={null} />
+    );
+    expect(container.firstChild).toBeNull();
+    expect(screen.queryByText(/Invoice NFT/i)).not.toBeInTheDocument();
+  });
+
+  it('renders nothing when NEXT_PUBLIC_INSURANCE_POOL_ENABLED is false', () => {
+    const { container } = render(<InsurancePoolPanel />);
+    expect(container.firstChild).toBeNull();
+    expect(screen.queryByText(/Default Protection/i)).not.toBeInTheDocument();
+  });
+});
diff --git a/app/dashboard/payer/page.tsx b/app/dashboard/payer/page.tsx
index 64ff11b..473f5de 100644
--- a/app/dashboard/payer/page.tsx
+++ b/app/dashboard/payer/page.tsx
@@ -1,28 +1,24 @@
-"use client";
+'use client';
 
-import Link from "next/link";
-import { useCallback, useEffect, useMemo, useState, Suspense } from "react";
-import Footer from "@/components/Footer";
-import Navbar from "@/components/Navbar";
-import { TokenAmount, TokenIcon } from "@/components/TokenSelector";
-import { useToast } from "@/context/ToastContext";
-import { useWallet } from "@/context/WalletContext";
-import { useApprovedTokens } from "@/hooks/useApprovedTokens";
-import {
-  APPEAL_WINDOW_LEDGERS,
-  formatLedgerWindow,
-  hashEvidence,
-} from "@/utils/evidence";
-import { formatAddress, formatDate, formatTokenAmount } from "@/utils/format";
+import Link from 'next/link';
+import { useCallback, useEffect, useMemo, useState, Suspense } from 'react';
+import Footer from '@/components/Footer';
+import Navbar from '@/components/Navbar';
+import { TokenAmount, TokenIcon } from '@/components/TokenSelector';
+import { useToast } from '@/context/ToastContext';
+import { useWallet } from '@/context/WalletContext';
+import { useApprovedTokens } from '@/hooks/useApprovedTokens';
+import { APPEAL_WINDOW_LEDGERS, formatLedgerWindow, hashEvidence } from '@/utils/evidence';
+import { formatAddress, formatDate, formatTokenAmount } from '@/utils/format';
 import {
   Invoice,
   appealDefault,
   getAllInvoices,
   markPaid,
   submitSignedTransaction,
-} from "@/utils/soroban";
+} from '@/utils/soroban';
 
-type PayerTab = "Outstanding" | "Settled" | "Pending" | "Disputed";
+type PayerTab = 'Outstanding' | 'Settled' | 'Pending' | 'Disputed';
 
 interface AppealState {
   invoice: Invoice;
@@ -31,57 +27,52 @@ interface AppealState {
   submitting: boolean;
 }
 
-const TABS: PayerTab[] = ["Outstanding", "Settled", "Pending", "Disputed"];
+const TABS: PayerTab[] = ['Outstanding', 'Settled', 'Pending', 'Disputed'];
 
 function isOverdue(invoice: Invoice): boolean {
-  return (
-    Number(invoice.due_date) * 1000 < Date.now() && invoice.status !== "Paid"
-  );
+  return Number(invoice.due_date) * 1000 < Date.now() && invoice.status !== 'Paid';
 }
 
 function invoiceTab(invoice: Invoice): PayerTab {
-  if (invoice.status === "Paid" || invoice.status === "Appealed")
-    return "Settled";
+  if (invoice.status === 'Paid' || invoice.status === 'Appealed') return 'Settled';
   if (
-    invoice.status === "Disputed" ||
-    invoice.status === "Expired" ||
-    invoice.status === "Defaulted"
+    invoice.status === 'Disputed' ||
+    invoice.status === 'Expired' ||
+    invoice.status === 'Defaulted'
   ) {
-    return "Disputed";
+    return 'Disputed';
   }
-  if (invoice.status === "Funded") return "Outstanding";
-  return "Pending";
+  if (invoice.status === 'Funded') return 'Outstanding';
+  return 'Pending';
 }
 
 function disputeMeta(invoice: Invoice) {
-  const id = invoice.id.toString().padStart(4, "0");
-  const expired =
-    invoice.status === "Expired" || invoice.status === "Defaulted";
+  const id = invoice.id.toString().padStart(4, '0');
+  const expired = invoice.status === 'Expired' || invoice.status === 'Defaulted';
   return {
-    evidenceHash: `0x${id}evidence${id}`.padEnd(18, "0"),
+    evidenceHash: `0x${id}evidence${id}`.padEnd(18, '0'),
     voteLink: `/governance/${Number(invoice.id) || 1}`,
     disputeDate: formatDate(invoice.due_date),
-    timeout: expired ? "Expired" : "2d 8h remaining",
+    timeout: expired ? 'Expired' : '2d 8h remaining',
     ruling: expired
-      ? "Ruling: Dismissed"
-      : invoice.status === "Disputed"
-        ? "Resolution pending"
-        : "Ruling: Resolved",
+      ? 'Ruling: Dismissed'
+      : invoice.status === 'Disputed'
+        ? 'Resolution pending'
+        : 'Ruling: Resolved',
   };
 }
 
 function StatusPill({ invoice }: { invoice: Invoice }) {
   const overdue = isOverdue(invoice);
-  const label =
-    overdue && invoice.status === "Funded" ? "Overdue" : invoice.status;
+  const label = overdue && invoice.status === 'Funded' ? 'Overdue' : invoice.status;
   const color =
-    label === "Paid" || label === "Appealed"
-      ? "bg-emerald-500/15 text-emerald-600 border-emerald-500/30"
-      : label === "Overdue" || label === "Expired" || label === "Defaulted"
-        ? "bg-red-500/15 text-red-600 border-red-500/30"
-        : label === "Disputed"
-          ? "bg-amber-500/15 text-amber-600 border-amber-500/30"
-          : "bg-primary/15 text-primary border-primary/30";
+    label === 'Paid' || label === 'Appealed'
+      ? 'bg-emerald-500/15 text-emerald-600 border-emerald-500/30'
+      : label === 'Overdue' || label === 'Expired' || label === 'Defaulted'
+        ? 'bg-red-500/15 text-red-600 border-red-500/30'
+        : label === 'Disputed'
+          ? 'bg-amber-500/15 text-amber-600 border-amber-500/30'
+          : 'bg-primary/15 text-primary border-primary/30';
 
   return (
     <span
@@ -96,12 +87,12 @@ function EmptyState({ connected, tab }: { connected: boolean; tab: PayerTab }) {
   return (
     <div className="py-20 text-center">
       <span className="material-symbols-outlined mb-4 block text-5xl text-on-surface-variant/30">
-        {connected ? "receipt_long" : "account_balance_wallet"}
+        {connected ? 'receipt_long' : 'account_balance_wallet'}
       </span>
       <p className="font-medium text-on-surface-variant">
         {connected
           ? `No ${tab.toLowerCase()} invoices found`
-          : "Connect your wallet to view payer invoices"}
+          : 'Connect your wallet to view payer invoices'}
       </p>
     </div>
   );
@@ -124,13 +115,13 @@ function AppealDefaultModal({
         <div className="border-b border-outline-variant/10 p-6">
           <h2 className="text-xl font-bold">Appeal Default</h2>
           <p className="mt-1 text-sm text-on-surface-variant">
-            Invoice #{state.invoice.id.toString()} will be appealed with a
-            client-side evidence hash.
+            Invoice #{state.invoice.id.toString()} will be appealed with a client-side evidence
+            hash.
           </p>
         </div>
         <div className="space-y-4 p-6">
           <div className="rounded-xl border border-amber-500/30 bg-amber-500/5 p-4 text-sm text-on-surface-variant">
-            Appeal window remaining:{" "}
+            Appeal window remaining:{' '}
             <span className="font-semibold text-amber-600">
               {formatLedgerWindow(APPEAL_WINDOW_LEDGERS)}
             </span>
@@ -163,7 +154,7 @@ function AppealDefaultModal({
             disabled={!state.evidenceHash || state.submitting}
             className="flex-[2] rounded-xl bg-primary px-4 py-3 text-sm font-bold text-white disabled:opacity-50"
           >
-            {state.submitting ? "Submitting..." : "Submit Appeal"}
+            {state.submitting ? 'Submitting...' : 'Submit Appeal'}
           </button>
         </div>
       </div>
@@ -183,7 +174,7 @@ function PayerDashboardContent() {
   const { address, isConnected, connect, signTx } = useWallet();
   const { addToast, updateToast } = useToast();
   const { tokenMap, defaultToken } = useApprovedTokens();
-  const [activeTab, setActiveTab] = useState<PayerTab>("Outstanding");
+  const [activeTab, setActiveTab] = useState<PayerTab>('Outstanding');
   const [invoices, setInvoices] = useState<Invoice[]>([]);
   const [loading, setLoading] = useState(false);
   const [settlingId, setSettlingId] = useState<string | null>(null);
@@ -197,9 +188,9 @@ function PayerDashboardContent() {
       setInvoices(all.filter((invoice) => invoice.payer === address));
     } catch (error) {
       addToast({
-        type: "error",
-        title: "Could not load payer invoices",
-        message: error instanceof Error ? error.message : "Unknown error",
+        type: 'error',
+        title: 'Could not load payer invoices',
+        message: error instanceof Error ? error.message : 'Unknown error',
       });
     } finally {
       setLoading(false);
@@ -207,14 +198,15 @@ function PayerDashboardContent() {
   }, [addToast, address, isConnected]);
 
   useEffect(() => {
+    // eslint-disable-next-line react-hooks/set-state-in-effect
     void loadInvoices();
   }, [loadInvoices]);
 
   const totalsByToken = useMemo(() => {
     return invoices
-      .filter((invoice) => invoiceTab(invoice) === "Outstanding")
+      .filter((invoice) => invoiceTab(invoice) === 'Outstanding')
       .reduce((totals, invoice) => {
-        const tokenId = invoice.token ?? defaultToken?.contractId ?? "";
+        const tokenId = invoice.token ?? defaultToken?.contractId ?? '';
         totals.set(tokenId, (totals.get(tokenId) ?? 0n) + invoice.amount);
         return totals;
       }, new Map<string, bigint>());
@@ -222,35 +214,32 @@ function PayerDashboardContent() {
 
   const visibleInvoices = useMemo(
     () => invoices.filter((invoice) => invoiceTab(invoice) === activeTab),
-    [activeTab, invoices],
+    [activeTab, invoices]
   );
 
   const handleSettle = async (invoice: Invoice) => {
     if (!address) return;
     setSettlingId(invoice.id.toString());
     const toastId = addToast({
-      type: "pending",
+      type: 'pending',
       title: `Settling invoice #${invoice.id}...`,
     });
     try {
-      const tx = await markPaid(address, invoice.id);
+      const tx = await markPaid(address, invoice.id, invoice.amount);
       const { txHash } = await submitSignedTransaction({ tx, signTx });
       updateToast(toastId, {
-        type: "success",
-        title: "Invoice settled",
+        type: 'success',
+        title: 'Invoice settled',
         txHash,
       });
       setInvoices((current) =>
-        current.map((item) =>
-          item.id === invoice.id ? { ...item, status: "Paid" } : item,
-        ),
+        current.map((item) => (item.id === invoice.id ? { ...item, status: 'Paid' } : item))
       );
     } catch (error) {
       updateToast(toastId, {
-        type: "error",
-        title: "Settlement failed",
-        message:
-          error instanceof Error ? error.message : "Transaction rejected",
+        type: 'error',
+        title: 'Settlement failed',
+        message: error instanceof Error ? error.message : 'Transaction rejected',
       });
     } finally {
       setSettlingId(null);
@@ -270,35 +259,28 @@ function PayerDashboardContent() {
     if (!appealState || !address) return;
     setAppealState({ ...appealState, submitting: true });
     const toastId = addToast({
-      type: "pending",
+      type: 'pending',
       title: `Appealing invoice #${appealState.invoice.id}...`,
     });
     try {
-      const tx = await appealDefault(
-        address,
-        appealState.invoice.id,
-        appealState.evidenceHash,
-      );
+      const tx = await appealDefault(address, appealState.invoice.id, appealState.evidenceHash);
       const { txHash } = await submitSignedTransaction({ tx, signTx });
       updateToast(toastId, {
-        type: "success",
-        title: "Default appealed",
+        type: 'success',
+        title: 'Default appealed',
         txHash,
       });
       setInvoices((current) =>
         current.map((item) =>
-          item.id === appealState.invoice.id
-            ? { ...item, status: "Appealed" }
-            : item,
-        ),
+          item.id === appealState.invoice.id ? { ...item, status: 'Appealed' } : item
+        )
       );
       setAppealState(null);
     } catch (error) {
       updateToast(toastId, {
-        type: "error",
-        title: "Appeal failed",
-        message:
-          error instanceof Error ? error.message : "Transaction rejected",
+        type: 'error',
+        title: 'Appeal failed',
+        message: error instanceof Error ? error.message : 'Transaction rejected',
       });
       setAppealState({ ...appealState, submitting: false });
     }
@@ -313,12 +295,10 @@ function PayerDashboardContent() {
             <p className="mb-2 text-xs font-bold uppercase tracking-widest text-primary">
               Payer Dashboard
             </p>
-            <h1 className="mb-3 text-4xl font-headline md:text-5xl">
-              Invoice Inbox
-            </h1>
+            <h1 className="mb-3 text-4xl font-headline md:text-5xl">Invoice Inbox</h1>
             <p className="max-w-2xl text-on-surface-variant">
-              Track invoices addressed to your wallet, settle funded invoices,
-              follow disputes, and appeal defaults.
+              Track invoices addressed to your wallet, settle funded invoices, follow disputes, and
+              appeal defaults.
             </p>
           </div>
           {isConnected ? (
@@ -328,7 +308,7 @@ function PayerDashboardContent() {
               className="inline-flex items-center gap-2 rounded-xl border border-outline-variant/30 px-4 py-2.5 text-sm font-bold text-on-surface-variant hover:text-primary disabled:opacity-50"
             >
               <span
-                className={`material-symbols-outlined text-[18px] ${loading ? "animate-spin" : ""}`}
+                className={`material-symbols-outlined text-[18px] ${loading ? 'animate-spin' : ''}`}
               >
                 refresh
               </span>
@@ -350,30 +330,21 @@ function PayerDashboardContent() {
           <div className="mx-auto flex max-w-7xl flex-wrap gap-8">
             <div>
               <p className="text-2xl font-bold">{invoices.length}</p>
-              <p className="text-xs text-on-surface-variant">
-                Invoices addressed to you
-              </p>
+              <p className="text-xs text-on-surface-variant">Invoices addressed to you</p>
             </div>
             <div>
               <div className="flex flex-wrap gap-3">
-                {Array.from(totalsByToken.entries()).map(
-                  ([tokenId, amount]) => {
-                    const token = tokenMap.get(tokenId) ?? defaultToken;
-                    if (!token) return null;
-                    return (
-                      <span key={tokenId} className="font-bold">
-                        <TokenAmount
-                          amount={formatTokenAmount(amount, token)}
-                          token={token}
-                        />
-                      </span>
-                    );
-                  },
-                )}
+                {Array.from(totalsByToken.entries()).map(([tokenId, amount]) => {
+                  const token = tokenMap.get(tokenId) ?? defaultToken;
+                  if (!token) return null;
+                  return (
+                    <span key={tokenId} className="font-bold">
+                      <TokenAmount amount={formatTokenAmount(amount, token)} token={token} />
+                    </span>
+                  );
+                })}
               </div>
-              <p className="text-xs text-on-surface-variant">
-                Outstanding total by token
-              </p>
+              <p className="text-xs text-on-surface-variant">Outstanding total by token</p>
             </div>
           </div>
         </section>
@@ -388,16 +359,11 @@ function PayerDashboardContent() {
                 onClick={() => setActiveTab(tab)}
                 className={`rounded-xl px-4 py-2 text-sm font-bold ${
                   activeTab === tab
-                    ? "bg-primary text-white"
-                    : "bg-surface-container text-on-surface-variant"
+                    ? 'bg-primary text-white'
+                    : 'bg-surface-container text-on-surface-variant'
                 }`}
               >
-                {tab} (
-                {
-                  invoices.filter((invoice) => invoiceTab(invoice) === tab)
-                    .length
-                }
-                )
+                {tab} ({invoices.filter((invoice) => invoiceTab(invoice) === tab).length})
               </button>
             ))}
           </div>
@@ -407,13 +373,13 @@ function PayerDashboardContent() {
               <thead className="bg-surface-container-low">
                 <tr>
                   {[
-                    "Invoice ID",
-                    "Freelancer",
-                    "Amount",
-                    "Token",
-                    "Due Date",
-                    "State",
-                    "Action",
+                    'Invoice ID',
+                    'Freelancer',
+                    'Amount',
+                    'Token',
+                    'Due Date',
+                    'State',
+                    'Action',
                   ].map((header) => (
                     <th
                       key={header}
@@ -433,27 +399,20 @@ function PayerDashboardContent() {
                   </tr>
                 ) : loading ? (
                   <tr>
-                    <td
-                      colSpan={7}
-                      className="px-6 py-10 text-center text-on-surface-variant"
-                    >
+                    <td colSpan={7} className="px-6 py-10 text-center text-on-surface-variant">
                       Loading invoices...
                     </td>
                   </tr>
                 ) : (
                   visibleInvoices.map((invoice) => {
                     const token =
-                      tokenMap.get(
-                        invoice.token ?? defaultToken?.contractId ?? "",
-                      ) ?? defaultToken;
-                    const disputed = activeTab === "Disputed";
+                      tokenMap.get(invoice.token ?? defaultToken?.contractId ?? '') ?? defaultToken;
+                    const disputed = activeTab === 'Disputed';
                     const meta = disputed ? disputeMeta(invoice) : null;
                     return (
                       <tr
                         key={invoice.id.toString()}
-                        className={
-                          isOverdue(invoice) ? "bg-red-500/[0.03]" : ""
-                        }
+                        className={isOverdue(invoice) ? 'bg-red-500/[0.03]' : ''}
                       >
                         <td className="px-6 py-5 font-bold text-primary">
                           #{invoice.id.toString()}
@@ -462,9 +421,7 @@ function PayerDashboardContent() {
                           <div className="font-mono text-sm">
                             {formatAddress(invoice.freelancer)}
                           </div>
-                          <div className="text-xs text-emerald-600">
-                            Reputation: 96%
-                          </div>
+                          <div className="text-xs text-emerald-600">Reputation: 96%</div>
                         </td>
                         <td className="px-6 py-5 font-bold">
                           {token
@@ -472,20 +429,14 @@ function PayerDashboardContent() {
                             : invoice.amount.toString()}
                         </td>
                         <td className="px-6 py-5">
-                          {token ? <TokenIcon token={token} /> : "TOKEN"}
+                          {token ? <TokenIcon token={token} /> : 'TOKEN'}
                         </td>
                         <td className="px-6 py-5">
                           <div>{formatDate(invoice.due_date)}</div>
                           {isOverdue(invoice) && (
-                            <div className="text-xs font-semibold text-red-600">
-                              Overdue
-                            </div>
-                          )}
-                          {meta && (
-                            <div className="text-xs text-amber-600">
-                              {meta.timeout}
-                            </div>
+                            <div className="text-xs font-semibold text-red-600">Overdue</div>
                           )}
+                          {meta && <div className="text-xs text-amber-600">{meta.timeout}</div>}
                         </td>
                         <td className="px-6 py-5">
                           <StatusPill invoice={invoice} />
@@ -494,11 +445,7 @@ function PayerDashboardContent() {
                               <div>{meta.disputeDate}</div>
                               <div>{meta.ruling}</div>
                               <button
-                                onClick={() =>
-                                  navigator.clipboard?.writeText(
-                                    meta.evidenceHash,
-                                  )
-                                }
+                                onClick={() => navigator.clipboard?.writeText(meta.evidenceHash)}
                                 className="font-mono text-primary"
                               >
                                 Copy evidence {formatAddress(meta.evidenceHash)}
@@ -507,33 +454,27 @@ function PayerDashboardContent() {
                           )}
                         </td>
                         <td className="px-6 py-5 text-right">
-                          {activeTab === "Outstanding" && (
+                          {activeTab === 'Outstanding' && (
                             <button
                               onClick={() => handleSettle(invoice)}
                               disabled={settlingId === invoice.id.toString()}
                               className="rounded-lg bg-primary px-4 py-2 text-xs font-bold text-white disabled:opacity-50"
                             >
-                              {settlingId === invoice.id.toString()
-                                ? "Settling..."
-                                : "Settle"}
+                              {settlingId === invoice.id.toString() ? 'Settling...' : 'Settle'}
                             </button>
                           )}
                           {meta && (
                             <div className="flex flex-col items-end gap-2">
-                              <Link
-                                href={meta.voteLink}
-                                className="text-xs font-bold text-primary"
-                              >
+                              <Link href={meta.voteLink} className="text-xs font-bold text-primary">
                                 Governance vote
                               </Link>
-                              {(invoice.status === "Expired" ||
-                                invoice.status === "Defaulted") && (
+                              {(invoice.status === 'Expired' || invoice.status === 'Defaulted') && (
                                 <button
                                   onClick={() =>
                                     setAppealState({
                                       invoice,
-                                      evidence: "",
-                                      evidenceHash: "",
+                                      evidence: '',
+                                      evidenceHash: '',
                                       submitting: false,
                                     })
                                   }
diff --git a/app/payer/page.tsx b/app/payer/page.tsx
index 3e7d0bf..b76b5fe 100644
--- a/app/payer/page.tsx
+++ b/app/payer/page.tsx
@@ -2,490 +2,4 @@ import { redirect } from 'next/navigation';
 
 export default function PayerRedirect() {
   redirect('/dashboard/payer');
-
-  const overdue = isOverdue(invoice);
-  const label = overdue && invoice.status === 'Funded' ? 'Overdue' : invoice.status;
-  const color =
-    label === 'Paid' || label === 'Appealed'
-      ? 'bg-emerald-500/15 text-emerald-600 border-emerald-500/30'
-      : label === 'Overdue' || label === 'Expired' || label === 'Defaulted'
-        ? 'bg-red-500/15 text-red-600 border-red-500/30'
-        : label === 'Disputed'
-          ? 'bg-amber-500/15 text-amber-600 border-amber-500/30'
-          : 'bg-primary/15 text-primary border-primary/30';
-
-  return (
-    <span
-      className={`inline-flex items-center rounded-full border px-2.5 py-1 text-xs font-semibold ${color}`}
-    >
-      {label}
-    </span>
-  );
-}
-
-function EmptyState({ connected, tab }: { connected: boolean; tab: PayerTab }) {
-  return (
-    <div className="py-20 text-center">
-      <span className="material-symbols-outlined mb-4 block text-5xl text-on-surface-variant/30">
-        {connected ? 'receipt_long' : 'account_balance_wallet'}
-      </span>
-      <p className="font-medium text-on-surface-variant">
-        {connected
-          ? `No ${tab.toLowerCase()} invoices found`
-          : 'Connect your wallet to view payer invoices'}
-      </p>
-    </div>
-  );
-}
-
-function AppealDefaultModal({
-  state,
-  onEvidenceChange,
-  onSubmit,
-  onClose,
-}: {
-  state: AppealState;
-  onEvidenceChange: (evidence: string) => void;
-  onSubmit: () => void;
-  onClose: () => void;
-}) {
-  return (
-    <div className="fixed inset-0 z-[100] flex items-center justify-center bg-background/80 p-4 backdrop-blur-sm">
-      <div className="w-full max-w-lg rounded-2xl border border-outline-variant/20 bg-surface-container-lowest shadow-2xl">
-        <div className="border-b border-outline-variant/10 p-6">
-          <h2 className="text-xl font-bold">Appeal Default</h2>
-          <p className="mt-1 text-sm text-on-surface-variant">
-            Invoice #{state.invoice.id.toString()} will be appealed with a client-side evidence
-            hash.
-          </p>
-        </div>
-        <div className="space-y-4 p-6">
-          <div className="rounded-xl border border-amber-500/30 bg-amber-500/5 p-4 text-sm text-on-surface-variant">
-            Appeal window remaining:{' '}
-            <span className="font-semibold text-amber-600">
-              {formatLedgerWindow(APPEAL_WINDOW_LEDGERS)}
-            </span>
-          </div>
-          <label className="block text-sm font-semibold text-on-surface">
-            Evidence
-            <textarea
-              value={state.evidence}
-              onChange={(event) => onEvidenceChange(event.target.value)}
-              className="mt-2 min-h-32 w-full rounded-xl border border-outline-variant/30 bg-surface-container-lowest p-3 text-sm outline-none focus:border-primary"
-              placeholder="Summarize why this default should be appealed"
-            />
-          </label>
-          {state.evidenceHash && (
-            <p className="break-all rounded-lg bg-surface-container p-3 font-mono text-xs text-on-surface-variant">
-              evidence_hash: {state.evidenceHash}
-            </p>
-          )}
-        </div>
-        <div className="flex gap-3 p-6 pt-0">
-          <button
-            onClick={onClose}
-            disabled={state.submitting}
-            className="flex-1 rounded-xl border border-outline-variant/30 px-4 py-3 text-sm font-bold text-on-surface-variant disabled:opacity-50"
-          >
-            Cancel
-          </button>
-          <button
-            onClick={onSubmit}
-            disabled={!state.evidenceHash || state.submitting}
-            className="flex-[2] rounded-xl bg-primary px-4 py-3 text-sm font-bold text-white disabled:opacity-50"
-          >
-            {state.submitting ? 'Submitting...' : 'Submit Appeal'}
-          </button>
-        </div>
-      </div>
-    </div>
-  );
-}
-
-export default function PayerDashboard() {
-  return (
-    <Suspense fallback={null}>
-      <PayerDashboardContent />
-    </Suspense>
-  );
-}
-
-function PayerDashboardContent() {
-  const { address, isConnected, connect, signTx } = useWallet();
-  const { addToast, updateToast } = useToast();
-  const { tokenMap, defaultToken } = useApprovedTokens();
-  const [activeTab, setActiveTab] = useState<PayerTab>('Outstanding');
-  const [invoices, setInvoices] = useState<Invoice[]>([]);
-  const [loading, setLoading] = useState(false);
-  const [settlingId, setSettlingId] = useState<string | null>(null);
-  const [settlementModal, setSettlementModal] = useState<{
-    invoice: Invoice;
-    token?: TokenMetadata;
-  } | null>(null);
-
-  const { execute, loading: txLoading, signingModal } = useTransaction();
-  const [appealState, setAppealState] = useState<AppealState | null>(null);
-
-  const loadInvoices = useCallback(async () => {
-    if (!isConnected || !address) return;
-    setLoading(true);
-    try {
-      const all = await getAllInvoices();
-      setInvoices(all.filter((invoice) => invoice.payer === address));
-    } catch (error) {
-      addToast({
-        type: 'error',
-        title: 'Could not load payer invoices',
-        message: error instanceof Error ? error.message : 'Unknown error',
-      });
-    } finally {
-      setLoading(false);
-    }
-  }, [addToast, address, isConnected]);
-
-  useEffect(() => {
-    void loadInvoices();
-  }, [loadInvoices]);
-
-  const totalsByToken = useMemo(() => {
-    return invoices
-      .filter((invoice) => invoiceTab(invoice) === 'Outstanding')
-      .reduce((totals, invoice) => {
-        const tokenId = invoice.token ?? defaultToken?.contractId ?? '';
-        totals.set(tokenId, (totals.get(tokenId) ?? 0n) + invoice.amount);
-        return totals;
-      }, new Map<string, bigint>());
-  }, [defaultToken?.contractId, invoices]);
-
-  const visibleInvoices = useMemo(
-    () => invoices.filter((invoice) => invoiceTab(invoice) === activeTab),
-    [activeTab, invoices]
-  );
-
-  const handleSettle = async (invoice: Invoice) => {
-    if (!address) return;
-    try {
-      const token = await getTokenMetadata(invoice.token || '');
-      setSettlementModal({ invoice, token });
-    } catch {
-      setSettlementModal({ invoice });
-    }
-  };
-
-  const handleConfirmSettlement = async (amount: bigint) => {
-    if (!settlementModal || !address) return;
-    const { invoice, token } = settlementModal;
-
-    await execute(
-      async (signTx) => {
-        // 1. Allowance check
-        if (token) {
-          const allowance = await getTokenAllowance({ owner: address, tokenId: token.contractId });
-          if (allowance < amount) {
-            const approveTx = await approveToken({
-              from: address,
-              amount: amount * 10n, // Approve 10x for convenience, or just exactly enough
-              tokenId: token.contractId,
-            });
-            await signTx(approveTx.toXDR());
-          }
-        }
-
-        // 2. Mark Paid
-        const tx = await markPaid(address, invoice.id, amount);
-        const { txHash } = await submitSignedTransaction({ tx, signTx });
-
-        // Update local state
-        setInvoices((current) =>
-          current.map((item) => (item.id === invoice.id ? { ...item, status: 'Paid' } : item))
-        );
-
-        return txHash;
-      },
-      {
-        title: `Settling invoice #${invoice.id}`,
-        successMessage: `Invoice #${invoice.id} has been settled successfully.`,
-      }
-    );
-
-    setSettlementModal(null);
-  };
-
-  const updateAppealEvidence = async (evidence: string) => {
-    if (!appealState) return;
-    setAppealState({ ...appealState, evidence, evidenceHash: await hashEvidence(evidence) });
-  };
-
-  const submitAppeal = async () => {
-    if (!appealState || !address) return;
-    setAppealState({ ...appealState, submitting: true });
-    const toastId = addToast({
-      type: 'pending',
-      title: `Appealing invoice #${appealState.invoice.id}...`,
-    });
-    try {
-      const tx = await appealDefault(address, appealState.invoice.id, appealState.evidenceHash);
-      const { txHash } = await submitSignedTransaction({ tx, signTx });
-      updateToast(toastId, { type: 'success', title: 'Default appealed', txHash });
-      setInvoices((current) =>
-        current.map((item) =>
-          item.id === appealState.invoice.id ? { ...item, status: 'Appealed' } : item
-        )
-      );
-      setAppealState(null);
-    } catch (error) {
-      updateToast(toastId, {
-        type: 'error',
-        title: 'Appeal failed',
-        message: error instanceof Error ? error.message : 'Transaction rejected',
-      });
-      setAppealState({ ...appealState, submitting: false });
-    }
-  };
-
-  return (
-    <main className="min-h-screen">
-      <Navbar />
-      <section className="border-b border-outline-variant/10 bg-surface-container-lowest px-8 pb-8 pt-32">
-        <div className="mx-auto flex max-w-7xl flex-col justify-between gap-6 md:flex-row md:items-end">
-          <div>
-            <p className="mb-2 text-xs font-bold uppercase tracking-widest text-primary">
-              Payer Dashboard
-            </p>
-            <h1 className="mb-3 text-4xl font-headline md:text-5xl">Invoice Inbox</h1>
-            <p className="max-w-2xl text-on-surface-variant mb-6">
-              Track invoices addressed to your wallet, settle funded invoices, follow disputes, and
-              appeal defaults.
-            </p>
-            <DecayWarningBanner address={address || undefined} />
-          </div>
-          {isConnected ? (
-            <button
-              onClick={loadInvoices}
-              disabled={loading}
-              className="inline-flex items-center gap-2 rounded-xl border border-outline-variant/30 px-4 py-2.5 text-sm font-bold text-on-surface-variant hover:text-primary disabled:opacity-50"
-            >
-              <span
-                className={`material-symbols-outlined text-[18px] ${loading ? 'animate-spin' : ''}`}
-              >
-                refresh
-              </span>
-              Refresh
-            </button>
-          ) : (
-            <button
-              onClick={connect}
-              className="rounded-xl bg-primary px-5 py-3 text-sm font-bold text-white"
-            >
-              Connect Wallet
-            </button>
-          )}
-        </div>
-      </section>
-
-      {isConnected && (
-        <section className="border-b border-outline-variant/10 bg-surface-container px-8 py-5">
-          <div className="mx-auto flex max-w-7xl flex-wrap gap-8">
-            <div>
-              <p className="text-2xl font-bold">{invoices.length}</p>
-              <p className="text-xs text-on-surface-variant">Invoices addressed to you</p>
-            </div>
-            <div>
-              <div className="flex flex-wrap gap-3">
-                {Array.from(totalsByToken.entries()).map(([tokenId, amount]) => {
-                  const token = tokenMap.get(tokenId) ?? defaultToken;
-                  if (!token) return null;
-                  return (
-                    <span key={tokenId} className="font-bold">
-                      <TokenAmount amount={formatTokenAmount(amount, token)} token={token} />
-                    </span>
-                  );
-                })}
-              </div>
-              <p className="text-xs text-on-surface-variant">Outstanding total by token</p>
-            </div>
-          </div>
-        </section>
-      )}
-
-      {isConnected && (
-        <section className="px-8 pt-8">
-          <div className="mx-auto max-w-7xl grid grid-cols-1 lg:grid-cols-3 gap-8">
-            <div className="lg:col-span-2">
-              <PayerReputationCard address={address!} />
-            </div>
-            <div>
-              <PayerReminderOptIn />
-            </div>
-          </div>
-        </section>
-      )}
-
-      <section className="px-8 py-8">
-        <div className="mx-auto max-w-7xl overflow-hidden rounded-2xl border border-outline-variant/10 bg-surface-container-lowest">
-          <div className="flex flex-wrap gap-2 border-b border-outline-variant/10 p-4">
-            {TABS.map((tab) => (
-              <button
-                key={tab}
-                onClick={() => setActiveTab(tab)}
-                className={`rounded-xl px-4 py-2 text-sm font-bold ${
-                  activeTab === tab
-                    ? 'bg-primary text-white'
-                    : 'bg-surface-container text-on-surface-variant'
-                }`}
-              >
-                {tab} ({invoices.filter((invoice) => invoiceTab(invoice) === tab).length})
-              </button>
-            ))}
-          </div>
-
-          <div className="overflow-x-auto">
-            <table className="w-full text-left">
-              <thead className="bg-surface-container-low">
-                <tr>
-                  {[
-                    'Invoice ID',
-                    'Freelancer',
-                    'Amount',
-                    'Token',
-                    'Due Date',
-                    'State',
-                    'Action',
-                  ].map((header) => (
-                    <th
-                      key={header}
-                      className="px-6 py-4 text-xs font-bold uppercase text-on-surface-variant"
-                    >
-                      {header}
-                    </th>
-                  ))}
-                </tr>
-              </thead>
-              <tbody className="divide-y divide-outline-variant/10">
-                {!isConnected || (!loading && visibleInvoices.length === 0) ? (
-                  <tr>
-                    <td colSpan={7}>
-                      <EmptyState connected={isConnected} tab={activeTab} />
-                    </td>
-                  </tr>
-                ) : loading ? (
-                  <tr>
-                    <td colSpan={7} className="px-6 py-10 text-center text-on-surface-variant">
-                      Loading invoices...
-                    </td>
-                  </tr>
-                ) : (
-                  visibleInvoices.map((invoice) => {
-                    const token =
-                      tokenMap.get(invoice.token ?? defaultToken?.contractId ?? '') ?? defaultToken;
-                    const disputed = activeTab === 'Disputed';
-                    const meta = disputed ? disputeMeta(invoice) : null;
-                    return (
-                      <tr
-                        key={invoice.id.toString()}
-                        className={isOverdue(invoice) ? 'bg-red-500/[0.03]' : ''}
-                      >
-                        <td className="px-6 py-5 font-bold text-primary">
-                          #{invoice.id.toString()}
-                        </td>
-                        <td className="px-6 py-5">
-                          <div className="font-mono text-sm">
-                            {formatAddress(invoice.freelancer)}
-                          </div>
-                          <div className="text-xs text-emerald-600">Reputation: 96%</div>
-                        </td>
-                        <td className="px-6 py-5 font-bold">
-                          {token
-                            ? formatTokenAmount(invoice.amount, token)
-                            : invoice.amount.toString()}
-                        </td>
-                        <td className="px-6 py-5">
-                          {token ? <TokenIcon token={token} /> : 'TOKEN'}
-                        </td>
-                        <td className="px-6 py-5">
-                          <div>{formatDate(invoice.due_date)}</div>
-                          {isOverdue(invoice) && (
-                            <div className="text-xs font-semibold text-red-600">Overdue</div>
-                          )}
-                          {meta && <div className="text-xs text-amber-600">{meta.timeout}</div>}
-                        </td>
-                        <td className="px-6 py-5">
-                          <StatusPill invoice={invoice} />
-                          {meta && (
-                            <div className="mt-2 space-y-1 text-xs text-on-surface-variant">
-                              <div>{meta.disputeDate}</div>
-                              <div>{meta.ruling}</div>
-                              <button
-                                onClick={() => navigator.clipboard?.writeText(meta.evidenceHash)}
-                                className="font-mono text-primary"
-                              >
-                                Copy evidence {formatAddress(meta.evidenceHash)}
-                              </button>
-                            </div>
-                          )}
-                        </td>
-                        <td className="px-6 py-5 text-right">
-                          {activeTab === 'Outstanding' && (
-                            <button
-                              onClick={() => handleSettle(invoice)}
-                              className="rounded-lg bg-primary px-4 py-2 text-xs font-bold text-white disabled:opacity-50"
-                            >
-                              Pay Now
-                            </button>
-                          )}
-                          {meta && (
-                            <div className="flex flex-col items-end gap-2">
-                              <Link href={meta.voteLink} className="text-xs font-bold text-primary">
-                                Governance vote
-                              </Link>
-                              {(invoice.status === 'Expired' || invoice.status === 'Defaulted') && (
-                                <button
-                                  onClick={() =>
-                                    setAppealState({
-                                      invoice,
-                                      evidence: '',
-                                      evidenceHash: '',
-                                      submitting: false,
-                                    })
-                                  }
-                                  className="rounded-lg bg-red-600 px-4 py-2 text-xs font-bold text-white"
-                                >
-                                  Appeal Default
-                                </button>
-                              )}
-                            </div>
-                          )}
-                        </td>
-                      </tr>
-                    );
-                  })
-                )}
-              </tbody>
-            </table>
-          </div>
-        </div>
-      </section>
-
-      <Footer />
-      {signingModal}
-      {settlementModal && (
-        <PayerSettlementModal
-          invoice={settlementModal.invoice}
-          token={settlementModal.token}
-          isOpen={!!settlementModal}
-          onClose={() => setSettlementModal(null)}
-          onConfirm={handleConfirmSettlement}
-          submitting={txLoading}
-        />
-      )}
-      {appealState && (
-        <AppealDefaultModal
-          state={appealState}
-          onEvidenceChange={(evidence) => void updateAppealEvidence(evidence)}
-          onSubmit={() => void submitAppeal()}
-          onClose={() => !appealState.submitting && setAppealState(null)}
-        />
-      )}
-    </main>
-  );
 }
diff --git a/docs/incident-response.md b/docs/incident-response.md
new file mode 100644
index 0000000..33428b9
--- /dev/null
+++ b/docs/incident-response.md
@@ -0,0 +1,156 @@
+# Frontend Security Incident Response Process
+
+This document defines the official incident response process specifically for the **ILN-Frontend** web application.
+
+Because ILN is a live financial application interacting with Soroban smart contracts and user wallets, frontend-side security threats (such as compromised npm package updates, malicious CDN script injections, DNS hijacking, or fake transaction-signing prompts) require rapid, specialized containment strategies distinct from contract-level incident response.
+
+---
+
+## 1. Scope & Incident Classification
+
+### Severity Levels
+
+| Level                    | Impact Description                                                                                                   | Examples                                                                                                                                                                                                                        |
+| ------------------------ | -------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **SEV-1 (Critical)**     | Direct risk to user funds, private keys, or wallet transactions. Malicious transaction payload generation.           | - Compromised dependency injecting malicious Soroban tx XDR into signing prompts.<br>- Malicious CDN script stealing session context or hijacking wallet interactions.<br>- Compromised Vercel deployment active in production. |
+| **SEV-2 (High)**         | Disruption of core frontend features, high-risk XSS, or unauthorized data exposure without direct fund manipulation. | - Stored XSS vulnerability on invoice detail page.<br>- Spoofed wallet connection status.<br>- Indexer API endpoint returning malicious links.                                                                                  |
+| **SEV-3 (Medium / Low)** | Cosmetic UI degradation, low-impact dependency vulnerability, non-critical API failure.                              | - Minor dependency CVE without exploit path.<br>- Non-sensitive CORS misconfiguration.                                                                                                                                          |
+
+---
+
+## 2. Emergency Escalation & Contact Matrix
+
+When a frontend security incident is detected, immediately notify the Incident Response Team via the following escalation chain:
+
+| Role                        | Contact Channel                    | Responsibility                                                         |
+| --------------------------- | ---------------------------------- | ---------------------------------------------------------------------- |
+| **Incident Commander (IC)** | Lead Maintainer / `#sec-incidents` | Leads response effort, coordinates containment decisions.              |
+| **Frontend Lead**           | `@frontend-leads`                  | Executes Vercel rollbacks, feature flag kill-switches, and code fixes. |
+| **Smart Contract Lead**     | `@contract-leads`                  | Evaluates on-chain impact and triggers contract pause if necessary.    |
+| **Communications Lead**     | `@comms-lead`                      | Publishes user advisories and updates status page.                     |
+
+---
+
+## 3. Containment & Mitigation Procedures
+
+### Step 1: Execute Feature Flag Kill-Switches
+
+For incidents isolated to specific frontend features (e.g. stub features, oracle feeds, or insurance pools), disable affected functionality immediately via environment variables without full app shutdown:
+
+- **Disable Insurance Pool**: Set `NEXT_PUBLIC_INSURANCE_POOL_ENABLED=false`
+- **Disable Oracle Verification**: Set `NEXT_PUBLIC_ORACLE_ENABLED=false`
+- **Disable Invoice NFT Display**: Set `NEXT_PUBLIC_NFT_ENABLED=false`
+
+To apply in Vercel:
+
+```bash
+# Update environment variable via Vercel CLI
+vercel env add NEXT_PUBLIC_INSURANCE_POOL_ENABLED production false
+# Trigger immediate redeployment
+vercel --prod
+```
+
+### Step 2: Emergency Vercel Rollback (SEV-1 Mitigation)
+
+If a malicious build or compromised supply chain dependency is deployed to production:
+
+1. **Identify the Last Known Safe Deployment ID**:
+   ```bash
+   vercel ls --prod
+   ```
+2. **Execute Instant Rollback**:
+   ```bash
+   vercel rollback <SAFE_DEPLOYMENT_ID>
+   ```
+3. **Alternatively, Roll Back via Vercel Dashboard**:
+   - Go to **Vercel Project Dashboard** -> **Deployments**.
+   - Locate the last known good deployment (verified git commit hash).
+   - Click **...** -> **Promote to Production**.
+
+### Step 3: DNS Maintenance Page & Emergency Lockout
+
+If the origin domain or CDN is compromised:
+
+1. Route traffic to static emergency maintenance page hosted on an isolated, safe CDN.
+2. Invalidate all active Supabase session tokens and client cache states if session hijacking is suspected.
+
+---
+
+## 4. Intersection with Smart Contract Incident Response
+
+A compromised frontend interface may attempt to trick users into signing malicious Soroban transactions targeting un-compromised smart contracts.
+
+When a frontend incident intersects with smart contract execution:
+
+1. **Transaction Simulation Audit**: Inspect raw transaction XDRs generated by the compromised frontend version to identify target contract functions and attacker wallet addresses.
+2. **Contract Pause Protocol**: If malicious transactions are actively executing on-chain due to user manipulation:
+   - Contact the Smart Contract Emergency Multisig team.
+   - Cross-reference the smart contract repo's emergency pause procedure (`contracts/invoice-escrow/src/lib.rs` emergency pause functions).
+   - Trigger protocol-level contract pause to halt invoice funding and settlements while the frontend is secured.
+3. **Verification Before Unpausing**: Ensure clean frontend build hash confirmation prior to unpausing smart contract execution.
+
+---
+
+## 5. User Communication Templates
+
+### Template A: Initial Security Advisory (Immediate Warning)
+
+> **[SECURITY ADVISORY] Urgent Notice for ILN Web App Users**
+>
+> **Date:** [YYYY-MM-DD HH:MM UTC]  
+> **Status:** Investigating / Mitigating
+>
+> We are currently investigating a potential security incident affecting the ILN frontend interface ([app.iln.finance](https://app.iln.finance)).
+>
+> **Action Required:**
+>
+> - **DO NOT sign any transactions** prompted by the ILN web app until further notice.
+> - Always double-check transaction details (Contract ID, Function Name, Amount) in your Freighter / wallet window before approving.
+> - Smart contract funds remain secure on-chain.
+>
+> Further updates will be posted here and on our official status page within 30 minutes.
+
+---
+
+### Template B: Mitigation & Clean Release Update
+
+> **[SECURITY ADVISORY UPDATE] Incident Mitigated & Clean Release Deployed**
+>
+> **Date:** [YYYY-MM-DD HH:MM UTC]  
+> **Status:** Resolved / Monitoring
+>
+> The security incident affecting the ILN web interface has been fully contained and resolved.
+>
+> **Summary of Action Taken:**
+>
+> - The affected production release was rolled back to verified safe deployment ID `[DEPLOYMENT_ID]`.
+> - A full audit of all client dependencies and build artifacts was conducted (Commit `[GIT_COMMIT_HASH]`).
+> - Transaction signing flows have been verified clean.
+>
+> Users may safely resume normal wallet interactions.
+
+---
+
+### Template C: Post-Mortem & Incident Summary
+
+> **ILN Frontend Incident Post-Mortem — [Incident Title]**
+>
+> - **Date of Incident:** [YYYY-MM-DD]
+> - **Severity:** [SEV-1 / SEV-2]
+> - **Root Cause:** [Description of dependency compromise, CDN issue, etc.]
+> - **Timeline:**
+>   - `[HH:MM UTC]`: Incident detected via automated monitoring / user report.
+>   - `[HH:MM UTC]`: Incident Commander assigned; Vercel rollback executed.
+>   - `[HH:MM UTC]`: User advisory published.
+>   - `[HH:MM UTC]`: Clean patch commit released and verified.
+> - **Preventative Measures Added:** [Hardened dependency locking, additional subresource integrity checks, etc.]
+
+---
+
+## 6. Post-Incident Review & Supply Chain Hardening
+
+Following any security incident:
+
+1. Conduct a post-mortem review within 72 hours.
+2. Perform a complete dependency audit: `pnpm audit` and `git diff pnpm-lock.yaml`.
+3. Verify all external script hashes and lockfile integrity.
diff --git a/src/components/CommandPalette.tsx b/src/components/CommandPalette.tsx
index c43216d..7d846cd 100644
--- a/src/components/CommandPalette.tsx
+++ b/src/components/CommandPalette.tsx
@@ -22,11 +22,13 @@ export default function CommandPalette() {
   useEffect(() => {
     if (isOpen) {
       inputRef.current?.focus();
+      // eslint-disable-next-line react-hooks/set-state-in-effect
       setSelectedIndex(0);
     }
   }, [isOpen]);
 
   useEffect(() => {
+    // eslint-disable-next-line react-hooks/set-state-in-effect
     setSelectedIndex(0);
   }, [query]);
 
diff --git a/src/components/InsurancePoolPanel.tsx b/src/components/InsurancePoolPanel.tsx
index f7156d9..b43e046 100644
--- a/src/components/InsurancePoolPanel.tsx
+++ b/src/components/InsurancePoolPanel.tsx
@@ -1,4 +1,5 @@
 import React, { useState } from 'react';
+import { NEXT_PUBLIC_INSURANCE_POOL_ENABLED } from '@/constants';
 import { useInsurance } from '@/hooks/useInsurance';
 import { useTransaction } from '@/hooks/useTransaction';
 import { useWallet } from '@/context/WalletContext';
@@ -13,6 +14,10 @@ export default function InsurancePoolPanel() {
   const { defaultToken } = useApprovedTokens();
   const [premiumAmount, setPremiumAmount] = useState('100');
 
+  const isEnabled =
+    NEXT_PUBLIC_INSURANCE_POOL_ENABLED || process.env.NEXT_PUBLIC_INSURANCE_POOL_ENABLED === 'true';
+  if (!isEnabled) return null;
+
   const handleEnroll = async () => {
     if (!address) return;
 
diff --git a/src/components/InvoiceNftCard.tsx b/src/components/InvoiceNftCard.tsx
index 2f9030a..044e725 100644
--- a/src/components/InvoiceNftCard.tsx
+++ b/src/components/InvoiceNftCard.tsx
@@ -1,7 +1,7 @@
 'use client';
 
 import Link from 'next/link';
-import { NETWORK_NAME, NFT_CONTRACT_ID } from '@/constants';
+import { NETWORK_NAME, NFT_CONTRACT_ID, NEXT_PUBLIC_NFT_ENABLED } from '@/constants';
 import { formatAddress } from '@/utils/format';
 import { useInvoiceNft } from '@/hooks/useInvoiceNft';
 import type { InvoiceNftState, InvoiceNftTransfer } from '@/lib/invoice-nft';
@@ -238,7 +238,10 @@ export default function InvoiceNftCard({
   walletAddress: string | null;
   invoiceFunder?: string;
 }) {
-  const { state, loading, reload } = useInvoiceNft(invoiceId, true);
+  const isEnabled = NEXT_PUBLIC_NFT_ENABLED || process.env.NEXT_PUBLIC_NFT_ENABLED === 'true';
+  const { state, loading, reload } = useInvoiceNft(invoiceId, isEnabled);
+
+  if (!isEnabled) return null;
 
   if (loading && !state) {
     return (
diff --git a/src/components/OracleBadge.tsx b/src/components/OracleBadge.tsx
index 323ef30..80c79f5 100644
--- a/src/components/OracleBadge.tsx
+++ b/src/components/OracleBadge.tsx
@@ -1,13 +1,12 @@
-'use client';
-
-const ORACLE_ENABLED = process.env.NEXT_PUBLIC_ORACLE_ENABLED === 'true';
+import { NEXT_PUBLIC_ORACLE_ENABLED } from '@/constants';
 
 interface OracleBadgeProps {
   verified: boolean;
 }
 
 export default function OracleBadge({ verified }: OracleBadgeProps) {
-  if (!ORACLE_ENABLED) return null;
+  const isEnabled = NEXT_PUBLIC_ORACLE_ENABLED || process.env.NEXT_PUBLIC_ORACLE_ENABLED === 'true';
+  if (!isEnabled) return null;
 
   if (verified) {
     return (
diff --git a/src/components/__tests__/WalletButton.test.tsx b/src/components/__tests__/WalletButton.test.tsx
index 90078be..c1f921e 100644
--- a/src/components/__tests__/WalletButton.test.tsx
+++ b/src/components/__tests__/WalletButton.test.tsx
@@ -38,6 +38,9 @@ const walletState = {
   isInstalled: true,
   isReconnecting: false,
   preferredWalletProvider: null as string | null,
+  connect: vi.fn(),
+  disconnect: vi.fn(),
+  switchNetwork: vi.fn(),
   signTx: vi.fn(),
 };
 
diff --git a/src/components/governance/__tests__/DelegationPanel.test.tsx b/src/components/governance/__tests__/DelegationPanel.test.tsx
index a8fd596..2cc1fc2 100644
--- a/src/components/governance/__tests__/DelegationPanel.test.tsx
+++ b/src/components/governance/__tests__/DelegationPanel.test.tsx
@@ -39,7 +39,7 @@ beforeEach(() => {
 describe('DelegationPanel', () => {
   it('renders the delegation panel', () => {
     render(<DelegationPanel />);
-    expect(screen.getByText(/delegat/i)).toBeInTheDocument();
+    expect(screen.getAllByText(/delegat/i)[0]).toBeInTheDocument();
   });
 
   it('validates stellar addresses', async () => {
diff --git a/src/constants.ts b/src/constants.ts
index 020c150..fd3f525 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -15,6 +15,7 @@ export const TESTNET_USDC_TOKEN_ID =
   'CCW67TSZV3SSS2HXMBQ5JFGCKJNXKZM7UQUWUZPUTHXSTZLEO7SJMI75';
 export const NEXT_PUBLIC_INSURANCE_POOL_ENABLED =
   process.env.NEXT_PUBLIC_INSURANCE_POOL_ENABLED === 'true';
+export const NEXT_PUBLIC_ORACLE_ENABLED = process.env.NEXT_PUBLIC_ORACLE_ENABLED === 'true';
 export const TESTNET_EURC_TOKEN_ID =
   process.env.NEXT_PUBLIC_TESTNET_EURC_TOKEN_ID ||
   'GDHU6WRG4IEQXM5NZ4BMPKOXHW76MZM4Y2IEMFDVXBSDP6SJY4ITNPP';
diff --git a/src/hooks/useCommandPalette.ts b/src/hooks/useCommandPalette.ts
index 8a0f003..bc17eac 100644
--- a/src/hooks/useCommandPalette.ts
+++ b/src/hooks/useCommandPalette.ts
@@ -118,6 +118,7 @@ export function useCommandPalette(onOpenShortcuts?: () => void) {
     const stored = localStorage.getItem(RECENT_COMMANDS_KEY);
     if (stored) {
       try {
+        // eslint-disable-next-line react-hooks/set-state-in-effect
         setRecentCommandIds(JSON.parse(stored));
       } catch {}
     }
@@ -180,6 +181,15 @@ export function useCommandPalette(onOpenShortcuts?: () => void) {
     return () => window.removeEventListener('keydown', handler);
   }, []);
 
+  const toggle = useCallback(() => {
+    setIsOpen((prev) => !prev);
+  }, []);
+
+  const clearHistory = useCallback(() => {
+    setRecentCommandIds([]);
+    localStorage.removeItem(RECENT_COMMANDS_KEY);
+  }, []);
+
   return {
     isOpen,
     query,
@@ -188,5 +198,7 @@ export function useCommandPalette(onOpenShortcuts?: () => void) {
     executeCommand,
     open,
     close,
+    toggle,
+    clearHistory,
   };
 }
diff --git a/src/utils/soroban.ts b/src/utils/soroban.ts
index bd7d3d8..35f7a4b 100644
--- a/src/utils/soroban.ts
+++ b/src/utils/soroban.ts
@@ -210,15 +210,112 @@ export async function getAllInvoices(): Promise<Invoice[]> {
   return invoices;
 }
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function parseInvoiceFromNative(native: any): Invoice {
+  return {
+    id: BigInt(native.id ?? 0),
+    freelancer: String(native.freelancer ?? native.submitter ?? ''),
+    payer: String(native.payer ?? ''),
+    amount: BigInt(native.amount ?? 0),
+    due_date: BigInt(native.due_date ?? 0),
+    discount_rate: Number(native.discount_rate ?? 0),
+    status: parseStatus(native.status),
+    funder: native.funder ? String(native.funder) : undefined,
+    funded_at: native.funded_at ? BigInt(native.funded_at) : undefined,
+    token: native.token ? String(native.token) : undefined,
+  };
+}
+
+export async function listInvoicesBySubmitter(submitterAddress: string): Promise<Invoice[]> {
+  try {
+    const params: xdr.ScVal[] = [Address.fromString(submitterAddress).toScVal()];
+    let callResult = await server.simulateTransaction(
+      buildReadTransaction(CONTRACT_ID, 'list_invoices_by_submitter', params)
+    );
+    if (!rpc.Api.isSimulationSuccess(callResult) || !callResult.result?.retval) {
+      callResult = await server.simulateTransaction(
+        buildReadTransaction(CONTRACT_ID, 'list_invoices_by_freelancer', params)
+      );
+    }
+    if (rpc.Api.isSimulationSuccess(callResult) && callResult.result?.retval) {
+      const native = scValToNative(callResult.result.retval);
+      if (Array.isArray(native)) {
+        return native.map(parseInvoiceFromNative);
+      }
+    }
+    return [];
+  } catch {
+    return [];
+  }
+}
+
+export async function listInvoicesByPayer(payerAddress: string): Promise<Invoice[]> {
+  try {
+    const params: xdr.ScVal[] = [Address.fromString(payerAddress).toScVal()];
+    const callResult = await server.simulateTransaction(
+      buildReadTransaction(CONTRACT_ID, 'list_invoices_by_payer', params)
+    );
+    if (rpc.Api.isSimulationSuccess(callResult) && callResult.result?.retval) {
+      const native = scValToNative(callResult.result.retval);
+      if (Array.isArray(native)) {
+        return native.map(parseInvoiceFromNative);
+      }
+    }
+    return [];
+  } catch {
+    return [];
+  }
+}
+
+export async function listInvoicesByLp(lpAddress: string): Promise<Invoice[]> {
+  try {
+    const params: xdr.ScVal[] = [Address.fromString(lpAddress).toScVal()];
+    const callResult = await server.simulateTransaction(
+      buildReadTransaction(CONTRACT_ID, 'list_invoices_by_lp', params)
+    );
+    if (rpc.Api.isSimulationSuccess(callResult) && callResult.result?.retval) {
+      const native = scValToNative(callResult.result.retval);
+      if (Array.isArray(native)) {
+        return native.map(parseInvoiceFromNative);
+      }
+    }
+    return [];
+  } catch {
+    return [];
+  }
+}
+
 export async function getWalletRoles(address: string): Promise<WalletRole[]> {
   const normalized = address.toLowerCase();
-  const invoices = await getAllInvoices();
   const roles = new Set<WalletRole>();
 
-  for (const invoice of invoices) {
-    if (invoice.freelancer?.toLowerCase() === normalized) roles.add('freelancer');
-    if (invoice.payer?.toLowerCase() === normalized) roles.add('payer');
-    if (invoice.funder?.toLowerCase() === normalized) roles.add('lp');
+  try {
+    const [submitterInvoices, payerInvoices, lpInvoices] = await Promise.all([
+      listInvoicesBySubmitter(address),
+      listInvoicesByPayer(address),
+      listInvoicesByLp(address),
+    ]);
+
+    if (submitterInvoices.length > 0) roles.add('freelancer');
+    if (payerInvoices.length > 0) roles.add('payer');
+    if (lpInvoices.length > 0) roles.add('lp');
+
+    if (roles.size > 0) {
+      return Array.from(roles);
+    }
+  } catch {
+    // ignore error and proceed to fallback
+  }
+
+  try {
+    const invoices = await getAllInvoices();
+    for (const invoice of invoices) {
+      if (invoice.freelancer?.toLowerCase() === normalized) roles.add('freelancer');
+      if (invoice.payer?.toLowerCase() === normalized) roles.add('payer');
+      if (invoice.funder?.toLowerCase() === normalized) roles.add('lp');
+    }
+  } catch {
+    // ignore fallback failure
   }
 
   return Array.from(roles);
@@ -699,7 +796,7 @@ export async function disputeInvoice(payer: string, invoice_id: bigint, reason_h
  * instruction; export a placeholder so consumers can safely call it
  * and bundlers don't fail on missing named exports.
  */
-export async function updateLPWhitelist(args: { invoiceId: bigint; whitelist: string[] }) {
+export async function updateLPWhitelist(_args: { invoiceId: bigint; whitelist: string[] }) {
   // In production this should build and return a transaction for signing.
   // For now, throw to indicate unsupported on-chain instruction.
   throw new Error('updateLPWhitelist is not supported by the deployed contract');
@@ -801,7 +898,7 @@ export async function submitInvoice(
     } else {
       invoiceId = BigInt(raw as any);
     }
-  } catch (_) {
+  } catch {
     // If we can't parse it, proceed without the ID — it'll be shown after poll
   }