From 82d4ad55026602a0f4fa4fbb0fa333243e7d9225 Mon Sep 17 00:00:00 2001 From: jeffvli Date: Wed, 16 Nov 2022 10:42:29 -0800 Subject: [PATCH] Add empty placeholder --- .../users/components/user-activity.tsx | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/renderer/features/users/components/user-activity.tsx b/src/renderer/features/users/components/user-activity.tsx index ab3a958aa..db7ef4b4b 100644 --- a/src/renderer/features/users/components/user-activity.tsx +++ b/src/renderer/features/users/components/user-activity.tsx @@ -5,6 +5,7 @@ import sortBy from 'lodash/sortBy'; import styled from 'styled-components'; import { socket } from '@/renderer/api'; import { UserListResponse } from '@/renderer/api/users.api'; +import { Text } from '@/renderer/components'; import { Activity, UserActivityItem, @@ -167,7 +168,7 @@ export const UserActivity = () => { const user = prev.find((user) => user.id === data.user.userId); if (!user) return prev; - return sortByName([ + return [ ...prev.filter((user) => user.id !== data.user.userId), { ...user, @@ -177,7 +178,7 @@ export const UserActivity = () => { status: data.status, }, }, - ]); + ]; }); }, []); @@ -252,15 +253,23 @@ export const UserActivity = () => { handleUserStatusChange, ]); + const orderedActivityList = sortByName( + activityList.filter( + (user) => user.activity?.status && user.activity?.status !== 'offline' + ) + ); + return ( - {activityList - .filter( - (user) => user.activity?.status && user.activity?.status !== 'offline' - ) - .map((user) => ( + {orderedActivityList.length ? ( + orderedActivityList.map((user) => ( - ))} + )) + ) : ( + + No users online + + )} ); };