From a88af852a8bf6ce206aa3394a1a8d0a602a11895 Mon Sep 17 00:00:00 2001
From: Ivan Sekovanikj <ivan.sekovanikj@getstream.io>
Date: Mon, 9 Dec 2024 15:30:59 +0100
Subject: [PATCH 1/2] fix: infinite image loading issue

---
 package/src/components/Attachment/Gallery.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/src/components/Attachment/Gallery.tsx b/package/src/components/Attachment/Gallery.tsx
index e7ca831dd9..20b182216f 100644
--- a/package/src/components/Attachment/Gallery.tsx
+++ b/package/src/components/Attachment/Gallery.tsx
@@ -458,7 +458,7 @@ const GalleryImageThumbnail = <
               setLoadingImage(false);
               setLoadingImageError(true);
             }}
-            onLoadEnd={() => setLoadingImage(false)}
+            onLoadEnd={() => setTimeout(() => setLoadingImage(false), 0)}
             onLoadStart={() => setLoadingImage(true)}
             resizeMode={thumbnail.resizeMode}
             style={[

From ec278ff0952948bd64aa45a3c48d4acada16dc47 Mon Sep 17 00:00:00 2001
From: Ivan Sekovanikj <ivan.sekovanikj@getstream.io>
Date: Mon, 9 Dec 2024 15:33:37 +0100
Subject: [PATCH 2/2] fix: image gallery animations issue

---
 .../components/ImageGallery/hooks/useAnimatedGalleryStyle.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/src/components/ImageGallery/hooks/useAnimatedGalleryStyle.tsx b/package/src/components/ImageGallery/hooks/useAnimatedGalleryStyle.tsx
index ed4bdc61e8..1ad1fcad40 100644
--- a/package/src/components/ImageGallery/hooks/useAnimatedGalleryStyle.tsx
+++ b/package/src/components/ImageGallery/hooks/useAnimatedGalleryStyle.tsx
@@ -72,12 +72,12 @@ export const useAnimatedGalleryStyle = ({
         { scaleX: -1 },
         { translateY: yScaleOffset },
         {
-          translateX: -translateX.value - xScaleOffset,
+          translateX: -xScaleOffset,
         },
         { scale: oneEighth },
       ],
     };
-  }, []);
+  }, [index]);
 
   return [animatedGalleryStyle, animatedStyles];
 };