summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMarkus Pettersson <markus.pettersson@mullvad.net>2025-01-23 09:55:54 +0100
committerMarkus Pettersson <markus.pettersson@mullvad.net>2025-01-23 09:55:54 +0100
commitd0e32be44b8ea13b22eca74d4e37399b2cec7803 (patch)
tree95cb6d049b3cdb073aea944c426367c1b277701c
parenta1b47c23a9532abc0f51fc94de481b0528afb9fb (diff)
parentc3eba43f010f9ad7053d7132fc37edafd70f9118 (diff)
downloadmullvadvpn-d0e32be44b8ea13b22eca74d4e37399b2cec7803.tar.xz
mullvadvpn-d0e32be44b8ea13b22eca74d4e37399b2cec7803.zip
Merge branch 'wrap-error-boundary-in-theme'
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/app.tsx18
1 files changed, 9 insertions, 9 deletions
diff --git a/desktop/packages/mullvad-vpn/src/renderer/app.tsx b/desktop/packages/mullvad-vpn/src/renderer/app.tsx
index 90af0cf22f..b92dbd9179 100644
--- 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>