Merge branch 'wrap-error-boundary-in-theme'

mullvad · Jan 23, 2025 · d0e32be · d0e32be
2 parents a1b47c2 + c3eba43
commit d0e32be
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/desktop/packages/mullvad-vpn/src/renderer/app.tsx b/desktop/packages/mullvad-vpn/src/renderer/app.tsx
@@ -293,16 +293,16 @@ export default class AppRenderer {
             <StyleSheetManager enableVendorPrefixes>
               <Lang>
                 <Router history={this.history.asHistory}>
-                  <ErrorBoundary>
-                    <ModalContainer>
-                      <KeyboardNavigation>
-                        <Theme>
+                  <Theme>
+                    <ErrorBoundary>
+                      <ModalContainer>
+                        <KeyboardNavigation>
                           <AppRouter />
-                        </Theme>
-                      </KeyboardNavigation>
-                      {window.env.platform === 'darwin' && <MacOsScrollbarDetection />}
-                    </ModalContainer>
-                  </ErrorBoundary>
+                        </KeyboardNavigation>
+                        {window.env.platform === 'darwin' && <MacOsScrollbarDetection />}
+                      </ModalContainer>
+                    </ErrorBoundary>
+                  </Theme>
                 </Router>
               </Lang>
             </StyleSheetManager>