From 1655bea6f00fcee49ff14498c953eaeb3d679d3f Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 12 Jan 2026 12:51:27 +0000
Subject: [PATCH] Iterate

---
 .../settings/tabs/user/SessionManagerTab.tsx  | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/components/views/settings/tabs/user/SessionManagerTab.tsx b/src/components/views/settings/tabs/user/SessionManagerTab.tsx
index fa54546352..e98fd4e8aa 100644
--- a/src/components/views/settings/tabs/user/SessionManagerTab.tsx
+++ b/src/components/views/settings/tabs/user/SessionManagerTab.tsx
@@ -152,16 +152,11 @@ const SessionManagerTab: React.FC<{
      * delegated auth provider.
      * See https://github.com/matrix-org/matrix-spec-proposals/pull/3824
      */
-    const accountManagementEndpoint = useAsyncMemo(async () => {
+    const accountManagement = useAsyncMemo(async () => {
         await sdkContext.oidcClientStore.readyPromise; // wait for the store to be ready
-        return sdkContext.oidcClientStore.accountManagementEndpoint;
+        return { endpoint:sdkContext.oidcClientStore.accountManagementEndpoint, actionsSupported: sdkContext.oidcClientStore.accountManagementActionsSupported };
     }, [sdkContext.oidcClientStore]);
-    const accountManagementActionsSupported = useAsyncMemo(async () => {
-        await sdkContext.oidcClientStore.readyPromise; // wait for the store to be ready
-        return sdkContext.oidcClientStore.accountManagementActionsSupported;
-    }, [sdkContext.oidcClientStore]);
-    const disableMultipleSignout = !!accountManagementEndpoint;
-
+    const disableMultipleSignout = !!accountManagement?.endpoint;
     const userId = matrixClient?.getUserId();
     const currentUserMember = (userId && matrixClient?.getUser(userId)) || undefined;
     const clientVersions = useAsyncMemo(() => matrixClient.getVersions(), [matrixClient]);
@@ -237,8 +232,8 @@ const SessionManagerTab: React.FC<{
     const { onSignOutCurrentDevice, onSignOutOtherDevices, signingOutDeviceIds } = useSignOut(
         matrixClient,
         onSignoutResolvedCallback,
-        accountManagementEndpoint,
-        accountManagementActionsSupported,
+        accountManagement?.endpoint,
+        accountManagement?.actionsSupported,
     );
 
     useEffect(
@@ -303,8 +298,8 @@ const SessionManagerTab: React.FC<{
                     onSignOutCurrentDevice={onSignOutCurrentDevice}
                     signOutAllOtherSessions={signOutAllOtherSessions}
                     otherSessionsCount={otherSessionsCount}
-                    accountManagementEndpoint={accountManagementEndpoint}
-                    accountManagementActionsSupported={accountManagementActionsSupported}
+                    accountManagementEndpoint={accountManagement?.endpoint}
+                    accountManagementActionsSupported={accountManagement?.actionsSupported}
                 />
                 {shouldShowOtherSessions && (
                     <SettingsSubsection
@@ -338,7 +333,8 @@ const SessionManagerTab: React.FC<{
                             setPushNotifications={setPushNotifications}
                             ref={filteredDeviceListRef}
                             supportsMSC3881={supportsMSC3881}
-                            accountManagementEndpoint={accountManagementEndpoint}
+                            accountManagementEndpoint={accountManagement?.endpoint}
+                            accountManagementActionsSupported={accountManagement?.actionsSupported}
                         />
                     </SettingsSubsection>
                 )}