fix profile page flow

ost-cas-fee-adv-22-23 · Apr 16, 2023 · b23ee05 · b23ee05 · vercel · Apr 16, 2023
1 parent 058401f
commit b23ee05
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/components/mumbles.tsx b/components/mumbles.tsx
@@ -43,7 +43,8 @@ export const Mumbles: FC<MumblesProps> = ({
         hasMore={hasMore}
         loader={<Skeleton />}
         endMessage={
-          isEndMessageNeeded && (
+          isEndMessageNeeded &&
+          !!mumbles.length && (
             <CardWrapper
               titel="Yaay, du hast alle mumbles gesehen!"
               src={noMoreMumblesPicture}

diff --git a/pages/profile/[id].tsx b/pages/profile/[id].tsx
@@ -159,7 +159,6 @@ export default function ProfilePage() {
           <div className="my-4 md:h-[35rem]">
             <Skeleton isProfile={true} />
           </div>
-          <Skeleton />
         </>
       ) : (
         <div className="my-4">
@@ -210,19 +209,22 @@ export default function ProfilePage() {
       )}
       {profileState.context.isOwnProfile &&
         !profileState.context.isNewUserProfile &&
-        !!profileState.context.likedPosts.length && (
+        profileState.matches('idle') && (
           <Toggle
             isToggleOn={profileState.context.isPostsOpen}
             onClick={toggle}
             onLabel="Deine Mumbles"
             offLabel="Deine Likes"
           />
         )}
-      {!profileState.context.posts.length && profileState.matches('idle') && (
+      {((profileState.matches('idle') &&
+        profileState.context.isPostsOpen &&
+        !profileState.context.posts.length) ||
+        (!profileState.context.isPostsOpen &&
+          !profileState.context.likedPosts.length)) && (
         <CardWrapper titel="Keine Mumbles gefunden" src={noMumblesPicture} />
       )}
-      {!profileState.context.posts.length ||
-      profileState.matches('loadPostsAndLikedPosts') ||
+      {profileState.matches('loadPostsAndLikedPosts') ||
       profileState.matches('loadPosts') ? (
         <>
           <Skeleton />