From 0619b162d6dc405da6c4ceb907bef45b66cd099e Mon Sep 17 00:00:00 2001
From: Nutomic <me@nutomic.com>
Date: Mon, 14 Mar 2022 20:11:21 +0000
Subject: [PATCH] Fix error during new site setup (#596)

* Fix error during new site setup

* remove logging
---
 src/shared/components/app/app.tsx   | 2 +-
 src/shared/components/app/theme.tsx | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/shared/components/app/app.tsx b/src/shared/components/app/app.tsx
index 67816f6..9ddff69 100644
--- a/src/shared/components/app/app.tsx
+++ b/src/shared/components/app/app.tsx
@@ -28,7 +28,7 @@ export class App extends Component<AppProps, any> {
           <div>
             <Theme
               myUserInfo={siteRes.my_user}
-              defaultTheme={siteRes.site_view.site.default_theme}
+              defaultTheme={siteRes?.site_view?.site?.default_theme}
             />
             {siteRes &&
               siteRes.site_view &&
diff --git a/src/shared/components/app/theme.tsx b/src/shared/components/app/theme.tsx
index 0af7ca7..b609b71 100644
--- a/src/shared/components/app/theme.tsx
+++ b/src/shared/components/app/theme.tsx
@@ -4,7 +4,7 @@ import { MyUserInfo } from "lemmy-js-client";
 
 interface Props {
   myUserInfo: MyUserInfo | undefined;
-  defaultTheme: string;
+  defaultTheme?: string;
 }
 
 export class Theme extends Component<Props> {
@@ -22,7 +22,10 @@ export class Theme extends Component<Props> {
           />
         </Helmet>
       );
-    } else if (this.props.defaultTheme != "browser") {
+    } else if (
+      this.props.defaultTheme != null &&
+      this.props.defaultTheme != "browser"
+    ) {
       return (
         <Helmet>
           <link
-- 
2.44.1