Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: element-hq/element-web
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8e18f6ec1ead3ef1ae2fec8561d22802063a797b
Choose a base ref
..
head repository: element-hq/element-web
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 52c6838add5a73aac457984b4c7733155fa63094
Choose a head ref
2 changes: 1 addition & 1 deletion src/components/views/rooms/EventTile.tsx
Original file line number Diff line number Diff line change
@@ -386,7 +386,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
return true;
}

public async componentDidMount(): Promise<void> {
public componentDidMount(): void {
this.unmounted = false;
this.suppressReadReceiptAnimation = false;
const client = MatrixClientPeg.safeGet();
Original file line number Diff line number Diff line change
@@ -32,7 +32,6 @@ import {
mkEvent,
mkMessage,
mkStubRoom,
mockClientMethodsCrypto,
mockPlatformPeg,
} from "../../../../test-utils";
import { TILE_SERVER_WK_KEY } from "../../../../../src/utils/WellKnownUtils";
@@ -76,7 +75,6 @@ describe("ForwardDialog", () => {
getClientWellKnown: jest.fn().mockReturnValue({
[TILE_SERVER_WK_KEY.name]: { map_style_url: "maps.com" },
}),
...mockClientMethodsCrypto(),
});
const defaultRooms = ["a", "A", "b"].map((name) => mkStubRoom(name, name, mockClient));

1 change: 0 additions & 1 deletion test/unit-tests/components/views/rooms/EventTile-test.tsx
Original file line number Diff line number Diff line change
@@ -245,7 +245,6 @@ describe("EventTile", () => {
const mockCrypto = {
// a mocked version of getEncryptionInfoForEvent which will pick its result from `eventToEncryptionInfoMap`
getEncryptionInfoForEvent: async (event: MatrixEvent) => eventToEncryptionInfoMap.get(event.getId()!)!,
isEncryptionEnabledInRoom: jest.fn().mockResolvedValue(false),
} as unknown as CryptoApi;
client.getCrypto = () => mockCrypto;
});