diff --git a/packages/shared/src/components/Feed.tsx b/packages/shared/src/components/Feed.tsx index 288f5ec1c9..84caed4f21 100644 --- a/packages/shared/src/components/Feed.tsx +++ b/packages/shared/src/components/Feed.tsx @@ -310,6 +310,7 @@ export default function Feed({ const { onMenuClick, postMenuIndex, postMenuLocation } = useFeedContextMenu(); const useList = isListMode && numCards > 1; const virtualizedNumCards = useList ? 1 : numCards; + const showFirstSlotCard = showProfileCompletionCard || showBriefCard; const { onOpenModal, onCloseModal, @@ -326,7 +327,7 @@ export default function Feed({ feedName, }); const { - heroInsertIndex, + adjustedHeroInsertIndex, shouldShowTopHero, shouldShowInFeedHero, title: readingReminderTitle, @@ -336,6 +337,7 @@ export default function Feed({ } = useReadingReminderFeedHero({ itemCount: items.length, itemsPerRow: virtualizedNumCards, + firstSlotOffset: Number(showProfileCompletionCard || showBriefCard), }); useMutationSubscription({ @@ -588,7 +590,6 @@ export default function Feed({ const currentPageSize = pageSize ?? currentSettings.pageSize; const showPromoBanner = !!briefBannerPage; const columnsDiffWithPage = currentPageSize % virtualizedNumCards; - const showFirstSlotCard = showProfileCompletionCard || showBriefCard; const indexWhenShowingPromoBanner = currentPageSize * Number(briefBannerPage) - // number of items at that page columnsDiffWithPage * Number(briefBannerPage) - // cards let out of rows * page number @@ -662,7 +663,7 @@ export default function Feed({ }} /> )} - {shouldShowInFeedHero && index === heroInsertIndex && ( + {shouldShowInFeedHero && index === adjustedHeroInsertIndex && (
-
+
{!acceptedJustNow && (
- {!showTextCloseButton && ( + {shouldUseTopRightCloseButton && ( {shouldInlineActionWithMessage && ( - +
+ + +
)} {shouldUseVerticalContentLayout && !acceptedJustNow && @@ -363,7 +371,7 @@ function EnableNotification({
)} + {!showTextCloseButton && + !shouldInlineActionWithMessage && + !shouldUseTopRightCloseButton && ( + + )}
- {!showTextCloseButton && !hideCloseButton && ( + {shouldUseTopRightCloseButton && ( } title="Don’t have time now? Set a reminder" > diff --git a/packages/shared/src/components/post/common/PostReminderOptions.tsx b/packages/shared/src/components/post/common/PostReminderOptions.tsx index decd48675f..0f8366d913 100644 --- a/packages/shared/src/components/post/common/PostReminderOptions.tsx +++ b/packages/shared/src/components/post/common/PostReminderOptions.tsx @@ -39,14 +39,14 @@ export function PostReminderOptions({ onInteract(previousInteraction); }; return ( - +