From 80116c7e5453f483f5a03486318e73cbd0cec633 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Tue, 1 Jul 2025 02:18:56 +1000
Subject: [PATCH] Use organizations$ observable instead of class member
 (#15377)

---
 .../organizations/members/members.component.ts           | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/web/src/app/admin-console/organizations/members/members.component.ts b/apps/web/src/app/admin-console/organizations/members/members.component.ts
index 633f45ae9a3..0247a8c881b 100644
--- a/apps/web/src/app/admin-console/organizations/members/members.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/members.component.ts
@@ -248,10 +248,13 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
     const separateCustomRolePermissionsEnabled$ = this.configService.getFeatureFlag$(
       FeatureFlag.SeparateCustomRolePermissions,
     );
-    this.showUserManagementControls$ = separateCustomRolePermissionsEnabled$.pipe(
+    this.showUserManagementControls$ = combineLatest([
+      separateCustomRolePermissionsEnabled$,
+      organization$,
+    ]).pipe(
       map(
-        (separateCustomRolePermissionsEnabled) =>
-          !separateCustomRolePermissionsEnabled || this.organization.canManageUsers,
+        ([separateCustomRolePermissionsEnabled, organization]) =>
+          !separateCustomRolePermissionsEnabled || organization.canManageUsers,
       ),
     );
   }