Merge branch 'develop' of https://github.com/credebl/studio into qa

credebl · Feb 26, 2024 · 008a17d · 008a17d
2 parents 69c78a6 + 1c20f6e
commit 008a17d
Showing 1 changed file with 20 additions and 15 deletions.
diff --git a/src/components/User/UserDashBoard.tsx b/src/components/User/UserDashBoard.tsx
@@ -686,8 +686,10 @@ const UserDashBoard = () => {
 																			</svg>
 																		</span>
 																	) : org.roles.includes(
-																			OrganizationRoles.organizationVerifier ??
-																				OrganizationRoles.organizationIssuer,
+																			OrganizationRoles.organizationVerifier,
+																	  ) ||
+																	  org.roles.includes(
+																			OrganizationRoles.organizationIssuer,
 																	  ) ? (
 																		<span
 																			title={org.roles.slice(
@@ -765,28 +767,31 @@ const UserDashBoard = () => {
 															placement="bottom"
 															className="items-center text-center dark:text-white"
 														>
-															{' '}
 															<button
 																onClick={() => {
 																	goToOrgSchema(org, org.id, org.roles);
 																}}
 																className={`p-1 rounded-md ${
-																	organizationsList[index].userOrgRoles[0]
-																		.orgRole.name !==
-																		OrganizationRoles.organizationOwner ||
-																	organizationsList[index].userOrgRoles[0]
-																		.orgRole.name ===
-																		OrganizationRoles.organizationAdmin
+																	!(
+																		organizationsList[index].userOrgRoles[0]
+																			.orgRole.name ===
+																			OrganizationRoles.organizationOwner ||
+																		organizationsList[index].userOrgRoles[0]
+																			.orgRole.name ===
+																			OrganizationRoles.organizationAdmin
+																	)
 																		? 'cursor-not-allowed opacity-50'
 																		: ''
 																}`}
 																disabled={
-																	organizationsList[index].userOrgRoles[0]
-																		.orgRole.name !==
-																		OrganizationRoles.organizationOwner ||
-																	organizationsList[index].userOrgRoles[0]
-																		.orgRole.name ===
-																		OrganizationRoles.organizationAdmin
+																	!(
+																		organizationsList[index].userOrgRoles[0]
+																			.orgRole.name ===
+																			OrganizationRoles.organizationOwner ||
+																		organizationsList[index].userOrgRoles[0]
+																			.orgRole.name ===
+																			OrganizationRoles.organizationAdmin
+																	)
 																}
 															>
 																<svg