From 2eae4ffa143712aed295c4b09d4922fb7ce7109c Mon Sep 17 00:00:00 2001
From: Pas <74743263+Pasithea0@users.noreply.github.com>
Date: Mon, 2 Jun 2025 00:34:15 -0600
Subject: [PATCH] complete merge

---
 src/components/overlays/details/DetailsHeader.tsx | 7 ++++++-
 src/pages/discover/Discover.tsx                   | 2 +-
 src/pages/discover/MoreContent.tsx                | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/overlays/details/DetailsHeader.tsx b/src/components/overlays/details/DetailsHeader.tsx
index 07bae2b4..7aa6d4d8 100644
--- a/src/components/overlays/details/DetailsHeader.tsx
+++ b/src/components/overlays/details/DetailsHeader.tsx
@@ -5,6 +5,7 @@ import { Button } from "@/components/buttons/Button";
 import { IconPatch } from "@/components/buttons/IconPatch";
 import { Icon, Icons } from "@/components/Icon";
 import { MediaBookmarkButton } from "@/components/media/MediaBookmark";
+import { usePreferencesStore } from "@/stores/preferences";
 
 import { DetailsHeaderProps } from "./types";
 
@@ -15,11 +16,15 @@ export function DetailsHeader({
   onShareClick,
   showProgress,
 }: DetailsHeaderProps) {
+  const enableImageLogos = usePreferencesStore(
+    (state) => state.enableImageLogos,
+  );
+
   return (
     <>
       {/* Title and Genres Row */}
       <div className="pb-2">
-        {data.logoUrl ? (
+        {data.logoUrl && enableImageLogos ? (
           <img
             src={data.logoUrl}
             alt={data.title}
diff --git a/src/pages/discover/Discover.tsx b/src/pages/discover/Discover.tsx
index c9c8c4db..8c8d392a 100644
--- a/src/pages/discover/Discover.tsx
+++ b/src/pages/discover/Discover.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
 import { Helmet } from "react-helmet-async";
 
-import { DetailsModal } from "@/components/overlays/DetailsModal";
+import { DetailsModal } from "@/components/overlays/details/DetailsModal";
 import { useModal } from "@/components/overlays/Modal";
 
 import { SubPageLayout } from "../layouts/SubPageLayout";
diff --git a/src/pages/discover/MoreContent.tsx b/src/pages/discover/MoreContent.tsx
index efc1fa6d..840a8efc 100644
--- a/src/pages/discover/MoreContent.tsx
+++ b/src/pages/discover/MoreContent.tsx
@@ -11,7 +11,7 @@ import { Icon, Icons } from "@/components/Icon";
 import { WideContainer } from "@/components/layout/WideContainer";
 import { MediaCard } from "@/components/media/MediaCard";
 import { MediaGrid } from "@/components/media/MediaGrid";
-import { DetailsModal } from "@/components/overlays/DetailsModal";
+import { DetailsModal } from "@/components/overlays/details/DetailsModal";
 import { useModal } from "@/components/overlays/Modal";
 import { Heading1 } from "@/components/utils/Text";
 import { SubPageLayout } from "@/pages/layouts/SubPageLayout";