From a64f10bb701327bf7a0f315aac513856f91fc18d Mon Sep 17 00:00:00 2001
From: Eric Bailey <git@esb.lol>
Date: Tue, 25 Jun 2024 19:47:29 -0500
Subject: [PATCH] Replace FeedSourceCard in SavedFeeds

---
 src/view/screens/SavedFeeds.tsx | 59 ++++++++++++++++++++++-----------
 1 file changed, 40 insertions(+), 19 deletions(-)

diff --git a/src/view/screens/SavedFeeds.tsx b/src/view/screens/SavedFeeds.tsx
index c72bec1605..ae0a2c4aca 100644
--- a/src/view/screens/SavedFeeds.tsx
+++ b/src/view/screens/SavedFeeds.tsx
@@ -21,7 +21,6 @@ import {usePalette} from 'lib/hooks/usePalette'
 import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries'
 import {CommonNavigatorParams} from 'lib/routes/types'
 import {colors, s} from 'lib/styles'
-import {FeedSourceCard} from 'view/com/feeds/FeedSourceCard'
 import {TextLink} from 'view/com/util/Link'
 import {Text} from 'view/com/util/text/Text'
 import * as Toast from 'view/com/util/Toast'
@@ -343,14 +342,45 @@ function ListItem({
       {feed.type === 'timeline' ? (
         <FollowingFeedCard />
       ) : (
-        <FeedSourceCard
-          key={feed.view.uri}
-          feedUri={feed.view.uri}
-          style={[isPinned && {paddingRight: 8}]}
-          showMinimalPlaceholder
-          showSaveBtn={!isPinned}
-          hideTopBorder={true}
-        />
+        <View style={[a.flex_1]}>
+          {feed.type === 'feed' ? (
+            <FeedCard.Link view={feed.view} type="feed">
+              <View style={[a.py_md, a.pl_lg, a.pr_sm, a.flex_1]}>
+                <FeedCard.Outer>
+                  <FeedCard.Header>
+                    <FeedCard.Avatar src={feed.view.avatar} />
+                    <FeedCard.TitleAndByline
+                      type="feed"
+                      title={feed.view.displayName}
+                      creator={feed.view.creator}
+                    />
+                    {!isPinned && (
+                      <FeedCard.Action uri={feed.view.uri} type="feed" />
+                    )}
+                  </FeedCard.Header>
+                </FeedCard.Outer>
+              </View>
+            </FeedCard.Link>
+          ) : (
+            <FeedCard.Link view={feed.view} type="list">
+              <View style={[a.py_md, a.pl_lg, a.pr_sm, a.flex_1]}>
+                <FeedCard.Outer>
+                  <FeedCard.Header>
+                    <FeedCard.Avatar src={feed.view.avatar} />
+                    <FeedCard.TitleAndByline
+                      type="list"
+                      title={feed.view.name}
+                      creator={feed.view.creator}
+                    />
+                    {!isPinned && (
+                      <FeedCard.Action uri={feed.view.uri} type="list" />
+                    )}
+                  </FeedCard.Header>
+                </FeedCard.Outer>
+              </View>
+            </FeedCard.Link>
+          )}
+        </View>
       )}
       {isPinned ? (
         <>
@@ -424,16 +454,7 @@ function ListItem({
 function FollowingFeedCard() {
   const t = useTheme()
   return (
-    <View
-      style={[
-        a.flex_row,
-        a.align_center,
-        a.flex_1,
-        {
-          paddingHorizontal: 18,
-          paddingVertical: 20,
-        },
-      ]}>
+    <View style={[a.flex_row, a.align_center, a.flex_1, a.px_lg, a.py_md]}>
       <View
         style={[
           a.align_center,