Merge branch 'main' into fix/remove-duplicate-error-notifications

frontend/src/layouts/PamLayout/PamLayout.tsx

@@ -19,7 +19,8 @@ export const PamLayout = () => {
   useEffect(() => {
     if (subscription && !subscription.pam) {
       handlePopUpOpen("upgradePlan", {
-        description: "You can use PAM if you switch to Infisical's Enterprise plan.",
+        description:
+          "Your current plan does not provide access to Infisical PAM. To unlock this feature, please upgrade to Infisical Enterprise plan.",
         isEnterpriseFeature: true
       });
     }

frontend/src/layouts/PkiManagerLayout/PkiManagerLayout.tsx

@@ -52,25 +52,7 @@ export const PkiManagerLayout = () => {
                       projectId: currentProject.id
                     }}
                   >
-                    {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Policies</Tab>}
-                  </Link>
-                  <Link
-                    to="/projects/cert-management/$projectId/certificates"
-                    params={{
-                      projectId: currentProject.id
-                    }}
-                  >
-                    {({ isActive }) => (
-                      <Tab
-                        value={
-                          isActive || location.pathname.match(/\/pki-collections\//)
-                            ? "selected"
-                            : ""
-                        }
-                      >
-                        Certificates
-                      </Tab>
-                    )}
+                    {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Certificates</Tab>}
                   </Link>
                   <Link
                     to="/projects/cert-management/$projectId/certificate-authorities"

frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx

@@ -225,7 +225,7 @@ export const ProjectSelect = () => {
       <UpgradePlanModal
         isOpen={popUp.upgradePlan.isOpen}
         onOpenChange={(isOpen) => handlePopUpToggle("upgradePlan", isOpen)}
-        text="You have exceeded the number of projects allowed on the free plan."
+        text="You’ve reached the maximum number of projects available on the Free plan. Upgrade to the Infisical Pro plan to create more projects."
       />
       <NewProjectModal
         isOpen={popUp.addNewWs.isOpen}