From 7d9a89c43f6844c939582036a7e6f0a860b45c3f Mon Sep 17 00:00:00 2001
From: Feyisara2108 <ayokomi2108@gmail.com>
Date: Mon, 30 Mar 2026 04:27:09 +0100
Subject: [PATCH 1/2] feat(frontend): add CSV export for wallet and loan
 records

---
 .../src/app/[locale]/loans/[loanId]/page.tsx  | 93 ++++++++++++++-----
 frontend/src/app/utils/csv.ts                 | 49 ++++++++++
 frontend/src/app/wallet/page.tsx              | 84 ++++++++++++++---
 3 files changed, 190 insertions(+), 36 deletions(-)
 create mode 100644 frontend/src/app/utils/csv.ts

diff --git a/frontend/src/app/[locale]/loans/[loanId]/page.tsx b/frontend/src/app/[locale]/loans/[loanId]/page.tsx
index a62b078b..d8a6a021 100644
--- a/frontend/src/app/[locale]/loans/[loanId]/page.tsx
+++ b/frontend/src/app/[locale]/loans/[loanId]/page.tsx
@@ -2,12 +2,14 @@
 
 import Link from "next/link";
 import { useParams } from "next/navigation";
-import { ChevronRight, Clock, Wallet } from "lucide-react";
+import { ChevronRight, Clock, Download, Wallet } from "lucide-react";
 import { LoanDetailSkeleton } from "../../../components/skeletons/LoanDetailSkeleton";
-import { useLoan } from "../../../hooks/useApi";
+import { useLoan, type LoanDetails } from "../../../hooks/useApi";
 import { RepaymentProgress } from "../../../components/ui/RepaymentProgress";
 import { LoanTimeline } from "../../../components/ui/LoanTimeline";
 import { TxHashLink } from "../../../components/ui/TxHashLink";
