From 56ebc7972cfaac260ab138a1e1d2131afd75db74 Mon Sep 17 00:00:00 2001
From: Herrera <eduardo.herrera@quartech.com>
Date: Wed, 12 Jun 2024 16:06:46 -0700
Subject: [PATCH 1/2] PSP-8566 : FT: Lease & Licences - Tenants: Select Tenants
 button gets blue after clicking on it.

---
 source/frontend/src/components/common/SectionListHeader.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/frontend/src/components/common/SectionListHeader.tsx b/source/frontend/src/components/common/SectionListHeader.tsx
index 157a02991f..22e1da14d6 100644
--- a/source/frontend/src/components/common/SectionListHeader.tsx
+++ b/source/frontend/src/components/common/SectionListHeader.tsx
@@ -19,7 +19,10 @@ export const SectionListHeader: React.FunctionComponent<
   React.PropsWithChildren<ISectionListHeaderProps>
 > = props => {
   const { hasClaim } = useKeycloakWrapper();
-  const onClick = () => props.onAdd && props.onAdd();
+  const onClick = (e): void => {
+    e.currentTarget.blur();
+    props.onAdd && props.onAdd();
+  };
 
   return (
     <StyledRow className="no-gutters">

From 0f9b870cf8e68bd2b1982351301696f684384050 Mon Sep 17 00:00:00 2001
From: Herrera <eduardo.herrera@quartech.com>
Date: Mon, 17 Jun 2024 14:30:25 -0700
Subject: [PATCH 2/2] - updates

---
 source/frontend/src/components/common/GenericModal.tsx      | 1 +
 source/frontend/src/components/common/SectionListHeader.tsx | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/source/frontend/src/components/common/GenericModal.tsx b/source/frontend/src/components/common/GenericModal.tsx
index 0eb3d28e84..b1213915d2 100644
--- a/source/frontend/src/components/common/GenericModal.tsx
+++ b/source/frontend/src/components/common/GenericModal.tsx
@@ -205,6 +205,7 @@ export const GenericModal = (props: Omit<BsModalProps, 'onHide'> & ModalProps) =
       variant={variant}
       show={showState}
       modalSize={modalSize}
+      restoreFocus={false}
       onHide={noop}
       className={getModalClass()}
     >
diff --git a/source/frontend/src/components/common/SectionListHeader.tsx b/source/frontend/src/components/common/SectionListHeader.tsx
index 22e1da14d6..157a02991f 100644
--- a/source/frontend/src/components/common/SectionListHeader.tsx
+++ b/source/frontend/src/components/common/SectionListHeader.tsx
@@ -19,10 +19,7 @@ export const SectionListHeader: React.FunctionComponent<
   React.PropsWithChildren<ISectionListHeaderProps>
 > = props => {
   const { hasClaim } = useKeycloakWrapper();
-  const onClick = (e): void => {
-    e.currentTarget.blur();
-    props.onAdd && props.onAdd();
-  };
+  const onClick = () => props.onAdd && props.onAdd();
 
   return (
     <StyledRow className="no-gutters">