diff --git a/web/src/app/ee/admin/whitelabeling/ImageUpload.tsx b/web/src/app/ee/admin/whitelabeling/ImageUpload.tsx
index 460db7c11f6..26ac76c5f6e 100644
--- a/web/src/app/ee/admin/whitelabeling/ImageUpload.tsx
+++ b/web/src/app/ee/admin/whitelabeling/ImageUpload.tsx
@@ -52,7 +52,7 @@ export function ImageUpload({
}`}
>
-
+
Drag and drop a .png or .jpg file, or click to select a file
diff --git a/web/src/app/layout.tsx b/web/src/app/layout.tsx
index eb34245ec92..eea6705469e 100644
--- a/web/src/app/layout.tsx
+++ b/web/src/app/layout.tsx
@@ -1,6 +1,9 @@
import "./globals.css";
import { Inter as FontSans } from "next/font/google";
-import { getCombinedSettings } from "@/components/settings/lib";
+import {
+ fetchSettingsSS,
+ getCombinedSettings,
+} from "@/components/settings/lib";
import { CUSTOM_ANALYTICS_ENABLED } from "@/lib/constants";
import { SettingsProvider } from "@/components/settings/SettingsProvider";
import { Metadata } from "next";
@@ -38,7 +41,7 @@ export default async function RootLayout({
}: {
children: React.ReactNode;
}) {
- const combinedSettings = await getCombinedSettings({});
+ const combinedSettings = await fetchSettingsSS();
return (
diff --git a/web/src/components/Logo.tsx b/web/src/components/Logo.tsx
index eb76e25f2b5..81af5bf796e 100644
--- a/web/src/components/Logo.tsx
+++ b/web/src/components/Logo.tsx
@@ -46,3 +46,27 @@ export function Logo({
);
}
+
+/* export function Logo({
+ height,
+ width,
+ className,
+}: {
+ height?: number;
+ width?: number;
+ className?: string;
+}) {
+ height = height || 40;
+ width = width || 40;
+
+ return (
+
+
}`})
+