From f3ab9d66e8ebb3bef3f95ec1d082bc5b697843c9 Mon Sep 17 00:00:00 2001
From: John Duprey <jwd@johnwduprey.com>
Date: Thu, 18 Dec 2025 22:00:15 -0500
Subject: [PATCH 1/2] Update _app.js

---
 src/pages/_app.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/pages/_app.js b/src/pages/_app.js
index a26f46d7f701..22753fa0beed 100644
--- a/src/pages/_app.js
+++ b/src/pages/_app.js
@@ -366,15 +366,13 @@ const App = (props) => {
             <LocalizationProvider dateAdapter={AdapterDateFns} adapterLocale={dateLocale}>
               <SettingsConsumer>
                 {(settings) => {
-                  if (!settings.isInitialized) {
-                    return null; // Don't render until settings are loaded
-                  }
+                  // Create theme even while initializing to avoid blank screen
                   const theme = createTheme({
                     colorPreset: "orange",
-                    direction: settings.direction,
+                    direction: settings.direction || "ltr",
                     paletteMode:
                       settings.currentTheme?.value !== "browser"
-                        ? settings.currentTheme?.value
+                        ? settings.currentTheme?.value || "light"
                         : preferredTheme,
                     contrast: "high",
                   });
@@ -384,13 +382,15 @@ const App = (props) => {
                       <ThemeProvider theme={theme}>
                         <RTL direction={settings.direction}>
                           <CssBaseline />
-                          <ErrorBoundary FallbackComponent={Error500}>
-                            <PrivateRoute>
-                              <ReleaseNotesProvider>
-                                {getLayout(<Component {...pageProps} />)}
-                              </ReleaseNotesProvider>
-                            </PrivateRoute>
-                          </ErrorBoundary>
+                          {settings.isInitialized ? (
+                            <ErrorBoundary FallbackComponent={Error500}>
+                              <PrivateRoute>
+                                <ReleaseNotesProvider>
+                                  {getLayout(<Component {...pageProps} />)}
+                                </ReleaseNotesProvider>
+                              </PrivateRoute>
+                            </ErrorBoundary>
+                          ) : null}
                           <Toaster position="top-center" />
                           <CippSpeedDial
                             actions={speedDialActions}

From 7e53ee39c33fc7ff8f1db0baad3c3986084f308d Mon Sep 17 00:00:00 2001
From: John Duprey <jwd@johnwduprey.com>
Date: Thu, 18 Dec 2025 22:14:21 -0500
Subject: [PATCH 2/2] Remove isInitialized check from app rendering

The conditional rendering based on settings.isInitialized was removed from _app.js, allowing the main app components to render regardless of initialization state. Also, minor formatting changes were made to the CippTenantSelector effect dependencies for readability.
---
 .../CippComponents/CippTenantSelector.jsx        |  8 +++++++-
 src/pages/_app.js                                | 16 +++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/components/CippComponents/CippTenantSelector.jsx b/src/components/CippComponents/CippTenantSelector.jsx
index 735ecfe82d40..de58af87c29a 100644
--- a/src/components/CippComponents/CippTenantSelector.jsx
+++ b/src/components/CippComponents/CippTenantSelector.jsx
@@ -230,7 +230,13 @@ export const CippTenantSelector = (props) => {
         });
       }
     }
-  }, [router.isReady, router.query.tenantFilter, tenantList.isSuccess, settings.currentTenant, settings.isInitialized]);
+  }, [
+    router.isReady,
+    router.query.tenantFilter,
+    tenantList.isSuccess,
+    settings.currentTenant,
+    settings.isInitialized,
+  ]);
 
   // This effect ensures the tenant filter parameter is included in the URL when missing
   useEffect(() => {
diff --git a/src/pages/_app.js b/src/pages/_app.js
index 22753fa0beed..b9b16e9d3ecd 100644
--- a/src/pages/_app.js
+++ b/src/pages/_app.js
@@ -382,15 +382,13 @@ const App = (props) => {
                       <ThemeProvider theme={theme}>
                         <RTL direction={settings.direction}>
                           <CssBaseline />
-                          {settings.isInitialized ? (
-                            <ErrorBoundary FallbackComponent={Error500}>
-                              <PrivateRoute>
-                                <ReleaseNotesProvider>
-                                  {getLayout(<Component {...pageProps} />)}
-                                </ReleaseNotesProvider>
-                              </PrivateRoute>
-                            </ErrorBoundary>
-                          ) : null}
+                          <ErrorBoundary FallbackComponent={Error500}>
+                            <PrivateRoute>
+                              <ReleaseNotesProvider>
+                                {getLayout(<Component {...pageProps} />)}
+                              </ReleaseNotesProvider>
+                            </PrivateRoute>
+                          </ErrorBoundary>
                           <Toaster position="top-center" />
                           <CippSpeedDial
                             actions={speedDialActions}