UX Tweaks

frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityUniversalAuthForm.tsx

@@ -453,7 +453,7 @@ export const IdentityUniversalAuthForm = ({
                       onCheckedChange={onChange}
                       isChecked={value}
                     >
-                      Lockout {value ? "Enabled" : "Disabled"}
+                      Lockout
                     </Switch>
                   </FormControl>
                 );

frontend/src/pages/organization/IdentityDetailsByIDPage/components/ViewIdentityAuthModal/ViewIdentityUniversalAuthContent.tsx

@@ -115,9 +115,17 @@ export const ViewIdentityUniversalAuthContent = ({
       <IdentityAuthFieldDisplay label="Client Secret Trusted IPs">
         {data.clientSecretTrustedIps.map((ip) => ip.ipAddress).join(", ")}
       </IdentityAuthFieldDisplay>
+      <IdentityAuthFieldDisplay label="Lockout">
+        {data.lockoutEnabled ? "Enabled" : "Disabled"}
+      </IdentityAuthFieldDisplay>
+      {data.lockoutEnabled && (
+        <>
           <div className="col-span-2 mt-3 flex justify-between border-b border-mineshaft-500 pb-2">
             <span className="text-bunker-300">Lockout Options</span>
-        <OrgPermissionCan I={OrgPermissionIdentityActions.Edit} a={OrgPermissionSubjects.Identity}>
+            <OrgPermissionCan
+              I={OrgPermissionIdentityActions.Edit}
+              a={OrgPermissionSubjects.Identity}
+            >
               {(isAllowed) => (
                 <Button
                   isDisabled={!isAllowed || !lockedOutState || isClearLockoutsPending}
@@ -131,9 +139,6 @@ export const ViewIdentityUniversalAuthContent = ({
               )}
             </OrgPermissionCan>
           </div>
-      <IdentityAuthFieldDisplay label="Lockout">
-        {data.lockoutEnabled ? "Enabled" : "Disabled"}
-      </IdentityAuthFieldDisplay>
           <IdentityAuthFieldDisplay label="Lockout Threshold">
             {data.lockoutThreshold}
           </IdentityAuthFieldDisplay>
@@ -143,6 +148,8 @@ export const ViewIdentityUniversalAuthContent = ({
           <IdentityAuthFieldDisplay label="Lockout Counter Reset">
             {ms(data.lockoutCounterResetSeconds * 1000, { long: true })}
           </IdentityAuthFieldDisplay>
+        </>
+      )}
       <div className="col-span-2 my-3">
         <div className="mb-3 border-b border-mineshaft-500 pb-2">
           <span className="text-bunker-300">Client ID</span>