Merge remote-tracking branch 'origin/develop' into dbkr/refactor_createcrosssigningdialog

test/test-utils/test-utils.ts

@@ -130,6 +130,7 @@ export function createTestClient(): MatrixClient {
             setDeviceIsolationMode: jest.fn(),
             prepareToEncrypt: jest.fn(),
             bootstrapCrossSigning: jest.fn(),
+            getActiveSessionBackupVersion: jest.fn().mockResolvedValue(null),
         }),
 
         getPushActionsForEvent: jest.fn(),
@@ -167,7 +168,6 @@ export function createTestClient(): MatrixClient {
             });
         }),
         mxcUrlToHttp: jest.fn().mockImplementation((mxc: string) => `http://this.is.a.url/${mxc.substring(6)}`),
-        scheduleAllGroupSessionsForBackup: jest.fn().mockResolvedValue(undefined),
         setAccountData: jest.fn(),
         setRoomAccountData: jest.fn(),
         setRoomTopic: jest.fn(),