diff --git a/frontend/src/views/SecretMainPage/components/ActionBar/ActionBar.tsx b/frontend/src/views/SecretMainPage/components/ActionBar/ActionBar.tsx
index 0c3f3b03e..be511486d 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 52ac1b7ba..a8e1fb336 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 f5268c427..a3cf1a2ae 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"
/>
{
try {
// create folder if not existing
if (secretPath !== "/") {
+ // /hello/world -> ["", "hello","world"]
const path = secretPath.split("/");
- const directory = path.slice(0, -1).join("/");
- const folderName = path.at(-1);
+ // if its empty string on join use and OR gate to convert to /
+ // /hello
+ const directory =
+ path
+ .slice(0, -1)
+ .reduce(
+ (prev, curr, index, arr) => prev + (index + 1 === arr.length ? curr : `/${curr}`),
+ ""
+ ) || "/";
+ const folderName = path.at(-1); // world
if (folderName && directory) {
await createFolder({
workspaceId,
diff --git a/frontend/src/views/Settings/OrgSettingsPage/components/OrgGeneralTab/OrgGeneralTab.tsx b/frontend/src/views/Settings/OrgSettingsPage/components/OrgGeneralTab/OrgGeneralTab.tsx
index e4e219e0f..d8e48966d 100644
--- a/frontend/src/views/Settings/OrgSettingsPage/components/OrgGeneralTab/OrgGeneralTab.tsx
+++ b/frontend/src/views/Settings/OrgSettingsPage/components/OrgGeneralTab/OrgGeneralTab.tsx
@@ -10,7 +10,7 @@ export const OrgGeneralTab = () => {
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 8b62b1a08..0dba6ce6c 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}
/>