diff --git a/admin-ui/app/routes/Apps/Gluu/GluuAutoCompleteWithAdd.js b/admin-ui/app/routes/Apps/Gluu/GluuAutoCompleteWithAdd.js
index 12a8031cd..7f9ef85fb 100644
--- a/admin-ui/app/routes/Apps/Gluu/GluuAutoCompleteWithAdd.js
+++ b/admin-ui/app/routes/Apps/Gluu/GluuAutoCompleteWithAdd.js
@@ -5,6 +5,7 @@ import GluuLabel from '../Gluu/GluuLabel'
 import GluuTooltip from './GluuTooltip'
 import { useTranslation } from 'react-i18next'
 import { ThemeContext } from 'Context/theme/themeContext'
+import PropTypes from "prop-types";
 
 function GluuAutoCompleteWithAdd({
   label,
@@ -89,4 +90,16 @@ function GluuAutoCompleteWithAdd({
   )
 }
 
+GluuAutoCompleteWithAdd.propTypes = {
+  label: PropTypes.string,
+  name: PropTypes.string,
+  value: PropTypes.array,
+  options: PropTypes.array,
+  validator: PropTypes.func,
+  inputId: PropTypes.string,
+  formik: PropTypes.object,
+  placeholder: PropTypes.string,
+  doc_category: PropTypes.string,
+  handler: PropTypes.func
+}
 export default GluuAutoCompleteWithAdd
diff --git a/admin-ui/app/routes/Apps/Gluu/GluuCommitDialog.js b/admin-ui/app/routes/Apps/Gluu/GluuCommitDialog.js
index 139b76ca4..8261c3c9e 100644
--- a/admin-ui/app/routes/Apps/Gluu/GluuCommitDialog.js
+++ b/admin-ui/app/routes/Apps/Gluu/GluuCommitDialog.js
@@ -159,7 +159,7 @@ const GluuCommitDialog = ({
                 <Col sm={12}>
                   <Input
                     id={USER_MESSAGE}
-                    type={inputType ? inputType : "textarea"}
+                    type={inputType || "textarea"}
                     name={USER_MESSAGE}
                     onChange={(e) => setUserMessage(e.target.value)}
                     placeholder={
diff --git a/admin-ui/app/routes/Apps/Gluu/GluuTypeAheadWithAdd.js b/admin-ui/app/routes/Apps/Gluu/GluuTypeAheadWithAdd.js
index 9c4397826..44a63e352 100644
--- a/admin-ui/app/routes/Apps/Gluu/GluuTypeAheadWithAdd.js
+++ b/admin-ui/app/routes/Apps/Gluu/GluuTypeAheadWithAdd.js
@@ -5,6 +5,7 @@ import GluuLabel from "../Gluu/GluuLabel";
 import applicationStyle from "./styles/applicationstyle";
 import { useTranslation } from "react-i18next";
 import { ThemeContext } from "Context/theme/themeContext";
+import PropTypes from "prop-types";
 
 function GluuTypeAheadWithAdd({
   label,
@@ -114,4 +115,20 @@ function GluuTypeAheadWithAdd({
     </FormGroup>
   );
 }
+
+GluuTypeAheadWithAdd.protoTypes ={
+  label: PropTypes.string,
+  name: PropTypes.string,
+  value: PropTypes.array,
+  placeholder: PropTypes.string,
+  options: PropTypes.array,
+  formik: PropTypes.object,
+  validator: PropTypes.func,
+  inputId: PropTypes.string,
+  doc_category: PropTypes.string,
+  lsize: PropTypes.number,
+  rsize: PropTypes.number,
+  disabled: PropTypes.bool,
+  handler: PropTypes.func,
+}
 export default GluuTypeAheadWithAdd;
diff --git a/admin-ui/plugins/auth-server/components/Clients/ClientAdvancedPanel.js b/admin-ui/plugins/auth-server/components/Clients/ClientAdvancedPanel.js
index afa5c6c18..35e11bd3b 100644
--- a/admin-ui/plugins/auth-server/components/Clients/ClientAdvancedPanel.js
+++ b/admin-ui/plugins/auth-server/components/Clients/ClientAdvancedPanel.js
@@ -14,7 +14,6 @@ import { DateTimePicker, LocalizationProvider } from "@mui/x-date-pickers";
 import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
 import dayjs from "dayjs";
 import PropTypes from "prop-types";
-import { set } from "lodash";
 const DOC_CATEGORY = "openid_client";
 
 function ClientAdvancedPanel({
diff --git a/admin-ui/plugins/auth-server/components/Clients/ClientBasicPanel.js b/admin-ui/plugins/auth-server/components/Clients/ClientBasicPanel.js
index 445a95b81..e8767b409 100644
--- a/admin-ui/plugins/auth-server/components/Clients/ClientBasicPanel.js
+++ b/admin-ui/plugins/auth-server/components/Clients/ClientBasicPanel.js
@@ -70,10 +70,7 @@ const ClientBasicPanel = ({
   const scopeOptions = client?.scopes?.length ? clientScopeOptions : scopes;
   const { t } = useTranslation();
 
-  const tokenEndpointAuthMethod =
-    !!oidcConfiguration?.tokenEndpointAuthMethodsSupported
-      ? oidcConfiguration.tokenEndpointAuthMethodsSupported
-      : [];
+  const tokenEndpointAuthMethod = oidcConfiguration?.tokenEndpointAuthMethodsSupported || [];
 
   const [showClientSecret, setShowClientSecret] = useState(false);
   const [userScopeAction] = useState({
diff --git a/admin-ui/plugins/auth-server/components/Clients/ClientCibaParUmaPanel.js b/admin-ui/plugins/auth-server/components/Clients/ClientCibaParUmaPanel.js
index ae306e3f6..9a9bb312b 100644
--- a/admin-ui/plugins/auth-server/components/Clients/ClientCibaParUmaPanel.js
+++ b/admin-ui/plugins/auth-server/components/Clients/ClientCibaParUmaPanel.js
@@ -475,4 +475,7 @@ ClientCibaParUmaPanel.propTypes = {
   setCurrentStep: PropTypes.any,
   sequence: PropTypes.any,
   umaResources: PropTypes.any,
+  dispatch: PropTypes.func,
+  modifiedFields: PropTypes.any,
+  setModifiedFields: PropTypes.func,
 };
diff --git a/admin-ui/plugins/auth-server/components/Clients/ClientEncryptionSigningPanel.js b/admin-ui/plugins/auth-server/components/Clients/ClientEncryptionSigningPanel.js
index 5d2e82941..7f951305a 100644
--- a/admin-ui/plugins/auth-server/components/Clients/ClientEncryptionSigningPanel.js
+++ b/admin-ui/plugins/auth-server/components/Clients/ClientEncryptionSigningPanel.js
@@ -15,52 +15,52 @@ function ClientEncryptionSigningPanel({
 }) {
   const { t } = useTranslation();
   const accessTokenSigningAlg =
-    !!oidcConfiguration.tokenEndpointAuthSigningAlgValuesSupported
+    oidcConfiguration.tokenEndpointAuthSigningAlgValuesSupported
       ? oidcConfiguration.tokenEndpointAuthSigningAlgValuesSupported
       : [];
   //id_token
   const idTokenSignedResponseAlg =
-    !!oidcConfiguration.idTokenSigningAlgValuesSupported
+    oidcConfiguration.idTokenSigningAlgValuesSupported
       ? oidcConfiguration.idTokenSigningAlgValuesSupported
       : [];
 
   const idTokenEncryptedResponseAlg =
-    !!oidcConfiguration.idTokenEncryptionAlgValuesSupported
+    oidcConfiguration.idTokenEncryptionAlgValuesSupported
       ? oidcConfiguration.idTokenEncryptionAlgValuesSupported
       : [];
 
   const idTokenEncryptedResponseEnc =
-    !!oidcConfiguration.idTokenEncryptionEncValuesSupported
+    oidcConfiguration.idTokenEncryptionEncValuesSupported
       ? oidcConfiguration.idTokenEncryptionEncValuesSupported
       : [];
   //request-object
   const requestObjectSignedResponseAlg =
-    !!oidcConfiguration.requestObjectSigningAlgValuesSupported
+    oidcConfiguration.requestObjectSigningAlgValuesSupported
       ? oidcConfiguration.requestObjectSigningAlgValuesSupported
       : [];
 
   const requestObjectEncryptedResponseAlg =
-    !!oidcConfiguration.requestObjectEncryptionAlgValuesSupported
+    oidcConfiguration.requestObjectEncryptionAlgValuesSupported
       ? oidcConfiguration.requestObjectEncryptionAlgValuesSupported
       : [];
 
   const requestObjectEncryptedResponseEnc =
-    !!oidcConfiguration.requestObjectEncryptionEncValuesSupported
+    oidcConfiguration.requestObjectEncryptionEncValuesSupported
       ? oidcConfiguration.requestObjectEncryptionEncValuesSupported
       : [];
   //user-info
   const userInfoSignedResponseAlg =
-    !!oidcConfiguration.userInfoSigningAlgValuesSupported
+    oidcConfiguration.userInfoSigningAlgValuesSupported
       ? oidcConfiguration.userInfoSigningAlgValuesSupported
       : [];
 
   const userInfoEncryptedResponseAlg =
-    !!oidcConfiguration.userInfoEncryptionAlgValuesSupported
+    oidcConfiguration.userInfoEncryptionAlgValuesSupported
       ? oidcConfiguration.userInfoEncryptionAlgValuesSupported
       : [];
 
   const userInfoEncryptedResponseEnc =
-    !!oidcConfiguration.userInfoEncryptionEncValuesSupported
+    oidcConfiguration.userInfoEncryptionEncValuesSupported
       ? oidcConfiguration.userInfoEncryptionEncValuesSupported
       : [];
 
@@ -409,9 +409,11 @@ function ClientEncryptionSigningPanel({
 }
 
 ClientEncryptionSigningPanel.propTypes = {
-  formik: PropTypes.shape({
-    values: PropTypes.any,
-  }),
+  formik: PropTypes.object,
+  oidcConfiguration: PropTypes.object,
+  viewOnly: PropTypes.bool,
+  modifiedFields: PropTypes.object,
+  setModifiedFields: PropTypes.func,
 };
 
 export default ClientEncryptionSigningPanel;
diff --git a/admin-ui/plugins/auth-server/components/Clients/ClientLogoutPanel.js b/admin-ui/plugins/auth-server/components/Clients/ClientLogoutPanel.js
index 5db55b96a..6f40ed1ce 100644
--- a/admin-ui/plugins/auth-server/components/Clients/ClientLogoutPanel.js
+++ b/admin-ui/plugins/auth-server/components/Clients/ClientLogoutPanel.js
@@ -124,4 +124,7 @@ export default ClientLogoutPanel;
 ClientLogoutPanel.propTypes = {
   formik: PropTypes.any,
   viewOnly: PropTypes.bool,
+  modifiedFields: PropTypes.object,
+  setModifiedFields: PropTypes.func,
+
 };
diff --git a/admin-ui/plugins/auth-server/components/Clients/ClientSoftwarePanel.js b/admin-ui/plugins/auth-server/components/Clients/ClientSoftwarePanel.js
index 05428eb65..a4fc30c91 100644
--- a/admin-ui/plugins/auth-server/components/Clients/ClientSoftwarePanel.js
+++ b/admin-ui/plugins/auth-server/components/Clients/ClientSoftwarePanel.js
@@ -4,6 +4,7 @@ import GluuInputRow from "Routes/Apps/Gluu/GluuInputRow";
 import GluuTypeAheadWithAdd from "Routes/Apps/Gluu/GluuTypeAheadWithAdd";
 import { useTranslation } from "react-i18next";
 import isEmpty from "lodash/isEmpty";
+import PropTypes from "prop-types";
 const DOC_CATEGORY = "openid_client";
 
 const EMPTY = "";
@@ -181,4 +182,10 @@ function ClientSoftwarePanel({
   );
 }
 
+ClientSoftwarePanel.propTypes = {
+  formik: PropTypes.object,
+  viewOnly: PropTypes.bool,
+  modifiedFields: PropTypes.object,
+  setModifiedFields: PropTypes.func,
+}
 export default ClientSoftwarePanel;
diff --git a/admin-ui/plugins/auth-server/components/Clients/ClientWizardForm.js b/admin-ui/plugins/auth-server/components/Clients/ClientWizardForm.js
index 5def7fea2..0d11a563c 100644
--- a/admin-ui/plugins/auth-server/components/Clients/ClientWizardForm.js
+++ b/admin-ui/plugins/auth-server/components/Clients/ClientWizardForm.js
@@ -17,8 +17,8 @@ import ClientCibaParUmaPanel from "./ClientCibaParUmaPanel";
 import ClientEncryptionSigningPanel from "./ClientEncryptionSigningPanel";
 import { toast } from "react-toastify";
 import { setClientSelectedScopes } from "Plugins/auth-server/redux/features/scopeSlice";
-import { cloneDeep, set } from "lodash";
-import { useDispatch, useSelector } from "react-redux";
+import { cloneDeep } from "lodash";
+import { useDispatch } from "react-redux";
 import PropTypes from "prop-types";
 import { adminUiFeatures } from "Plugins/admin/helper/utils";
 
@@ -56,7 +56,6 @@ function ClientWizardForm({
   const [modal, setModal] = useState(false);
   const [currentStep, setCurrentStep] = useState(sequence[0]);
   const dispatch = useDispatch();
-  const userDetails = useSelector((state) => state.authReducer.userinfo);
 
 
   const initialValues = {
diff --git a/admin-ui/plugins/auth-server/components/Scopes/ScopeForm.js b/admin-ui/plugins/auth-server/components/Scopes/ScopeForm.js
index 34ea25e8f..803bad76a 100644
--- a/admin-ui/plugins/auth-server/components/Scopes/ScopeForm.js
+++ b/admin-ui/plugins/auth-server/components/Scopes/ScopeForm.js
@@ -51,7 +51,6 @@ function ScopeForm({
   const client = scope.clients || [];
 
   const authReducer = useSelector((state) => state.authReducer);
-  const userDetails = useSelector((state) => state.authReducer.userinfo);
   let claims = [];
   scripts = scripts || [];
   attributes = attributes || [];