From 07bca4466baa963ca48966c0557c3c6675d01ee9 Mon Sep 17 00:00:00 2001
From: Good-Coded <goodnessjohn744@gmail.com>
Date: Mon, 1 Jun 2026 07:07:04 +0000
Subject: [PATCH] fix: resolve issues #685 #686 #687 #688

- #685 Toast.tsx: add type-based auto-dismiss defaults (error=5s,
  success=3s) and pause-on-hover with remaining-time tracking
- #686 DisputeResolution.tsx: capture tx_hash from resolve response
  and display it with a Stellar Expert explorer link
- #687 sdk/src/test-utils.ts: extract makeProposalScVal into shared
  test utilities file and export it; update governance.test.ts import
- #688 settlements.ts: validate sender/agent are valid Stellar
  addresses (G... 56 chars) before processing net settlements
---
 api/src/routes/settlements.ts                 | 13 +++++++
 frontend/src/components/DisputeResolution.tsx | 20 ++++++++++
 frontend/src/components/Toast.tsx             | 39 ++++++++++++++++---
 sdk/src/governance.test.ts                    | 19 +--------
 sdk/src/test-utils.ts                         | 16 ++++++++
 5 files changed, 83 insertions(+), 24 deletions(-)
 create mode 100644 sdk/src/test-utils.ts

