Skip to content

[pull] main from KelvinTegelaar:main #672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Dec 19, 2025
+10 −6
Merged

[pull] main from KelvinTegelaar:main #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3ab9d6
Update _app.js
JohnDuprey Dec 19, 2025
7e53ee3
Remove isInitialized check from app rendering
JohnDuprey Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/components/CippComponents/CippTenantSelector.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(() => {
Expand Down
8 changes: 3 additions & 5 deletions src/pages/_app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
});
Expand Down