Merge branch 'master' into feature/defaultsearchprovider

src/app.tsx

@@ -3,7 +3,7 @@ import { createGlobalStyle } from "styled-components";
 import SearchBar from "./components/searchBar";
 import Greeter from "./components/greeter";
 import AppList from "./components/appList";
-import BookmarkList from "./components/bookmarkList";
+import BookmarkList from "./components/bookmarks";
 import Settings from "./components/settings";
 import Imprint from "./components/imprint";
 
@@ -29,20 +29,27 @@ const GlobalStyle = createGlobalStyle`
  * Renders the entire app by calling individual components
  */
 const App = () => {
-
-  const { appData, bookmarkData, searchProviderData, themeData, imprintData, greeterData } = useFetcher();
+  const {
+    appData,
+    bookmarkData,
+    searchProviderData,
+    themeData,
+    imprintData,
+    greeterData,
+  } = useFetcher();
 
   return (
     <>
       <GlobalStyle />
       <div>
         <SearchBar search={searchProviderData?.search} />
-        {!themeData.error && !searchProviderData.error && (
-          <Settings
-            themes={themeData?.themes}
-            search={searchProviderData?.search}
-          />
-        )}
+        {!themeData.error ||
+          (!searchProviderData.error && (
+            <Settings
+              themes={themeData?.themes}
+              search={searchProviderData?.search}
+            />
+          ))}
         <Greeter data={greeterData.greeter} />
         {!appData.error && (
           <AppList apps={appData.apps} categories={appData.categories} />