From e97b6771910d3e6809810561a0deb76caaf7e0d5 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Mon, 3 Jul 2023 08:13:56 -0700
Subject: Apply theme to server loading

---
 modern/src/index.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'modern')

diff --git a/modern/src/index.js b/modern/src/index.js
index a4aecc1a..6473e2cd 100644
--- a/modern/src/index.js
+++ b/modern/src/index.js
@@ -26,17 +26,16 @@ root.render(
     <Provider store={store}>
       <LocalizationProvider>
         <StyledEngineProvider injectFirst>
-          <CssBaseline />
-          <ServerProvider>
-            <AppThemeProvider>
-              <CssBaseline />
+          <AppThemeProvider>
+            <CssBaseline />
+            <ServerProvider>
               <BrowserRouter>
                 <Navigation />
               </BrowserRouter>
               <ErrorHandler />
               <NativeInterface />
-            </AppThemeProvider>
-          </ServerProvider>
+            </ServerProvider>
+          </AppThemeProvider>
         </StyledEngineProvider>
       </LocalizationProvider>
     </Provider>
-- 
cgit v1.2.3