+import { Button } from "../../../components/ui/Button";
+import { downloadCsv } from "../../../utils/csv";
 
 function formatCurrency(value: number) {
   return new Intl.NumberFormat("en-US", { style: "currency", currency: "USD" }).format(value);
@@ -28,6 +30,44 @@ function getDaysRemaining(deadline: string | undefined): number | null {
   return Math.ceil(diff / (1000 * 60 * 60 * 24));
 }
 
+function formatLoanEventType(type: string): string {
+  return type
+    .replace(/([a-z])([A-Z])/g, "$1 $2")
+    .replace(/_/g, " ")
+    .trim();
+}
+
+function getLoanAsset(loan: LoanDetails): string {
+  const loanWithAsset = loan as LoanDetails & { currency?: string; asset?: string };
+  return loanWithAsset.currency ?? loanWithAsset.asset ?? "USD";
+}
+
+function buildLoanCsvRows(loan: LoanDetails) {
+  const asset = getLoanAsset(loan);
+
+  if (loan.events.length > 0) {
+    return loan.events.map((event) => ({
+      date: event.timestamp,
+      type: formatLoanEventType(event.type),
+      amount: event.amount,
+      asset,
+      status: loan.status,
+      transaction_hash: event.txHash ?? "",
+    }));
+  }
+
+  return [
+    {
+      date: loan.requestedAt ?? loan.approvedAt ?? new Date().toISOString(),
+      type: "Loan Record",
+      amount: loan.totalOwed,
+      asset,
+      status: loan.status,
+      transaction_hash: "",
+    },
+  ];
+}
+
 export default function LoanDetailsPage() {
   const params = useParams<{ loanId: string }>();
   const loanId = params.loanId;
@@ -63,39 +103,55 @@ export default function LoanDetailsPage() {
   }
 
   const latestTxHash = loan.events.find((event) => Boolean(event.txHash))?.txHash;
-  // Some API responses include nextPaymentDeadline in the extended loan object
-  const nextDeadline = (loan as unknown as { nextPaymentDeadline?: string }).nextPaymentDeadline;
+  const nextDeadline = (loan as LoanDetails & { nextPaymentDeadline?: string }).nextPaymentDeadline;
   const daysRemaining = getDaysRemaining(nextDeadline);
 
+  const handleExport = () => {
+    downloadCsv(
+      `loan-record-${loanId}-${new Date().toISOString().slice(0, 10)}.csv`,
+      buildLoanCsvRows(loan),
+    );
+  };
+
   return (
     <section className="space-y-6">
-      {/* Breadcrumb */}
       <nav
         aria-label="Breadcrumb"
         className="flex items-center gap-1.5 text-sm text-zinc-500 dark:text-zinc-400"
       >
-        <Link href="/" className="hover:text-zinc-900 dark:hover:text-zinc-100 transition">
+        <Link href="/" className="transition hover:text-zinc-900 dark:hover:text-zinc-100">
           Home
         </Link>
         <ChevronRight className="h-3.5 w-3.5" />
-        <Link href="/loans" className="hover:text-zinc-900 dark:hover:text-zinc-100 transition">
+        <Link href="/loans" className="transition hover:text-zinc-900 dark:hover:text-zinc-100">
           Loans
         </Link>
         <ChevronRight className="h-3.5 w-3.5" />
         <span className="font-medium text-zinc-900 dark:text-zinc-50">Loan #{loanId}</span>
       </nav>
 
-      {/* Header */}
       <header className="rounded-3xl border border-zinc-200 bg-white p-6 shadow-sm shadow-zinc-200/50 dark:border-zinc-800 dark:bg-zinc-950 dark:shadow-none">
-        <p className="text-sm font-semibold uppercase tracking-[0.2em] text-indigo-600">
-          Borrower Portal
-        </p>
-        <h1 className="mt-3 text-3xl font-bold text-zinc-900 dark:text-zinc-50">Loan #{loanId}</h1>
-        <p className="mt-2 max-w-2xl text-sm text-zinc-500 dark:text-zinc-400">
-          Track repayment timing, lender terms, and the current outstanding balance for this loan.
-        </p>
+        <div className="flex flex-col gap-4 lg:flex-row lg:items-start lg:justify-between">
+          <div>
+            <p className="text-sm font-semibold uppercase tracking-[0.2em] text-indigo-600">
+              Borrower Portal
+            </p>
+            <h1 className="mt-3 text-3xl font-bold text-zinc-900 dark:text-zinc-50">
+              Loan #{loanId}
+            </h1>
+            <p className="mt-2 max-w-2xl text-sm text-zinc-500 dark:text-zinc-400">
+              Track repayment timing, lender terms, and the current outstanding balance for this loan.
+            </p>
+          </div>
+          <Button
+            variant="outline"
+            leftIcon={<Download className="h-4 w-4" />}
+            onClick={handleExport}
+          >
+            Export CSV
+          </Button>
+        </div>
 
-        {/* Loan metadata row */}
         <div className="mt-4 flex flex-wrap gap-x-6 gap-y-2 text-sm text-zinc-500 dark:text-zinc-400">
           {loan.interestRate > 0 && (
             <span>
@@ -125,7 +181,6 @@ export default function LoanDetailsPage() {
       </header>
 
       <div className="grid gap-4 lg:grid-cols-[1.3fr_0.7fr]">
-        {/* Main content */}
         <article className="rounded-3xl border border-zinc-200 bg-white p-6 shadow-sm shadow-zinc-200/50 dark:border-zinc-800 dark:bg-zinc-950 dark:shadow-none">
           <h2 className="text-lg font-semibold text-zinc-900 dark:text-zinc-50">Repayment plan</h2>
 
@@ -163,9 +218,7 @@ export default function LoanDetailsPage() {
           </div>
         </article>
 
-        {/* Sidebar */}
         <aside className="space-y-4">
-          {/* Due date countdown */}
           {loan.status === "active" && daysRemaining !== null && (
             <div className="rounded-3xl border border-zinc-200 bg-white p-5 shadow-sm shadow-zinc-200/50 dark:border-zinc-800 dark:bg-zinc-950 dark:shadow-none">
               <div className="flex items-center gap-2 text-zinc-700 dark:text-zinc-300">
@@ -199,7 +252,6 @@ export default function LoanDetailsPage() {
             </div>
           )}
 
-          {/* Action panel */}
           <div className="rounded-3xl border border-zinc-200 bg-white p-6 shadow-sm shadow-zinc-200/50 dark:border-zinc-800 dark:bg-zinc-950 dark:shadow-none">
             <div className="rounded-2xl bg-indigo-50 p-5 dark:bg-indigo-500/10">
               <div className="flex items-center gap-3 text-indigo-700 dark:text-indigo-300">
@@ -230,7 +282,6 @@ export default function LoanDetailsPage() {
             </div>
           </div>
 
-          {/* Collateral status */}
           <div className="rounded-3xl border border-zinc-200 bg-white p-5 shadow-sm shadow-zinc-200/50 dark:border-zinc-800 dark:bg-zinc-950 dark:shadow-none">
             <h2 className="text-sm font-semibold text-zinc-900 dark:text-zinc-50">
               Collateral status
diff --git a/frontend/src/app/utils/csv.ts b/frontend/src/app/utils/csv.ts
new file mode 100644
index 00000000..c72ebb08
--- /dev/null
+++ b/frontend/src/app/utils/csv.ts
@@ -0,0 +1,49 @@
+export type CsvValue = string | number | boolean | null | undefined;
+
+export type CsvRow = Record<string, CsvValue>;
+
+function escapeCsvValue(value: CsvValue): string {
+  if (value === null || value === undefined) {
+    return "";
+  }
+
+  const stringValue = String(value);
+  if (/[",\n]/.test(stringValue)) {
+    return `"${stringValue.replace(/"/g, '""')}"`;
+  }
+
+  return stringValue;
+}
+
+export function serializeCsv(rows: CsvRow[]): string {
+  if (rows.length === 0) {
+    return "";
+  }
+
+  const headers = Object.keys(rows[0]);
+  const lines = [headers.join(",")];
+
+  for (const row of rows) {
+    lines.push(headers.map((header) => escapeCsvValue(row[header])).join(","));
+  }
+
+  return lines.join("\n");
+}
+
+export function downloadCsv(filename: string, rows: CsvRow[]): void {
+  if (typeof window === "undefined" || rows.length === 0) {
+    return;
+  }
+
+  const csv = serializeCsv(rows);
+  const blob = new Blob([`\uFEFF${csv}`], { type: "text/csv;charset=utf-8;" });
+  const url = URL.createObjectURL(blob);
+  const link = document.createElement("a");
+
+  link.href = url;
+  link.download = filename;
+  document.body.appendChild(link);
+  link.click();
+  document.body.removeChild(link);
+  URL.revokeObjectURL(url);
+}
diff --git a/frontend/src/app/wallet/page.tsx b/frontend/src/app/wallet/page.tsx
index b269ee0c..5ad7fd80 100644
--- a/frontend/src/app/wallet/page.tsx
+++ b/frontend/src/app/wallet/page.tsx
@@ -12,6 +12,7 @@ import {
   QrCode,
   ExternalLink,
   Globe,
+  Download,
 } from "lucide-react";
 import { Card, CardHeader, CardTitle, CardContent } from "../components/ui/Card";
 import { Button } from "../components/ui/Button";
@@ -25,6 +26,7 @@ import {
   selectIsWalletConnected,
 } from "../stores/useWalletStore";
 import Link from "next/link";
+import { downloadCsv } from "../utils/csv";
 
 // ─── Helpers ──────────────────────────────────────────────────────────────────
 
@@ -50,6 +52,34 @@ function getExplorerBase(networkName: string | null | undefined): string {
     : "https://stellar.expert/explorer/testnet";
 }
 
+function paymentAsset(p: HorizonPayment): string {
+  return p.asset_type === "native" ? "XLM" : (p.asset_code ?? p.asset_type ?? "Unknown");
+}
+
+function buildPaymentCsvRows(payments: HorizonPayment[], address: string) {
+  return payments.map((payment) => {
+    const inflow = payment.to === address || (payment.type === "create_account" && payment.source_account !== address);
+
+    return {
+      date: payment.created_at,
+      type:
+        payment.type === "payment"
+          ? inflow
+            ? "Received"
+            : "Sent"
+          : payment.type === "create_account"
+            ? "Account Created"
+            : payment.type === "path_payment_strict_send" || payment.type === "path_payment_strict_receive"
+              ? "Path Payment"
+              : payment.type.replace(/_/g, " "),
+      amount: payment.amount ?? "",
+      asset: paymentAsset(payment),
+      status: "completed",
+      transaction_hash: payment.transaction_hash,
+    };
+  });
+}
+
 // ─── Horizon types ─────────────────────────────────────────────────────────────
 
 interface HorizonBalance {
@@ -298,17 +328,42 @@ function TransactionHistoryCard({
 
   function paymentAmount(p: HorizonPayment): string {
     if (!p.amount) return "—";
-    const asset = p.asset_type === "native" ? "XLM" : (p.asset_code ?? "");
-    return `${parseFloat(p.amount).toLocaleString("en-US", { maximumFractionDigits: 7 })} ${asset}`;
+    return `${parseFloat(p.amount).toLocaleString("en-US", { maximumFractionDigits: 7 })} ${paymentAsset(p)}`;
   }
 
+  const canExport = Boolean(payments?.length);
+
+  const handleExport = () => {
+    if (!payments?.length) {
+      return;
+    }
+
+    downloadCsv(
+      `transaction-history-${address.slice(0, 6)}-${new Date().toISOString().slice(0, 10)}.csv`,
+      buildPaymentCsvRows(payments, address),
+    );
+  };
+
   return (
     <Card>
       <CardHeader>
-        <CardTitle>Transaction History</CardTitle>
-        <p className="text-sm text-zinc-500 dark:text-zinc-400 mt-1">
-          Recent payments from Stellar Horizon
-        </p>
+        <div className="flex flex-col gap-3 sm:flex-row sm:items-start sm:justify-between">
+          <div>
+            <CardTitle>Transaction History</CardTitle>
+            <p className="mt-1 text-sm text-zinc-500 dark:text-zinc-400">
+              Recent payments from Stellar Horizon
+            </p>
+          </div>
+          <Button
+            variant="outline"
+            size="sm"
+            leftIcon={<Download className="h-4 w-4" />}
+            onClick={handleExport}
+            disabled={!canExport || isLoading || isError}
+          >
+            Export CSV
+          </Button>
+        </div>
       </CardHeader>
       <CardContent>
         {isLoading ? (
@@ -320,16 +375,16 @@ function TransactionHistoryCard({
             </p>
           </div>
         ) : !payments || payments.length === 0 ? (
-          <p className="text-sm text-zinc-500 dark:text-zinc-400 text-center py-8">
+          <p className="py-8 text-center text-sm text-zinc-500 dark:text-zinc-400">
             No transactions found.
           </p>
         ) : (
           <div className="divide-y divide-zinc-100 dark:divide-zinc-800">
             {payments.map((p) => (
-              <div key={p.id} className="flex items-center justify-between py-3 gap-4">
-                <div className="flex items-center gap-3 min-w-0">
+              <div key={p.id} className="flex items-center justify-between gap-4 py-3">
+                <div className="flex min-w-0 items-center gap-3">
                   <div
-                    className={`h-9 w-9 rounded-full flex items-center justify-center flex-shrink-0 ${
+                    className={`flex h-9 w-9 flex-shrink-0 items-center justify-center rounded-full ${
                       isInflow(p)
                         ? "bg-green-50 dark:bg-green-500/10"
                         : "bg-zinc-50 dark:bg-zinc-900"
@@ -342,15 +397,15 @@ function TransactionHistoryCard({
                     )}
                   </div>
                   <div className="min-w-0">
-                    <p className="text-sm font-semibold text-zinc-900 dark:text-zinc-50 truncate capitalize">
+                    <p className="truncate text-sm font-semibold capitalize text-zinc-900 dark:text-zinc-50">
                       {paymentLabel(p)}
                     </p>
-                    <p className="text-xs text-zinc-500 dark:text-zinc-400 font-mono truncate">
+                    <p className="truncate font-mono text-xs text-zinc-500 dark:text-zinc-400">
                       {counterparty(p)}
                     </p>
                   </div>
                 </div>
-                <div className="text-right flex-shrink-0 flex items-center gap-2">
+                <div className="flex flex-shrink-0 items-center gap-2 text-right">
                   <div>
                     <p
                       className={`text-sm font-bold ${
@@ -370,7 +425,7 @@ function TransactionHistoryCard({
                     href={`${explorerBase}/tx/${p.transaction_hash}`}
                     target="_blank"
                     rel="noopener noreferrer"
-                    className="p-1 text-zinc-400 hover:text-indigo-600 dark:hover:text-indigo-400 transition-colors"
+                    className="p-1 text-zinc-400 transition-colors hover:text-indigo-600 dark:hover:text-indigo-400"
                     title="View on Stellar Explorer"
                   >
                     <ExternalLink className="h-3.5 w-3.5" />
@@ -384,7 +439,6 @@ function TransactionHistoryCard({
     </Card>
   );
 }
-
 // ─── Page ──────────────────────────────────────────────────────────────────────
 
 export default function WalletPage() {

From dec3a62754207437c584f6cdabc43eec9ac68050 Mon Sep 17 00:00:00 2001
From: Feyisara2108 <ayokomi2108@gmail.com>
Date: Mon, 30 Mar 2026 05:46:19 +0100
Subject: [PATCH 2/2] test(backend): align event indexer test with bulk score
 updates

---
 backend/src/__tests__/eventIndexer.test.ts | 70 ++++++++++------------
 1 file changed, 32 insertions(+), 38 deletions(-)

diff --git a/backend/src/__tests__/eventIndexer.test.ts b/backend/src/__tests__/eventIndexer.test.ts
index 269bd317..cd280bd1 100644
--- a/backend/src/__tests__/eventIndexer.test.ts
+++ b/backend/src/__tests__/eventIndexer.test.ts
@@ -9,6 +9,7 @@ const mockGetScoreConfig = jest.fn(() => ({
   repaymentDelta: 15,
   defaultPenalty: 50,
 }));
+const mockUpdateUserScoresBulk = jest.fn<() => Promise<void>>().mockResolvedValue(undefined);
 
 jest.unstable_mockModule("../db/connection.js", () => ({
   query: mockQuery,
@@ -32,6 +33,10 @@ jest.unstable_mockModule("../services/sorobanService.js", () => ({
   sorobanService: { getScoreConfig: mockGetScoreConfig },
 }));
 
+jest.unstable_mockModule("../services/scoresService.js", () => ({
+  updateUserScoresBulk: mockUpdateUserScoresBulk,
+}));
+
 jest.unstable_mockModule("../utils/logger.js", () => ({
   default: {
     info: jest.fn(),
@@ -126,7 +131,6 @@ describe("EventIndexer", () => {
     const borrowerRepaid = makeAddress();
     const borrowerDefaulted = makeAddress();
     const insertedLoanEvents: unknown[][] = [];
-    const scoreUpdates: unknown[][] = [];
 
     mockQuery.mockImplementation(async (sql: string, params: unknown[] = []) => {
       if (sql === "BEGIN" || sql === "COMMIT") {
@@ -138,11 +142,6 @@ describe("EventIndexer", () => {
         return { rows: [{ event_id: params[0] }], rowCount: 1 };
       }
 
-      if (sql.includes("INSERT INTO scores")) {
-        scoreUpdates.push(params);
-        return { rows: [], rowCount: 1 };
-      }
-
       return { rows: [], rowCount: 0 };
     });
 
@@ -208,10 +207,13 @@ describe("EventIndexer", () => {
     expect(insertedLoanEvents[3]?.[2]).toBe(9);
     expect(insertedLoanEvents[3]?.[3]).toBe(borrowerDefaulted);
 
-    expect(scoreUpdates).toEqual([
-      [borrowerRepaid, 515, 15],
-      [borrowerDefaulted, 450, -50],
-    ]);
+    expect(mockUpdateUserScoresBulk).toHaveBeenCalledTimes(1);
+    expect(mockUpdateUserScoresBulk).toHaveBeenCalledWith(
+      new Map([
+        [borrowerRepaid, 15],
+        [borrowerDefaulted, -50],
+      ]),
+    );
     expect(mockGetScoreConfig).toHaveBeenCalledTimes(2);
     expect(mockDispatch).toHaveBeenCalledTimes(4);
     expect(mockBroadcast).toHaveBeenCalledTimes(4);
@@ -236,10 +238,6 @@ describe("EventIndexer", () => {
         };
       }
 
-      if (sql.includes("INSERT INTO scores")) {
-        return { rows: [], rowCount: 1 };
-      }
-
       return { rows: [], rowCount: 0 };
     });
 
@@ -269,6 +267,8 @@ describe("EventIndexer", () => {
     expect(mockBroadcast).toHaveBeenCalledTimes(1);
     expect(mockCreateNotification).toHaveBeenCalledTimes(1);
     expect(mockGetScoreConfig).toHaveBeenCalledTimes(1);
+    expect(mockUpdateUserScoresBulk).toHaveBeenCalledTimes(1);
+    expect(mockUpdateUserScoresBulk).toHaveBeenCalledWith(new Map([[borrower, 15]]));
   });
 
   it("initializes missing indexer state and persists the last indexed ledger during polling", async () => {
@@ -279,9 +279,8 @@ describe("EventIndexer", () => {
         return { rows: [], rowCount: 0 };
       }
 
-      if (sql.includes("INSERT INTO indexer_state")) {
-        stateWrites.push(Number(params[0] ?? 0));
-        return { rows: [], rowCount: 1 };
+      if (sql.includes("INSERT INTO indexer_state") && params.length === 0) {
+        return { rows: [{ last_indexed_ledger: 0 }], rowCount: 1 };
       }
 
       if (sql.includes("UPDATE indexer_state")) {
@@ -289,37 +288,32 @@ describe("EventIndexer", () => {
         return { rows: [], rowCount: 1 };
       }
 
-      if (sql === "BEGIN" || sql === "COMMIT") {
-        return { rows: [], rowCount: 0 };
-      }
-
-      if (sql.includes("INSERT INTO loan_events")) {
-        return { rows: [{ event_id: params[0] }], rowCount: 1 };
-      }
-
       return { rows: [], rowCount: 0 };
     });
 
     const indexer = new EventIndexer({
       rpcUrl: "https://rpc.test",
       contractId: "CINDEXERTEST",
+      pollIntervalMs: 5,
+      batchSize: 50,
     });
 
-    (indexer as { running: boolean }).running = true;
-    (indexer as {
-      rpc: {
-        getLatestLedger: () => Promise<{ sequence: number }>;
-        getEvents: () => Promise<{ events: unknown[] }>;
-      };
-    }).rpc = {
-      getLatestLedger: jest.fn().mockResolvedValue({ sequence: 15 }),
-      getEvents: jest.fn().mockResolvedValue({
-        events: [makeRawEvent({ id: "evt-poll", ledger: 15, type: "LoanRequested" })],
-      }),
+    const processChunk = jest
+      .spyOn(indexer as unknown as { processChunk: (start: number, end: number) => Promise<unknown> }, "processChunk")
+      .mockResolvedValue({
+        lastProcessedLedger: 25,
+        fetchedEvents: 0,
+        insertedEvents: 0,
+      });
+
+    (indexer as { rpc: { getLatestLedger: () => Promise<{ sequence: number }> } }).rpc = {
+      getLatestLedger: jest.fn().mockResolvedValue({ sequence: 25 }),
     };
 
-    await (indexer as { pollOnce: () => Promise<void> }).pollOnce();
+    await indexer.start();
+    indexer.stop();
 
-    expect(stateWrites).toEqual([0, 15]);
+    expect(processChunk).toHaveBeenCalledWith(1, 25);
+    expect(stateWrites).toContain(25);
   });
 });