Cleanup

onaio · Sep 13, 2024 · 0d19829 · 0d19829
1 parent 2024593
commit 0d19829
Showing 1 changed file with 10 additions and 20 deletions.
diff --git a/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/index.tsx b/packages/fhir-keycloak-user-management/src/components/UserList/Viewdetails/index.tsx
@@ -102,26 +102,16 @@ export const UserDetails = (props: UserDetailProps) => {
 
   const { id, firstName, lastName, username, email, emailVerified, enabled, attributes } = user;
 
-  const userDetails =
-    attributes?.phoneNumber && attributes?.nationalId
-      ? {
-          [t('Id')]: id,
-          [t('First Name')]: firstName,
-          [t('Last Name')]: lastName,
-          [t('National ID')]: attributes?.nationalId,
-          [t('Phone Number')]: attributes?.phoneNumber,
-          [t('Username')]: username,
-          [t('Email')]: email,
-          [t('Verified')]: emailVerified ? t('True') : t('False'),
-        }
-      : {
-          [t('Id')]: id,
-          [t('First Name')]: firstName,
-          [t('Last Name')]: lastName,
-          [t('Username')]: username,
-          [t('Email')]: email,
-          [t('Verified')]: emailVerified ? t('True') : t('False'),
-        };
+  const userDetails = {
+    [t('Id')]: id,
+    [t('First Name')]: firstName,
+    [t('Last Name')]: lastName,
+    ...(attributes?.nationalId ? { [t('National ID')]: attributes.nationalId } : {}),
+    ...(attributes?.phoneNumber ? { [t('Phone Number')]: attributes.phoneNumber } : {}),
+    [t('Username')]: username,
+    [t('Email')]: email,
+    [t('Verified')]: emailVerified ? t('True') : t('False'),
+  };
   const attributesArray = Object.entries(attributes ?? {});
   const breadCrumbProps = {
     items: [