From 71d802e91f5d5533b684fe7642e4506ebb31c8b5 Mon Sep 17 00:00:00 2001
From: BasilTh <116033419+BasilTh@users.noreply.github.com>
Date: Wed, 22 Jul 2026 17:20:35 +0000
Subject: [PATCH] fix: add scoped ErrorBoundaries to mobile schedules, payees,
 and bank sync pages (#8547)

---
 .../src/components/FinancesApp.tsx            | 60 +++++++++++++++----
 ...or-boundaries-schedules-payees-banksync.md |  6 ++
 2 files changed, 54 insertions(+), 12 deletions(-)
 create mode 100644 upcoming-release-notes/mobile-error-boundaries-schedules-payees-banksync.md

diff --git a/packages/desktop-client/src/components/FinancesApp.tsx b/packages/desktop-client/src/components/FinancesApp.tsx
index 7d4817be15..84176384a3 100644
--- a/packages/desktop-client/src/components/FinancesApp.tsx
+++ b/packages/desktop-client/src/components/FinancesApp.tsx
@@ -277,27 +277,51 @@ export function FinancesApp() {
 
                   <Route
                     path="/schedules"
-                    element={<NarrowAlternate name="Schedules" />}
+                    element={
+                      <ErrorBoundary
+                        FallbackComponent={FeatureErrorFallback}
+                        resetKeys={[location.pathname]}
+                      >
+                        <NarrowAlternate name="Schedules" />
+                      </ErrorBoundary>
+                    }
                   />
                   <Route
                     path="/schedules/:id"
                     element={
-                      <WideNotSupported>
-                        <NarrowAlternate name="ScheduleEdit" />
-                      </WideNotSupported>
+                      <ErrorBoundary
+                        FallbackComponent={FeatureErrorFallback}
+                        resetKeys={[location.pathname]}
+                      >
+                        <WideNotSupported>
+                          <NarrowAlternate name="ScheduleEdit" />
+                        </WideNotSupported>
+                      </ErrorBoundary>
                     }
                   />
 
                   <Route
                     path="/payees"
-                    element={<NarrowAlternate name="Payees" />}
+                    element={
+                      <ErrorBoundary
+                        FallbackComponent={FeatureErrorFallback}
+                        resetKeys={[location.pathname]}
+                      >
+                        <NarrowAlternate name="Payees" />
+                      </ErrorBoundary>
+                    }
                   />
                   <Route
                     path="/payees/:id"
                     element={
-                      <WideNotSupported>
-                        <NarrowAlternate name="PayeeEdit" />
-                      </WideNotSupported>
+                      <ErrorBoundary
+                        FallbackComponent={FeatureErrorFallback}
+                        resetKeys={[location.pathname]}
+                      >
+                        <WideNotSupported>
+                          <NarrowAlternate name="PayeeEdit" />
+                        </WideNotSupported>
+                      </ErrorBoundary>
                     }
                   />
                   <Route
@@ -324,14 +348,26 @@ export function FinancesApp() {
                   />
                   <Route
                     path="/bank-sync"
-                    element={<NarrowAlternate name="BankSync" />}
+                    element={
+                      <ErrorBoundary
+                        FallbackComponent={FeatureErrorFallback}
+                        resetKeys={[location.pathname]}
+                      >
+                        <NarrowAlternate name="BankSync" />
+                      </ErrorBoundary>
+                    }
                   />
                   <Route
                     path="/bank-sync/account/:accountId/edit"
                     element={
-                      <WideNotSupported redirectTo="/bank-sync">
-                        <MobileBankSyncAccountEditPage />
-                      </WideNotSupported>
+                      <ErrorBoundary
+                        FallbackComponent={FeatureErrorFallback}
+                        resetKeys={[location.pathname]}
+                      >
+                        <WideNotSupported redirectTo="/bank-sync">
+                          <MobileBankSyncAccountEditPage />
+                        </WideNotSupported>
+                      </ErrorBoundary>
                     }
                   />
                   <Route path="/tags" element={<ManageTagsPage />} />
diff --git a/upcoming-release-notes/mobile-error-boundaries-schedules-payees-banksync.md b/upcoming-release-notes/mobile-error-boundaries-schedules-payees-banksync.md
new file mode 100644
index 0000000000..06bc99470f
--- /dev/null
+++ b/upcoming-release-notes/mobile-error-boundaries-schedules-payees-banksync.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [BasilTh]
+---
+
+Wrap the mobile schedules, payees, and bank sync pages in scoped error boundaries, so a rendering error in one of these sections shows a recoverable fallback instead of crashing the whole app.