Merge branch 'issue-5088-gets0ul' into bug-bash

Author: luizrrodrigues

src/shared/components/challenge-listing/Listing/Bucket/index.jsx

@@ -184,7 +184,7 @@ export default function Bucket({
       {placeholders}
       {
       // (expandable || loadMore) && (expandable || !keepPlaceholders) && !loading && !expanded ? (
-        (expanding || expandable) && !loading && !expanded && loadMore ? (
+        (expanding || expandable) && !loading && loadMore && (expandable ? expanded : !expanded) ? (
           <a
             // href={`${challengesUrl}?${bucketQuery}`}
             href={`${challengesUrl}`}

src/shared/components/challenge-listing/Listing/index.jsx

@@ -182,8 +182,7 @@ function Listing({
     );
   };
 
-  if (!expanding && (activeBucket !== BUCKETS.ALL)
-  && (activeBucket !== BUCKETS.SAVED_FILTER)) {
+  if ((activeBucket !== BUCKETS.SAVED_FILTER)) {
     return (
       <div styleName="challengeCardContainer">
         {getBucket(activeBucket, true)}
@@ -207,7 +206,8 @@ function Listing({
   // }
   const loading = loadingMyChallenges
     || loadingOpenForRegistrationChallenges
-    || loadingOnGoingChallenges;
+    || loadingOnGoingChallenges
+    || loadingAllChallenges;
   const placeholders = [];
   if (challenges.length > 0 || (activeBucket === BUCKETS.ALL && allChallenges.length > 0)) {
     return (