From bfd5174cb080f9942b2945ba3f9ba3e59e6d4c5a Mon Sep 17 00:00:00 2001
From: Roie Natan <roie.natan@gmail.com>
Date: Mon, 23 Oct 2023 10:24:04 +0100
Subject: [PATCH] update isJoinAllowed condition

---
 .../components/CommonEntranceJoin/CommonEntranceJoin.tsx        | 2 +-
 src/pages/common/providers/CommonData/CommonData.tsx            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/common/components/CommonTabPanels/components/AboutTab/components/CommonEntranceInfo/components/CommonEntranceJoin/CommonEntranceJoin.tsx b/src/pages/common/components/CommonTabPanels/components/AboutTab/components/CommonEntranceInfo/components/CommonEntranceJoin/CommonEntranceJoin.tsx
index 7415a9e920..c823fa7709 100644
--- a/src/pages/common/components/CommonTabPanels/components/AboutTab/components/CommonEntranceInfo/components/CommonEntranceJoin/CommonEntranceJoin.tsx
+++ b/src/pages/common/components/CommonTabPanels/components/AboutTab/components/CommonEntranceInfo/components/CommonEntranceJoin/CommonEntranceJoin.tsx
@@ -14,7 +14,7 @@ interface CommonEntranceJoinProps {
 }
 
 const CommonEntranceJoin: FC<CommonEntranceJoinProps> = (props) => {
-  const { withJoinRequest = false, common, isProject } = props;
+  const { common, isProject } = props;
   const history = useHistory();
   const {
     parentCommon,
diff --git a/src/pages/common/providers/CommonData/CommonData.tsx b/src/pages/common/providers/CommonData/CommonData.tsx
index 03035d23b9..4f6f99cafc 100644
--- a/src/pages/common/providers/CommonData/CommonData.tsx
+++ b/src/pages/common/providers/CommonData/CommonData.tsx
@@ -123,7 +123,7 @@ const CommonData: FC<CommonDataProps> = (props) => {
     isGlobalDataFetched &&
       !isJoinPending &&
       ((!isProject && !commonMember) ||
-        (isProject && parentCommonMember && !commonMember)),
+        (isProject && rootCommonMember && parentCommonMember && !commonMember)),
   );
 
   const handleMenuItemSelect = useCallback(