nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'develop' into midhun/new-memberlist

Browse Source
This commit is contained in:
R Midhun Suresh
2024-12-25 23:58:59 +05:30
parent 8774bf2ce6 e98529824e
commit 2f351193da
115 changed files with 753 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/unit-tests/components/structures/MatrixChat-test.tsx
View File

@@ -1493,7 +1493,7 @@ describe("<MatrixChat />", () => {
};
const enabledMobileRegistration = (): void => {
jest.spyOn(SettingsStore, "getValue").mockImplementation((settingName: string) => {
jest.spyOn(SettingsStore, "getValue").mockImplementation((settingName): any => {
if (settingName === "Registration.mobileRegistrationHelper") return true;
if (settingName === UIFeature.Registration) return true;
});

4
test/unit-tests/components/structures/TimelinePanel-test.tsx
View File

@@ -303,8 +303,8 @@ describe("TimelinePanel", () => {
client.isVersionSupported.mockResolvedValue(true);
client.doesServerSupportUnstableFeature.mockResolvedValue(true);
jest.spyOn(SettingsStore, "getValue").mockImplementation((setting: string) => {
if (setting === "sendReadReceipt") return false;
jest.spyOn(SettingsStore, "getValue").mockImplementation((setting: string): any => {
if (setting === "sendReadReceipts") return false;
return undefined;
});