From 06a1087fef0a97af300ea511fd38e58453044582 Mon Sep 17 00:00:00 2001
From: Deepak Bhagat <deepak988088@gmail.com>
Date: Mon, 9 Feb 2026 20:30:25 +0530
Subject: [PATCH] Fix: Render App Engine image attachments correctly

---
 .../src/views/AttachmentHandler/Attachment.js |  6 ++-
 .../AttachmentHandler/ImageAttachment.js      | 48 +++++++++++++++----
 2 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/packages/react/src/views/AttachmentHandler/Attachment.js b/packages/react/src/views/AttachmentHandler/Attachment.js
index 20c329138d..379e2e251e 100644
--- a/packages/react/src/views/AttachmentHandler/Attachment.js
+++ b/packages/react/src/views/AttachmentHandler/Attachment.js
@@ -32,7 +32,11 @@ const Attachment = ({ attachment, host, type, variantStyles = {}, msg }) => {
       />
     );
   }
-  if (attachment && attachment.image_url) {
+  if (
+    attachment &&
+    (attachment.image_url ||
+      (attachment.image_type?.startsWith('image/') && attachment.title_link))
+  ) {
     return (
       <ImageAttachment
         attachment={attachment}
diff --git a/packages/react/src/views/AttachmentHandler/ImageAttachment.js b/packages/react/src/views/AttachmentHandler/ImageAttachment.js
index 84516ce65a..460dc4a12d 100644
--- a/packages/react/src/views/AttachmentHandler/ImageAttachment.js
+++ b/packages/react/src/views/AttachmentHandler/ImageAttachment.js
@@ -35,6 +35,16 @@ const ImageAttachment = ({
     setIsExpanded((prevState) => !prevState);
   };
 
+  const getImageUrl = (url) => {
+    if (!url) {
+      return;
+    }
+    if (url.startsWith('http') || url.startsWith('//')) {
+      return url;
+    }
+    return `${host}${url}`;
+  };
+
   return (
     <Box css={variantStyles.imageAttachmentContainer}>
       <Box
@@ -86,7 +96,7 @@ const ImageAttachment = ({
         >
           <AttachmentMetadata
             attachment={attachment}
-            url={host + (attachment.title_link || attachment.image_url)}
+            url={getImageUrl(attachment.title_link || attachment.image_url)}
             variantStyles={variantStyles}
             msg={msg}
             onExpandCollapseClick={toggleExpanded}
@@ -94,9 +104,20 @@ const ImageAttachment = ({
           />
         </Box>
         {isExpanded && (
-          <Box onClick={() => setShowGallery(true)}>
+          <Box
+            onClick={() =>
+              extractIdFromUrl(attachment.title_link)
+                ? setShowGallery(true)
+                : null
+            }
+            style={{
+              cursor: extractIdFromUrl(attachment.title_link)
+                ? 'pointer'
+                : 'default',
+            }}
+          >
             <img
-              src={host + attachment.image_url}
+              src={getImageUrl(attachment.image_url || attachment.title_link)}
               style={{
                 maxWidth: '100%',
                 objectFit: 'contain',
@@ -110,10 +131,16 @@ const ImageAttachment = ({
           attachment.attachments.map((nestedAttachment, index) => (
             <Box css={variantStyles.imageAttachmentContainer} key={index}>
               <Box
-                onClick={() => setShowGallery(true)}
+                onClick={() =>
+                  extractIdFromUrl(nestedAttachment.title_link)
+                    ? setShowGallery(true)
+                    : null
+                }
                 css={[
                   css`
-                    cursor: pointer;
+                    cursor: ${extractIdFromUrl(nestedAttachment.title_link)
+                      ? 'pointer'
+                      : 'default'};
                     border-radius: inherit;
                     line-height: 0;
                     padding: 0.5rem;
@@ -153,14 +180,15 @@ const ImageAttachment = ({
                 )}
                 <AttachmentMetadata
                   attachment={nestedAttachment}
-                  url={
-                    host +
-                    (nestedAttachment.title_link || nestedAttachment.image_url)
-                  }
+                  url={getImageUrl(
+                    nestedAttachment.title_link || nestedAttachment.image_url
+                  )}
                   variantStyles={variantStyles}
                 />
                 <img
-                  src={host + nestedAttachment.image_url}
+                  src={getImageUrl(
+                    nestedAttachment.image_url || nestedAttachment.title_link
+                  )}
                   style={{
                     maxWidth: '100%',
                     objectFit: 'contain',