Unify the display name fallback behavior

2 files changed, 10 insertions, 6 deletions

diff --git a/src/state/models/feeds/custom-feed.ts b/src/state/models/feeds/custom-feed.ts
index 20eef49ad..e60ac2740 100644
--- a/src/state/models/feeds/custom-feed.ts
+++ b/src/state/models/feeds/custom-feed.ts
@@ -1,6 +1,7 @@
 import {AppBskyFeedDefs, AtUri} from '@atproto/api'
 import {makeAutoObservable} from 'mobx'
 import {RootStoreModel} from 'state/models/root-store'
+import {sanitizeDisplayName} from 'lib/strings/display-names'
 
 export class CustomFeedModel {
   // data
@@ -34,6 +35,13 @@ export class CustomFeedModel {
     return this.data.uri
   }
 
+  get displayName() {
+    if (this.data.displayName) {
+      return sanitizeDisplayName(this.data.displayName)
+    }
+    return `Feed by @${this.data.creator.handle}`
+  }
+
   get isSaved() {
     return this.data.viewer?.saved
   }
diff --git a/src/state/models/ui/saved-feeds.ts b/src/state/models/ui/saved-feeds.ts
index ce0de25ec..85e77cae5 100644
--- a/src/state/models/ui/saved-feeds.ts
+++ b/src/state/models/ui/saved-feeds.ts
@@ -66,15 +66,11 @@ export class SavedFeedsModel {
   }
 
   get listOfFeedNames() {
-    return this.feeds.map(
-      f => f.data.displayName ?? f.data.creator.displayName + "'s feed",
-    )
+    return this.feeds.map(f => f.displayName)
   }
 
   get listOfPinnedFeedNames() {
-    return this.pinned.map(
-      f => f.data.displayName ?? f.data.creator.displayName + "'s feed",
-    )
+    return this.pinned.map(f => f.displayName)
   }
 
   get savedFeedsWithoutPinned() {