Skip to content

Commit

Permalink
[Fix] User activity showing twice (#2580)
Browse files Browse the repository at this point in the history
* [Fix] User activity showing twice

* REmove unused var

* REmove tabs
  • Loading branch information
GedeonTS authored Jun 6, 2024
1 parent 874ac60 commit 8d5783f
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions apps/web/lib/features/team/user-team-card/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ export function UserTeamCard({
? ''
: memberInfo.memberUser?.id ?? ''
);
setShowActivity(false);
}}
className={clsxm('h-6 w-6 absolute right-4 top-0 cursor-pointer p-[3px]')}
>
Expand All @@ -199,7 +200,9 @@ export function UserTeamCard({
{isManagerConnectedUser != 1 ? (
<p
className="flex cursor-pointer w-8 h-8 border dark:border-gray-800 rounded justify-center items-center text-center"
onClick={() => showActivityFilter('TICKET', memberInfo.member ?? null)}
onClick={() => {
showActivityFilter('TICKET', memberInfo.member ?? null); setUserDetailAccordion('');
}}
>
{!showActivity ? (
<ExpandIcon height={24} width={24} />
Expand Down Expand Up @@ -251,7 +254,7 @@ export function UserTeamCard({
<div className="absolute right-2">{menu}</div>
</div>
{userDetailAccordion == memberInfo.memberUser?.id &&
memberInfo.memberUser.id == profile.userProfile?.id ? (
memberInfo.memberUser.id == profile.userProfile?.id && !showActivity? (
<div className="h-96 overflow-y-auto">
{canSeeActivity && (
<Container fullWidth={fullWidth} className="py-8">
Expand Down

0 comments on commit 8d5783f

Please sign in to comment.