From f8c5eac8a978a2beb3828893859ef5b38fed6c84 Mon Sep 17 00:00:00 2001
From: Florian Duros <florian.duros@ormaz.fr>
Date: Thu, 14 Nov 2024 17:59:18 +0100
Subject: [PATCH] Replace `MatrixClient.isRoomEncrypted` by
 `MatrixClient.CryptoApi.isEncryptionEnabledInRoom` in `MemberListStore.tsx`

---
 src/stores/MemberListStore.ts                  | 6 +++---
 test/unit-tests/stores/MemberListStore-test.ts | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/stores/MemberListStore.ts b/src/stores/MemberListStore.ts
index 1455a4526f..cf4b933983 100644
--- a/src/stores/MemberListStore.ts
+++ b/src/stores/MemberListStore.ts
@@ -70,7 +70,7 @@ export class MemberListStore {
             return [];
         }
 
-        if (!this.isLazyLoadingEnabled(roomId) || this.loadedRooms.has(roomId)) {
+        if (!(await this.isLazyLoadingEnabled(roomId)) || this.loadedRooms.has(roomId)) {
             // nice and easy, we must already have all the members so just return them.
             return this.loadMembersInRoom(room);
         }
@@ -121,10 +121,10 @@ export class MemberListStore {
      * @param roomId The room to check if lazy loading is enabled
      * @returns True if enabled
      */
-    private isLazyLoadingEnabled(roomId: string): boolean {
+    private async isLazyLoadingEnabled(roomId: string): Promise<boolean> {
         if (SettingsStore.getValue("feature_sliding_sync")) {
             // only unencrypted rooms use lazy loading
-            return !this.stores.client!.isRoomEncrypted(roomId);
+            return !(await this.stores.client?.getCrypto()?.isEncryptionEnabledInRoom(roomId));
         }
         return this.stores.client!.hasLazyLoadMembersEnabled();
     }
diff --git a/test/unit-tests/stores/MemberListStore-test.ts b/test/unit-tests/stores/MemberListStore-test.ts
index 889a9d3505..815dea8758 100644
--- a/test/unit-tests/stores/MemberListStore-test.ts
+++ b/test/unit-tests/stores/MemberListStore-test.ts
@@ -189,8 +189,7 @@ describe("MemberListStore", () => {
         });
 
         it("does not use lazy loading on encrypted rooms", async () => {
-            client.isRoomEncrypted = jest.fn();
-            mocked(client.isRoomEncrypted).mockReturnValue(true);
+            jest.spyOn(client.getCrypto()!, "isEncryptionEnabledInRoom").mockResolvedValue(true);
 
             const { joined } = await store.loadMemberList(roomId);
             expect(joined).toEqual([room.getMember(alice)]);