From 8f3e5a8362af37636116544153fffe1855b26b51 Mon Sep 17 00:00:00 2001
From: Victor Santos <victor@infisical.com>
Date: Wed, 3 Dec 2025 16:25:27 -0300
Subject: [PATCH] refactor: Consolidate project ID retrieval in
 PolicySelectionModal and RolePermissionsSection for improved clarity and
 consistency

---
 .../components/PolicySelectionModal.tsx                  | 4 ++--
 .../components/RolePermissionsSection.tsx                | 9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/components/PolicySelectionModal.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/components/PolicySelectionModal.tsx
index d8aca9f38..46ea296ea 100644
--- a/frontend/src/pages/project/RoleDetailsBySlugPage/components/PolicySelectionModal.tsx
+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/components/PolicySelectionModal.tsx
@@ -47,9 +47,9 @@ type TForm = { permissions: Record<ProjectPermissionSub, boolean> };
 const Content = ({ onClose, type: projectType }: ContentProps) => {
   const rootForm = useFormContext<TFormSchema>();
   const [search, setSearch] = useState("");
-  const { currentProject } = useProject();
+  const { currentProject, projectId } = useProject();
   const isSecretManagerProject = currentProject.type === ProjectType.SecretManager;
-  const { data: integrations = [] } = useGetWorkspaceIntegrations(currentProject?.id ?? "", {
+  const { data: integrations = [] } = useGetWorkspaceIntegrations(projectId, {
     enabled: isSecretManagerProject,
     refetchInterval: false
   });
diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/components/RolePermissionsSection.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/components/RolePermissionsSection.tsx
index 86ff1e3aa..e853715e0 100644
--- a/frontend/src/pages/project/RoleDetailsBySlugPage/components/RolePermissionsSection.tsx
+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/components/RolePermissionsSection.tsx
@@ -103,14 +103,11 @@ export const renderConditionalComponents = (
 };
 
 export const RolePermissionsSection = ({ roleSlug, isDisabled }: Props) => {
-  const { currentProject } = useProject();
-  const projectId = currentProject?.id || "";
+  const { currentProject, projectId } = useProject();
+
   const isSecretManagerProject = currentProject.type === ProjectType.SecretManager;
 
-  const { data: role, isPending } = useGetProjectRoleBySlug(
-    currentProject?.id ?? "",
-    roleSlug as string
-  );
+  const { data: role, isPending } = useGetProjectRoleBySlug(projectId, roleSlug as string);
   const { data: integrations = [] } = useGetWorkspaceIntegrations(projectId, {
     enabled: isSecretManagerProject,
     refetchInterval: false