Merge branch 'beta' into develop

tipisai · Apr 25, 2024 · e9b75a2 · e9b75a2
2 parents 9cead1c + bee9ee3
commit e9b75a2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 28 deletions.
diff --git a/apps/agent/src/Layout/Workspace/components/Tab/PinedTipiTab/mobile/index.tsx b/apps/agent/src/Layout/Workspace/components/Tab/PinedTipiTab/mobile/index.tsx
@@ -6,7 +6,6 @@ import { v4 } from "uuid"
 import { getPinedTipisByTipisID } from "@/redux/ui/pinedTipis/selector"
 import { useRemovePinedTipiTabByTipiIDReducer } from "@/utils/pinedTabs/baseHook"
 import { useNavigateToRunTipis } from "@/utils/routeHelper/hook"
-import { useGetCurrentTeamInfo } from "@/utils/team"
 import {
   baseMenuItemContainerStyle,
   baseOuterContainerStyle,
@@ -20,7 +19,6 @@ const MobilePinedTipiTab: FC<IMobilePinedTipisTab> = (props) => {
   const pinedTipiTabInfo = useSelector((state) =>
     getPinedTipisByTipisID(state, tipiID),
   )!
-  const currentTeamInfo = useGetCurrentTeamInfo()
   const { t } = useTranslation()
 
   const navigateToRunTipis = useNavigateToRunTipis()
@@ -43,8 +41,6 @@ const MobilePinedTipiTab: FC<IMobilePinedTipisTab> = (props) => {
   ]
 
   const { tabIcon, tabName, tipiOwnerTeamIdentity } = pinedTipiTabInfo
-  const isCurrentUserTeam =
-    currentTeamInfo?.identifier === tipiOwnerTeamIdentity
 
   const onTouchStart = () => {
     isLongPressTriggered.current = false
@@ -64,16 +60,15 @@ const MobilePinedTipiTab: FC<IMobilePinedTipisTab> = (props) => {
   }
 
   const handleNavigateToRunTipis = () => {
-    if (isCurrentUserTeam) {
-      navigateToRunTipis(
-        {
-          tipisID: tipiID,
-          tipisIcon: tabIcon,
-          tipisName: tabName,
-        },
-        v4(),
-      )
-    }
+    navigateToRunTipis(
+      {
+        tipisID: tipiID,
+        tipisIcon: tabIcon,
+        tipisName: tabName,
+      },
+      v4(),
+      tipiOwnerTeamIdentity,
+    )
   }
 
   const handleMenuCLick: MenuProps["onClick"] = async ({ key, domEvent }) => {

diff --git a/apps/agent/src/Layout/Workspace/components/Tab/PinedTipiTab/pc/index.tsx b/apps/agent/src/Layout/Workspace/components/Tab/PinedTipiTab/pc/index.tsx
@@ -8,7 +8,6 @@ import { MoreIcon } from "@illa-public/icon"
 import { getPinedTipisByTipisID } from "@/redux/ui/pinedTipis/selector"
 import { useRemovePinedTipiTabByTipiIDReducer } from "@/utils/pinedTabs/baseHook"
 import { useNavigateToRunTipis } from "@/utils/routeHelper/hook"
-import { useGetCurrentTeamInfo } from "@/utils/team"
 import DropIndicator from "../../DropIndicator/DropIndicator"
 import {
   baseMenuItemContainerStyle,
@@ -26,14 +25,11 @@ const PCPinedTipiTab: FC<IPCPinedTipisTab> = (props) => {
   const pinedTipiTabInfo = useSelector((state) =>
     getPinedTipisByTipisID(state, tipiID),
   )!
-  const currentTeamInfo = useGetCurrentTeamInfo()
   const navigateToRunTipis = useNavigateToRunTipis()
   const removePinedTipi = useRemovePinedTipiTabByTipiIDReducer()
   const { t } = useTranslation()
 
   const { tabIcon, tabName, tipiOwnerTeamIdentity } = pinedTipiTabInfo
-  const isCurrentUserTeam =
-    currentTeamInfo?.identifier === tipiOwnerTeamIdentity
 
   const ref = useRef<HTMLDivElement>(null)
 
@@ -61,16 +57,15 @@ const PCPinedTipiTab: FC<IPCPinedTipisTab> = (props) => {
   }
 
   const handleNavigateToRunTipis = () => {
-    if (isCurrentUserTeam) {
-      navigateToRunTipis(
-        {
-          tipisID: tipiID,
-          tipisIcon: tabIcon,
-          tipisName: tabName,
-        },
-        v4(),
-      )
-    }
+    navigateToRunTipis(
+      {
+        tipisID: tipiID,
+        tipisIcon: tabIcon,
+        tipisName: tabName,
+      },
+      v4(),
+      tipiOwnerTeamIdentity,
+    )
   }
 
   const onClick = () => {