diff --git a/api/src/routes/settlements.ts b/api/src/routes/settlements.ts
index cd2dd78e..aaa206f9 100644
--- a/api/src/routes/settlements.ts
+++ b/api/src/routes/settlements.ts
@@ -138,6 +138,7 @@ router.post('/simulate', (req: Request, res: Response) => {
   }
 
   // Basic input validation
+  const STELLAR_ADDRESS_RE = /^G[A-Z2-7]{55}$/;
   for (const r of remittances) {
     if (
       typeof r !== 'object' ||
@@ -157,6 +158,18 @@ router.post('/simulate', (req: Request, res: Response) => {
       };
       return res.status(400).json(err);
     }
+    const item = r as SimulateRemittanceInput;
+    if (!STELLAR_ADDRESS_RE.test(item.sender) || !STELLAR_ADDRESS_RE.test(item.agent)) {
+      const err: ErrorResponse = {
+        success: false,
+        error: {
+          message: 'sender and agent must be valid Stellar addresses (G... 56 characters)',
+          code: 'INVALID_INPUT',
+        },
+        timestamp: new Date().toISOString(),
+      };
+      return res.status(400).json(err);
+    }
   }
 
   const inputs = remittances as SimulateRemittanceInput[];
diff --git a/frontend/src/components/DisputeResolution.tsx b/frontend/src/components/DisputeResolution.tsx
index 9cff8172..45b82d99 100644
--- a/frontend/src/components/DisputeResolution.tsx
+++ b/frontend/src/components/DisputeResolution.tsx
@@ -72,6 +72,7 @@ export default function DisputeResolution() {
   const [auditLog, setAuditLog] = useState<AuditLogItem[]>([]);
   const [resolving, setResolving] = useState<string | number | null>(null);
   const [confirmOpen, setConfirmOpen] = useState<ConfirmState | null>(null);
+  const [resolvedTxHash, setResolvedTxHash] = useState<string | null>(null);
 
   useEffect(() => {
     void fetchDisputes();
@@ -122,6 +123,7 @@ export default function DisputeResolution() {
     setConfirmOpen(null);
     setResolving(id);
     setError(null);
+    setResolvedTxHash(null);
     try {
       const res = await fetch(`${API_URL}/api/disputes/${id}/resolve`, {
         method: 'POST',
@@ -129,6 +131,9 @@ export default function DisputeResolution() {
         body: JSON.stringify({ in_favour_of_sender: inFavourOfSender }),
       });
       if (!res.ok) throw new Error(`HTTP ${res.status}`);
+      const data = await res.json() as Record<string, unknown>;
+      const txHash = typeof data.tx_hash === 'string' ? data.tx_hash : null;
+      setResolvedTxHash(txHash);
       await fetchDisputes();
       await fetchAuditLog();
     } catch (e: unknown) {
@@ -144,6 +149,21 @@ export default function DisputeResolution() {
 
       {error && <div className="error" role="alert">{error}</div>}
 
+      {resolvedTxHash && (
+        <div role="status" style={{ background: '#f0fff4', border: '1px solid #9ae6b4', borderRadius: '8px', padding: '12px 16px', marginBottom: '16px', fontSize: '0.85rem' }}>
+          ✅ Dispute resolved on-chain.{' '}
+          <strong>Tx:</strong>{' '}
+          <a
+            href={`https://stellar.expert/explorer/public/tx/${resolvedTxHash}`}
+            target="_blank"
+            rel="noopener noreferrer"
+            style={{ wordBreak: 'break-all' }}
+          >
+            {resolvedTxHash}
+          </a>
+        </div>
+      )}
+
       {confirmOpen && (
         <div
           role="dialog"
diff --git a/frontend/src/components/Toast.tsx b/frontend/src/components/Toast.tsx
index 65f04a2b..89765f5c 100644
--- a/frontend/src/components/Toast.tsx
+++ b/frontend/src/components/Toast.tsx
@@ -1,4 +1,5 @@
 import { useState, useCallback, useEffect, useRef } from 'react';
+
 import './Toast.css';
 
 export type ToastType = 'success' | 'error' | 'info' | 'warning';
@@ -22,19 +23,45 @@ interface ToastItemProps {
   onDismiss: (id: string) => void;
 }
 
+const DEFAULT_DURATION: Record<ToastType, number> = {
+  error: 5000,
+  success: 3000,
+  info: 4000,
+  warning: 4000,
+};
+
 function ToastItem({ toast, onDismiss }: ToastItemProps) {
-  const duration = toast.duration ?? 4000;
+  const duration = toast.duration ?? DEFAULT_DURATION[toast.type];
   const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const remainingRef = useRef(duration);
+  const startRef = useRef<number>(0);
 
-  useEffect(() => {
-    if (duration > 0) {
-      timerRef.current = setTimeout(() => onDismiss(toast.id), duration);
+  const startTimer = useCallback(() => {
+    if (duration <= 0) return;
+    startRef.current = Date.now();
+    timerRef.current = setTimeout(() => onDismiss(toast.id), remainingRef.current);
+  }, [duration, toast.id, onDismiss]);
+
+  const pauseTimer = useCallback(() => {
+    if (timerRef.current) {
+      clearTimeout(timerRef.current);
+      remainingRef.current -= Date.now() - startRef.current;
     }
+  }, []);
+
+  useEffect(() => {
+    startTimer();
     return () => { if (timerRef.current) clearTimeout(timerRef.current); };
-  }, [toast.id, duration, onDismiss]);
+  }, [startTimer]);
 
   return (
-    <div className={`toast ${toast.type}`} role="alert" aria-live="polite">
+    <div
+      className={`toast ${toast.type}`}
+      role="alert"
+      aria-live="polite"
+      onMouseEnter={pauseTimer}
+      onMouseLeave={startTimer}
+    >
       <span className="toast-icon" aria-hidden="true">{ICONS[toast.type]}</span>
       <span className="toast-message">{toast.message}</span>
       <button
diff --git a/sdk/src/governance.test.ts b/sdk/src/governance.test.ts
index 68da7ba0..90310e45 100644
--- a/sdk/src/governance.test.ts
+++ b/sdk/src/governance.test.ts
@@ -1,24 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 import { parseProposal } from "../src/convert.js";
 import type { Proposal } from "../src/types.js";
-import { xdr, nativeToScVal } from "@stellar/stellar-sdk";
-
-// ─── Helpers ─────────────────────────────────────────────────────────────────
-
-function makeProposalScVal(overrides: Record<string, unknown> = {}): xdr.ScVal {
-  const base = {
-    id: 1,
-    proposer: "GABC",
-    action: { UpdateFee: 300 },
-    state: { Pending: {} },
-    created_at: 1000,
-    expiry: 2000,
-    approval_count: 1,
-    approval_timestamp: null,
-    ...overrides,
-  };
-  return nativeToScVal(base);
-}
+import { makeProposalScVal } from "../src/test-utils.js";
 
 // ─── parseProposal ────────────────────────────────────────────────────────────
 
diff --git a/sdk/src/test-utils.ts b/sdk/src/test-utils.ts
new file mode 100644
index 00000000..9b836d8c
--- /dev/null
+++ b/sdk/src/test-utils.ts
@@ -0,0 +1,16 @@
+import { xdr, nativeToScVal } from "@stellar/stellar-sdk";
+
+export function makeProposalScVal(overrides: Record<string, unknown> = {}): xdr.ScVal {
+  const base = {
+    id: 1,
+    proposer: "GABC",
+    action: { UpdateFee: 300 },
+    state: { Pending: {} },
+    created_at: 1000,
+    expiry: 2000,
+    approval_count: 1,
+    approval_timestamp: null,
+    ...overrides,
+  };
+  return nativeToScVal(base);
+}