diff --git a/src/fireedge/src/client/components/Header/Group.js b/src/fireedge/src/client/components/Header/Group.js index 4dd9a90f622..f9b1b098a66 100644 --- a/src/fireedge/src/client/components/Header/Group.js +++ b/src/fireedge/src/client/components/Header/Group.js @@ -22,7 +22,7 @@ import { Group as GroupIcon, VerifiedBadge as SelectIcon } from 'iconoir-react' import { useAuth, useAuthApi } from 'client/features/Auth' import Search from 'client/components/Search' import HeaderPopover from 'client/components/Header/Popover' -import { Translate } from 'client/components/HOC' +import { Tr, Translate } from 'client/components/HOC' import { T, FILTER_POOL } from 'client/constants' const { ALL_RESOURCES, PRIMARY_GROUP_RESOURCES } = FILTER_POOL @@ -73,12 +73,11 @@ const Group = () => { const sortGroupAsMainFirst = (a, b) => a.ID === user?.GUID ? -1 : b.ID === user?.GUID ? 1 : 0 + const ShowAllOption = { ID: ALL_RESOURCES, NAME: Tr(T.ShowAll) } + const sortMainGroupFirst = useMemo( - () => - [{ ID: ALL_RESOURCES, NAME: }] - ?.concat(groups) - ?.sort(sortGroupAsMainFirst), - [user?.GUID] + () => [ShowAllOption].concat(groups).sort(sortGroupAsMainFirst), + [user?.GUID, ShowAllOption?.NAME] ) return (