Iterate

Signed-off-by: Michael Telatynski <[email protected]>
element-hq · Oct 30, 2024 · 03d8b8c · 03d8b8c
1 parent f62de51
commit 03d8b8c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/Modal.tsx b/src/Modal.tsx
@@ -460,9 +460,7 @@ export class ModalManager extends TypedEventEmitter<ModalManagerEvent, HandlerMa
                 </StrictMode>
             );
 
-            setTimeout(() => {
-                ModalManager.getOrCreateRoot().render(dialog);
-            }, 0);
+            ModalManager.getOrCreateRoot().render(dialog);
         } else {
             // This is safe to call repeatedly if we happen to do that
             ModalManager.getOrCreateRoot().render(<></>);

diff --git a/test/unit-tests/components/structures/MatrixChat-test.tsx b/test/unit-tests/components/structures/MatrixChat-test.tsx
@@ -62,6 +62,7 @@ import { DRAFT_LAST_CLEANUP_KEY } from "../../../../src/DraftCleaner";
 import { UIFeature } from "../../../../src/settings/UIFeature";
 import AutoDiscoveryUtils from "../../../../src/utils/AutoDiscoveryUtils";
 import { ValidatedServerConfig } from "../../../../src/utils/ValidatedServerConfig";
+import Modal from "../../../../src/Modal.tsx";
 
 jest.mock("matrix-js-sdk/src/oidc/authorize", () => ({
     completeAuthorizationCodeGrant: jest.fn(),
@@ -1514,7 +1515,9 @@ describe("<MatrixChat />", () => {
 
     describe("when key backup failed", () => {
         it("should show the new recovery method dialog", async () => {
+            const spy = jest.spyOn(Modal, "createDialogAsync");
             jest.mock("../../../../src/async-components/views/dialogs/security/NewRecoveryMethodDialog", () => ({
+                __test: true,
                 __esModule: true,
                 default: () => <span>mocked dialog</span>,
             }));
@@ -1526,7 +1529,8 @@ describe("<MatrixChat />", () => {
             });
             await flushPromises();
             mockClient.emit(CryptoEvent.KeyBackupFailed, "error code");
-            await expect(screen.findByText("mocked dialog")).resolves.toBeInTheDocument();
+            await waitFor(() => expect(spy).toHaveBeenCalledTimes(1));
+            expect(await spy.mock.lastCall![0]).toEqual(expect.objectContaining({ __test: true }));
         });
     });
 });
diff --git a/test/unit-tests/components/views/rooms/wysiwyg_composer/utils/message-test.ts b/test/unit-tests/components/views/rooms/wysiwyg_composer/utils/message-test.ts
@@ -417,7 +417,7 @@ describe("message", () => {
             expect(mockClient.sendMessage).toHaveBeenCalledTimes(0);
             expect(mockClient.cancelPendingEvent).toHaveBeenCalledTimes(1);
             expect(mockCreateRedactEventDialog).toHaveBeenCalledTimes(1);
-            expect(spyDispatcher).toHaveBeenCalledTimes(0);
+            expect(spyDispatcher).toHaveBeenCalledTimes(1);
         });
 
         it("Should do nothing if the content is unmodified", async () => {