diff --git a/frontend/pages/Homepage/ActivityFeed/ActivityFeed.tsx b/frontend/pages/Homepage/ActivityFeed/ActivityFeed.tsx index 9004931496..f68d7d1072 100644 --- a/frontend/pages/Homepage/ActivityFeed/ActivityFeed.tsx +++ b/frontend/pages/Homepage/ActivityFeed/ActivityFeed.tsx @@ -143,14 +143,17 @@ const ActivityFeed = (): JSX.Element => { ); }; + const renderActivities = activities.map((activity: IActivity, i: number) => + renderActivityBlock(activity, i) + ); return (
{isLoadingError && renderError()} - {!isLoadingError && !isLoading && isEmpty(activities) - ? renderNoActivities() - : activities.map((activity: IActivity, i: number) => - renderActivityBlock(activity, i) - )} + {!isLoadingError && !isLoading && isEmpty(activities) ? ( + renderNoActivities() + ) : ( +
{renderActivities}
+ )} {isLoading && } {!isLoadingError && !isEmpty(activities) && showMore && (