From 0085ef9fca70004afe9adb3e310437ae30b59772 Mon Sep 17 00:00:00 2001
From: Shane Melton <smelton@bitwarden.com>
Date: Wed, 13 Jul 2022 16:01:09 -0700
Subject: [PATCH] More org tab permission cleanup

---
 .../layouts/organization-layout.component.ts           | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/web/src/app/organizations/layouts/organization-layout.component.ts b/apps/web/src/app/organizations/layouts/organization-layout.component.ts
index a6fcd21811..3b46a2521a 100644
--- a/apps/web/src/app/organizations/layouts/organization-layout.component.ts
+++ b/apps/web/src/app/organizations/layouts/organization-layout.component.ts
@@ -55,19 +55,21 @@ export class OrganizationLayoutComponent implements OnInit, OnDestroy {
   }
 
   get showMembersTab(): boolean {
-    return this.organization.canManageUsers;
+    return NavigationPermissionsService.canAccessMembers(this.organization);
   }
 
   get showGroupsTab(): boolean {
-    return this.organization.useGroups && this.organization.canManageGroups;
+    return (
+      this.organization.useGroups && NavigationPermissionsService.canAccessGroups(this.organization)
+    );
   }
 
   get showReportsTab(): boolean {
-    return this.organization.canAccessReports;
+    return NavigationPermissionsService.canAccessReporting(this.organization);
   }
 
   get showBillingTab(): boolean {
-    return this.organization.canManageBilling;
+    return NavigationPermissionsService.canAccessBilling(this.organization);
   }
 
   get reportTabLabel(): string {