diff --git a/src/components/views/settings/tabs/user/MediaPreviewSetting.tsx b/src/components/views/settings/tabs/user/MediaPreviewSetting.tsx index 29c57894ed..82fafda6ee 100644 --- a/src/components/views/settings/tabs/user/MediaPreviewSetting.tsx +++ b/src/components/views/settings/tabs/user/MediaPreviewSetting.tsx @@ -15,7 +15,7 @@ import { useSettingValue } from "../../../../../hooks/useSettings"; import SettingsStore from "../../../../../settings/SettingsStore"; import { SettingLevel } from "../../../../../settings/SettingLevel"; -export function MediaPreviewAccountSettings() { +export const MediaPreviewAccountSettings: React.FC = () => { const currentMediaPreview = useSettingValue("mediaPreviewConfig"); const avatarOnChange = useCallback( diff --git a/src/settings/SettingsStore.ts b/src/settings/SettingsStore.ts index 44449bf7db..89cd5a1f0c 100644 --- a/src/settings/SettingsStore.ts +++ b/src/settings/SettingsStore.ts @@ -386,7 +386,6 @@ export default class SettingsStore { const setting = SETTINGS[settingName]; const levelOrder = getLevelOrder(setting); - return SettingsStore.getValueAt(levelOrder[0], settingName, roomId, false, excludeDefault); } diff --git a/test/unit-tests/components/views/avatars/RoomAvatar-test.tsx b/test/unit-tests/components/views/avatars/RoomAvatar-test.tsx index 98eedb8ffb..cf3f71d473 100644 --- a/test/unit-tests/components/views/avatars/RoomAvatar-test.tsx +++ b/test/unit-tests/components/views/avatars/RoomAvatar-test.tsx @@ -38,7 +38,7 @@ describe("RoomAvatar", () => { const origFn = SettingsStore.getValue; jest.spyOn(SettingsStore, "getValue").mockImplementation((setting, ...args) => { if (setting === "mediaPreviewConfig") { - return { invite_avatars: showAvatarsSetting, media_previews: MediaPreviewValue.Off}; + return { invite_avatars: showAvatarsSetting, media_previews: MediaPreviewValue.Off }; } return origFn(setting, ...args); }); diff --git a/test/unit-tests/components/views/messages/HideActionButton-test.tsx b/test/unit-tests/components/views/messages/HideActionButton-test.tsx index d702d2dd29..4286bf7b22 100644 --- a/test/unit-tests/components/views/messages/HideActionButton-test.tsx +++ b/test/unit-tests/components/views/messages/HideActionButton-test.tsx @@ -16,10 +16,7 @@ import { SettingLevel } from "../../../../../src/settings/SettingLevel"; import type { Settings } from "../../../../../src/settings/Settings"; import { MediaPreviewValue } from "../../../../../src/@types/media_preview"; -function mockSetting( - mediaPreviews: MediaPreviewValue, - showMediaEventIds: Settings["showMediaEventIds"]["default"], -) { +function mockSetting(mediaPreviews: MediaPreviewValue, showMediaEventIds: Settings["showMediaEventIds"]["default"]) { jest.spyOn(SettingsStore, "getValue").mockImplementation((settingName) => { if (settingName === "mediaPreviewConfig") { return { media_previews: mediaPreviews, invite_avatars: MediaPreviewValue.Off }; diff --git a/test/unit-tests/components/views/messages/MImageBody-test.tsx b/test/unit-tests/components/views/messages/MImageBody-test.tsx index ec01d2ed30..a9a2e11d84 100644 --- a/test/unit-tests/components/views/messages/MImageBody-test.tsx +++ b/test/unit-tests/components/views/messages/MImageBody-test.tsx @@ -142,7 +142,7 @@ describe("", () => { const origFn = SettingsStore.getValue; jest.spyOn(SettingsStore, "getValue").mockImplementation((setting, ...args) => { if (setting === "mediaPreviewConfig") { - return { invite_avatars: MediaPreviewValue.Off, media_previews: MediaPreviewValue.Off}; + return { invite_avatars: MediaPreviewValue.Off, media_previews: MediaPreviewValue.Off }; } return origFn(setting, ...args); }); @@ -168,7 +168,7 @@ describe("", () => { mxEvent={encryptedMediaEvent} mediaEventHelper={new MediaEventHelper(encryptedMediaEvent)} />, - withClientContextRenderOptions(cli) + withClientContextRenderOptions(cli), ); expect(screen.getByText("Show image")).toBeInTheDocument(); @@ -185,7 +185,7 @@ describe("", () => { mxEvent={encryptedMediaEvent} mediaEventHelper={new MediaEventHelper(encryptedMediaEvent)} />, - withClientContextRenderOptions(cli) + withClientContextRenderOptions(cli), ); expect(screen.getByText("Show image")).toBeInTheDocument(); diff --git a/test/unit-tests/components/views/messages/MVideoBody-test.tsx b/test/unit-tests/components/views/messages/MVideoBody-test.tsx index 0170af1bcd..163dd80779 100644 --- a/test/unit-tests/components/views/messages/MVideoBody-test.tsx +++ b/test/unit-tests/components/views/messages/MVideoBody-test.tsx @@ -7,9 +7,10 @@ Please see LICENSE files in the repository root for full details. */ import React, { act } from "react"; -import { EventType, getHttpUriForMxc, type IContent, MatrixClient, MatrixEvent } from "matrix-js-sdk/src/matrix"; +import { EventType, getHttpUriForMxc, type IContent, type MatrixClient, MatrixEvent } from "matrix-js-sdk/src/matrix"; import { fireEvent, render, screen, type RenderResult } from "jest-matrix-react"; import fetchMock from "fetch-mock-jest"; +import { type MockedObject } from "jest-mock"; import MatrixClientContext from "../../../../../src/contexts/MatrixClientContext"; import { type RoomPermalinkCreator } from "../../../../../src/utils/permalinks/Permalinks"; @@ -27,7 +28,6 @@ import type { IBodyProps } from "../../../../../src/components/views/messages/IB import { SettingLevel } from "../../../../../src/settings/SettingLevel"; import SettingsStore from "../../../../../src/settings/SettingsStore"; import { MediaPreviewValue } from "../../../../../src/@types/media_preview"; -import { MockedObject } from "jest-mock"; // Needed so we don't throw an error about failing to decrypt. jest.mock("matrix-encrypt-attachment", () => ({ @@ -107,7 +107,7 @@ describe("MVideoBody", () => { const origFn = SettingsStore.getValue; jest.spyOn(SettingsStore, "getValue").mockImplementation((setting, ...args) => { if (setting === "mediaPreviewConfig") { - return { invite_avatars: MediaPreviewValue.Off, media_previews: MediaPreviewValue.Off}; + return { invite_avatars: MediaPreviewValue.Off, media_previews: MediaPreviewValue.Off }; } return origFn(setting, ...args); }); @@ -133,7 +133,7 @@ describe("MVideoBody", () => { mxEvent={encryptedMediaEvent} mediaEventHelper={new MediaEventHelper(encryptedMediaEvent)} />, - withClientContextRenderOptions(cli) + withClientContextRenderOptions(cli), ); expect(screen.getByText("Show video")).toBeInTheDocument(); @@ -149,7 +149,7 @@ describe("MVideoBody", () => { mxEvent={encryptedMediaEvent} mediaEventHelper={new MediaEventHelper(encryptedMediaEvent)} />, - withClientContextRenderOptions(cli) + withClientContextRenderOptions(cli), ); const placeholderButton = screen.getByRole("button", { name: "Show video" });