From b5ebd1cec0d4022957a776fe9df46e3f717ab9c9 Mon Sep 17 00:00:00 2001
From: Ole <ole.richter91@gmail.com>
Date: Tue, 22 Oct 2024 10:11:26 +0200
Subject: [PATCH 1/3] fix: Activity Item screen spacing

---
 .../MasonryInfiniteScrollArtworkGrid.tsx           |  3 +--
 .../Activity/components/AlertNotification.tsx      | 14 ++++++++------
 .../components/ArtworkPublishedNotification.tsx    | 12 +++++++-----
 .../components/NotificationArtworkList.tsx         |  5 +++--
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/app/Components/ArtworkGrids/MasonryInfiniteScrollArtworkGrid.tsx b/src/app/Components/ArtworkGrids/MasonryInfiniteScrollArtworkGrid.tsx
index 7c71077d501..152aef75bf6 100644
--- a/src/app/Components/ArtworkGrids/MasonryInfiniteScrollArtworkGrid.tsx
+++ b/src/app/Components/ArtworkGrids/MasonryInfiniteScrollArtworkGrid.tsx
@@ -127,7 +127,6 @@ export const MasonryInfiniteScrollArtworkGrid: React.FC<MasonryInfiniteScrollArt
       contentContainerStyle={{
         // No paddings are needed for single column grids
         paddingHorizontal: getAdjustedNumColumns() === 1 ? 0 : space(2),
-        paddingBottom: artworks.length === 1 ? 0 : space(6),
       }}
       data={artworks}
       keyExtractor={(item) => item.id}
@@ -140,7 +139,7 @@ export const MasonryInfiniteScrollArtworkGrid: React.FC<MasonryInfiniteScrollArt
       refreshControl={refreshControl}
       renderItem={renderItem}
       ListFooterComponent={
-        <AnimatedMasonryListFooter shouldDisplaySpinner={shouldDisplaySpinner} />
+        hasMore ? <AnimatedMasonryListFooter shouldDisplaySpinner={shouldDisplaySpinner} /> : null
       }
       onScroll={rest.onScroll}
     />
diff --git a/src/app/Scenes/Activity/components/AlertNotification.tsx b/src/app/Scenes/Activity/components/AlertNotification.tsx
index 2f03284700c..e2153c4e079 100644
--- a/src/app/Scenes/Activity/components/AlertNotification.tsx
+++ b/src/app/Scenes/Activity/components/AlertNotification.tsx
@@ -1,13 +1,13 @@
 import {
+  ArrowRightIcon,
   Button,
+  DEFAULT_HIT_SLOP,
   Flex,
-  Text,
+  Pill,
   Screen,
   Spacer,
-  ArrowRightIcon,
+  Text,
   Touchable,
-  Pill,
-  DEFAULT_HIT_SLOP,
 } from "@artsy/palette-mobile"
 import { AlertNotification_notification$key } from "__generated__/AlertNotification_notification.graphql"
 import { ActivityErrorScreen } from "app/Scenes/Activity/components/ActivityErrorScreen"
@@ -15,7 +15,7 @@ import { NotificationArtworkList } from "app/Scenes/Activity/components/Notifica
 import { goBack, navigate } from "app/system/navigation/navigate"
 import { FC } from "react"
 import { ScrollView, TouchableOpacity } from "react-native"
