improvements: address greppy

2026-09-22 13:39:35 +00:00 · 2025-06-02 20:24:50 -07:00
parent d4523b0ca4
commit 98ab969356
89 changed files with 125 additions and 155 deletions
--- a/backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-router.ts
+++ b/backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-router.ts
@@ -242,7 +242,7 @@ export const registerSecretScanningV2Router = async (server: FastifyZodProvider)
      tags: [ApiDocsTags.SecretScanning],
      description: "Update the specified Secret Scanning Configuration.",
      querystring: z.object({
-        projectId: z.string().trim().min(1, "Finding ID required").describe(SecretScanningConfigs.UPDATE.projectId)
+        projectId: z.string().trim().min(1, "Project ID required").describe(SecretScanningConfigs.UPDATE.projectId)
      }),
      body: z.object({
        content: z.string().nullable().describe(SecretScanningConfigs.UPDATE.content)
--- a/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-factory.ts
+++ b/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-factory.ts
@@ -1,6 +1,5 @@
 import { join } from "path";
 import { ProbotOctokit } from "probot";
-import RE2 from "re2";

 import { scanContentAndGetFindings } from "@app/ee/services/secret-scanning/secret-scanning-queue/secret-scanning-fns";
 import { SecretMatch } from "@app/ee/services/secret-scanning/secret-scanning-queue/secret-scanning-queue-types";
@@ -25,12 +24,11 @@ import {
 import { getConfig } from "@app/lib/config/env";
 import { BadRequestError } from "@app/lib/errors";
 import { titleCaseToCamelCase } from "@app/lib/fn";
+import { GitHubRepositoryRegex } from "@app/lib/regex";
 import { listGitHubRadarRepositories, TGitHubRadarConnection } from "@app/services/app-connection/github-radar";

 import { TGitHubDataSourceWithConnection, TQueueGitHubResourceDiffScan } from "./github-secret-scanning-types";

-const GitHubRepositoryRegex = new RE2(/^[a-zA-Z0-9._-]+\/[a-zA-Z0-9._-]+$/);
-
 export const GitHubSecretScanningFactory = () => {
  const initialize: TSecretScanningFactoryInitialize<TGitHubRadarConnection> = async (
    { connection, secretScanningV2DAL },
--- a/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-schemas.ts
+++ b/backend/src/ee/services/secret-scanning-v2/github/github-secret-scanning-schemas.ts
@@ -12,11 +12,12 @@ import {
  GitRepositoryScanFindingDetailsSchema
 } from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-schemas";
 import { SecretScanningDataSources } from "@app/lib/api-docs";
+import { GitHubRepositoryRegex } from "@app/lib/regex";
 import { AppConnection } from "@app/services/app-connection/app-connection-enums";

 export const GitHubDataSourceConfigSchema = z.object({
  includeRepos: z
-    .array(z.string().min(1).max(256))
+    .array(z.string().regex(GitHubRepositoryRegex, "Invalid repository name format").min(1).max(256))
    .nonempty("One or more repositories required")
    .max(25)
    .default(["*"])
--- a/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-service.ts
+++ b/backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-service.ts
@@ -827,6 +827,7 @@ export const secretScanningV2ServiceFactory = ({
        const configPath = join(tempFolder, "infisical-scan.toml");
        await writeTextToFile(configPath, content);

+        // just checking if config parses
        await scanContentAndGetFindings("", configPath);
      } catch (e) {
        throw new BadRequestError({
--- a/backend/src/lib/regex/index.ts
+++ b/backend/src/lib/regex/index.ts
@@ -9,3 +9,5 @@ export const DistinguishedNameRegex =
 export const UserPrincipalNameRegex = new RE2(/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9._-]+\.[a-zA-Z]{2,}$/);

 export const LdapUrlRegex = new RE2(/^ldaps?:\/\//);
+
+export const GitHubRepositoryRegex = new RE2(/^[a-zA-Z0-9._-]+\/[a-zA-Z0-9._-]+$/);
--- a/backend/src/services/app-connection/app-connection-fns.ts
+++ b/backend/src/services/app-connection/app-connection-fns.ts
@@ -195,7 +195,6 @@ export const validateAppConnectionCredentials = async (
 export const getAppConnectionMethodName = (method: TAppConnection["method"]) => {
  switch (method) {
    case GitHubConnectionMethod.App:
-      return "GitHub App";
    case GitHubRadarConnectionMethod.App:
      return "GitHub App";
    case AzureKeyVaultConnectionMethod.OAuth:
--- a/docs/documentation/platform/secret-scanning/github.mdx
+++ b/docs/documentation/platform/secret-scanning/github.mdx
@@ -31,7 +31,7 @@ description: "Learn how to configure secret scanning for GitHub."
        ![Data Source Details](/images/platform/secret-scanning/github/github-data-source-step-4.png)

            - **Name** - the name of the data source. Must be slug-friendly.
-            - **Description** (optional) - a description of this rotation configuration.
+            - **Description** (optional) - a description of this data source.

        5. Review your data source, then click **Create Data Source**.
        ![Data Source Review](/images/platform/secret-scanning/github/github-data-source-step-5.png)
@@ -60,9 +60,8 @@ description: "Learn how to configure secret scanning for GitHub."
            "description": "my github data source",
            "connectionId": "3c90c3cc-0d44-4b50-8888-8dd25736052a",
            "isAutoScanEnabled": true,
-            "rotationInterval": 30,
            "config": {
-                "includeRepos": ["*"],
+                "includeRepos": ["*"]
            }
        }'
        ```
--- a/frontend/src/components/projects/ProjectSettings/components/ProjectTemplatesTab/components/DeleteProjectTemplateModal.tsx
+++ b/frontend/src/components/projects/ProjectSettings/components/ProjectTemplatesTab/components/DeleteProjectTemplateModal.tsx
@@ -41,7 +41,7 @@ export const DeleteProjectTemplateModal = ({ isOpen, onOpenChange, template }: P
    <DeleteActionModal
      isOpen={isOpen}
      onChange={onOpenChange}
-      title={`Are you sure want to delete ${name}?`}
+      title={`Are you sure you want to delete ${name}?`}
      deleteKey="confirm"
      onDeleteApproved={handleDeleteProjectTemplate}
    />
--- a/frontend/src/components/projects/ProjectSettings/components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/EditProjectTemplate.tsx
+++ b/frontend/src/components/projects/ProjectSettings/components/ProjectTemplatesTab/components/EditProjectTemplateSection/components/EditProjectTemplate.tsx
@@ -112,7 +112,7 @@ export const EditProjectTemplate = ({ isInfisicalTemplate, projectTemplate, onBa
      />
      <DeleteActionModal
        isOpen={popUp.removeTemplate.isOpen}
-        title={`Are you sure want to delete ${projectTemplate.name}?`}
+        title={`Are you sure you want to delete ${projectTemplate.name}?`}
        deleteKey="confirm"
        onChange={(isOpen) => handlePopUpToggle("removeTemplate", isOpen)}
        onDeleteApproved={handleRemoveTemplate}
--- a/frontend/src/components/secret-rotations-v2/DeleteSecretRotationV2Modal.tsx
+++ b/frontend/src/components/secret-rotations-v2/DeleteSecretRotationV2Modal.tsx
@@ -66,7 +66,7 @@ export const DeleteSecretRotationV2Modal = ({
    <DeleteActionModal
      isOpen={isOpen}
      onChange={onOpenChange}
-      title={`Are you sure want to delete ${name}?`}
+      title={`Are you sure you want to delete ${name}?`}
      deleteKey={name}
      onDeleteApproved={handleDeleteSecretRotation}
    >
--- a/frontend/src/components/secret-scanning/DeleteSecretScanningDataSourceModal.tsx
+++ b/frontend/src/components/secret-scanning/DeleteSecretScanningDataSourceModal.tsx
@@ -19,7 +19,7 @@ export const DeleteSecretScanningDataSourceModal = ({
  dataSource,
  onComplete
 }: Props) => {
-  const deleteSecretRotation = useDeleteSecretScanningDataSource();
+  const deleteDataSource = useDeleteSecretScanningDataSource();

  if (!dataSource) return null;

@@ -29,7 +29,7 @@ export const DeleteSecretScanningDataSourceModal = ({
    const dataSourceType = SECRET_SCANNING_DATA_SOURCE_MAP[type].name;

    try {
-      await deleteSecretRotation.mutateAsync({
+      await deleteDataSource.mutateAsync({
        dataSourceId,
        type,
        projectId
@@ -54,7 +54,7 @@ export const DeleteSecretScanningDataSourceModal = ({
    <DeleteActionModal
      isOpen={isOpen}
      onChange={onOpenChange}
-      title={`Are you sure want to delete ${name}?`}
+      title={`Are you sure you want to delete ${name}?`}
      deleteKey={name}
      onDeleteApproved={handleDeleteDataSource}
    >
--- a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConfigFields/GitHubDataSourceConfigFields.tsx
+++ b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConfigFields/GitHubDataSourceConfigFields.tsx
@@ -43,7 +43,7 @@ export const GitHubDataSourceConfigFields = () => {
    if (!includeRepos) {
      setValue("config.includeRepos", ["*"]);
    }
-  }, [includeRepos]);
+  }, [includeRepos, setValue]);

  return (
    <>
--- a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConnectionField.tsx
+++ b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceConnectionField.tsx
@@ -36,8 +36,6 @@ export const SecretScanningDataSourceConnectionField = ({
    OrgPermissionSubjects.AppConnections
  );

-  const appName = APP_CONNECTION_MAP[app].name;
-
  return (
    <>
      <Controller
@@ -89,14 +87,14 @@ export const SecretScanningDataSourceConnectionField = ({
          <FontAwesomeIcon className="mr-1" size="xs" icon={faInfoCircle} />
          {canCreateConnection ? (
            <>
-              You do not have access to any {appName} Connections. Create one from the{" "}
+              You do not have access to any {connectionName} Connections. Create one from the{" "}
              <Link to="/organization/app-connections" className="underline">
                App Connections
              </Link>{" "}
              page.
            </>
          ) : (
-            `You do not have access to any ${appName} Connections. Contact an admin to create one.`
+            `You do not have access to any ${connectionName} Connections. Contact an admin to create one.`
          )}
        </p>
      )}
--- a/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceForm.tsx
+++ b/frontend/src/components/secret-scanning/forms/SecretScanningDataSourceForm.tsx
@@ -66,13 +66,13 @@ export const SecretScanningDataSourceForm = ({ type, onComplete, onCancel, dataS
          projectId: currentWorkspace.id
        });
    try {
-      const rotation = await mutation;
+      const source = await mutation;

      createNotification({
-        text: `Successfully ${dataSource ? "updated" : "created"} ${sourceType} Data Source`,
+        text: `Successfully ${source ? "updated" : "created"} ${sourceType} Data Source`,
        type: "success"
      });
-      onComplete(rotation);
+      onComplete(source);
    } catch (err: any) {
      createNotification({
        title: `Failed to ${dataSource ? "update" : "create"} ${sourceType} Data Source`,
--- a/frontend/src/components/secret-scanning/forms/schemas/github-data-source-schema.ts
+++ b/frontend/src/components/secret-scanning/forms/schemas/github-data-source-schema.ts
@@ -8,7 +8,11 @@ export const GitHubDataSourceSchema = z
  .object({
    type: z.literal(SecretScanningDataSource.GitHub),
    config: z.object({
-      includeRepos: z.string().array().min(1, "One or more repositories required")
+      includeRepos: z
+        .string()
+        .array()
+        .min(1, "One or more repositories required")
+        .max(25, "Cannot configure more than 25 repositories")
    })
  })
  .merge(BaseSecretScanningDataSourceSchema({ isConnectionRequired: true }));
--- a/frontend/src/components/secret-syncs/DeleteSecretSyncModal.tsx
+++ b/frontend/src/components/secret-syncs/DeleteSecretSyncModal.tsx
@@ -52,7 +52,7 @@ export const DeleteSecretSyncModal = ({ isOpen, onOpenChange, secretSync, onComp
    <DeleteActionModal
      isOpen={isOpen}
      onChange={onOpenChange}
-      title={`Are you sure want to delete ${name}?`}
+      title={`Are you sure you want to delete ${name}?`}
      deleteKey={name}
      onDeleteApproved={handleDeleteSecretSync}
    >
--- a/frontend/src/helpers/appConnections.ts
+++ b/frontend/src/helpers/appConnections.ts
@@ -80,7 +80,6 @@ export const APP_CONNECTION_MAP: Record<
 export const getAppConnectionMethodDetails = (method: TAppConnection["method"]) => {
  switch (method) {
    case GitHubConnectionMethod.App:
-      return { name: "GitHub App", icon: faGithub };
    case GitHubRadarConnectionMethod.App:
      return { name: "GitHub App", icon: faGithub };
    case AzureKeyVaultConnectionMethod.OAuth:
--- a/frontend/src/hooks/api/secretScanningV2/types/shared/secret-scanning-data-source-base.ts
+++ b/frontend/src/hooks/api/secretScanningV2/types/shared/secret-scanning-data-source-base.ts
@@ -8,11 +8,11 @@ export type TSecretScanningDataSourceBase = {
  createdAt: string;
  updatedAt: string;
  projectId: string;
-  connection: {
+  connection?: {
    app: AppConnection;
    id: string;
    name: string;
-  };
+  } | null;
  isAutoScanEnabled: boolean;
  isDisconnected: boolean;
 };
--- a/frontend/src/pages/admin/MachineIdentitiesResourcesPage/components/MachineIdentitiesTable.tsx
+++ b/frontend/src/pages/admin/MachineIdentitiesResourcesPage/components/MachineIdentitiesTable.tsx
@@ -164,7 +164,7 @@ export const MachineIdentitiesTable = () => {
      <IdentityPanelTable handlePopUpOpen={handlePopUpOpen} />
      <DeleteActionModal
        isOpen={popUp.removeServerAdmin.isOpen}
-        title={`Are you sure want to remove Server Admin permissions from ${
+        title={`Are you sure you want to remove Server Admin permissions from ${
          (popUp?.removeServerAdmin?.data as { name: string })?.name || ""
        }?`}
        subTitle=""
--- a/frontend/src/pages/admin/UserIdentitiesResourcesPage/components/UserIdentitiesTable.tsx
+++ b/frontend/src/pages/admin/UserIdentitiesResourcesPage/components/UserIdentitiesTable.tsx
@@ -309,7 +309,7 @@ export const UserIdentitiesTable = () => {
      />
      <DeleteActionModal
        isOpen={popUp.upgradeToServerAdmin.isOpen}
-        title={`Are you sure want to grant Server Admin permissions to ${
+        title={`Are you sure you want to grant Server Admin permissions to ${
          (popUp?.upgradeToServerAdmin?.data as { id: string; username: string })?.username || ""
        }?`}
        subTitle=""
@@ -320,7 +320,7 @@ export const UserIdentitiesTable = () => {
      />
      <DeleteActionModal
        isOpen={popUp.removeServerAdmin.isOpen}
-        title={`Are you sure want to remove Server Admin permissions from ${
+        title={`Are you sure you want to remove Server Admin permissions from ${
          (popUp?.removeServerAdmin?.data as { id: string; username: string })?.username || ""
        }?`}
        subTitle=""
--- a/frontend/src/pages/cert-manager/AlertingPage/components/PkiAlertsSection.tsx
+++ b/frontend/src/pages/cert-manager/AlertingPage/components/PkiAlertsSection.tsx
@@ -70,7 +70,7 @@ export const PkiAlertsSection = () => {
      <PkiAlertModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
      <DeleteActionModal
        isOpen={popUp.deletePkiAlert.isOpen}
-        title={`Are you sure want to remove the alert ${
+        title={`Are you sure you want to remove the alert ${
          (popUp?.deletePkiAlert?.data as { name: string })?.name || ""
        } from the project?`}
        onChange={(isOpen) => handlePopUpToggle("deletePkiAlert", isOpen)}
--- a/frontend/src/pages/cert-manager/AlertingPage/components/PkiCollectionSection.tsx
+++ b/frontend/src/pages/cert-manager/AlertingPage/components/PkiCollectionSection.tsx
@@ -70,7 +70,7 @@ export const PkiCollectionSection = () => {
      <PkiCollectionModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
      <DeleteActionModal
        isOpen={popUp.deletePkiCollection.isOpen}
-        title={`Are you sure want to remove the alert ${
+        title={`Are you sure you want to remove the alert ${
          (popUp?.deletePkiCollection?.data as { name: string })?.name || ""
        } from the project?`}
        onChange={(isOpen) => handlePopUpToggle("deletePkiCollection", isOpen)}
--- a/frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/CertAuthDetailsByIDPage.tsx
+++ b/frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/CertAuthDetailsByIDPage.tsx
@@ -135,7 +135,7 @@ const Page = () => {
      <CaInstallCertModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
      <DeleteActionModal
        isOpen={popUp.deleteCa.isOpen}
-        title={`Are you sure want to remove the CA ${
+        title={`Are you sure you want to remove the CA ${
          (popUp?.deleteCa?.data as { dn: string })?.dn || ""
        } from the project?`}
        subTitle="This action will delete other CAs and certificates below it in your CA hierarchy."
--- a/frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/CaSection.tsx
+++ b/frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/CaSection.tsx
@@ -96,7 +96,7 @@ export const CaSection = () => {
      <CaTable handlePopUpOpen={handlePopUpOpen} />
      <DeleteActionModal
        isOpen={popUp.deleteCa.isOpen}
-        title={`Are you sure want to remove the CA ${
+        title={`Are you sure you want to remove the CA ${
          (popUp?.deleteCa?.data as { dn: string })?.dn || ""
        } from the project?`}
        subTitle="This action will delete other CAs and certificates below it in your CA hierarchy."
@@ -108,7 +108,7 @@ export const CaSection = () => {
      />
      <DeleteActionModal
        isOpen={popUp.caStatus.isOpen}
-        title={`Are you sure want to ${
+        title={`Are you sure you want to ${
          (popUp?.caStatus?.data as { status: string })?.status === CaStatus.ACTIVE
            ? "enable"
            : "disable"
--- a/frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/ExternalCaSection.tsx
+++ b/frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/ExternalCaSection.tsx
@@ -97,7 +97,7 @@ export const ExternalCaSection = () => {
      <ExternalCaTable handlePopUpOpen={handlePopUpOpen} />
      <DeleteActionModal
        isOpen={popUp.deleteCa.isOpen}
-        title={`Are you sure want to remove the CA ${
+        title={`Are you sure you want to remove the CA ${
          (popUp?.deleteCa?.data as { dn: string })?.dn || ""
        } from the project?`}
        subTitle="This action will delete other CAs and certificates below it in your CA hierarchy."
@@ -112,7 +112,7 @@ export const ExternalCaSection = () => {
      />
      <DeleteActionModal
        isOpen={popUp.caStatus.isOpen}
-        title={`Are you sure want to ${
+        title={`Are you sure you want to ${
          (popUp?.caStatus?.data as { status: string })?.status === CaStatus.ACTIVE
            ? "enable"
            : "disable"
--- a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateTemplatesSection.tsx
+++ b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificateTemplatesSection.tsx
@@ -90,7 +90,7 @@ export const CertificateTemplatesSection = ({ caId }: Props) => {
      <CertificateTemplateEnrollmentModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
      <DeleteActionModal
        isOpen={popUp.deleteCertificateTemplate.isOpen}
-        title={`Are you sure want to delete the certificate template ${
+        title={`Are you sure you want to delete the certificate template ${
          (popUp?.deleteCertificateTemplate?.data as { name: string })?.name || ""
        } from the project?`}
        onChange={(isOpen) => handlePopUpToggle("deleteCertificateTemplate", isOpen)}
--- a/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesSection.tsx
+++ b/frontend/src/pages/cert-manager/CertificatesPage/components/CertificatesSection.tsx
@@ -89,7 +89,7 @@ export const CertificatesSection = () => {
      <CertificateRevocationModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
      <DeleteActionModal
        isOpen={popUp.deleteCertificate.isOpen}
-        title={`Are you sure want to remove the certificate ${
+        title={`Are you sure you want to remove the certificate ${
          (popUp?.deleteCertificate?.data as { commonName: string })?.commonName || ""
        } from the project?`}
        onChange={(isOpen) => handlePopUpToggle("deleteCertificate", isOpen)}
--- a/frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/PkiCollectionDetailsByIDPage.tsx
+++ b/frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/PkiCollectionDetailsByIDPage.tsx
@@ -152,7 +152,7 @@ export const PkiCollectionPage = () => {
      <PkiCollectionModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
      <DeleteActionModal
        isOpen={popUp.deletePkiCollection.isOpen}
-        title={`Are you sure want to delete the PKI collection ${data?.name ?? ""}?`}
+        title={`Are you sure you want to delete the PKI collection ${data?.name ?? ""}?`}
        onChange={(isOpen) => handlePopUpToggle("deletePkiCollection", isOpen)}
        deleteKey="confirm"
        onDeleteApproved={() =>
--- a/frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/components/PkiCollectionItemsSection.tsx
+++ b/frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/components/PkiCollectionItemsSection.tsx
@@ -74,7 +74,7 @@ export const PkiCollectionItemsSection = ({ collectionId, type }: Props) => {
      />
      <DeleteActionModal
        isOpen={popUp.deletePkiCollectionItem.isOpen}
-        title={`Are you sure want to remove the item from the collection ${pkiCollection.name}?`}
+        title={`Are you sure you want to remove the item from the collection ${pkiCollection.name}?`}
        onChange={(isOpen) => handlePopUpToggle("deletePkiCollectionItem", isOpen)}
        deleteKey="confirm"
        onDeleteApproved={() => {
--- a/frontend/src/pages/cert-manager/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx
+++ b/frontend/src/pages/cert-manager/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx
@@ -79,14 +79,6 @@ export const DeleteProjectSection = () => {
  };

  const handleLeaveWorkspaceSubmit = async () => {
-    console.log({
-      currentWorkspace,
-      currentOrg,
-      members,
-      isNoAccessMember,
-      membership
-    });
-
    try {
      setIsLeaving.on();

@@ -170,7 +162,7 @@ export const DeleteProjectSection = () => {

      <DeleteActionModal
        isOpen={popUp.deleteWorkspace.isOpen}
-        title="Are you sure want to delete this project?"
+        title="Are you sure you want to delete this project?"
        subTitle={`Permanently delete ${currentWorkspace?.name} and all of its data. This action is not reversible, so please be careful.`}
        onChange={(isOpen) => handlePopUpToggle("deleteWorkspace", isOpen)}
        deleteKey="confirm"
@@ -180,8 +172,8 @@ export const DeleteProjectSection = () => {

      <LeaveProjectModal
        isOpen={popUp.leaveWorkspace.isOpen}
-        title="Are you sure want to leave this project?"
-        subTitle={`If you leave ${currentWorkspace?.name} you will lose access to the project and it's contents.`}
+        title="Are you sure you want to leave this project?"
+        subTitle={`If you leave ${currentWorkspace?.name} you will lose access to the project and its contents.`}
        onChange={(isOpen) => handlePopUpToggle("leaveWorkspace", isOpen)}
        deleteKey="confirm"
        buttonText="Leave Project"
--- a/frontend/src/pages/kms/KmipPage/components/DeleteKmipClientModal.tsx
+++ b/frontend/src/pages/kms/KmipPage/components/DeleteKmipClientModal.tsx
@@ -44,7 +44,7 @@ export const DeleteKmipClientModal = ({ isOpen, onOpenChange, kmipClient }: Prop
  return (
    <DeleteActionModal
      isOpen={isOpen}
-      title={`Are you sure want to delete ${name}?`}
+      title={`Are you sure you want to delete ${name}?`}
      onChange={onOpenChange}
      deleteKey="confirm"
      onDeleteApproved={handleDeleteKmipClient}
--- a/frontend/src/pages/kms/OverviewPage/components/DeleteCmekModal.tsx
+++ b/frontend/src/pages/kms/OverviewPage/components/DeleteCmekModal.tsx
@@ -43,7 +43,7 @@ export const DeleteCmekModal = ({ isOpen, onOpenChange, cmek }: Props) => {
  return (
    <DeleteActionModal
      isOpen={isOpen}
-      title={`Are you sure want to delete ${name}?`}
+      title={`Are you sure you want to delete ${name}?`}
      onChange={onOpenChange}
      deleteKey="confirm"
      onDeleteApproved={handleDeleteCmek}
--- a/frontend/src/pages/kms/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx
+++ b/frontend/src/pages/kms/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx
@@ -79,14 +79,6 @@ export const DeleteProjectSection = () => {
  };

  const handleLeaveWorkspaceSubmit = async () => {
-    console.log({
-      currentWorkspace,
-      currentOrg,
-      members,
-      isNoAccessMember,
-      membership
-    });
-
    try {
      setIsLeaving.on();

@@ -170,7 +162,7 @@ export const DeleteProjectSection = () => {

      <DeleteActionModal
        isOpen={popUp.deleteWorkspace.isOpen}
-        title="Are you sure want to delete this project?"
+        title="Are you sure you want to delete this project?"
        subTitle={`Permanently delete ${currentWorkspace?.name} and all of its data. This action is not reversible, so please be careful.`}
        onChange={(isOpen) => handlePopUpToggle("deleteWorkspace", isOpen)}
        deleteKey="confirm"
@@ -180,8 +172,8 @@ export const DeleteProjectSection = () => {

      <LeaveProjectModal
        isOpen={popUp.leaveWorkspace.isOpen}
-        title="Are you sure want to leave this project?"
-        subTitle={`If you leave ${currentWorkspace?.name} you will lose access to the project and it's contents.`}
+        title="Are you sure you want to leave this project?"
+        subTitle={`If you leave ${currentWorkspace?.name} you will lose access to the project and its contents.`}
        onChange={(isOpen) => handlePopUpToggle("leaveWorkspace", isOpen)}
        deleteKey="confirm"
        buttonText="Leave Project"
--- a/frontend/src/pages/organization/AccessManagementPage/components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsSection.tsx
+++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsSection.tsx
@@ -80,7 +80,7 @@ export const OrgGroupsSection = () => {
      />
      <DeleteActionModal
        isOpen={popUp.deleteGroup.isOpen}
-        title={`Are you sure want to delete the group named ${
+        title={`Are you sure you want to delete the group named ${
          (popUp?.deleteGroup?.data as { name: string })?.name || ""
        }?`}
        onChange={(isOpen) => handlePopUpToggle("deleteGroup", isOpen)}
--- a/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentitySection.tsx
+++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentitySection.tsx
@@ -127,7 +127,7 @@ export const IdentitySection = withPermission(
        <IdentityTokenAuthTokenModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
        <DeleteActionModal
          isOpen={popUp.deleteIdentity.isOpen}
-          title={`Are you sure want to delete ${
+          title={`Are you sure you want to delete ${
            (popUp?.deleteIdentity?.data as { name: string })?.name || ""
          }?`}
          onChange={(isOpen) => handlePopUpToggle("deleteIdentity", isOpen)}
--- a/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx
+++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx
@@ -143,7 +143,7 @@ export const OrgMembersSection = () => {
      />
      <DeleteActionModal
        isOpen={popUp.removeMember.isOpen}
-        title={`Are you sure want to remove member with username ${
+        title={`Are you sure you want to remove member with username ${
          (popUp?.removeMember?.data as { username: string })?.username || ""
        }?`}
        onChange={(isOpen) => handlePopUpToggle("removeMember", isOpen)}
@@ -156,7 +156,7 @@ export const OrgMembersSection = () => {
      />
      <DeleteActionModal
        isOpen={popUp.deactivateMember.isOpen}
-        title={`Are you sure want to deactivate member with username ${
+        title={`Are you sure you want to deactivate member with username ${
          (popUp?.deactivateMember?.data as { username: string })?.username || ""
        }?`}
        onChange={(isOpen) => handlePopUpToggle("deactivateMember", isOpen)}
--- a/frontend/src/pages/organization/AccessManagementPage/components/OrgRoleTabSection/OrgRoleTable.tsx
+++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgRoleTabSection/OrgRoleTable.tsx
@@ -280,7 +280,7 @@ export const OrgRoleTable = () => {
      <RoleModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
      <DeleteActionModal
        isOpen={popUp.deleteRole.isOpen}
-        title={`Are you sure want to delete ${
+        title={`Are you sure you want to delete ${
          (popUp?.deleteRole?.data as TOrgRole)?.name || " "
        } role?`}
        onChange={(isOpen) => handlePopUpToggle("deleteRole", isOpen)}
--- a/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionList.tsx
+++ b/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionList.tsx
@@ -54,7 +54,7 @@ export const AppConnectionsSelect = ({ onSelect }: Props) => {
              />
              {icon && (
                <FontAwesomeIcon
-                  className="-right- absolute -bottom-1.5 -right-1.5 text-primary-700"
+                  className="absolute -bottom-1.5 -right-1.5 text-primary-700"
                  size="xl"
                  icon={icon}
                />
--- a/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/DeleteAppConnectionModal.tsx
+++ b/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/DeleteAppConnectionModal.tsx
@@ -44,7 +44,7 @@ export const DeleteAppConnectionModal = ({ isOpen, onOpenChange, appConnection }
    <DeleteActionModal
      isOpen={isOpen}
      onChange={onOpenChange}
-      title={`Are you sure want to delete ${name}?`}
+      title={`Are you sure you want to delete ${name}?`}
      deleteKey={name}
      onDeleteApproved={handleDeleteAppConnection}
    >
--- a/frontend/src/pages/organization/Gateways/GatewayListPage/GatewayListPage.tsx
+++ b/frontend/src/pages/organization/Gateways/GatewayListPage/GatewayListPage.tsx
@@ -229,7 +229,7 @@ export const GatewayListPage = withPermission(
                  )}
                  <DeleteActionModal
                    isOpen={popUp.deleteGateway.isOpen}
-                    title={`Are you sure want to delete gateway ${
+                    title={`Are you sure you want to delete gateway ${
                      (popUp?.deleteGateway?.data as { name: string })?.name || ""
                    }?`}
                    onChange={(isOpen) => handlePopUpToggle("deleteGateway", isOpen)}
--- a/frontend/src/pages/organization/GroupDetailsByIDPage/GroupDetailsByIDPage.tsx
+++ b/frontend/src/pages/organization/GroupDetailsByIDPage/GroupDetailsByIDPage.tsx
@@ -157,7 +157,7 @@ const Page = () => {
      />
      <DeleteActionModal
        isOpen={popUp.deleteGroup.isOpen}
-        title={`Are you sure want to delete the group named ${
+        title={`Are you sure you want to delete the group named ${
          (popUp?.deleteGroup?.data as { name: string })?.name || ""
        }?`}
        onChange={(isOpen) => handlePopUpToggle("deleteGroup", isOpen)}
--- a/frontend/src/pages/organization/GroupDetailsByIDPage/components/GroupMembersSection/GroupMembersSection.tsx
+++ b/frontend/src/pages/organization/GroupDetailsByIDPage/components/GroupMembersSection/GroupMembersSection.tsx
@@ -94,7 +94,7 @@ export const GroupMembersSection = ({ groupId, groupSlug }: Props) => {
      <AddGroupMembersModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
      <DeleteActionModal
        isOpen={popUp.removeMemberFromGroup.isOpen}
-        title={`Are you sure want to remove ${
+        title={`Are you sure you want to remove ${
          (popUp?.removeMemberFromGroup?.data as { username: string })?.username || ""
        } from the group?`}
        onChange={(isOpen) => handlePopUpToggle("removeMemberFromGroup", isOpen)}
--- a/frontend/src/pages/organization/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx
+++ b/frontend/src/pages/organization/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx
@@ -101,7 +101,7 @@ const Page = () => {
      />
      <DeleteActionModal
        isOpen={popUp.deleteIdentity.isOpen}
-        title={`Are you sure want to delete ${
+        title={`Are you sure you want to delete ${
          (popUp?.deleteIdentity?.data as { name: string })?.name || ""
        }?`}
        onChange={(isOpen) => handlePopUpToggle("deleteIdentity", isOpen)}
--- a/frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityProjectsSection.tsx
+++ b/frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityProjectsSection.tsx
@@ -66,7 +66,7 @@ export const IdentityProjectsSection = ({ identityId }: Props) => {
      </div>
      <DeleteActionModal
        isOpen={popUp.removeIdentityFromProject.isOpen}
-        title={`Are you sure want to remove ${
+        title={`Are you sure you want to remove ${
          (popUp?.removeIdentityFromProject?.data as { identityName: string })?.identityName || ""
        } from ${
          (popUp?.removeIdentityFromProject?.data as { projectName: string })?.projectName || ""
--- a/frontend/src/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/IdentityTokenAuthTokensTable.tsx
+++ b/frontend/src/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/IdentityTokenAuthTokensTable.tsx
@@ -218,7 +218,7 @@ export const IdentityTokenAuthTokensTable = ({ tokens, identityId }: Props) => {
      </TableContainer>
      <DeleteActionModal
        isOpen={popUp.revokeToken.isOpen}
-        title={`Are you sure want to revoke ${
+        title={`Are you sure you want to revoke ${
          (popUp?.revokeToken?.data as { name: string })?.name || ""
        }?`}
        onChange={(isOpen) => handlePopUpToggle("revokeToken", isOpen)}
--- a/frontend/src/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/IdentityUniversalAuthClientSecretsTable.tsx
+++ b/frontend/src/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/IdentityUniversalAuthClientSecretsTable.tsx
@@ -175,7 +175,7 @@ export const IdentityUniversalAuthClientSecretsTable = ({ clientSecrets, identit
      </TableContainer>
      <DeleteActionModal
        isOpen={popUp.revokeClientSecret.isOpen}
-        title={`Are you sure want to delete the client secret ${
+        title={`Are you sure you want to delete the client secret ${
          (popUp?.revokeClientSecret?.data as { clientSecretPrefix: string })?.clientSecretPrefix ||
          ""
        }************?`}
--- a/frontend/src/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/ViewIdentityAuthModal.tsx
+++ b/frontend/src/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/ViewIdentityAuthModal.tsx
@@ -151,7 +151,7 @@ export const Content = ({
      />
      <DeleteActionModal
        isOpen={popUp?.revokeAuthMethod?.isOpen}
-        title={`Are you sure want to remove ${identityAuthToNameMap[authMethod]} on this identity?`}
+        title={`Are you sure you want to remove ${identityAuthToNameMap[authMethod]} on this identity?`}
        onChange={(isOpen) => handlePopUpToggle("revokeAuthMethod", isOpen)}
        deleteKey="confirm"
        buttonText="Remove"
--- a/frontend/src/pages/organization/RoleByIDPage/RoleByIDPage.tsx
+++ b/frontend/src/pages/organization/RoleByIDPage/RoleByIDPage.tsx
@@ -155,7 +155,7 @@ export const Page = () => {
      <RoleModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
      <DeleteActionModal
        isOpen={popUp.deleteOrgRole.isOpen}
-        title={`Are you sure want to delete the organization role ${data?.name ?? ""}?`}
+        title={`Are you sure you want to delete the organization role ${data?.name ?? ""}?`}
        onChange={(isOpen) => handlePopUpToggle("deleteOrgRole", isOpen)}
        deleteKey="confirm"
        onDeleteApproved={() => onDeleteOrgRoleSubmit()}
--- a/frontend/src/pages/organization/SecretScanningSettingsPage/route.tsx
+++ b/frontend/src/pages/organization/SecretScanningSettingsPage/route.tsx
@@ -16,7 +16,7 @@ export const Route = createFileRoute(
      },
      {
        label: "Secret Scanning",
-        link: linkOptions({ to: "/organization/secret-scanning/settings" })
+        link: linkOptions({ to: "/organization/secret-scanning/overview" })
      },
      {
        label: "Settings"
--- a/frontend/src/pages/organization/SettingsPage/components/OrgDeleteSection/OrgDeleteSection.tsx
+++ b/frontend/src/pages/organization/SettingsPage/components/OrgDeleteSection/OrgDeleteSection.tsx
@@ -59,7 +59,7 @@ export const OrgDeleteSection = () => {
      </div>
      <DeleteActionModal
        isOpen={popUp.deleteOrg.isOpen}
-        title="Are you sure want to delete this organization?"
+        title="Are you sure you want to delete this organization?"
        subTitle={`Permanently remove ${currentOrg?.name} and all of its data. This action is not reversible, so please be careful.`}
        onChange={(isOpen) => handlePopUpToggle("deleteOrg", isOpen)}
        deleteKey="confirm"
--- a/frontend/src/pages/organization/SettingsPage/components/OrgEncryptionTab/OrgEncryptionTab.tsx
+++ b/frontend/src/pages/organization/SettingsPage/components/OrgEncryptionTab/OrgEncryptionTab.tsx
@@ -136,7 +136,7 @@ export const OrgEncryptionTab = withPermission(
        />
        <DeleteActionModal
          isOpen={popUp.removeExternalKms.isOpen}
-          title={`Are you sure want to remove ${
+          title={`Are you sure you want to remove ${
            (popUp?.removeExternalKms?.data as { slug: string })?.slug || ""
          } from ${(popUp?.removeExternalKms?.data as { provider: string })?.provider || ""}?`}
          onChange={(isOpen) => handlePopUpToggle("removeExternalKms", isOpen)}
--- a/frontend/src/pages/organization/SettingsPage/components/OrgWorkflowIntegrationTab/OrgWorkflowIntegrationTab.tsx
+++ b/frontend/src/pages/organization/SettingsPage/components/OrgWorkflowIntegrationTab/OrgWorkflowIntegrationTab.tsx
@@ -305,7 +305,7 @@ export const OrgWorkflowIntegrationTab = withPermission(
        />
        <DeleteActionModal
          isOpen={popUp.removeIntegration.isOpen}
-          title={`Are you sure want to remove ${popUp?.removeIntegration?.data?.slug}?`}
+          title={`Are you sure you want to remove ${popUp?.removeIntegration?.data?.slug}?`}
          onChange={(isOpen) => handlePopUpToggle("removeIntegration", isOpen)}
          deleteKey="confirm"
          onDeleteApproved={handleRemoveIntegration}
--- a/frontend/src/pages/organization/SsoPage/components/OrgProvisioningTab/GithubOrgSyncConfigModal.tsx
+++ b/frontend/src/pages/organization/SsoPage/components/OrgProvisioningTab/GithubOrgSyncConfigModal.tsx
@@ -162,7 +162,7 @@ export const GithubOrgSyncConfigModal = ({
      </form>
      <DeleteActionModal
        isOpen={popUp.deleteGithubOrgSyncConfig.isOpen}
-        title="Are you sure want to remove GitHub organization sync?"
+        title="Are you sure you want to remove GitHub organization sync?"
        onChange={(isOpen) => handlePopUpToggle("deleteGithubOrgSyncConfig", isOpen)}
        deleteKey="confirm"
        onDeleteApproved={onDelete}
--- a/frontend/src/pages/organization/SsoPage/components/OrgProvisioningTab/ScimTokenModal.tsx
+++ b/frontend/src/pages/organization/SsoPage/components/OrgProvisioningTab/ScimTokenModal.tsx
@@ -301,7 +301,7 @@ export const ScimTokenModal = ({ popUp, handlePopUpOpen, handlePopUpToggle }: Pr
        </TableContainer>
        <DeleteActionModal
          isOpen={popUp.deleteScimToken.isOpen}
-          title="Are you sure want to delete the SCIM token?"
+          title="Are you sure you want to delete the SCIM token?"
          onChange={(isOpen) => handlePopUpToggle("scimToken", isOpen)}
          deleteKey="confirm"
          onDeleteApproved={() => {
--- a/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/LDAPGroupMapModal.tsx
+++ b/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/LDAPGroupMapModal.tsx
@@ -249,7 +249,7 @@ export const LDAPGroupMapModal = ({ popUp, handlePopUpOpen, handlePopUpToggle }:
            </TableContainer>
            <DeleteActionModal
              isOpen={popUp.deleteLdapGroupMap.isOpen}
-              title={`Are you sure want to delete the group mapping for ${
+              title={`Are you sure you want to delete the group mapping for ${
                (popUp?.deleteLdapGroupMap?.data as { ldapGroupCN: string })?.ldapGroupCN || ""
              }?`}
              onChange={(isOpen) => handlePopUpToggle("deleteLdapGroupMap", isOpen)}
--- a/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/LDAPModal.tsx
+++ b/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/LDAPModal.tsx
@@ -361,7 +361,7 @@ export const LDAPModal = ({ popUp, handlePopUpClose, handlePopUpToggle, hideDele
      </Modal>
      <DeleteActionModal
        isOpen={isDeletePopupOpen}
-        title="Are you sure want to delete LDAP?"
+        title="Are you sure you want to delete LDAP?"
        onChange={() => setIsDeletePopupOpen.toggle()}
        deleteKey="confirm"
        onDeleteApproved={handleLdapSoftDelete}
--- a/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/OIDCModal.tsx
+++ b/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/OIDCModal.tsx
@@ -478,7 +478,7 @@ export const OIDCModal = ({ popUp, handlePopUpClose, handlePopUpToggle, hideDele
      </Modal>
      <DeleteActionModal
        isOpen={isDeletePopupOpen}
-        title="Are you sure want to delete OIDC?"
+        title="Are you sure you want to delete OIDC?"
        onChange={() => setIsDeletePopupOpen.toggle()}
        deleteKey="confirm"
        onDeleteApproved={handleOidcSoftDelete}
--- a/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/SSOModal.tsx
+++ b/frontend/src/pages/organization/SsoPage/components/OrgSsoTab/SSOModal.tsx
@@ -371,7 +371,7 @@ export const SSOModal = ({ popUp, handlePopUpClose, handlePopUpToggle, hideDelet
      </Modal>
      <DeleteActionModal
        isOpen={isDeletePopupOpen}
-        title="Are you sure want to delete SAML SSO?"
+        title="Are you sure you want to delete SAML SSO?"
        onChange={() => setIsDeletePopupOpen.toggle()}
        deleteKey="confirm"
        onDeleteApproved={handleSamlSoftDelete}
--- a/frontend/src/pages/organization/UserDetailsByIDPage/UserDetailsByIDPage.tsx
+++ b/frontend/src/pages/organization/UserDetailsByIDPage/UserDetailsByIDPage.tsx
@@ -259,7 +259,7 @@ const Page = withPermission(
        )}
        <DeleteActionModal
          isOpen={popUp.removeMember.isOpen}
-          title={`Are you sure want to remove member with username ${
+          title={`Are you sure you want to remove member with username ${
            (popUp?.removeMember?.data as { username: string })?.username || ""
          }?`}
          onChange={(isOpen) => handlePopUpToggle("removeMember", isOpen)}
@@ -272,7 +272,7 @@ const Page = withPermission(
        />
        <DeleteActionModal
          isOpen={popUp.deactivateMember.isOpen}
-          title={`Are you sure want to deactivate member with username ${
+          title={`Are you sure you want to deactivate member with username ${
            (popUp?.deactivateMember?.data as { username: string })?.username || ""
          }?`}
          onChange={(isOpen) => handlePopUpToggle("deactivateMember", isOpen)}
--- a/frontend/src/pages/organization/UserDetailsByIDPage/components/UserProjectsSection/UserGroupsSection.tsx
+++ b/frontend/src/pages/organization/UserDetailsByIDPage/components/UserProjectsSection/UserGroupsSection.tsx
@@ -53,7 +53,7 @@ export const UserGroupsSection = ({ orgMembership }: Props) => {

      <DeleteActionModal
        isOpen={popUp.removeUserFromGroup.isOpen}
-        title="Are you sure want to unassign user from group?"
+        title="Are you sure you want to unassign user from group?"
        onChange={(isOpen) => handlePopUpToggle("removeUserFromGroup", isOpen)}
        deleteKey="confirm"
        onDeleteApproved={() => {
--- a/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsSection.tsx
+++ b/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsSection.tsx
@@ -87,7 +87,7 @@ export const GroupsSection = () => {
      <GroupTable handlePopUpOpen={handlePopUpOpen} />
      <DeleteActionModal
        isOpen={popUp.deleteGroup.isOpen}
-        title={`Are you sure want to remove the group ${
+        title={`Are you sure you want to remove the group ${
          (popUp?.deleteGroup?.data as { name: string })?.name || ""
        } from the project?`}
        onChange={(isOpen) => handlePopUpToggle("deleteGroup", isOpen)}
--- a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx
+++ b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx
@@ -432,7 +432,7 @@ export const IdentityTab = withProjectPermission(
          <IdentityModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
          <DeleteActionModal
            isOpen={popUp.deleteIdentity.isOpen}
-            title={`Are you sure want to remove ${
+            title={`Are you sure you want to remove ${
              (popUp?.deleteIdentity?.data as { name: string })?.name || ""
            } from the project?`}
            onChange={(isOpen) => handlePopUpToggle("deleteIdentity", isOpen)}
--- a/frontend/src/pages/project/AccessControlPage/components/ProjectRoleListTab/components/ProjectRoleList/ProjectRoleList.tsx
+++ b/frontend/src/pages/project/AccessControlPage/components/ProjectRoleListTab/components/ProjectRoleList/ProjectRoleList.tsx
@@ -195,7 +195,7 @@ export const ProjectRoleList = () => {
      <RoleModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
      <DeleteActionModal
        isOpen={popUp.deleteRole.isOpen}
-        title={`Are you sure want to delete ${
+        title={`Are you sure you want to delete ${
          (popUp?.deleteRole?.data as TProjectRole)?.name || " "
        } role?`}
        deleteKey={(popUp?.deleteRole?.data as TProjectRole)?.slug || ""}
--- a/frontend/src/pages/project/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx
+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx
@@ -184,7 +184,7 @@ const Page = () => {
          />
          <DeleteActionModal
            isOpen={popUp.deleteIdentity.isOpen}
-            title={`Are you sure want to remove ${identityMembershipDetails?.identity?.name} from the project?`}
+            title={`Are you sure you want to remove ${identityMembershipDetails?.identity?.name} from the project?`}
            onChange={(isOpen) => handlePopUpToggle("deleteIdentity", isOpen)}
            deleteKey="remove"
            onDeleteApproved={() => onRemoveIdentitySubmit()}
--- a/frontend/src/pages/project/RoleDetailsBySlugPage/RoleDetailsBySlugPage.tsx
+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/RoleDetailsBySlugPage.tsx
@@ -170,7 +170,7 @@ const Page = () => {
      <RoleModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
      <DeleteActionModal
        isOpen={popUp.deleteRole.isOpen}
-        title={`Are you sure want to delete the project role ${data?.name ?? ""}?`}
+        title={`Are you sure you want to delete the project role ${data?.name ?? ""}?`}
        onChange={(isOpen) => handlePopUpToggle("deleteRole", isOpen)}
        deleteKey="confirm"
        onDeleteApproved={() => onDeleteRoleSubmit()}
--- a/frontend/src/pages/project/RoleDetailsBySlugPage/components/ProjectRoleModifySection.utils.tsx
+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/components/ProjectRoleModifySection.utils.tsx
@@ -775,6 +775,7 @@ export const rolePermission2Form = (permissions: TProjectPermission[] = []) => {
        formVal[subject]![0][ProjectPermissionSecretSyncActions.ImportSecrets] = true;
      if (canRemoveSecrets)
        formVal[subject]![0][ProjectPermissionSecretSyncActions.RemoveSecrets] = true;
+      return;
    }

    if (subject === ProjectPermissionSub.SecretScanningDataSources) {
@@ -809,6 +810,8 @@ export const rolePermission2Form = (permissions: TProjectPermission[] = []) => {
        formVal[subject]![0][ProjectPermissionSecretScanningDataSourceActions.ReadResources] = true;
      if (canTriggerScans)
        formVal[subject]![0][ProjectPermissionSecretScanningDataSourceActions.TriggerScans] = true;
+
+      return;
    }

    if (subject === ProjectPermissionSub.SecretScanningFindings) {
@@ -821,6 +824,8 @@ export const rolePermission2Form = (permissions: TProjectPermission[] = []) => {
      if (canRead) formVal[subject]![0][ProjectPermissionSecretScanningFindingActions.Read] = true;
      if (canUpdate)
        formVal[subject]![0][ProjectPermissionSecretScanningFindingActions.Update] = true;
+
+      return;
    }

    if (subject === ProjectPermissionSub.SecretScanningConfigs) {
@@ -833,6 +838,8 @@ export const rolePermission2Form = (permissions: TProjectPermission[] = []) => {
      if (canRead) formVal[subject]![0][ProjectPermissionSecretScanningConfigActions.Read] = true;
      if (canUpdate)
        formVal[subject]![0][ProjectPermissionSecretScanningConfigActions.Update] = true;
+
+      return;
    }

    if (subject === ProjectPermissionSub.SshHosts) {
@@ -857,6 +864,8 @@ export const rolePermission2Form = (permissions: TProjectPermission[] = []) => {
        conditions: conditions ? convertCaslConditionToFormOperator(conditions) : [],
        inverted
      });
+
+      return;
    }

    if (subject === ProjectPermissionSub.PkiSubscribers) {
--- a/frontend/src/pages/secret-manager/IPAllowlistPage/components/IPAllowlistSection.tsx
+++ b/frontend/src/pages/secret-manager/IPAllowlistPage/components/IPAllowlistSection.tsx
@@ -91,7 +91,7 @@ export const IPAllowlistSection = () => {
      />
      <DeleteActionModal
        isOpen={popUp.deleteTrustedIp.isOpen}
-        title={`Are you sure want to delete ${
+        title={`Are you sure you want to delete ${
          (popUp?.deleteTrustedIp?.data as { name: string })?.name || " "
        }?`}
        onChange={(isOpen) => handlePopUpToggle("deleteTrustedIp", isOpen)}
--- a/frontend/src/pages/secret-manager/IntegrationsDetailsByIDPage/IntegrationsDetailsByIDPage.tsx
+++ b/frontend/src/pages/secret-manager/IntegrationsDetailsByIDPage/IntegrationsDetailsByIDPage.tsx
@@ -166,7 +166,7 @@ export const IntegrationDetailsByIDPage = () => {

      <DeleteActionModal
        isOpen={popUp.deleteConfirmation.isOpen}
-        title={`Are you sure want to remove ${integration?.integration || " "} integration for ${
+        title={`Are you sure you want to remove ${integration?.integration || " "} integration for ${
          integration?.app || "this project"
        }?`}
        onChange={(isOpen) => handlePopUpToggle("deleteConfirmation", isOpen)}
--- a/frontend/src/pages/secret-manager/IntegrationsListPage/components/CloudIntegrationSection/CloudIntegrationSection.tsx
+++ b/frontend/src/pages/secret-manager/IntegrationsListPage/components/CloudIntegrationSection/CloudIntegrationSection.tsx
@@ -237,7 +237,7 @@ export const CloudIntegrationSection = ({
      )}
      <DeleteActionModal
        isOpen={popUp.deleteConfirmation.isOpen}
-        title={`Are you sure want to revoke access ${
+        title={`Are you sure you want to revoke access ${
          (popUp?.deleteConfirmation.data as TRevokeIntegrationPopUp)?.provider || " "
        }?`}
        subTitle="This will remove all the secret integration of this provider!!!"
--- a/frontend/src/pages/secret-manager/IntegrationsListPage/components/NativeIntegrationsTab/NativeIntegrationsTab.tsx
+++ b/frontend/src/pages/secret-manager/IntegrationsListPage/components/NativeIntegrationsTab/NativeIntegrationsTab.tsx
@@ -202,7 +202,7 @@ export const NativeIntegrationsTab = () => {
      )}
      <DeleteActionModal
        isOpen={popUp.deleteConfirmation.isOpen}
-        title={`Are you sure want to remove ${
+        title={`Are you sure you want to remove ${
          (popUp?.deleteConfirmation.data as TIntegration)?.integration || " "
        } integration for ${
          (popUp?.deleteConfirmation.data as TIntegration)?.app || "this project"
--- a/frontend/src/pages/secret-manager/SecretRotationPage/SecretRotationPage.tsx
+++ b/frontend/src/pages/secret-manager/SecretRotationPage/SecretRotationPage.tsx
@@ -387,7 +387,7 @@ const Page = () => {
      />
      <DeleteActionModal
        isOpen={popUp.deleteRotation.isOpen}
-        title="Are you sure want to delete this rotation?"
+        title="Are you sure you want to delete this rotation?"
        subTitle="This will stop the rotation from dynamically changing. Secret won't be deleted"
        onChange={(isOpen) => handlePopUpToggle("deleteRotation", isOpen)}
        deleteKey="delete"
--- a/frontend/src/pages/secret-manager/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx
+++ b/frontend/src/pages/secret-manager/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx
@@ -79,14 +79,6 @@ export const DeleteProjectSection = () => {
  };

  const handleLeaveWorkspaceSubmit = async () => {
-    console.log({
-      currentWorkspace,
-      currentOrg,
-      members,
-      isNoAccessMember,
-      membership
-    });
-
    try {
      setIsLeaving.on();

@@ -176,7 +168,7 @@ export const DeleteProjectSection = () => {

      <DeleteActionModal
        isOpen={popUp.deleteWorkspace.isOpen}
-        title="Are you sure want to delete this project?"
+        title="Are you sure you want to delete this project?"
        subTitle={`Permanently delete ${currentWorkspace?.name} and all of its data. This action is not reversible, so please be careful.`}
        onChange={(isOpen) => handlePopUpToggle("deleteWorkspace", isOpen)}
        deleteKey="confirm"
@@ -186,8 +178,8 @@ export const DeleteProjectSection = () => {

      <LeaveProjectModal
        isOpen={popUp.leaveWorkspace.isOpen}
-        title="Are you sure want to leave this project?"
-        subTitle={`If you leave ${currentWorkspace?.name} you will lose access to the project and it's contents.`}
+        title="Are you sure you want to leave this project?"
+        subTitle={`If you leave ${currentWorkspace?.name} you will lose access to the project and its contents.`}
        onChange={(isOpen) => handlePopUpToggle("leaveWorkspace", isOpen)}
        deleteKey="confirm"
        buttonText="Leave Project"
--- a/frontend/src/pages/secret-manager/SettingsPage/components/EnvironmentSection/EnvironmentSection.tsx
+++ b/frontend/src/pages/secret-manager/SettingsPage/components/EnvironmentSection/EnvironmentSection.tsx
@@ -114,7 +114,7 @@ export const EnvironmentSection = () => {
      />
      <DeleteActionModal
        isOpen={popUp.deleteEnv.isOpen}
-        title={`Are you sure want to delete ${
+        title={`Are you sure you want to delete ${
          (popUp?.deleteEnv?.data as { name: string })?.name || " "
        }?`}
        onChange={(isOpen) => handlePopUpToggle("deleteEnv", isOpen)}
--- a/frontend/src/pages/secret-manager/SettingsPage/components/WorkflowIntegrationSection/WorkflowIntegrationTab.tsx
+++ b/frontend/src/pages/secret-manager/SettingsPage/components/WorkflowIntegrationSection/WorkflowIntegrationTab.tsx
@@ -142,7 +142,7 @@ export const WorkflowIntegrationTab = () => {
      />
      <DeleteActionModal
        isOpen={popUp.removeIntegration.isOpen}
-        title="Are you sure want to remove this integration?"
+        title="Are you sure you want to remove this integration?"
        onChange={(isOpen) => handlePopUpToggle("removeIntegration", isOpen)}
        deleteKey="confirm"
        onDeleteApproved={async () => {
--- a/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningResourceRow.tsx
+++ b/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningResourceRow.tsx
@@ -238,7 +238,7 @@ export const SecretScanningResourceRow = ({ resource, dataSource }: Props) => {
                        content={`Manually trigger a scan for this ${resourceDetails.singularNoun}.`}
                      >
                        <div className="flex h-full w-full items-center justify-between gap-1">
-                          <span> Trigger Scan</span>
+                          <span>Trigger Scan</span>
                          <FontAwesomeIcon
                            className="text-bunker-300"
                            size="sm"
--- a/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningResourceTable.tsx
+++ b/frontend/src/pages/secret-scanning/SecretScanningDataSourceByIdPage/components/SecretScanningResourceTable.tsx
@@ -293,7 +293,7 @@ export const SecretScanningResourcesTable = ({ dataSource }: Props) => {
          </THead>
          <TBody>
            {canReadResources && isResourcesPending && (
-              <TableSkeleton columns={5} innerKey="resource" />
+              <TableSkeleton columns={4} innerKey="resource" />
            )}
            {filteredResources.slice(offset, perPage * page).map((resource) => (
              <SecretScanningResourceRow
--- a/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/SecretScanningDataSourceRow.tsx
+++ b/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/SecretScanningDataSourceRow.tsx
@@ -274,7 +274,7 @@ export const SecretScanningDataSourceRow = ({
                      content={`Manually trigger a scan for this ${sourceDetails.name} data source.`}
                    >
                      <div className="flex h-full w-full items-center justify-between gap-1">
-                        <span> Trigger Scan</span>
+                        <span>Trigger Scan</span>
                        <FontAwesomeIcon
                          className="text-bunker-300"
                          size="sm"
--- a/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/SecretScanningDataSourcesTable.tsx
+++ b/frontend/src/pages/secret-scanning/SecretScanningDataSourcesPage/components/SecretScanningDataSourcesTable.tsx
@@ -100,7 +100,7 @@ export const SecretScanningDataSourcesTable = ({ dataSources }: Props) => {
          return (
            SECRET_SCANNING_DATA_SOURCE_MAP[type].name.toLowerCase().includes(searchValue) ||
            name.toLowerCase().includes(searchValue) ||
-            connection.name.toLowerCase().includes(searchValue)
+            (connection && connection.name.toLowerCase().includes(searchValue))
          );
        })
        .sort((a, b) => {
--- a/frontend/src/pages/secret-scanning/SecretScanningFindingsPage/components/SecretScanningUpdateFindingModal.tsx
+++ b/frontend/src/pages/secret-scanning/SecretScanningFindingsPage/components/SecretScanningUpdateFindingModal.tsx
@@ -27,7 +27,7 @@ type Props = {
 };

 const FormSchema = z.object({
-  remarks: z.string().optional(),
+  remarks: z.string().max(256, "Cannot exceed 256 characters").optional(),
  status: z.nativeEnum(SecretScanningFindingStatus)
 });

--- a/frontend/src/pages/secret-scanning/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx
+++ b/frontend/src/pages/secret-scanning/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx
@@ -79,14 +79,6 @@ export const DeleteProjectSection = () => {
  };

  const handleLeaveWorkspaceSubmit = async () => {
-    console.log({
-      currentWorkspace,
-      currentOrg,
-      members,
-      isNoAccessMember,
-      membership
-    });
-
    try {
      setIsLeaving.on();

@@ -170,7 +162,7 @@ export const DeleteProjectSection = () => {

      <DeleteActionModal
        isOpen={popUp.deleteWorkspace.isOpen}
-        title="Are you sure want to delete this project?"
+        title="Are you sure you want to delete this project?"
        subTitle={`Permanently delete ${currentWorkspace?.name} and all of its data. This action is not reversible, so please be careful.`}
        onChange={(isOpen) => handlePopUpToggle("deleteWorkspace", isOpen)}
        deleteKey="confirm"
@@ -180,8 +172,8 @@ export const DeleteProjectSection = () => {

      <LeaveProjectModal
        isOpen={popUp.leaveWorkspace.isOpen}
-        title="Are you sure want to leave this project?"
-        subTitle={`If you leave ${currentWorkspace?.name} you will lose access to the project and it's contents.`}
+        title="Are you sure you want to leave this project?"
+        subTitle={`If you leave ${currentWorkspace?.name} you will lose access to the project and its contents.`}
        onChange={(isOpen) => handlePopUpToggle("leaveWorkspace", isOpen)}
        deleteKey="confirm"
        buttonText="Leave Project"
--- a/frontend/src/pages/ssh/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx
+++ b/frontend/src/pages/ssh/SettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx
@@ -79,14 +79,6 @@ export const DeleteProjectSection = () => {
  };

  const handleLeaveWorkspaceSubmit = async () => {
-    console.log({
-      currentWorkspace,
-      currentOrg,
-      members,
-      isNoAccessMember,
-      membership
-    });
-
    try {
      setIsLeaving.on();

@@ -170,7 +162,7 @@ export const DeleteProjectSection = () => {

      <DeleteActionModal
        isOpen={popUp.deleteWorkspace.isOpen}
-        title="Are you sure want to delete this project?"
+        title="Are you sure you want to delete this project?"
        subTitle={`Permanently delete ${currentWorkspace?.name} and all of its data. This action is not reversible, so please be careful.`}
        onChange={(isOpen) => handlePopUpToggle("deleteWorkspace", isOpen)}
        deleteKey="confirm"
@@ -180,8 +172,8 @@ export const DeleteProjectSection = () => {

      <LeaveProjectModal
        isOpen={popUp.leaveWorkspace.isOpen}
-        title="Are you sure want to leave this project?"
-        subTitle={`If you leave ${currentWorkspace?.name} you will lose access to the project and it's contents.`}
+        title="Are you sure you want to leave this project?"
+        subTitle={`If you leave ${currentWorkspace?.name} you will lose access to the project and its contents.`}
        onChange={(isOpen) => handlePopUpToggle("leaveWorkspace", isOpen)}
        deleteKey="confirm"
        buttonText="Leave Project"
--- a/frontend/src/pages/ssh/SshCaByIDPage/SshCaByIDPage.tsx
+++ b/frontend/src/pages/ssh/SshCaByIDPage/SshCaByIDPage.tsx
@@ -119,7 +119,7 @@ const Page = () => {
      <SshCaModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
      <DeleteActionModal
        isOpen={popUp.deleteSshCa.isOpen}
-        title="Are you sure want to remove the SSH CA from the project?"
+        title="Are you sure you want to remove the SSH CA from the project?"
        onChange={(isOpen) => handlePopUpToggle("deleteSshCa", isOpen)}
        deleteKey="confirm"
        onDeleteApproved={() =>
--- a/frontend/src/pages/ssh/SshCaByIDPage/components/SshCertificateTemplatesSection.tsx
+++ b/frontend/src/pages/ssh/SshCaByIDPage/components/SshCertificateTemplatesSection.tsx
@@ -114,7 +114,7 @@ export const SshCertificateTemplatesSection = ({ caId }: Props) => {
      />
      <DeleteActionModal
        isOpen={popUp.deleteSshCertificateTemplate.isOpen}
-        title={`Are you sure want to delete the SSH certificate template ${
+        title={`Are you sure you want to delete the SSH certificate template ${
          (popUp?.deleteSshCertificateTemplate?.data as { name: string })?.name || ""
        }?`}
        onChange={(isOpen) => handlePopUpToggle("deleteSshCertificateTemplate", isOpen)}
@@ -127,7 +127,7 @@ export const SshCertificateTemplatesSection = ({ caId }: Props) => {
      />
      <DeleteActionModal
        isOpen={popUp.sshCertificateTemplateStatus.isOpen}
-        title={`Are you sure want to ${
+        title={`Are you sure you want to ${
          (popUp?.sshCertificateTemplateStatus?.data as { status: string })?.status ===
          SshCertTemplateStatus.ACTIVE
            ? "enable"
--- a/frontend/src/pages/ssh/SshCasPage/components/SshCaSection.tsx
+++ b/frontend/src/pages/ssh/SshCasPage/components/SshCaSection.tsx
@@ -85,7 +85,7 @@ export const SshCaSection = () => {
      <SshCaModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
      <DeleteActionModal
        isOpen={popUp.deleteSshCa.isOpen}
-        title="Are you sure want to remove the SSH CA?"
+        title="Are you sure you want to remove the SSH CA?"
        onChange={(isOpen) => handlePopUpToggle("deleteSshCa", isOpen)}
        deleteKey="confirm"
        onDeleteApproved={() =>
@@ -94,7 +94,7 @@ export const SshCaSection = () => {
      />
      <DeleteActionModal
        isOpen={popUp.sshCaStatus.isOpen}
-        title={`Are you sure want to ${
+        title={`Are you sure you want to ${
          (popUp?.sshCaStatus?.data as { status: string })?.status === SshCaStatus.ACTIVE
            ? "enable"
            : "disable"
--- a/frontend/src/pages/ssh/SshHostGroupDetailsByIDPage/SshHostGroupDetailsByIDPage.tsx
+++ b/frontend/src/pages/ssh/SshHostGroupDetailsByIDPage/SshHostGroupDetailsByIDPage.tsx
@@ -124,7 +124,7 @@ const Page = () => {
      <SshHostGroupModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
      <DeleteActionModal
        isOpen={popUp.deleteSshHostGroup.isOpen}
-        title={`Are you sure want to remove the SSH group: ${
+        title={`Are you sure you want to remove the SSH group: ${
          (popUp?.deleteSshHostGroup?.data as { name: string })?.name || ""
        }?`}
        onChange={(isOpen) => handlePopUpToggle("deleteSshHostGroup", isOpen)}
--- a/frontend/src/pages/ssh/SshHostGroupDetailsByIDPage/components/SshHostGroupHostsSection.tsx
+++ b/frontend/src/pages/ssh/SshHostGroupDetailsByIDPage/components/SshHostGroupHostsSection.tsx
@@ -88,7 +88,7 @@ export const SshHostGroupHostsSection = ({ sshHostGroupId }: Props) => {
      <AddHostGroupMemberModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} />
      <DeleteActionModal
        isOpen={popUp.removeHostFromSshHostGroup.isOpen}
-        title={`Are you sure want to remove ${
+        title={`Are you sure you want to remove ${
          (popUp?.removeHostFromSshHostGroup?.data as { hostname: string; alias?: string })
            ?.alias ||
          (popUp?.removeHostFromSshHostGroup?.data as { hostname: string; alias?: string })
--- a/frontend/src/pages/user/PersonalSettingsPage/components/DeleteAccountSection/DeleteAccountSection.tsx
+++ b/frontend/src/pages/user/PersonalSettingsPage/components/DeleteAccountSection/DeleteAccountSection.tsx
@@ -48,7 +48,7 @@ export const DeleteAccountSection = () => {
      </Button>
      <DeleteActionModal
        isOpen={popUp.deleteAccount.isOpen}
-        title="Are you sure want to delete your account?"
+        title="Are you sure you want to delete your account?"
        subTitle="Permanently remove this account and all of its data. This action is not reversible, so please be careful."
        onChange={(isOpen) => handlePopUpToggle("deleteAccount", isOpen)}
        deleteKey="confirm"
--- a/frontend/src/pages/user/PersonalSettingsPage/components/SecuritySection/MFASection.tsx
+++ b/frontend/src/pages/user/PersonalSettingsPage/components/SecuritySection/MFASection.tsx
@@ -221,7 +221,7 @@ export const MFASection = () => {
      />
      <DeleteActionModal
        isOpen={popUp.deleteTotpConfig.isOpen}
-        title="Are you sure want to delete the configured authenticator?"
+        title="Are you sure you want to delete the configured authenticator?"
        subTitle="This action is irreversible. You’ll have to go through the setup process to enable it again."
        onChange={(isOpen) => handlePopUpToggle("deleteTotpConfig", isOpen)}
        deleteKey="confirm"
--- a/frontend/src/pages/user/PersonalSettingsPage/components/SessionsSection/SessionsTable.tsx
+++ b/frontend/src/pages/user/PersonalSettingsPage/components/SessionsSection/SessionsTable.tsx
@@ -61,7 +61,7 @@ export const SessionsTable = () => {
    <>
      <DeleteActionModal
        isOpen={popUp.deleteSession.isOpen}
-        title="Are you sure want to sign out of this session?"
+        title="Are you sure you want to sign out of this session?"
        onChange={(isOpen) => handlePopUpToggle("deleteSession", isOpen)}
        deleteKey="confirm"
        onDeleteApproved={() =>