From 13672f6254ab7cdc7fac8cd8e7297c9b7b84c9fe Mon Sep 17 00:00:00 2001
From: shiva raj badu <shivabadu5@gmail.com>
Date: Sun, 29 Mar 2026 18:14:33 +0545
Subject: [PATCH] fix: Merge conflict

---
 .../(dashboard)/dashboard/components/PresentationCard.tsx  | 2 +-
 .../components/PresentationRender.tsx                      | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/electron/servers/nextjs/app/(presentation-generator)/(dashboard)/dashboard/components/PresentationCard.tsx b/electron/servers/nextjs/app/(presentation-generator)/(dashboard)/dashboard/components/PresentationCard.tsx
index 87658cf4..87ce0d75 100644
--- a/electron/servers/nextjs/app/(presentation-generator)/(dashboard)/dashboard/components/PresentationCard.tsx
+++ b/electron/servers/nextjs/app/(presentation-generator)/(dashboard)/dashboard/components/PresentationCard.tsx
@@ -111,7 +111,7 @@ export const PresentationCard = ({
         <img src="/card_bg.svg" alt="" className="absolute top-0 left-0 w-full h-full object-cover" />
         <div className="scale-[0.75] mt-4  border border-gray-300 rounded-lg overflow-hidden">
 
-          <SlideScale slide={firstSlide} isClickable={true} />
+          <SlideScale slide={firstSlide} isClickable={false} />
         </div>
 
         <div className="w-full py-3 px-5 mt-auto z-40 relative bg-white  border-t border-[#EDEEEF]">
diff --git a/electron/servers/nextjs/app/(presentation-generator)/components/PresentationRender.tsx b/electron/servers/nextjs/app/(presentation-generator)/components/PresentationRender.tsx
index 855dcf1f..fc37153d 100644
--- a/electron/servers/nextjs/app/(presentation-generator)/components/PresentationRender.tsx
+++ b/electron/servers/nextjs/app/(presentation-generator)/components/PresentationRender.tsx
@@ -12,7 +12,8 @@ const SlideScale = ({
     isEditMode = true,
     /** Fill viewport; scale may exceed 1 so slides appear larger in present mode */
     presentMode = false,
-}: { slide: any; theme?: any; isEditMode?: boolean; presentMode?: boolean }) => {
+    isClickable = true,
+}: { slide: any; theme?: any; isEditMode?: boolean; presentMode?: boolean; isClickable?: boolean }) => {
 
     const containerRef = useRef<HTMLDivElement | null>(null);
     const [box, setBox] = useState({ w: 0, h: 0 });
@@ -76,11 +77,11 @@ const SlideScale = ({
                     } as React.CSSProperties}
                 >
 
-                    {isClickable && <div
+                    {!isClickable && <div
                         className="absolute inset-0 bg-transparent z-30 w-full h-full  select-none"
                         aria-hidden="true"
 
-                    /> */}
+                    />}
                     <V1ContentRender slide={slide} isEditMode={isEditMode} theme={theme} />
                 </div>