From 69c035214ddce15607aa9a27d21aac2b04110a11 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Sun, 19 Jan 2025 20:49:43 +0000
Subject: [PATCH] Fix undefined logic, remove header for interstitial

---
 src/components/interstitials/TrendingVideos.tsx         | 2 +-
 src/screens/Search/components/ExploreTrendingVideos.tsx | 2 +-
 src/screens/VideoFeed/components/Header.tsx             | 5 +++++
 src/screens/VideoFeed/index.tsx                         | 4 ++--
 src/screens/VideoFeed/types.ts                          | 2 +-
 src/view/com/posts/PostFeed.tsx                         | 7 ++-----
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/components/interstitials/TrendingVideos.tsx b/src/components/interstitials/TrendingVideos.tsx
index fc174a27ce..126d6f4174 100644
--- a/src/components/interstitials/TrendingVideos.tsx
+++ b/src/components/interstitials/TrendingVideos.tsx
@@ -174,7 +174,7 @@ function VideoCards({
             sourceContext={{
               type: 'feedgen',
               uri: VIDEO_FEED_URI,
-              feedCacheKey: 'discover',
+              sourceInterstitial: 'discover',
             }}
             onInteract={() => {
               logEvent('videoCard:click', {
diff --git a/src/screens/Search/components/ExploreTrendingVideos.tsx b/src/screens/Search/components/ExploreTrendingVideos.tsx
index 633b72169c..daceb9acd9 100644
--- a/src/screens/Search/components/ExploreTrendingVideos.tsx
+++ b/src/screens/Search/components/ExploreTrendingVideos.tsx
@@ -214,7 +214,7 @@ function VideoCards({
             sourceContext={{
               type: 'feedgen',
               uri: VIDEO_FEED_URI,
-              feedCacheKey: 'explore',
+              sourceInterstitial: 'explore',
             }}
             onInteract={() => {
               logEvent('videoCard:click', {
diff --git a/src/screens/VideoFeed/components/Header.tsx b/src/screens/VideoFeed/components/Header.tsx
index c9a194646b..2caa3019aa 100644
--- a/src/screens/VideoFeed/components/Header.tsx
+++ b/src/screens/VideoFeed/components/Header.tsx
@@ -107,6 +107,11 @@ export function FeedHeader({
     return null
   }
 
+  if (sourceContext.sourceInterstitial !== undefined) {
+    // For now, don't show the header if coming from an interstitial.
+    return null
+  }
+
   return (
     <View style={[a.flex_1, a.flex_row, a.align_center, a.gap_sm]}>
       {info.avatar && <UserAvatar size={36} type="algo" avatar={info.avatar} />}
diff --git a/src/screens/VideoFeed/index.tsx b/src/screens/VideoFeed/index.tsx
index 488c12cad4..4873dcaedf 100644
--- a/src/screens/VideoFeed/index.tsx
+++ b/src/screens/VideoFeed/index.tsx
@@ -192,9 +192,9 @@ function Feed() {
   const {data, error, hasNextPage, isFetchingNextPage, fetchNextPage} =
     usePostFeedQuery(
       feedDesc,
-      params.type === 'feedgen' && params.feedCacheKey !== undefined
+      params.type === 'feedgen' && params.sourceInterstitial !== 'none'
         ? {
-            feedCacheKey: params.feedCacheKey,
+            feedCacheKey: params.sourceInterstitial,
           }
         : undefined,
     )
diff --git a/src/screens/VideoFeed/types.ts b/src/screens/VideoFeed/types.ts
index 709ae959d2..2ab854bb38 100644
--- a/src/screens/VideoFeed/types.ts
+++ b/src/screens/VideoFeed/types.ts
@@ -7,8 +7,8 @@ export type VideoFeedSourceContext =
   | {
       type: 'feedgen'
       uri: string
+      sourceInterstitial: 'discover' | 'explore' | 'none'
       initialPostUri?: string
-      feedCacheKey?: 'discover' | 'explore' | undefined
     }
   | {
       type: 'author'
diff --git a/src/view/com/posts/PostFeed.tsx b/src/view/com/posts/PostFeed.tsx
index 28671d2f46..ab7fff24d9 100644
--- a/src/view/com/posts/PostFeed.tsx
+++ b/src/view/com/posts/PostFeed.tsx
@@ -14,10 +14,7 @@ import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useQueryClient} from '@tanstack/react-query'
 
-import {
-  DISCOVER_FEED_URI,
-  KNOWN_SHUTDOWN_FEEDS,
-} from '#/lib/constants'
+import {DISCOVER_FEED_URI, KNOWN_SHUTDOWN_FEEDS} from '#/lib/constants'
 import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender'
 import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
 import {useGate} from '#/lib/statsig/statsig'
@@ -655,7 +652,7 @@ let PostFeed = ({
             sourceContext={{
               type: 'feedgen',
               uri: row.sourceFeedUri,
-              feedCacheKey: feedCacheKey,
+              sourceInterstitial: feedCacheKey ?? 'none',
             }}
           />
         )