Merge branch 'develop' into dbkr/stateafter

test/unit-tests/components/views/settings/JoinRuleSettings-test.tsx

@@ -59,7 +59,7 @@ describe("<JoinRuleSettings />", () => {
         onError: jest.fn(),
     };
     const getComponent = (props: Partial<JoinRuleSettingsProps> = {}) =>
-        render(<JoinRuleSettings {...defaultProps} {...props} />);
+        render(<JoinRuleSettings {...defaultProps} {...props} />, { legacyRoot: false });
 
     const setRoomStateEvents = (
         room: Room,

test/unit-tests/components/views/settings/SecureBackupPanel-test.tsx

@@ -130,10 +130,8 @@ describe("<SecureBackupPanel />", () => {
             })
             .mockResolvedValue(null);
         getComponent();
-        // flush checkKeyBackup promise
-        await flushPromises();
 
-        fireEvent.click(screen.getByText("Delete Backup"));
+        fireEvent.click(await screen.findByText("Delete Backup"));
 
         const dialog = await screen.findByRole("dialog");