diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsx
index c5e1e5cf0..b1cd906bb 100644
--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsx
+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/AccessApprovalRequest/components/ReviewAccessModal.tsx
@@ -432,14 +432,14 @@ export const ReviewAccessRequestModal = ({
                       <GenericFieldLabel className="col-span-2" icon={faUser} label="Users">
                         {Boolean(approver.user.length) && (
                           <div className="flex flex-row flex-wrap gap-2">
-                            {approver?.user?.map((el, index) => {
+                            {approver?.user?.map((el, idx) => {
                               const member = approverSequence?.membersGroupById?.[el.id]?.[0];
                               if (!member) return null;
 
                               return member.user.isOrgMembershipActive ? (
                                 <div className="flex items-center" key={member.user.id}>
                                   <span>{member.user.username}</span>
-                                  {index < approver.user.length - 1 && ","}
+                                  {idx < approver.user.length - 1 && ","}
                                 </div>
                               ) : (
                                 <div className="flex items-center" key={member.user.id}>
@@ -456,7 +456,7 @@ export const ReviewAccessRequestModal = ({
                                       </Tooltip>
                                     </span>
                                   </span>
-                                  {index < approver.user.length - 1 && ","}
+                                  {idx < approver.user.length - 1 && ","}
                                 </div>
                               );
                             })}
diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/ApprovalPolicyRow.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/ApprovalPolicyRow.tsx
index d1c54d85f..89a97003e 100644
--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/ApprovalPolicyRow.tsx
+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/ApprovalPolicyList/components/ApprovalPolicyRow.tsx
@@ -215,11 +215,11 @@ export const ApprovalPolicyRow = ({
                     <GenericFieldLabel className="col-span-2" icon={faUser} label="Users">
                       {Boolean(el.users.length) && (
                         <div className="flex flex-row flex-wrap gap-2">
-                          {el.users.map((u, index) => {
+                          {el.users.map((u, idx) => {
                             return u.user.isOrgMembershipActive ? (
                               <div className="flex items-center" key={u.id}>
                                 <span>{getMemberLabel(u)}</span>
-                                {index < el.users.length - 1 && ","}
+                                {idx < el.users.length - 1 && ","}
                               </div>
                             ) : (
                               <div className="flex items-center" key={u.id}>
@@ -236,7 +236,7 @@ export const ApprovalPolicyRow = ({
                                     </Tooltip>
                                   </span>
                                 </span>
-                                {index < el.users.length - 1 && ","}
+                                {idx < el.users.length - 1 && ","}
                               </div>
                             );
                           })}
diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/components/SecretApprovalRequestChanges.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/components/SecretApprovalRequestChanges.tsx
index 1f4d708f9..4bfebc5da 100644
--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/components/SecretApprovalRequestChanges.tsx
+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/components/SecretApprovalRequest/components/SecretApprovalRequestChanges.tsx
@@ -629,6 +629,7 @@ export const SecretApprovalRequestChanges = ({
                     <Tooltip
                       className="relative !z-[500]"
                       content={
+                        // eslint-disable-next-line no-nested-ternary
                         !isOrgMembershipActive
                           ? "This user has been deactivated and no longer has an active organization membership."
                           : `${reviewer.firstName || ""} ${reviewer.lastName || ""}`