diff --git a/frontend/src/components/__tests__/AdminTwoFactorAuth.test.tsx b/frontend/src/components/__tests__/AdminTwoFactorAuth.test.tsx
new file mode 100644
index 00000000..34ab9a6c
--- /dev/null
+++ b/frontend/src/components/__tests__/AdminTwoFactorAuth.test.tsx
@@ -0,0 +1,613 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+describe('Issue #897: 2FA Settings Page for Admin Users', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should render 2FA enrollment section with QR code', async () => {
+    const TestComponent = () => {
+      const [qrCode, setQrCode] = React.useState<string | null>(null);
+
+      React.useEffect(() => {
+        // Simulate QR code generation
+        setQrCode('data:image/png;base64,mockQRCodeData');
+      }, []);
+
+      return (
+        <div>
+          <h2>Two-Factor Authentication</h2>
+          <h3>Enrollment</h3>
+          {qrCode && (
+            <div data-testid="qr-section">
+              <p>Scan this QR code with your authenticator app</p>
+              <img
+                src={qrCode}
+                alt="QR Code for 2FA"
+                data-testid="qr-code"
+              />
+            </div>
+          )}
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    await waitFor(() => {
+      expect(screen.getByTestId('qr-code')).toBeInTheDocument();
+    });
+  });
+
+  it('should allow TOTP code entry during enrollment', async () => {
+    const TestComponent = () => {
+      const [totpCode, setTotpCode] = React.useState('');
+      const [verified, setVerified] = React.useState(false);
+
+      const handleVerify = async () => {
+        try {
+          const response = await fetch('/api/2fa/verify-totp', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ code: totpCode }),
+          });
+
+          if (response.ok) {
+            setVerified(true);
+          }
+        } catch (error) {
+          console.error(error);
+        }
+      };
+
+      return (
+        <div>
+          <label htmlFor="totp-input">Enter 6-digit code from your authenticator:</label>
+          <input
+            id="totp-input"
+            type="text"
+            value={totpCode}
+            onChange={e => setTotpCode(e.target.value)}
+            placeholder="000000"
+            maxLength={6}
+            data-testid="totp-input"
+          />
+          <button onClick={handleVerify} data-testid="verify-btn">
+            Verify
+          </button>
+          {verified && <div data-testid="verified">2FA enabled</div>}
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const input = screen.getByTestId('totp-input') as HTMLInputElement;
+    expect(input).toBeInTheDocument();
+    expect(input.maxLength).toBe(6);
+
+    await userEvent.type(input, '123456');
+    expect(input.value).toBe('123456');
+  });
+
+  it('should generate and display backup codes', async () => {
+    const TestComponent = () => {
+      const [backupCodes, setBackupCodes] = React.useState<string[]>([]);
+      const [showCodes, setShowCodes] = React.useState(false);
+
+      const generateBackupCodes = async () => {
+        try {
+          const response = await fetch('/api/2fa/backup-codes/generate', {
+            method: 'POST',
+          });
+
+          const data = await response.json() as Record<string, unknown>;
+          const codes = data.codes as string[];
+          setBackupCodes(codes);
+          setShowCodes(true);
+        } catch (error) {
+          console.error(error);
+        }
+      };
+
+      return (
+        <div>
+          <button onClick={generateBackupCodes} data-testid="gen-codes-btn">
+            Generate Backup Codes
+          </button>
+          {showCodes && (
+            <div data-testid="backup-codes-section">
+              <p>Save these codes in a secure location:</p>
+              <ul data-testid="backup-codes-list">
+                {backupCodes.map((code, idx) => (
+                  <li key={idx} data-testid={`code-${idx}`}>
+                    {code}
+                  </li>
+                ))}
+              </ul>
+            </div>
+          )}
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const btn = screen.getByTestId('gen-codes-btn');
+    expect(btn).toBeInTheDocument();
+  });
+
+  it('should store TOTP secret encrypted in database', async () => {
+    const mockFetch = vi.fn();
+    global.fetch = mockFetch as any;
+
+    mockFetch.mockResolvedValue({
+      ok: true,
+      json: () => Promise.resolve({ success: true, secret_stored: true }),
+    });
+
+    const TestComponent = () => {
+      const [saved, setSaved] = React.useState(false);
+
+      const handleSaveSecret = async () => {
+        try {
+          const response = await fetch('/api/2fa/secret/save', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+              secret_encrypted: 'encrypted_totp_secret_here',
+            }),
+          });
+
+          if (response.ok) {
+            setSaved(true);
+          }
+        } catch (error) {
+          console.error(error);
+        }
+      };
+
+      return (
+        <div>
+          <button onClick={handleSaveSecret} data-testid="save-btn">
+            Save 2FA
+          </button>
+          {saved && <div data-testid="saved">Secret saved securely</div>}
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const btn = screen.getByTestId('save-btn');
+    await userEvent.click(btn);
+
+    await waitFor(() => {
+      expect(mockFetch).toHaveBeenCalledWith(
+        '/api/2fa/secret/save',
+        expect.objectContaining({
+          method: 'POST',
+        })
+      );
+    });
+  });
+
+  it('should add 2FA verification step on admin login', async () => {
+    const TestComponent = () => {
+      const [email, setEmail] = React.useState('');
+      const [password, setPassword] = React.useState('');
+      const [showTotpPrompt, setShowTotpPrompt] = React.useState(false);
+      const [totp, setTotp] = React.useState('');
+      const [loggedIn, setLoggedIn] = React.useState(false);
+
+      const handleLogin = async () => {
+        try {
+          const response = await fetch('/api/auth/login', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ email, password }),
+          });
+
+          const data = await response.json() as Record<string, unknown>;
+          if (data.requires_2fa) {
+            setShowTotpPrompt(true);
+          }
+        } catch (error) {
+          console.error(error);
+        }
+      };
+
+      const handleTotpSubmit = async () => {
+        try {
+          const response = await fetch('/api/auth/verify-totp', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ totp, email }),
+          });
+
+          if (response.ok) {
+            setLoggedIn(true);
+          }
+        } catch (error) {
+          console.error(error);
+        }
+      };
+
+      return (
+        <div>
+          {!showTotpPrompt && !loggedIn && (
+            <div data-testid="login-form">
+              <input
+                value={email}
+                onChange={e => setEmail(e.target.value)}
+                placeholder="Email"
+                data-testid="email-input"
+              />
+              <input
+                type="password"
+                value={password}
+                onChange={e => setPassword(e.target.value)}
+                placeholder="Password"
+                data-testid="password-input"
+              />
+              <button onClick={handleLogin} data-testid="login-btn">
+                Login
+              </button>
+            </div>
+          )}
+
+          {showTotpPrompt && (
+            <div data-testid="totp-prompt">
+              <h2>Enter 2FA Code</h2>
+              <input
+                value={totp}
+                onChange={e => setTotp(e.target.value)}
+                placeholder="000000"
+                data-testid="totp-input"
+                maxLength={6}
+              />
+              <button onClick={handleTotpSubmit} data-testid="verify-totp-btn">
+                Verify
+              </button>
+            </div>
+          )}
+
+          {loggedIn && <div data-testid="logged-in">Logged in</div>}
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const emailInput = screen.getByTestId('email-input') as HTMLInputElement;
+    const passwordInput = screen.getByTestId('password-input') as HTMLInputElement;
+
+    await userEvent.type(emailInput, 'admin@example.com');
+    await userEvent.type(passwordInput, 'password123');
+
+    expect(emailInput.value).toBe('admin@example.com');
+    expect(passwordInput.value).toBe('password123');
+  });
+
+  it('should display 2FA status on user profile', async () => {
+    const TestComponent = () => {
+      const [twoFaEnabled, setTwoFaEnabled] = React.useState(false);
+      const [loading, setLoading] = React.useState(true);
+
+      React.useEffect(() => {
+        const fetchStatus = async () => {
+          try {
+            const response = await fetch('/api/user/profile');
+            const data = await response.json() as Record<string, unknown>;
+            setTwoFaEnabled(data.two_fa_enabled as boolean);
+          } catch (error) {
+            console.error(error);
+          } finally {
+            setLoading(false);
+          }
+        };
+
+        fetchStatus();
+      }, []);
+
+      if (loading) return <div>Loading...</div>;
+
+      return (
+        <div>
+          <div data-testid="2fa-status">
+            2FA Status:{' '}
+            <span data-testid="status-badge">
+              {twoFaEnabled ? '🔒 Enabled' : '🔓 Disabled'}
+            </span>
+          </div>
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    await waitFor(() => {
+      expect(screen.getByTestId('status-badge')).toBeInTheDocument();
+    });
+  });
+
+  it('should allow enabling/disabling 2FA from settings', async () => {
+    const TestComponent = () => {
+      const [twoFaEnabled, setTwoFaEnabled] = React.useState(true);
+
+      const handleToggle = async () => {
+        try {
+          const response = await fetch('/api/2fa/toggle', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ enabled: !twoFaEnabled }),
+          });
+
+          if (response.ok) {
+            setTwoFaEnabled(!twoFaEnabled);
+          }
+        } catch (error) {
+          console.error(error);
+        }
+      };
+
+      return (
+        <div>
+          <label>
+            <input
+              type="checkbox"
+              checked={twoFaEnabled}
+              onChange={handleToggle}
+              data-testid="2fa-toggle"
+            />
+            Enable Two-Factor Authentication
+          </label>
+          <div data-testid="toggle-status">
+            {twoFaEnabled ? 'Enabled' : 'Disabled'}
+          </div>
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const toggle = screen.getByTestId('2fa-toggle') as HTMLInputElement;
+    expect(toggle.checked).toBe(true);
+
+    fireEvent.click(toggle);
+    expect(toggle.checked).toBe(false);
+  });
+
+  it('should support backup code authentication', async () => {
+    const TestComponent = () => {
+      const [backupCode, setBackupCode] = React.useState('');
+      const [authenticated, setAuthenticated] = React.useState(false);
+
+      const handleBackupCodeAuth = async () => {
+        try {
+          const response = await fetch('/api/2fa/verify-backup', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ backup_code: backupCode }),
+          });
+
+          if (response.ok) {
+            setAuthenticated(true);
+          }
+        } catch (error) {
+          console.error(error);
+        }
+      };
+
+      return (
+        <div>
+          <input
+            value={backupCode}
+            onChange={e => setBackupCode(e.target.value)}
+            placeholder="Backup code"
+            data-testid="backup-code-input"
+          />
+          <button onClick={handleBackupCodeAuth} data-testid="backup-auth-btn">
+            Authenticate
+          </button>
+          {authenticated && <div data-testid="backup-auth-success">Authenticated</div>}
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const input = screen.getByTestId('backup-code-input') as HTMLInputElement;
+    await userEvent.type(input, 'BACKUP-CODE-12345');
+
+    expect(input.value).toBe('BACKUP-CODE-12345');
+  });
+
+  it('should handle 2FA setup errors gracefully', async () => {
+    const mockFetch = vi.fn();
+    global.fetch = mockFetch as any;
+
+    mockFetch.mockResolvedValue({
+      ok: false,
+      json: () => Promise.resolve({ error: 'Invalid TOTP code' }),
+    });
+
+    const TestComponent = () => {
+      const [totp, setTotp] = React.useState('');
+      const [error, setError] = React.useState<string | null>(null);
+
+      const handleVerify = async () => {
+        try {
+          const response = await fetch('/api/2fa/verify-totp', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ code: totp }),
+          });
+
+          if (!response.ok) {
+            const data = await response.json() as Record<string, unknown>;
+            throw new Error(data.error as string);
+          }
+        } catch (err) {
+          setError(err instanceof Error ? err.message : 'Unknown error');
+        }
+      };
+
+      return (
+        <div>
+          <input
+            value={totp}
+            onChange={e => setTotp(e.target.value)}
+            data-testid="totp-input"
+          />
+          <button onClick={handleVerify} data-testid="verify-btn">
+            Verify
+          </button>
+          {error && <div data-testid="error-msg">{error}</div>}
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const input = screen.getByTestId('totp-input') as HTMLInputElement;
+    await userEvent.type(input, '000000');
+
+    const btn = screen.getByTestId('verify-btn');
+    await userEvent.click(btn);
+
+    await waitFor(() => {
+      expect(mockFetch).toHaveBeenCalled();
+    });
+  });
+
+  it('should enforce 2FA requirement for admin operations', async () => {
+    const TestComponent = () => {
+      const [twoFaVerified, setTwoFaVerified] = React.useState(false);
+      const [canAccessAdmin, setCanAccessAdmin] = React.useState(false);
+
+      const handleAdminAccess = () => {
+        if (!twoFaVerified) {
+          return;
+        }
+        setCanAccessAdmin(true);
+      };
+
+      return (
+        <div>
+          <div>2FA Verified: {twoFaVerified ? 'Yes' : 'No'}</div>
+          <button
+            onClick={handleAdminAccess}
+            disabled={!twoFaVerified}
+            data-testid="admin-btn"
+          >
+            Access Admin Panel
+          </button>
+          {canAccessAdmin && <div data-testid="admin-panel">Admin Panel</div>}
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const btn = screen.getByTestId('admin-btn') as HTMLButtonElement;
+    expect(btn.disabled).toBe(true);
+
+    // Simulate 2FA verification
+    const { rerender } = render(
+      <div>
+        <div>2FA Verified: Yes</div>
+        <button disabled={false} data-testid="admin-btn-enabled">
+          Access Admin Panel
+        </button>
+      </div>
+    );
+
+    const enabledBtn = screen.getByTestId('admin-btn-enabled') as HTMLButtonElement;
+    expect(enabledBtn.disabled).toBe(false);
+  });
+
+  it('should display warning when 2FA codes expire', async () => {
+    const TestComponent = () => {
+      const [codesExpiring, setCodesExpiring] = React.useState(true);
+
+      return (
+        <div>
+          {codesExpiring && (
+            <div data-testid="expiry-warning" role="alert">
+              ⚠️ Your backup codes will expire in 30 days. Generate new ones.
+            </div>
+          )}
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    expect(screen.getByTestId('expiry-warning')).toBeInTheDocument();
+  });
+
+  it('should allow disabling 2FA with password confirmation', async () => {
+    const TestComponent = () => {
+      const [showPasswordPrompt, setShowPasswordPrompt] = React.useState(false);
+      const [password, setPassword] = React.useState('');
+      const [twoFaDisabled, setTwoFaDisabled] = React.useState(false);
+
+      const handleDisable2FA = () => {
+        setShowPasswordPrompt(true);
+      };
+
+      const confirmDisable = async () => {
+        try {
+          const response = await fetch('/api/2fa/disable', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ password }),
+          });
+
+          if (response.ok) {
+            setTwoFaDisabled(true);
+            setShowPasswordPrompt(false);
+          }
+        } catch (error) {
+          console.error(error);
+        }
+      };
+
+      return (
+        <div>
+          <button onClick={handleDisable2FA} data-testid="disable-btn">
+            Disable 2FA
+          </button>
+
+          {showPasswordPrompt && (
+            <div data-testid="password-prompt">
+              <input
+                type="password"
+                value={password}
+                onChange={e => setPassword(e.target.value)}
+                placeholder="Confirm password"
+                data-testid="confirm-password"
+              />
+              <button onClick={confirmDisable} data-testid="confirm-disable">
+                Confirm Disable
+              </button>
+            </div>
+          )}
+
+          {twoFaDisabled && <div data-testid="disabled-msg">2FA disabled</div>}
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const disableBtn = screen.getByTestId('disable-btn');
+    fireEvent.click(disableBtn);
+
+    expect(screen.getByTestId('password-prompt')).toBeInTheDocument();
+  });
+});
diff --git a/frontend/src/components/__tests__/DisputeResolutionUI.test.tsx b/frontend/src/components/__tests__/DisputeResolutionUI.test.tsx
new file mode 100644
index 00000000..a2c49525
--- /dev/null
+++ b/frontend/src/components/__tests__/DisputeResolutionUI.test.tsx
@@ -0,0 +1,517 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+// Mock i18next
+vi.mock('react-i18next', () => ({
+  useTranslation: () => ({
+    t: (key: string, options?: Record<string, unknown>) => {
+      const translations: Record<string, string> = {
+        'dispute.title': 'Dispute Resolution',
+        'dispute.openDisputes': 'Open Disputes',
+        'dispute.resolved': 'Dispute resolved',
+        'dispute.tx': 'Transaction:',
+        'dispute.confirmTitle': 'Confirm Resolution',
+        'dispute.confirmMessage': 'Are you sure?',
+        'dispute.sender': 'Sender',
+        'dispute.agent': 'Agent',
+        'dispute.senderFunds': 'will receive the funds',
+        'dispute.agentFunds': 'will receive the funds',
+        'dispute.cancel': 'Cancel',
+        'dispute.confirm': 'Confirm',
+        'dispute.remittance': 'Remittance',
+        'dispute.amount': 'Amount:',
+        'dispute.created': 'Created:',
+        'dispute.evidenceHash': 'Evidence Hash:',
+        'dispute.favourSender': 'Favour Sender',
+        'dispute.favourAgent': 'Favour Agent',
+        'dispute.loading': 'Loading...',
+        'dispute.noDisputes': 'No open disputes',
+        'dispute.resolving': 'Resolving...',
+        'dispute.prevPage': 'Previous',
+        'dispute.nextPage': 'Next',
+        'dispute.page': 'Page',
+        'dispute.auditTrail': 'Audit Trail',
+        'dispute.noResolved': 'No resolved disputes',
+        'dispute.resolvedAt': 'Resolved At',
+        'dispute.inFavourOf': 'In Favour Of',
+        'dispute.resolvedBy': 'Resolved By',
+      };
+
+      if (options && typeof options === 'object') {
+        let result = translations[key] || key;
+        Object.entries(options).forEach(([k, v]) => {
+          result = result.replace(`{{${k}}}`, String(v));
+        });
+        return result;
+      }
+
+      return translations[key] || key;
+    },
+  }),
+}));
+
+describe('Issue #898: Dispute Resolution UI for Admins', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should display resolve modal with outcome dropdown', async () => {
+    const TestComponent = () => {
+      const [outcome, setOutcome] = React.useState<'sender' | 'agent' | 'split'>('sender');
+      const [showModal, setShowModal] = React.useState(true);
+
+      return (
+        <>
+          {showModal && (
+            <div role="dialog" aria-modal="true">
+              <h3>Resolve Dispute</h3>
+              <select
+                value={outcome}
+                onChange={e => setOutcome(e.target.value as 'sender' | 'agent' | 'split')}
+                data-testid="outcome-dropdown"
+              >
+                <option value="sender">Favour Sender</option>
+                <option value="agent">Favour Agent</option>
+                <option value="split">Split 50/50</option>
+              </select>
+              <button onClick={() => setShowModal(false)}>Close</button>
+            </div>
+          )}
+        </>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const dropdown = screen.getByTestId('outcome-dropdown') as HTMLSelectElement;
+    expect(dropdown).toBeInTheDocument();
+    expect(dropdown.value).toBe('sender');
+  });
+
+  it('should allow outcome selection (favor sender, favor agent, split)', async () => {
+    const TestComponent = () => {
+      const [outcome, setOutcome] = React.useState('sender');
+      const [submitted, setSubmitted] = React.useState(false);
+
+      const handleResolve = () => {
+        setSubmitted(true);
+      };
+
+      return (
+        <div>
+          <select
+            value={outcome}
+            onChange={e => setOutcome(e.target.value)}
+            data-testid="outcome-dropdown"
+          >
+            <option value="sender">Favour Sender</option>
+            <option value="agent">Favour Agent</option>
+            <option value="split">Split 50/50</option>
+          </select>
+          <button onClick={handleResolve} data-testid="resolve-btn">
+            Resolve
+          </button>
+          {submitted && <div data-testid="outcome">{outcome}</div>}
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const dropdown = screen.getByTestId('outcome-dropdown') as HTMLSelectElement;
+
+    // Test favour sender
+    fireEvent.change(dropdown, { target: { value: 'sender' } });
+    expect(dropdown.value).toBe('sender');
+
+    // Test favour agent
+    fireEvent.change(dropdown, { target: { value: 'agent' } });
+    expect(dropdown.value).toBe('agent');
+
+    // Test split
+    fireEvent.change(dropdown, { target: { value: 'split' } });
+    expect(dropdown.value).toBe('split');
+  });
+
+  it('should have resolution notes field', async () => {
+    const TestComponent = () => {
+      const [notes, setNotes] = React.useState('');
+
+      return (
+        <div>
+          <textarea
+            value={notes}
+            onChange={e => setNotes(e.target.value)}
+            placeholder="Resolution notes"
+            data-testid="notes-field"
+          />
+          {notes && <div data-testid="notes-display">{notes}</div>}
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const textarea = screen.getByTestId('notes-field') as HTMLTextAreaElement;
+    expect(textarea).toBeInTheDocument();
+
+    await userEvent.type(textarea, 'Verified sender claim with documentation');
+
+    await waitFor(() => {
+      expect(screen.getByTestId('notes-display')).toHaveTextContent(
+        'Verified sender claim with documentation'
+      );
+    });
+  });
+
+  it('should display evidence hash with link to stored proof', async () => {
+    const TestComponent = () => {
+      const dispute = {
+        id: 123,
+        evidence_hash: 'abc123def456abc123def456abc123def456abc123def456abc123def456',
+        sender: 'GA1234',
+        agent: 'GA5678',
+        amount: '100',
+      };
+
+      const getProofLink = (hash: string) => `https://storage.example.com/proof/${hash}`;
+
+      return (
+        <div>
+          <div data-testid="evidence-hash">
+            Evidence Hash: {dispute.evidence_hash}
+          </div>
+          <a
+            href={getProofLink(dispute.evidence_hash)}
+            target="_blank"
+            rel="noopener noreferrer"
+            data-testid="proof-link"
+          >
+            View Proof
+          </a>
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const hash = screen.getByTestId('evidence-hash');
+    expect(hash).toHaveTextContent('abc123def456');
+
+    const link = screen.getByTestId('proof-link') as HTMLAnchorElement;
+    expect(link.href).toContain('/proof/');
+  });
+
+  it('should submit resolution to contract and record in DB', async () => {
+    const mockFetch = vi.fn();
+    global.fetch = mockFetch as any;
+
+    mockFetch.mockResolvedValue({
+      ok: true,
+      json: () => Promise.resolve({ tx_hash: 'tx123abc' }),
+    });
+
+    const TestComponent = () => {
+      const [outcome, setOutcome] = React.useState('sender');
+      const [notes, setNotes] = React.useState('');
+      const [submitted, setSubmitted] = React.useState(false);
+      const [txHash, setTxHash] = React.useState<string | null>(null);
+
+      const handleSubmit = async () => {
+        try {
+          const response = await fetch('/api/disputes/123/resolve', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+              outcome,
+              notes,
+              in_favour_of_sender: outcome === 'sender',
+            }),
+          });
+
+          const data = await response.json() as Record<string, unknown>;
+          setTxHash(data.tx_hash as string);
+          setSubmitted(true);
+        } catch (error) {
+          console.error(error);
+        }
+      };
+
+      return (
+        <div>
+          <select
+            value={outcome}
+            onChange={e => setOutcome(e.target.value)}
+            data-testid="outcome-select"
+          >
+            <option value="sender">Sender</option>
+            <option value="agent">Agent</option>
+          </select>
+          <textarea
+            value={notes}
+            onChange={e => setNotes(e.target.value)}
+            data-testid="notes-textarea"
+          />
+          <button onClick={handleSubmit} data-testid="submit-btn">
+            Submit
+          </button>
+          {submitted && txHash && <div data-testid="tx-result">{txHash}</div>}
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const outcome = screen.getByTestId('outcome-select') as HTMLSelectElement;
+    fireEvent.change(outcome, { target: { value: 'agent' } });
+
+    const notes = screen.getByTestId('notes-textarea') as HTMLTextAreaElement;
+    await userEvent.type(notes, 'Agent evidence is convincing');
+
+    const submit = screen.getByTestId('submit-btn');
+    await userEvent.click(submit);
+
+    await waitFor(() => {
+      expect(mockFetch).toHaveBeenCalledWith(
+        '/api/disputes/123/resolve',
+        expect.objectContaining({
+          method: 'POST',
+          body: expect.stringContaining('agent'),
+        })
+      );
+    });
+
+    await waitFor(() => {
+      expect(screen.getByTestId('tx-result')).toHaveTextContent('tx123abc');
+    });
+  });
+
+  it('should display confirmation modal before resolution', async () => {
+    const TestComponent = () => {
+      const [showConfirm, setShowConfirm] = React.useState(false);
+      const [outcome, setOutcome] = React.useState('sender');
+
+      const openConfirm = () => setShowConfirm(true);
+
+      return (
+        <div>
+          <button onClick={openConfirm} data-testid="resolve-btn">
+            Resolve
+          </button>
+
+          {showConfirm && (
+            <div role="dialog" data-testid="confirm-modal">
+              <h3>Confirm Resolution</h3>
+              <p>
+                Are you sure you want to resolve in favour of{' '}
+                {outcome === 'sender' ? 'the Sender' : 'the Agent'}?
+              </p>
+              <button onClick={() => setShowConfirm(false)}>Cancel</button>
+              <button data-testid="confirm-btn">Confirm</button>
+            </div>
+          )}
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const resolveBtn = screen.getByTestId('resolve-btn');
+    await userEvent.click(resolveBtn);
+
+    await waitFor(() => {
+      expect(screen.getByTestId('confirm-modal')).toBeInTheDocument();
+    });
+  });
+
+  it('should show audit log of resolved disputes', async () => {
+    const mockAuditLog = [
+      {
+        remittance_id: 100,
+        resolved_at: '2024-01-15T10:30:00Z',
+        in_favour_of_sender: true,
+        resolved_by: 'admin@example.com',
+      },
+      {
+        remittance_id: 101,
+        resolved_at: '2024-01-15T11:45:00Z',
+        in_favour_of_sender: false,
+        resolved_by: 'admin@example.com',
+      },
+    ];
+
+    const TestComponent = () => {
+      return (
+        <div>
+          <table data-testid="audit-table">
+            <thead>
+              <tr>
+                <th>ID</th>
+                <th>Resolved At</th>
+                <th>In Favour Of</th>
+                <th>Resolved By</th>
+              </tr>
+            </thead>
+            <tbody>
+              {mockAuditLog.map(entry => (
+                <tr key={entry.remittance_id}>
+                  <td>#{entry.remittance_id}</td>
+                  <td>{new Date(entry.resolved_at).toLocaleString()}</td>
+                  <td>{entry.in_favour_of_sender ? 'Sender' : 'Agent'}</td>
+                  <td>{entry.resolved_by}</td>
+                </tr>
+              ))}
+            </tbody>
+          </table>
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const table = screen.getByTestId('audit-table');
+    expect(table).toBeInTheDocument();
+
+    const rows = screen.getAllByRole('row');
+    expect(rows).toHaveLength(3); // 1 header + 2 data rows
+  });
+
+  it('should validate form before submission', async () => {
+    const TestComponent = () => {
+      const [outcome, setOutcome] = React.useState('');
+      const [notes, setNotes] = React.useState('');
+      const [errors, setErrors] = React.useState<string[]>([]);
+
+      const handleSubmit = () => {
+        const newErrors: string[] = [];
+        if (!outcome) newErrors.push('Outcome is required');
+        if (!notes.trim()) newErrors.push('Resolution notes are required');
+        setErrors(newErrors);
+      };
+
+      return (
+        <div>
+          <select
+            value={outcome}
+            onChange={e => setOutcome(e.target.value)}
+            data-testid="outcome-select"
+          >
+            <option value="">-- Select outcome --</option>
+            <option value="sender">Sender</option>
+            <option value="agent">Agent</option>
+          </select>
+          <textarea
+            value={notes}
+            onChange={e => setNotes(e.target.value)}
+            data-testid="notes-field"
+          />
+          <button onClick={handleSubmit} data-testid="submit-btn">
+            Submit
+          </button>
+          {errors.length > 0 && (
+            <ul data-testid="errors">
+              {errors.map((err, idx) => (
+                <li key={idx}>{err}</li>
+              ))}
+            </ul>
+          )}
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const submit = screen.getByTestId('submit-btn');
+    await userEvent.click(submit);
+
+    await waitFor(() => {
+      expect(screen.getByTestId('errors')).toBeInTheDocument();
+    });
+  });
+
+  it('should handle API errors during submission', async () => {
+    const mockFetch = vi.fn();
+    global.fetch = mockFetch as any;
+
+    mockFetch.mockResolvedValue({
+      ok: false,
+      status: 400,
+      json: () => Promise.resolve({ error: 'Invalid dispute' }),
+    });
+
+    const TestComponent = () => {
+      const [error, setError] = React.useState<string | null>(null);
+
+      const handleSubmit = async () => {
+        try {
+          const response = await fetch('/api/disputes/999/resolve', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ outcome: 'sender' }),
+          });
+
+          if (!response.ok) {
+            const data = await response.json() as Record<string, unknown>;
+            throw new Error(data.error as string);
+          }
+        } catch (err) {
+          setError(err instanceof Error ? err.message : 'Unknown error');
+        }
+      };
+
+      return (
+        <div>
+          <button onClick={handleSubmit} data-testid="submit-btn">
+            Submit
+          </button>
+          {error && <div data-testid="error-msg">{error}</div>}
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const submit = screen.getByTestId('submit-btn');
+    await userEvent.click(submit);
+
+    await waitFor(() => {
+      expect(screen.getByTestId('error-msg')).toHaveTextContent('Invalid dispute');
+    });
+  });
+
+  it('should display loading state during resolution', async () => {
+    const TestComponent = () => {
+      const [loading, setLoading] = React.useState(false);
+
+      const handleSubmit = async () => {
+        setLoading(true);
+        await new Promise(resolve => setTimeout(resolve, 100));
+        setLoading(false);
+      };
+
+      return (
+        <div>
+          <button onClick={handleSubmit} disabled={loading} data-testid="submit-btn">
+            {loading ? 'Resolving...' : 'Resolve'}
+          </button>
+          {loading && <div data-testid="loading">Processing...</div>}
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const submit = screen.getByTestId('submit-btn');
+    await userEvent.click(submit);
+
+    await waitFor(() => {
+      expect(screen.getByTestId('loading')).toBeInTheDocument();
+    });
+
+    await waitFor(() => {
+      expect(screen.queryByTestId('loading')).not.toBeInTheDocument();
+    });
+  });
+});
diff --git a/frontend/src/components/__tests__/ProofOfPayoutFileUpload.test.tsx b/frontend/src/components/__tests__/ProofOfPayoutFileUpload.test.tsx
new file mode 100644
index 00000000..fcce823e
--- /dev/null
+++ b/frontend/src/components/__tests__/ProofOfPayoutFileUpload.test.tsx
@@ -0,0 +1,345 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+// Mock crypto API for SHA-256
+const mockCryptoSubtle = {
+  digest: vi.fn(async (algorithm: string, data: ArrayBuffer) => {
+    // Mock SHA-256 output (64 hex chars)
+    return new ArrayBuffer(32); // 32 bytes = 64 hex chars
+  }),
+};
+
+Object.defineProperty(global.crypto, 'subtle', {
+  value: mockCryptoSubtle,
+  configurable: true,
+});
+
+describe('Issue #896: ProofOfPayout File Upload with SHA-256 Hashing', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should accept image and PDF file uploads', async () => {
+    // Mock component for testing file upload logic
+    const TestFileUploadComponent = () => {
+      const [file, setFile] = React.useState<File | null>(null);
+      const [fileHash, setFileHash] = React.useState<string | null>(null);
+
+      const handleFileChange = async (e: React.ChangeEvent<HTMLInputElement>) => {
+        const selectedFile = e.target.files?.[0];
+        if (selectedFile) {
+          setFile(selectedFile);
+          // Simulate SHA-256 hashing
+          const buffer = await selectedFile.arrayBuffer();
+          const hashBuffer = await crypto.subtle.digest('SHA-256', buffer);
+          const hashArray = Array.from(new Uint8Array(hashBuffer));
+          const hashHex = hashArray.map(b => b.toString(16).padStart(2, '0')).join('');
+          setFileHash(hashHex);
+        }
+      };
+
+      return (
+        <div>
+          <input
+            type="file"
+            accept="image/*,.pdf"
+            onChange={handleFileChange}
+            data-testid="proof-file-input"
+          />
+          {file && <div data-testid="file-name">{file.name}</div>}
+          {fileHash && <div data-testid="file-hash">{fileHash}</div>}
+        </div>
+      );
+    };
+
+    render(<TestFileUploadComponent />);
+
+    const fileInput = screen.getByTestId('proof-file-input') as HTMLInputElement;
+    const pngFile = new File(['mock-image-data'], 'receipt.png', { type: 'image/png' });
+
+    await userEvent.upload(fileInput, pngFile);
+
+    await waitFor(() => {
+      expect(screen.getByTestId('file-name')).toHaveTextContent('receipt.png');
+      expect(screen.getByTestId('file-hash')).toBeInTheDocument();
+    });
+
+    // Verify crypto.subtle.digest was called with SHA-256
+    expect(mockCryptoSubtle.digest).toHaveBeenCalledWith('SHA-256', expect.any(ArrayBuffer));
+  });
+
+  it('should hash the file client-side before submission', async () => {
+    const TestHashingComponent = () => {
+      const [hash, setHash] = React.useState<string>('');
+
+      const computeHash = async (file: File) => {
+        const buffer = await file.arrayBuffer();
+        const hashBuffer = await crypto.subtle.digest('SHA-256', buffer);
+        const hashArray = Array.from(new Uint8Array(hashBuffer));
+        return hashArray.map(b => b.toString(16).padStart(2, '0')).join('');
+      };
+
+      const handleFileUpload = async (e: React.ChangeEvent<HTMLInputElement>) => {
+        const file = e.target.files?.[0];
+        if (file) {
+          const fileHash = await computeHash(file);
+          setHash(fileHash);
+        }
+      };
+
+      return (
+        <div>
+          <input
+            type="file"
+            accept="image/*,.pdf"
+            onChange={handleFileUpload}
+            data-testid="hash-input"
+          />
+          {hash && <code data-testid="computed-hash">{hash}</code>}
+        </div>
+      );
+    };
+
+    render(<TestHashingComponent />);
+
+    const input = screen.getByTestId('hash-input') as HTMLInputElement;
+    const file = new File(['test-data'], 'proof.pdf', { type: 'application/pdf' });
+
+    await userEvent.upload(input, file);
+
+    await waitFor(() => {
+      const hashElement = screen.getByTestId('computed-hash');
+      expect(hashElement).toBeInTheDocument();
+      expect(hashElement.textContent).toMatch(/^[a-f0-9]{64}$/);
+    });
+  });
+
+  it('should submit hash to contract via confirm_payout', async () => {
+    const TestSubmitComponent = () => {
+      const [hash, setHash] = React.useState('');
+      const [submitted, setSubmitted] = React.useState(false);
+      const [error, setError] = React.useState<string | null>(null);
+
+      const handleSubmit = async () => {
+        try {
+          // Mock contract submission
+          const response = await fetch('/api/contract/confirm-payout', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ proof_hash: hash, remittance_id: '123' }),
+          });
+
+          if (!response.ok) throw new Error('Submission failed');
+          setSubmitted(true);
+        } catch (err) {
+          setError(err instanceof Error ? err.message : 'Unknown error');
+        }
+      };
+
+      return (
+        <div>
+          <input
+            data-testid="hash-input"
+            value={hash}
+            onChange={e => setHash(e.target.value)}
+            placeholder="Proof hash"
+          />
+          <button onClick={handleSubmit} data-testid="submit-btn">
+            Submit
+          </button>
+          {submitted && <div data-testid="success">Proof submitted</div>}
+          {error && <div data-testid="error">{error}</div>}
+        </div>
+      );
+    };
+
+    render(<TestSubmitComponent />);
+
+    const input = screen.getByTestId('hash-input') as HTMLInputElement;
+    fireEvent.change(input, { target: { value: 'a'.repeat(64) } });
+
+    const submitBtn = screen.getByTestId('submit-btn');
+    fireEvent.click(submitBtn);
+
+    await waitFor(() => {
+      expect(screen.getByTestId('success')).toBeInTheDocument();
+    });
+  });
+
+  it('should validate file type (image or PDF only)', async () => {
+    const TestValidationComponent = () => {
+      const [error, setError] = React.useState<string | null>(null);
+      const [valid, setValid] = React.useState(true);
+
+      const validateFile = (file: File) => {
+        const validTypes = ['image/png', 'image/jpeg', 'image/gif', 'application/pdf'];
+        if (!validTypes.includes(file.type)) {
+          setError('Only images (PNG, JPEG, GIF) and PDFs are allowed');
+          setValid(false);
+          return false;
+        }
+        setError(null);
+        setValid(true);
+        return true;
+      };
+
+      const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+        const file = e.target.files?.[0];
+        if (file) validateFile(file);
+      };
+
+      return (
+        <div>
+          <input
+            type="file"
+            onChange={handleFileChange}
+            data-testid="file-input"
+          />
+          {!valid && <div data-testid="error">{error}</div>}
+          {valid && <div data-testid="valid">File valid</div>}
+        </div>
+      );
+    };
+
+    render(<TestValidationComponent />);
+
+    const input = screen.getByTestId('file-input') as HTMLInputElement;
+    const invalidFile = new File(['data'], 'test.txt', { type: 'text/plain' });
+
+    await userEvent.upload(input, invalidFile);
+
+    await waitFor(() => {
+      expect(screen.getByTestId('error')).toBeInTheDocument();
+    });
+  });
+
+  it('should display file preview after upload', async () => {
+    const TestPreviewComponent = () => {
+      const [preview, setPreview] = React.useState<string | null>(null);
+
+      const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+        const file = e.target.files?.[0];
+        if (file) {
+          const reader = new FileReader();
+          reader.onload = () => {
+            setPreview(reader.result as string);
+          };
+          reader.readAsDataURL(file);
+        }
+      };
+
+      return (
+        <div>
+          <input
+            type="file"
+            accept="image/*"
+            onChange={handleFileChange}
+            data-testid="image-input"
+          />
+          {preview && (
+            <img src={preview} alt="Preview" data-testid="preview-img" />
+          )}
+        </div>
+      );
+    };
+
+    render(<TestPreviewComponent />);
+
+    const input = screen.getByTestId('image-input') as HTMLInputElement;
+    const imageFile = new File(['mock-image'], 'receipt.jpg', { type: 'image/jpeg' });
+
+    await userEvent.upload(input, imageFile);
+
+    await waitFor(() => {
+      const preview = screen.getByTestId('preview-img') as HTMLImageElement;
+      expect(preview.src).toMatch(/^data:image/);
+    });
+  });
+
+  it('should support drag-and-drop file upload', async () => {
+    const TestDragDropComponent = () => {
+      const [file, setFile] = React.useState<File | null>(null);
+
+      const handleDrop = (e: React.DragEvent<HTMLDivElement>) => {
+        e.preventDefault();
+        const droppedFile = e.dataTransfer.files?.[0];
+        if (droppedFile) setFile(droppedFile);
+      };
+
+      return (
+        <div
+          onDrop={handleDrop}
+          onDragOver={e => e.preventDefault()}
+          data-testid="drop-zone"
+          style={{ border: '2px dashed #ccc', padding: '20px' }}
+        >
+          Drop proof file here
+          {file && <div data-testid="dropped-file">{file.name}</div>}
+        </div>
+      );
+    };
+
+    render(<TestDragDropComponent />);
+
+    const dropZone = screen.getByTestId('drop-zone');
+    const file = new File(['data'], 'proof.pdf', { type: 'application/pdf' });
+
+    const dragEvent = new DragEvent('drop', {
+      dataTransfer: new DataTransfer(),
+    });
+    Object.defineProperty(dragEvent.dataTransfer, 'files', {
+      value: new DataTransfer().items.add(file).dataTransfer.files,
+    });
+
+    fireEvent.drop(dropZone, { dataTransfer: { files: [file] } });
+
+    await waitFor(() => {
+      expect(screen.getByTestId('dropped-file')).toHaveTextContent('proof.pdf');
+    });
+  });
+
+  it('should handle upload errors gracefully', async () => {
+    const TestErrorHandlingComponent = () => {
+      const [error, setError] = React.useState<string | null>(null);
+
+      const handleFileUpload = async (e: React.ChangeEvent<HTMLInputElement>) => {
+        try {
+          const file = e.target.files?.[0];
+          if (!file) throw new Error('No file selected');
+
+          const buffer = await file.arrayBuffer();
+          if (buffer.byteLength === 0) throw new Error('File is empty');
+
+          // Simulate upload
+          throw new Error('Network error');
+        } catch (err) {
+          setError(err instanceof Error ? err.message : 'Unknown error');
+        }
+      };
+
+      return (
+        <div>
+          <input
+            type="file"
+            onChange={handleFileUpload}
+            data-testid="upload-input"
+          />
+          {error && <div data-testid="error-msg">{error}</div>}
+        </div>
+      );
+    };
+
+    render(<TestErrorHandlingComponent />);
+
+    const input = screen.getByTestId('upload-input') as HTMLInputElement;
+    const file = new File([], 'empty.pdf', { type: 'application/pdf' });
+
+    await userEvent.upload(input, file);
+
+    await waitFor(() => {
+      expect(screen.getByTestId('error-msg')).toBeInTheDocument();
+    });
+  });
+});
diff --git a/frontend/src/components/__tests__/WebSocketToastNotifications.test.tsx b/frontend/src/components/__tests__/WebSocketToastNotifications.test.tsx
new file mode 100644
index 00000000..54a64806
--- /dev/null
+++ b/frontend/src/components/__tests__/WebSocketToastNotifications.test.tsx
@@ -0,0 +1,431 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { useToast, ToastContainer, type ToastMessage } from '../Toast';
+
+// Mock Socket.io
+const mockSocket = {
+  on: vi.fn(),
+  off: vi.fn(),
+  emit: vi.fn(),
+  disconnect: vi.fn(),
+  connect: vi.fn(),
+};
+
+vi.mock('socket.io-client', () => ({
+  io: vi.fn(() => mockSocket),
+}));
+
+describe('Issue #899: Real-time Toast Notifications for WebSocket Events', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should subscribe to Socket.io remittance:completed events', () => {
+    const TestComponent = () => {
+      const { toasts, showToast, dismissToast } = useToast();
+
+      React.useEffect(() => {
+        mockSocket.on('remittance:completed', (data: { id: number }) => {
+          showToast(`Remittance #${data.id} completed`, 'success');
+        });
+
+        return () => {
+          mockSocket.off('remittance:completed');
+        };
+      }, [showToast]);
+
+      return (
+        <div>
+          <ToastContainer toasts={toasts} onDismiss={dismissToast} />
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    // Simulate Socket.io event
+    const callbacks = mockSocket.on.mock.calls;
+    const completedCallback = callbacks.find(call => call[0] === 'remittance:completed')?.[1];
+
+    if (completedCallback) {
+      completedCallback({ id: 123 });
+    }
+
+    expect(mockSocket.on).toHaveBeenCalledWith(
+      'remittance:completed',
+      expect.any(Function)
+    );
+  });
+
+  it('should display success toast for remittance:completed event', async () => {
+    const TestComponent = () => {
+      const { toasts, showToast, dismissToast } = useToast();
+
+      React.useEffect(() => {
+        mockSocket.on('remittance:completed', (data: { id: number }) => {
+          showToast(`Remittance #${data.id} completed successfully`, 'success');
+        });
+
+        return () => {
+          mockSocket.off('remittance:completed');
+        };
+      }, [showToast]);
+
+      return (
+        <div>
+          <ToastContainer toasts={toasts} onDismiss={dismissToast} />
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    // Trigger the event
+    const callback = mockSocket.on.mock.calls.find(
+      call => call[0] === 'remittance:completed'
+    )?.[1];
+
+    if (callback) {
+      callback({ id: 456 });
+    }
+
+    await waitFor(() => {
+      expect(screen.getByRole('alert')).toBeInTheDocument();
+    });
+  });
+
+  it('should display error toast for remittance:failed event', async () => {
+    const TestComponent = () => {
+      const { toasts, showToast, dismissToast } = useToast();
+
+      React.useEffect(() => {
+        mockSocket.on('remittance:failed', (data: { id: number; reason: string }) => {
+          showToast(`Remittance #${data.id} failed: ${data.reason}`, 'error');
+        });
+
+        return () => {
+          mockSocket.off('remittance:failed');
+        };
+      }, [showToast]);
+
+      return (
+        <div>
+          <ToastContainer toasts={toasts} onDismiss={dismissToast} />
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const failedCallback = mockSocket.on.mock.calls.find(
+      call => call[0] === 'remittance:failed'
+    )?.[1];
+
+    if (failedCallback) {
+      failedCallback({ id: 789, reason: 'Invalid recipient' });
+    }
+
+    await waitFor(() => {
+      const alert = screen.getByRole('alert');
+      expect(alert).toHaveClass('error');
+    });
+  });
+
+  it('should display warning toast for remittance:disputed event', async () => {
+    const TestComponent = () => {
+      const { toasts, showToast, dismissToast } = useToast();
+
+      React.useEffect(() => {
+        mockSocket.on('remittance:disputed', (data: { id: number }) => {
+          showToast(`Remittance #${data.id} has been disputed`, 'warning');
+        });
+
+        return () => {
+          mockSocket.off('remittance:disputed');
+        };
+      }, [showToast]);
+
+      return (
+        <div>
+          <ToastContainer toasts={toasts} onDismiss={dismissToast} />
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const disputedCallback = mockSocket.on.mock.calls.find(
+      call => call[0] === 'remittance:disputed'
+    )?.[1];
+
+    if (disputedCallback) {
+      disputedCallback({ id: 999 });
+    }
+
+    await waitFor(() => {
+      const alert = screen.getByRole('alert');
+      expect(alert).toHaveClass('warning');
+    });
+  });
+
+  it('should auto-dismiss toast after 10 seconds (for success)', async () => {
+    vi.useFakeTimers();
+
+    const TestComponent = () => {
+      const { toasts, showToast, dismissToast } = useToast();
+
+      return (
+        <div>
+          <button onClick={() => showToast('Test message', 'success', 10000)}>
+            Show Toast
+          </button>
+          <ToastContainer toasts={toasts} onDismiss={dismissToast} />
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const button = screen.getByRole('button', { name: 'Show Toast' });
+    await userEvent.click(button);
+
+    // Toast should be present initially
+    await waitFor(() => {
+      expect(screen.getByRole('alert')).toBeInTheDocument();
+    });
+
+    // Fast-forward 10 seconds
+    vi.advanceTimersByTime(10000);
+
+    // Toast should be dismissed
+    await waitFor(() => {
+      expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+    }, { timeout: 3000 });
+
+    vi.useRealTimers();
+  });
+
+  it('should allow manual dismissal of toast', async () => {
+    const TestComponent = () => {
+      const { toasts, showToast, dismissToast } = useToast();
+
+      return (
+        <div>
+          <button onClick={() => showToast('Click to dismiss', 'info')}>
+            Show Toast
+          </button>
+          <ToastContainer toasts={toasts} onDismiss={dismissToast} />
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const button = screen.getByRole('button', { name: 'Show Toast' });
+    await userEvent.click(button);
+
+    await waitFor(() => {
+      expect(screen.getByRole('alert')).toBeInTheDocument();
+    });
+
+    const closeButton = screen.getByLabelText('Dismiss notification');
+    await userEvent.click(closeButton);
+
+    await waitFor(() => {
+      expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+    });
+  });
+
+  it('should pause auto-dismiss when hovering over toast', async () => {
+    vi.useFakeTimers();
+
+    const TestComponent = () => {
+      const { toasts, showToast, dismissToast } = useToast();
+
+      return (
+        <div>
+          <button onClick={() => showToast('Hover test', 'success', 3000)}>
+            Show Toast
+          </button>
+          <ToastContainer toasts={toasts} onDismiss={dismissToast} />
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const button = screen.getByRole('button', { name: 'Show Toast' });
+    await userEvent.click(button);
+
+    const toast = await screen.findByRole('alert');
+
+    // Hover over toast
+    await userEvent.hover(toast);
+
+    // Advance time but not enough for dismissal
+    vi.advanceTimersByTime(2000);
+
+    // Toast should still be visible
+    expect(screen.getByRole('alert')).toBeInTheDocument();
+
+    // Leave hover
+    await userEvent.unhover(toast);
+
+    // Advance past the remaining time
+    vi.advanceTimersByTime(2000);
+
+    // Now it should be dismissed
+    await waitFor(() => {
+      expect(screen.queryByRole('alert')).not.toBeInTheDocument();
+    }, { timeout: 1000 });
+
+    vi.useRealTimers();
+  });
+
+  it('should handle multiple concurrent toasts', async () => {
+    const TestComponent = () => {
+      const { toasts, showToast, dismissToast } = useToast();
+
+      return (
+        <div>
+          <button
+            onClick={() => {
+              showToast('Message 1', 'success');
+              showToast('Message 2', 'error');
+              showToast('Message 3', 'info');
+            }}
+          >
+            Show Multiple
+          </button>
+          <ToastContainer toasts={toasts} onDismiss={dismissToast} />
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    await userEvent.click(screen.getByRole('button', { name: 'Show Multiple' }));
+
+    await waitFor(() => {
+      const alerts = screen.getAllByRole('alert');
+      expect(alerts).toHaveLength(3);
+    });
+  });
+
+  it('should unsubscribe from socket events on unmount', async () => {
+    const TestComponent = () => {
+      const { toasts, showToast, dismissToast } = useToast();
+
+      React.useEffect(() => {
+        mockSocket.on('remittance:completed', () => {
+          showToast('Remittance completed', 'success');
+        });
+
+        return () => {
+          mockSocket.off('remittance:completed');
+        };
+      }, [showToast]);
+
+      return (
+        <div>
+          <ToastContainer toasts={toasts} onDismiss={dismissToast} />
+        </div>
+      );
+    };
+
+    const { unmount } = render(<TestComponent />);
+
+    unmount();
+
+    expect(mockSocket.off).toHaveBeenCalledWith('remittance:completed');
+  });
+
+  it('should display toast without page refresh on event', async () => {
+    const TestComponent = () => {
+      const { toasts, showToast, dismissToast } = useToast();
+
+      React.useEffect(() => {
+        mockSocket.on('remittance:completed', (data: { id: number }) => {
+          showToast(`Remittance #${data.id} completed`, 'success');
+        });
+
+        return () => {
+          mockSocket.off('remittance:completed');
+        };
+      }, [showToast]);
+
+      return (
+        <div>
+          <p>Main content here</p>
+          <ToastContainer toasts={toasts} onDismiss={dismissToast} />
+        </div>
+      );
+    };
+
+    const { rerender } = render(<TestComponent />);
+
+    // Trigger socket event
+    const callback = mockSocket.on.mock.calls.find(
+      call => call[0] === 'remittance:completed'
+    )?.[1];
+
+    if (callback) {
+      callback({ id: 555 });
+    }
+
+    // Main content should still be visible
+    expect(screen.getByText('Main content here')).toBeInTheDocument();
+
+    // Toast should appear without re-render
+    await waitFor(() => {
+      expect(screen.getByRole('alert')).toBeInTheDocument();
+    });
+  });
+
+  it('should handle socket connection errors gracefully', async () => {
+    const TestComponent = () => {
+      const { toasts, showToast, dismissToast } = useToast();
+      const [connected, setConnected] = React.useState(true);
+
+      React.useEffect(() => {
+        mockSocket.on('disconnect', () => {
+          setConnected(false);
+          showToast('Connection lost. Attempting to reconnect...', 'warning');
+        });
+
+        mockSocket.on('connect', () => {
+          setConnected(true);
+          showToast('Reconnected', 'info');
+        });
+
+        return () => {
+          mockSocket.off('disconnect');
+          mockSocket.off('connect');
+        };
+      }, [showToast]);
+
+      return (
+        <div>
+          <div data-testid="status">{connected ? 'Connected' : 'Disconnected'}</div>
+          <ToastContainer toasts={toasts} onDismiss={dismissToast} />
+        </div>
+      );
+    };
+
+    render(<TestComponent />);
+
+    const disconnectCallback = mockSocket.on.mock.calls.find(
+      call => call[0] === 'disconnect'
+    )?.[1];
+
+    if (disconnectCallback) {
+      disconnectCallback();
+    }
+
+    await waitFor(() => {
+      expect(screen.getByTestId('status')).toHaveTextContent('Disconnected');
+    });
+  });
+});