-import { useFragment, graphql } from "react-relay"
+import { graphql, useFragment } from "react-relay"
 
 interface AlertNotificationProps {
   notification: AlertNotification_notification$key
@@ -86,7 +86,9 @@ export const AlertNotification: FC<AlertNotificationProps> = ({ notification })
 
         <NotificationArtworkList artworksConnection={artworksConnection} />
 
-        <Flex mx={2} mt={1} mb={2}>
+        <Spacer y={2} />
+
+        <Flex mx={2}>
           <Button
             block
             variant="outline"
diff --git a/src/app/Scenes/Activity/components/ArtworkPublishedNotification.tsx b/src/app/Scenes/Activity/components/ArtworkPublishedNotification.tsx
index d374521f0c8..2e17acf5ddf 100644
--- a/src/app/Scenes/Activity/components/ArtworkPublishedNotification.tsx
+++ b/src/app/Scenes/Activity/components/ArtworkPublishedNotification.tsx
@@ -1,10 +1,10 @@
 import {
+  ArrowRightIcon,
   Flex,
-  Text,
-  Screen,
   FollowButton,
+  Screen,
   Spacer,
-  ArrowRightIcon,
+  Text,
   Touchable,
 } from "@artsy/palette-mobile"
 import { ArtworkPublishedNotificationFollowArtistMutation } from "__generated__/ArtworkPublishedNotificationFollowArtistMutation.graphql"
@@ -14,7 +14,7 @@ import { NotificationArtworkList } from "app/Scenes/Activity/components/Notifica
 import { goBack, navigate } from "app/system/navigation/navigate"
 import { FC } from "react"
 import { ScrollView } from "react-native"
-import { useFragment, graphql, useMutation } from "react-relay"
+import { graphql, useFragment, useMutation } from "react-relay"
 
 interface ArtworkPublishedNotificationProps {
   notification: ArtworkPublishedNotification_notification$key
@@ -81,7 +81,9 @@ export const ArtworkPublishedNotification: FC<ArtworkPublishedNotificationProps>
 
         <NotificationArtworkList artworksConnection={artworksConnection} />
 
-        <Flex mx={2} mt={1} mb={2}>
+        <Spacer y={2} />
+
+        <Flex mx={2}>
           <Touchable onPress={handleViewAllWorksPress}>
             <Flex flexDirection="row">
               <Text fontWeight="bold">View all works by {artist.name}</Text>
diff --git a/src/app/Scenes/Activity/components/NotificationArtworkList.tsx b/src/app/Scenes/Activity/components/NotificationArtworkList.tsx
index a0d33d6fe42..003db9ed1f5 100644
--- a/src/app/Scenes/Activity/components/NotificationArtworkList.tsx
+++ b/src/app/Scenes/Activity/components/NotificationArtworkList.tsx
@@ -7,7 +7,7 @@ import { CommercialButtonsQueryRenderer } from "app/Scenes/Activity/components/N
 import { extractNodes } from "app/utils/extractNodes"
 import { FC } from "react"
 import { ImageBackground } from "react-native"
-import { useFragment, graphql } from "react-relay"
+import { graphql, useFragment } from "react-relay"
 
 export interface PartnerOffer {
   internalID: string
@@ -48,14 +48,15 @@ export const NotificationArtworkList: FC<NotificationArtworkListProps> = (props)
         onScroll={scrollHandler}
         partnerOffer={partnerOffer}
         priceOfferMessage={priceOfferMessage}
-        style={{ paddingBottom: 120 }}
       />
+
       {!!showArtworkCommercialButtons && (
         <CommercialButtonsQueryRenderer
           artworkID={artworks[0].internalID}
           partnerOffer={partnerOffer}
         />
       )}
+
       {!!note && (
         <Flex width="100%" flexDirection="row" p={2}>
           <Flex width="100%" flexDirection="row" bg="black5" p={1}>

From 80de800bb94480a56bd53cd6578adfc91410b9f6 Mon Sep 17 00:00:00 2001
From: Ole <ole.richter91@gmail.com>
Date: Mon, 28 Oct 2024 13:13:07 +0100
Subject: [PATCH 2/3] min height

---
 .secrets.baseline                                              | 2 +-
 src/app/Scenes/Activity/components/NotificationArtworkList.tsx | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.secrets.baseline b/.secrets.baseline
index 0c801e9ac18..d66d07f6f17 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -1134,5 +1134,5 @@
       }
     ]
   },
-  "generated_at": "2024-10-24T13:23:36Z"
+  "generated_at": "2024-10-28T12:12:54Z"
 }
diff --git a/src/app/Scenes/Activity/components/NotificationArtworkList.tsx b/src/app/Scenes/Activity/components/NotificationArtworkList.tsx
index 003db9ed1f5..9b93956e37d 100644
--- a/src/app/Scenes/Activity/components/NotificationArtworkList.tsx
+++ b/src/app/Scenes/Activity/components/NotificationArtworkList.tsx
@@ -36,7 +36,8 @@ export const NotificationArtworkList: FC<NotificationArtworkListProps> = (props)
   const color = useColor()
 
   return (
-    <Flex minHeight={400}>
+    // Setting the min heiht here because lashlist needs a container with a valid height.
+    <Flex minHeight={1}>
       <MasonryInfiniteScrollArtworkGrid
         animated
         artworks={artworks}

From b00ac65b626cb8d542f9697aa67910387c0aa8d0 Mon Sep 17 00:00:00 2001
From: Ole <ole.richter91@gmail.com>
Date: Mon, 28 Oct 2024 15:55:22 +0100
Subject: [PATCH 3/3] Update
 src/app/Scenes/Activity/components/NotificationArtworkList.tsx

Co-authored-by: Mounir Dhahri <soussouheros@gmail.com>
---
 src/app/Scenes/Activity/components/NotificationArtworkList.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/Scenes/Activity/components/NotificationArtworkList.tsx b/src/app/Scenes/Activity/components/NotificationArtworkList.tsx
index 9b93956e37d..de98a18b8b7 100644
--- a/src/app/Scenes/Activity/components/NotificationArtworkList.tsx
+++ b/src/app/Scenes/Activity/components/NotificationArtworkList.tsx
@@ -36,7 +36,7 @@ export const NotificationArtworkList: FC<NotificationArtworkListProps> = (props)
   const color = useColor()
 
   return (
-    // Setting the min heiht here because lashlist needs a container with a valid height.
+    // Setting the min heiht here because Flashlist needs a container with a valid height.
     <Flex minHeight={1}>
       <MasonryInfiniteScrollArtworkGrid
         animated