diff --git a/frontend/src/views/SecretMainPage/components/ActionBar/ActionBar.tsx b/frontend/src/views/SecretMainPage/components/ActionBar/ActionBar.tsx
index 0c3f3b03..be511486 100644
--- a/frontend/src/views/SecretMainPage/components/ActionBar/ActionBar.tsx
+++ b/frontend/src/views/SecretMainPage/components/ActionBar/ActionBar.tsx
@@ -289,7 +289,7 @@ export const ActionBar = ({
className="h-10"
isDisabled={!isAllowed}
>
- {snapshotCount} Commits
+ {`${snapshotCount} ${snapshotCount === 1 ? "Commit" : "Commits"}`}
)}
diff --git a/frontend/src/views/SecretMainPage/components/CreateSecretForm/CreateSecretForm.tsx b/frontend/src/views/SecretMainPage/components/CreateSecretForm/CreateSecretForm.tsx
index 52ac1b7b..a8e1fb33 100644
--- a/frontend/src/views/SecretMainPage/components/CreateSecretForm/CreateSecretForm.tsx
+++ b/frontend/src/views/SecretMainPage/components/CreateSecretForm/CreateSecretForm.tsx
@@ -105,7 +105,7 @@ export const CreateSecretForm = ({
>
)}
diff --git a/frontend/src/views/SecretMainPage/components/SecretListView/SecretListView.tsx b/frontend/src/views/SecretMainPage/components/SecretListView/SecretListView.tsx
index f5268c42..a3cf1a2a 100644
--- a/frontend/src/views/SecretMainPage/components/SecretListView/SecretListView.tsx
+++ b/frontend/src/views/SecretMainPage/components/SecretListView/SecretListView.tsx
@@ -339,6 +339,7 @@ export const SecretListView = ({
title="Do you want to delete this secret?"
onChange={(isOpen) => handlePopUpToggle("deleteSecret", isOpen)}
onDeleteApproved={handleSecretDelete}
+ buttonText="Delete Secret"
/>
{
const { user } = useUser();
const { data: members } = useGetOrgUsers(currentOrg?._id ?? "");
- const membershipOrg = members?.find((member) => member.user._id === user._id);
+ const membershipOrg = members?.find((member) => member.user._id === user?._id);
return (
diff --git a/frontend/src/views/Settings/ProjectSettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx b/frontend/src/views/Settings/ProjectSettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx
index 8b62b1a0..0dba6ce6 100644
--- a/frontend/src/views/Settings/ProjectSettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx
+++ b/frontend/src/views/Settings/ProjectSettingsPage/components/DeleteProjectSection/DeleteProjectSection.tsx
@@ -77,9 +77,10 @@ export const DeleteProjectSection = () => {
handlePopUpToggle("deleteWorkspace", isOpen)}
deleteKey="confirm"
+ buttonText="Delete Project"
onDeleteApproved={handleDeleteWorkspaceSubmit}
/>