From c8ec32c55f2d8cf82c177ed6df0b45dcf6b3c4a7 Mon Sep 17 00:00:00 2001
From: flourishbar <you@example.com>
Date: Tue, 28 Jul 2026 07:27:52 +0100
Subject: [PATCH] fix(ErrorBoundary): preserve errorCount in custom fallback
 retry path (#223)

---
 components/ErrorBoundary.tsx                |  4 +-
 components/Navbar.tsx                       |  4 +-
 components/__tests__/ErrorBoundary.test.tsx | 56 +++++++++++++++++++++
 3 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/components/ErrorBoundary.tsx b/components/ErrorBoundary.tsx
index 7c6783f..3b9f491 100644
--- a/components/ErrorBoundary.tsx
+++ b/components/ErrorBoundary.tsx
@@ -4,7 +4,7 @@ import React, { Component, ErrorInfo, ReactNode } from 'react';
 
 interface Props {
   children?: ReactNode;
-  fallback?: (error: Error, reset: () => void) => ReactNode;
+  fallback?: (error: Error, retry: () => void, reset: () => void) => ReactNode;
   onError?: (error: Error, errorInfo: ErrorInfo) => void;
 }
 
@@ -108,7 +108,7 @@ export class ErrorBoundary extends Component<Props, State> {
       }
 
       if (this.props.fallback) {
-        return this.props.fallback(this.state.error!, this.reset);
+        return this.props.fallback(this.state.error!, this.retry, this.reset);
       }
 
       return React.createElement('div', { className: 'flex items-center justify-center min-h-[200px]' },
diff --git a/components/Navbar.tsx b/components/Navbar.tsx
index 430dbc7..2799fc1 100644
--- a/components/Navbar.tsx
+++ b/components/Navbar.tsx
@@ -67,10 +67,10 @@ export function Navbar() {
               undefined value in a widget's state hook) shouldn't blank the
               whole header, just fall back to a compact retry (fixes #191). */}
           <ErrorBoundary
-            fallback={(_error, reset) => (
+            fallback={(_error, retry) => (
               <button
                 type="button"
-                onClick={reset}
+                onClick={retry}
                 className="text-xs text-gray-400 hover:text-black dark:hover:text-white underline"
               >
                 Reload wallet controls
diff --git a/components/__tests__/ErrorBoundary.test.tsx b/components/__tests__/ErrorBoundary.test.tsx
index c63b90b..bc16859 100644
--- a/components/__tests__/ErrorBoundary.test.tsx
+++ b/components/__tests__/ErrorBoundary.test.tsx
@@ -95,6 +95,62 @@ describe('ErrorBoundary (issue #92 regression)', () => {
     expect(container.textContent).toContain('Too many errors');
   });
 
+  it('preserves errorCount and trips the circuit breaker when retrying via a custom fallback', () => {
+    // Render custom fallback with Bomb throwing
+    act(() => {
+      root.render(
+        React.createElement(
+          ErrorBoundary,
+          {
+            fallback: (_err, retry) =>
+              React.createElement('button', { onClick: retry }, 'Custom Reload'),
+          },
+          React.createElement(Bomb, { shouldThrow: true }),
+        ),
+      );
+    });
+
+    // 1st error occurred on initial render. Click custom retry button MAX_ERROR_COUNT - 1 times.
+    for (let i = 1; i < MAX_ERROR_COUNT; i++) {
+      const button = container.querySelector('button');
+      expect(button?.textContent).toBe('Custom Reload');
+      act(() => {
+        button!.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      });
+    }
+
+    // After MAX_ERROR_COUNT total errors, the circuit breaker should trip instead of displaying custom fallback.
+    expect(container.textContent).toContain('Too many errors');
+  });
+
+  it('resets errorCount when custom fallback explicitly invokes reset', () => {
+    act(() => {
+      root.render(
+        React.createElement(
+          ErrorBoundary,
+          {
+            fallback: (_err, _retry, reset) =>
+              React.createElement('button', { onClick: reset }, 'Full Reset'),
+          },
+          React.createElement(Bomb, { shouldThrow: true }),
+        ),
+      );
+    });
+
+    // Clicking reset clears errorCount each time, preventing the circuit breaker from tripping.
+    for (let i = 0; i < MAX_ERROR_COUNT + 2; i++) {
+      const button = container.querySelector('button');
+      expect(button?.textContent).toBe('Full Reset');
+      act(() => {
+        button!.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      });
+    }
+
+    // Should still show custom fallback, not circuit breaker
+    expect(container.textContent).toContain('Full Reset');
+    expect(container.textContent).not.toContain('Too many errors');
+  });
+
   it('does not throw when an unhandled promise rejection is observed', () => {
     const onError = vi.fn();
     act(() => {