From f4891a47a17cdcd35751867153f73350c90a8f72 Mon Sep 17 00:00:00 2001 From: Paul Frazee Date: Tue, 15 Aug 2023 09:59:49 -0700 Subject: Fix to feeds view in profiles (#1171) * Fix load of feeds tab * Add e2e test for profile feeds --- src/state/models/ui/profile.ts | 23 ++++++++--------------- src/view/com/feeds/CustomFeed.tsx | 1 + 2 files changed, 9 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/state/models/ui/profile.ts b/src/state/models/ui/profile.ts index a8c8ec0a0..9dae09ec5 100644 --- a/src/state/models/ui/profile.ts +++ b/src/state/models/ui/profile.ts @@ -114,32 +114,25 @@ export class ProfileUiModel { }, ]) } else { - // not loading, no error, show content if ( this.selectedView === Sections.PostsNoReplies || this.selectedView === Sections.PostsWithReplies || - this.selectedView === Sections.PostsWithMedia || - this.selectedView === Sections.CustomAlgorithms + this.selectedView === Sections.PostsWithMedia ) { if (this.feed.hasContent) { - if (this.selectedView === Sections.CustomAlgorithms) { - arr = this.algos.feeds - } else if ( - this.selectedView === Sections.PostsNoReplies || - this.selectedView === Sections.PostsWithReplies || - this.selectedView === Sections.PostsWithMedia - ) { - arr = this.feed.slices.slice() - } else { - // posts with replies is also default - arr = this.feed.slices.slice() - } + arr = this.feed.slices.slice() if (!this.feed.hasMore) { arr = arr.concat([ProfileUiModel.END_ITEM]) } } else if (this.feed.isEmpty) { arr = arr.concat([ProfileUiModel.EMPTY_ITEM]) } + } else if (this.selectedView === Sections.CustomAlgorithms) { + if (this.algos.hasContent) { + arr = this.algos.feeds + } else if (this.algos.isEmpty) { + arr = arr.concat([ProfileUiModel.EMPTY_ITEM]) + } } else if (this.selectedView === Sections.Lists) { if (this.lists.hasContent) { arr = this.lists.lists diff --git a/src/view/com/feeds/CustomFeed.tsx b/src/view/com/feeds/CustomFeed.tsx index 79f1dd74d..264c2d982 100644 --- a/src/view/com/feeds/CustomFeed.tsx +++ b/src/view/com/feeds/CustomFeed.tsx @@ -69,6 +69,7 @@ export const CustomFeed = observer( return ( { -- cgit 1.4.1