1 files changed, 42 insertions, 28 deletions
diff --git a/src/view/screens/Feeds.tsx b/src/view/screens/Feeds.tsx
index fc4d99cf5..383bbcaa5 100644
--- a/src/view/screens/Feeds.tsx
+++ b/src/view/screens/Feeds.tsx
@@ -2,7 +2,6 @@ import React from 'react'
 import {ActivityIndicator, StyleSheet, RefreshControl, View} from 'react-native'
 import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
 import {FontAwesomeIconStyle} from '@fortawesome/react-native-fontawesome'
-import {AtUri} from '@atproto/api'
 import {withAuthRequired} from 'view/com/auth/withAuthRequired'
 import {ViewHeader} from 'view/com/util/ViewHeader'
 import {FAB} from 'view/com/util/fab/FAB'
@@ -24,9 +23,10 @@ import {ErrorMessage} from 'view/com/util/error/ErrorMessage'
 import debounce from 'lodash.debounce'
 import {Text} from 'view/com/util/text/Text'
 import {MyFeedsUIModel, MyFeedsItem} from 'state/models/ui/my-feeds'
+import {FeedSourceModel} from 'state/models/content/feed-source'
 import {FlatList} from 'view/com/util/Views'
 import {useFocusEffect} from '@react-navigation/native'
-import {CustomFeed} from 'view/com/feeds/CustomFeed'
+import {FeedSourceCard} from 'view/com/feeds/FeedSourceCard'
 
 type Props = NativeStackScreenProps<FeedsTabNavigatorParams, 'Feeds'>
 export const FeedsScreen = withAuthRequired(
@@ -52,6 +52,10 @@ export const FeedsScreen = withAuthRequired(
         }
       }, [store, myFeeds]),
     )
+    React.useEffect(() => {
+      // watch for changes to saved/pinned feeds
+      return myFeeds.registerListeners()
+    }, [myFeeds])
 
     const onPressCompose = React.useCallback(() => {
       store.shell.openComposer({})
@@ -139,13 +143,7 @@ export const FeedsScreen = withAuthRequired(
             </>
           )
         } else if (item.type === 'saved-feed') {
-          return (
-            <SavedFeed
-              uri={item.feed.uri}
-              avatar={item.feed.data.avatar}
-              displayName={item.feed.displayName}
-            />
-          )
+          return <SavedFeed feed={item.feed} />
         } else if (item.type === 'discover-feeds-header') {
           return (
             <>
@@ -187,7 +185,7 @@ export const FeedsScreen = withAuthRequired(
           )
         } else if (item.type === 'discover-feed') {
           return (
-            <CustomFeed
+            <FeedSourceCard
               item={item.feed}
               showSaveBtn
               showDescription
@@ -257,33 +255,43 @@ export const FeedsScreen = withAuthRequired(
   }),
 )
 
-function SavedFeed({
-  uri,
-  avatar,
-  displayName,
-}: {
-  uri: string
-  avatar: string | undefined
-  displayName: string
-}) {
+function SavedFeed({feed}: {feed: FeedSourceModel}) {
   const pal = usePalette('default')
-  const urip = new AtUri(uri)
-  const href = `/profile/${urip.hostname}/feed/${urip.rkey}`
   const {isMobile} = useWebMediaQueries()
   return (
     <Link
-      testID={`saved-feed-${displayName}`}
-      href={href}
+      testID={`saved-feed-${feed.displayName}`}
+      href={feed.href}
       style={[pal.border, styles.savedFeed, isMobile && styles.savedFeedMobile]}
       hoverStyle={pal.viewLight}
-      accessibilityLabel={displayName}
+      accessibilityLabel={feed.displayName}
       accessibilityHint=""
       asAnchor
       anchorNoUnderline>
-      <UserAvatar type="algo" size={28} avatar={avatar} />
-      <Text type="lg-medium" style={[pal.text, s.flex1]} numberOfLines={1}>
-        {displayName}
-      </Text>
+      {feed.error ? (
+        <View
+          style={{width: 28, flexDirection: 'row', justifyContent: 'center'}}>
+          <FontAwesomeIcon
+            icon="exclamation-circle"
+            color={pal.colors.textLight}
+          />
+        </View>
+      ) : (
+        <UserAvatar type="algo" size={28} avatar={feed.avatar} />
+      )}
+      <View
+        style={{flex: 1, flexDirection: 'row', gap: 8, alignItems: 'center'}}>
+        <Text type="lg-medium" style={pal.text} numberOfLines={1}>
+          {feed.displayName}
+        </Text>
+        {feed.error && (
+          <View style={[styles.offlineSlug, pal.borderDark]}>
+            <Text type="xs" style={pal.textLight}>
+              Feed offline
+            </Text>
+          </View>
+        )}
+      </View>
       {isMobile && (
         <FontAwesomeIcon
           icon="chevron-right"
@@ -342,4 +350,10 @@ const styles = StyleSheet.create({
   savedFeedMobile: {
     paddingVertical: 10,
   },
+  offlineSlug: {
+    borderWidth: 1,
+    borderRadius: 4,
+    paddingHorizontal: 4,
+    paddingVertical: 2,
+  },
 })