From 0a338ee539cf14e13e82e2f940128425fcfa0e31 Mon Sep 17 00:00:00 2001
From: carlosmonastyrski <charly.monastyrski@gmail.com>
Date: Fri, 28 Mar 2025 13:22:40 -0300
Subject: [PATCH 1/2] Fix infinite loading icon on snapshot button

---
 .../SecretDashboardPage/SecretDashboardPage.tsx           | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx b/frontend/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx
index e6fc5eadf..4b90e1fbb 100644
--- a/frontend/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx
+++ b/frontend/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx
@@ -250,7 +250,11 @@ const Page = () => {
     limit: 10
   });
 
-  const { data: snapshotCount, isPending: isSnapshotCountLoading } = useGetWsSnapshotCount({
+  const {
+    data: snapshotCount,
+    isPending: isSnapshotCountLoading,
+    isFetching: isSnapshotCountFetching
+  } = useGetWsSnapshotCount({
     workspaceId,
     environment,
     directory: secretPath,
@@ -414,7 +418,7 @@ const Page = () => {
             onSearchChange={handleSearchChange}
             onToggleTagFilter={handleTagToggle}
             snapshotCount={snapshotCount || 0}
-            isSnapshotCountLoading={isSnapshotCountLoading}
+            isSnapshotCountLoading={isSnapshotCountLoading && isSnapshotCountFetching}
             onToggleRowType={handleToggleRowType}
             onClickRollbackMode={() => handlePopUpToggle("snapshots", true)}
             protectedBranchPolicyName={boardPolicy?.name}

From a2c9c4529b4652c18f69789cea860d5cd13d11a5 Mon Sep 17 00:00:00 2001
From: carlosmonastyrski <charly.monastyrski@gmail.com>
Date: Fri, 28 Mar 2025 15:22:13 -0300
Subject: [PATCH 2/2] Fix sidebar menus on safari

---
 .../components/MinimizedOrgSidebar/MinimizedOrgSidebar.tsx  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/layouts/OrganizationLayout/components/MinimizedOrgSidebar/MinimizedOrgSidebar.tsx b/frontend/src/layouts/OrganizationLayout/components/MinimizedOrgSidebar/MinimizedOrgSidebar.tsx
index d59a3e1d6..a4ff5fff1 100644
--- a/frontend/src/layouts/OrganizationLayout/components/MinimizedOrgSidebar/MinimizedOrgSidebar.tsx
+++ b/frontend/src/layouts/OrganizationLayout/components/MinimizedOrgSidebar/MinimizedOrgSidebar.tsx
@@ -329,7 +329,7 @@ export const MinimizedOrgSidebar = () => {
                 )}
               </Link>
               <div className="my-1 w-full bg-mineshaft-500" style={{ height: "1px" }} />
-              <DropdownMenu open={open} onOpenChange={setOpen}>
+              <DropdownMenu open={open} onOpenChange={setOpen} modal={false}>
                 <DropdownMenuTrigger
                   onMouseEnter={() => setOpen(true)}
                   onMouseLeave={() => setOpen(false)}
@@ -396,7 +396,7 @@ export const MinimizedOrgSidebar = () => {
                 : "mb-4"
             } flex w-full cursor-default flex-col items-center px-1 text-sm text-mineshaft-400`}
           >
-            <DropdownMenu open={openSupport} onOpenChange={setOpenSupport}>
+            <DropdownMenu open={openSupport} onOpenChange={setOpenSupport} modal={false}>
               <DropdownMenuTrigger
                 onMouseEnter={() => setOpenSupport(true)}
                 onMouseLeave={() => setOpenSupport(false)}
@@ -479,7 +479,7 @@ export const MinimizedOrgSidebar = () => {
                 </button>
               </Tooltip>
             )}
-            <DropdownMenu open={openUser} onOpenChange={setOpenUser}>
+            <DropdownMenu open={openUser} onOpenChange={setOpenUser} modal={false}>
               <DropdownMenuTrigger
                 onMouseEnter={() => setOpenUser(true)}
                 onMouseLeave={() => setOpenUser(false)}