diff options
| author | Oskar <oskar@mullvad.net> | 2024-10-01 16:59:27 +0200 |
|---|---|---|
| committer | Oskar <oskar@mullvad.net> | 2024-10-01 16:59:27 +0200 |
| commit | fa641713ae50f8f6180230f2866a12ac17836fd3 (patch) | |
| tree | b212784d8ba113a264179055cc166d529781605c /gui/src | |
| parent | ffa5d846607f680a35b59266845196c34971a2ba (diff) | |
| parent | d27b4090b139327f5e87df459784286edc22a805 (diff) | |
| download | mullvadvpn-fa641713ae50f8f6180230f2866a12ac17836fd3.tar.xz mullvadvpn-fa641713ae50f8f6180230f2866a12ac17836fd3.zip | |
Merge branch 'enable-react-strict-mode-des-1284'
Diffstat (limited to 'gui/src')
| -rw-r--r-- | gui/src/renderer/app.tsx | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx index 7f8cf02ddd..940dcc000f 100644 --- a/gui/src/renderer/app.tsx +++ b/gui/src/renderer/app.tsx @@ -1,3 +1,4 @@ +import { StrictMode } from 'react'; import { batch, Provider } from 'react-redux'; import { Router } from 'react-router'; import { bindActionCreators } from 'redux'; @@ -287,25 +288,27 @@ export default class AppRenderer { public renderView() { return ( - <AppContext.Provider value={{ app: this }}> - <Provider store={this.reduxStore}> - <StyleSheetManager enableVendorPrefixes> - <Lang> - <Router history={this.history.asHistory}> - <ErrorBoundary> - <ModalContainer> - <KeyboardNavigation> - <AppRouter /> - <Changelog /> - </KeyboardNavigation> - {window.env.platform === 'darwin' && <MacOsScrollbarDetection />} - </ModalContainer> - </ErrorBoundary> - </Router> - </Lang> - </StyleSheetManager> - </Provider> - </AppContext.Provider> + <StrictMode> + <AppContext.Provider value={{ app: this }}> + <Provider store={this.reduxStore}> + <StyleSheetManager enableVendorPrefixes> + <Lang> + <Router history={this.history.asHistory}> + <ErrorBoundary> + <ModalContainer> + <KeyboardNavigation> + <AppRouter /> + <Changelog /> + </KeyboardNavigation> + {window.env.platform === 'darwin' && <MacOsScrollbarDetection />} + </ModalContainer> + </ErrorBoundary> + </Router> + </Lang> + </StyleSheetManager> + </Provider> + </AppContext.Provider> + </StrictMode> ); } |