From 1c06ebadcd04ca5305facf2ea5db6842d6c12898 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 5 Nov 2024 18:36:26 +0000 Subject: [PATCH] Avoid double exports Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/BackdropPanel.tsx | 1 - src/components/structures/LoggedInView.tsx | 7 +++---- src/components/structures/RoomView.tsx | 2 -- .../views/dialogs/SpacePreferencesDialog.tsx | 2 +- src/components/views/location/LocationButton.tsx | 2 +- src/components/views/location/index.tsx | 10 ---------- src/components/views/settings/CryptographyPanel.tsx | 2 +- src/components/views/settings/FontScalingPanel.tsx | 2 +- src/components/views/settings/ImageSizePanel.tsx | 2 +- src/components/views/settings/LayoutSwitcher.tsx | 2 +- src/components/views/settings/Notifications.tsx | 2 +- src/components/views/settings/ThemeChoicePanel.tsx | 2 +- .../views/settings/UserPersonalInfoSettings.tsx | 4 +--- .../views/settings/devices/CurrentDeviceSection.tsx | 2 +- .../views/settings/devices/LoginWithQRSection.tsx | 2 +- .../views/settings/devices/SecurityRecommendations.tsx | 2 +- .../views/settings/discovery/DiscoverySettings.tsx | 4 +--- .../notifications/NotificationPusherSettings.tsx | 2 +- .../settings/notifications/NotificationSettings2.tsx | 2 +- .../views/settings/shared/SettingsSubsection.tsx | 2 -- .../settings/tabs/room/AdvancedRoomSettingsTab.tsx | 2 +- .../settings/tabs/room/GeneralRoomSettingsTab.tsx | 2 +- .../settings/tabs/room/NotificationSettingsTab.tsx | 2 +- .../views/settings/tabs/room/VoipRoomSettingsTab.tsx | 2 +- .../settings/tabs/user/AccountUserSettingsTab.tsx | 4 ++-- .../settings/tabs/user/AppearanceUserSettingsTab.tsx | 2 +- .../views/settings/tabs/user/HelpUserSettingsTab.tsx | 2 +- .../settings/tabs/user/KeyboardUserSettingsTab.tsx | 2 +- .../views/settings/tabs/user/LabsUserSettingsTab.tsx | 2 +- .../settings/tabs/user/MjolnirUserSettingsTab.tsx | 2 +- .../settings/tabs/user/PreferencesUserSettingsTab.tsx | 2 +- .../settings/tabs/user/SecurityUserSettingsTab.tsx | 4 ++-- .../views/settings/tabs/user/SessionManagerTab.tsx | 2 +- .../settings/tabs/user/SidebarUserSettingsTab.tsx | 2 +- .../views/settings/tabs/user/VoiceUserSettingsTab.tsx | 2 +- .../views/spaces/SpaceSettingsGeneralTab.tsx | 2 +- src/dispatcher/dispatcher.ts | 2 +- .../settings/discovery/DiscoverySettings-test.tsx | 2 +- .../views/settings/shared/SettingsSubsection-test.tsx | 2 +- test/unit-tests/stores/BreadcrumbsStore-test.ts | 2 +- 40 files changed, 40 insertions(+), 60 deletions(-) diff --git a/src/components/structures/BackdropPanel.tsx b/src/components/structures/BackdropPanel.tsx index 80c21235cc..32c75a936e 100644 --- a/src/components/structures/BackdropPanel.tsx +++ b/src/components/structures/BackdropPanel.tsx @@ -31,4 +31,3 @@ export const BackdropPanel: React.FC = ({ backgroundImage, blurMultiplie ); }; -export default BackdropPanel; diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx index 75156cdf60..0042169f45 100644 --- a/src/components/structures/LoggedInView.tsx +++ b/src/components/structures/LoggedInView.tsx @@ -49,11 +49,10 @@ import LegacyCallHandler, { LegacyCallHandlerEvent } from "../../LegacyCallHandl import AudioFeedArrayForLegacyCall from "../views/voip/AudioFeedArrayForLegacyCall"; import { OwnProfileStore } from "../../stores/OwnProfileStore"; import { UPDATE_EVENT } from "../../stores/AsyncStore"; -import RoomView from "./RoomView"; -import type { RoomView as RoomViewType } from "./RoomView"; +import { RoomView } from "./RoomView"; import ToastContainer from "./ToastContainer"; import UserView from "./UserView"; -import BackdropPanel from "./BackdropPanel"; +import { BackdropPanel } from "./BackdropPanel"; import { mediaFromMxc } from "../../customisations/Media"; import { UserTab } from "../views/dialogs/UserTab"; import { OpenToTabPayload } from "../../dispatcher/payloads/OpenToTabPayload"; @@ -125,7 +124,7 @@ class LoggedInView extends React.Component { public static displayName = "LoggedInView"; protected readonly _matrixClient: MatrixClient; - protected readonly _roomView: React.RefObject; + protected readonly _roomView: React.RefObject; protected readonly _resizeContainer: React.RefObject; protected readonly resizeHandler: React.RefObject; protected layoutWatcherRef?: string; diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx index 520760713c..2378eda557 100644 --- a/src/components/structures/RoomView.tsx +++ b/src/components/structures/RoomView.tsx @@ -2547,5 +2547,3 @@ export class RoomView extends React.Component { ); } } - -export default RoomView; diff --git a/src/components/views/dialogs/SpacePreferencesDialog.tsx b/src/components/views/dialogs/SpacePreferencesDialog.tsx index dd5898d5ff..1361b2728f 100644 --- a/src/components/views/dialogs/SpacePreferencesDialog.tsx +++ b/src/components/views/dialogs/SpacePreferencesDialog.tsx @@ -21,7 +21,7 @@ import { SpacePreferenceTab } from "../../../dispatcher/payloads/OpenSpacePrefer import { NonEmptyArray } from "../../../@types/common"; import SettingsTab from "../settings/tabs/SettingsTab"; import { SettingsSection } from "../settings/shared/SettingsSection"; -import SettingsSubsection, { SettingsSubsectionText } from "../settings/shared/SettingsSubsection"; +import { SettingsSubsection, SettingsSubsectionText } from "../settings/shared/SettingsSubsection"; interface IProps { space: Room; diff --git a/src/components/views/location/LocationButton.tsx b/src/components/views/location/LocationButton.tsx index 5ec67c4214..654a3b69f5 100644 --- a/src/components/views/location/LocationButton.tsx +++ b/src/components/views/location/LocationButton.tsx @@ -23,7 +23,7 @@ export interface IProps { relation?: IEventRelation; } -export const LocationButton: React.FC = ({ roomId, sender, menuPosition, relation }) => { +const LocationButton: React.FC = ({ roomId, sender, menuPosition, relation }) => { const overflowMenuCloser = useContext(OverflowMenuContext); const [menuDisplayed, button, openMenu, closeMenu] = useContextMenu(); diff --git a/src/components/views/location/index.tsx b/src/components/views/location/index.tsx index 452b7ac54f..d51d6c58f3 100644 --- a/src/components/views/location/index.tsx +++ b/src/components/views/location/index.tsx @@ -22,16 +22,6 @@ export function Map(props: ComponentProps): JSX.Element { ); } -const LocationPickerComponent = lazy(() => import("./LocationPicker")); - -export function LocationPicker(props: ComponentProps): JSX.Element { - return ( - }> - - - ); -} - const SmartMarkerComponent = lazy(() => import("./SmartMarker")); export function SmartMarker(props: ComponentProps): JSX.Element { diff --git a/src/components/views/settings/CryptographyPanel.tsx b/src/components/views/settings/CryptographyPanel.tsx index ae0436a9e5..850e5c7ff5 100644 --- a/src/components/views/settings/CryptographyPanel.tsx +++ b/src/components/views/settings/CryptographyPanel.tsx @@ -18,7 +18,7 @@ import * as FormattingUtils from "../../../utils/FormattingUtils"; import SettingsStore from "../../../settings/SettingsStore"; import SettingsFlag from "../elements/SettingsFlag"; import { SettingLevel } from "../../../settings/SettingLevel"; -import SettingsSubsection, { SettingsSubsectionText } from "./shared/SettingsSubsection"; +import { SettingsSubsection, SettingsSubsectionText } from "./shared/SettingsSubsection"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; interface IProps {} diff --git a/src/components/views/settings/FontScalingPanel.tsx b/src/components/views/settings/FontScalingPanel.tsx index b7f7c64a3b..edc6c66645 100644 --- a/src/components/views/settings/FontScalingPanel.tsx +++ b/src/components/views/settings/FontScalingPanel.tsx @@ -14,7 +14,7 @@ import { Layout } from "../../../settings/enums/Layout"; import { MatrixClientPeg } from "../../../MatrixClientPeg"; import { SettingLevel } from "../../../settings/SettingLevel"; import { _t } from "../../../languageHandler"; -import SettingsSubsection from "./shared/SettingsSubsection"; +import { SettingsSubsection } from "./shared/SettingsSubsection"; import Field from "../elements/Field"; import { FontWatcher } from "../../../settings/watchers/FontWatcher"; diff --git a/src/components/views/settings/ImageSizePanel.tsx b/src/components/views/settings/ImageSizePanel.tsx index e215792628..dca21d89e2 100644 --- a/src/components/views/settings/ImageSizePanel.tsx +++ b/src/components/views/settings/ImageSizePanel.tsx @@ -13,7 +13,7 @@ import StyledRadioButton from "../elements/StyledRadioButton"; import { _t } from "../../../languageHandler"; import { SettingLevel } from "../../../settings/SettingLevel"; import { ImageSize } from "../../../settings/enums/ImageSize"; -import SettingsSubsection from "./shared/SettingsSubsection"; +import { SettingsSubsection } from "./shared/SettingsSubsection"; interface IProps { // none diff --git a/src/components/views/settings/LayoutSwitcher.tsx b/src/components/views/settings/LayoutSwitcher.tsx index 5ca2610a38..bbf090aa38 100644 --- a/src/components/views/settings/LayoutSwitcher.tsx +++ b/src/components/views/settings/LayoutSwitcher.tsx @@ -9,7 +9,7 @@ import React, { JSX, useEffect, useState } from "react"; import { Field, HelpMessage, InlineField, Label, RadioControl, Root, ToggleControl } from "@vector-im/compound-web"; -import SettingsSubsection from "./shared/SettingsSubsection"; +import { SettingsSubsection } from "./shared/SettingsSubsection"; import { _t } from "../../../languageHandler"; import SettingsStore from "../../../settings/SettingsStore"; import { SettingLevel } from "../../../settings/SettingLevel"; diff --git a/src/components/views/settings/Notifications.tsx b/src/components/views/settings/Notifications.tsx index 6890c7b5d3..4ac5e2069b 100644 --- a/src/components/views/settings/Notifications.tsx +++ b/src/components/views/settings/Notifications.tsx @@ -48,7 +48,7 @@ import { } from "../../../utils/pushRules/updatePushRuleActions"; import { Caption } from "../typography/Caption"; import { SettingsSubsectionHeading } from "./shared/SettingsSubsectionHeading"; -import SettingsSubsection from "./shared/SettingsSubsection"; +import { SettingsSubsection } from "./shared/SettingsSubsection"; import { doesRoomHaveUnreadMessages } from "../../../Unread"; import SettingsFlag from "../elements/SettingsFlag"; diff --git a/src/components/views/settings/ThemeChoicePanel.tsx b/src/components/views/settings/ThemeChoicePanel.tsx index 4ba08612a0..83f17a2f7b 100644 --- a/src/components/views/settings/ThemeChoicePanel.tsx +++ b/src/components/views/settings/ThemeChoicePanel.tsx @@ -23,7 +23,7 @@ import classNames from "classnames"; import { logger } from "matrix-js-sdk/src/logger"; import { _t } from "../../../languageHandler"; -import SettingsSubsection from "./shared/SettingsSubsection"; +import { SettingsSubsection } from "./shared/SettingsSubsection"; import ThemeWatcher from "../../../settings/watchers/ThemeWatcher"; import SettingsStore from "../../../settings/SettingsStore"; import { SettingLevel } from "../../../settings/SettingLevel"; diff --git a/src/components/views/settings/UserPersonalInfoSettings.tsx b/src/components/views/settings/UserPersonalInfoSettings.tsx index c8c8729817..e33aa87781 100644 --- a/src/components/views/settings/UserPersonalInfoSettings.tsx +++ b/src/components/views/settings/UserPersonalInfoSettings.tsx @@ -12,7 +12,7 @@ import { Alert } from "@vector-im/compound-web"; import { _t } from "../../../languageHandler"; import InlineSpinner from "../elements/InlineSpinner"; -import SettingsSubsection from "./shared/SettingsSubsection"; +import { SettingsSubsection } from "./shared/SettingsSubsection"; import { useMatrixClientContext } from "../../../contexts/MatrixClientContext"; import { ThirdPartyIdentifier } from "../../../AddThreepid"; import SettingsStore from "../../../settings/SettingsStore"; @@ -125,5 +125,3 @@ export const UserPersonalInfoSettings: React.FC = ); }; - -export default UserPersonalInfoSettings; diff --git a/src/components/views/settings/devices/CurrentDeviceSection.tsx b/src/components/views/settings/devices/CurrentDeviceSection.tsx index cf338392c8..153a9c5d4b 100644 --- a/src/components/views/settings/devices/CurrentDeviceSection.tsx +++ b/src/components/views/settings/devices/CurrentDeviceSection.tsx @@ -11,7 +11,7 @@ import { LocalNotificationSettings } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../../languageHandler"; import Spinner from "../../elements/Spinner"; -import SettingsSubsection from "../shared/SettingsSubsection"; +import { SettingsSubsection } from "../shared/SettingsSubsection"; import { SettingsSubsectionHeading } from "../shared/SettingsSubsectionHeading"; import DeviceDetails from "./DeviceDetails"; import { DeviceExpandDetailsButton } from "./DeviceExpandDetailsButton"; diff --git a/src/components/views/settings/devices/LoginWithQRSection.tsx b/src/components/views/settings/devices/LoginWithQRSection.tsx index e9d8029987..a164ff894b 100644 --- a/src/components/views/settings/devices/LoginWithQRSection.tsx +++ b/src/components/views/settings/devices/LoginWithQRSection.tsx @@ -19,7 +19,7 @@ import { Text } from "@vector-im/compound-web"; import { _t } from "../../../../languageHandler"; import AccessibleButton from "../../elements/AccessibleButton"; -import SettingsSubsection from "../shared/SettingsSubsection"; +import { SettingsSubsection } from "../shared/SettingsSubsection"; import { useMatrixClientContext } from "../../../../contexts/MatrixClientContext"; interface IProps { diff --git a/src/components/views/settings/devices/SecurityRecommendations.tsx b/src/components/views/settings/devices/SecurityRecommendations.tsx index be4b749500..c0fc8e26b8 100644 --- a/src/components/views/settings/devices/SecurityRecommendations.tsx +++ b/src/components/views/settings/devices/SecurityRecommendations.tsx @@ -10,7 +10,7 @@ import React from "react"; import { _t } from "../../../../languageHandler"; import AccessibleButton from "../../elements/AccessibleButton"; -import SettingsSubsection from "../shared/SettingsSubsection"; +import { SettingsSubsection } from "../shared/SettingsSubsection"; import DeviceSecurityCard from "./DeviceSecurityCard"; import { DeviceSecurityLearnMore } from "./DeviceSecurityLearnMore"; import { filterDevicesBySecurityRecommendation, FilterVariation, INACTIVE_DEVICE_AGE_DAYS } from "./filter"; diff --git a/src/components/views/settings/discovery/DiscoverySettings.tsx b/src/components/views/settings/discovery/DiscoverySettings.tsx index d240d53d7c..42e90f475d 100644 --- a/src/components/views/settings/discovery/DiscoverySettings.tsx +++ b/src/components/views/settings/discovery/DiscoverySettings.tsx @@ -18,7 +18,7 @@ import SettingsStore from "../../../../settings/SettingsStore"; import { UIFeature } from "../../../../settings/UIFeature"; import { _t } from "../../../../languageHandler"; import SetIdServer from "../SetIdServer"; -import SettingsSubsection from "../shared/SettingsSubsection"; +import { SettingsSubsection } from "../shared/SettingsSubsection"; import InlineTermsAgreement from "../../terms/InlineTermsAgreement"; import { Service, ServicePolicyPair, startTermsFlow } from "../../../../Terms"; import IdentityAuthClient from "../../../../IdentityAuthClient"; @@ -196,5 +196,3 @@ export const DiscoverySettings: React.FC = () => { ); }; - -export default DiscoverySettings; diff --git a/src/components/views/settings/notifications/NotificationPusherSettings.tsx b/src/components/views/settings/notifications/NotificationPusherSettings.tsx index 193436f5d1..9e17e7b829 100644 --- a/src/components/views/settings/notifications/NotificationPusherSettings.tsx +++ b/src/components/views/settings/notifications/NotificationPusherSettings.tsx @@ -20,7 +20,7 @@ import { UserTab } from "../../dialogs/UserTab"; import AccessibleButton from "../../elements/AccessibleButton"; import LabelledCheckbox from "../../elements/LabelledCheckbox"; import { SettingsIndent } from "../shared/SettingsIndent"; -import SettingsSubsection, { SettingsSubsectionText } from "../shared/SettingsSubsection"; +import { SettingsSubsection, SettingsSubsectionText } from "../shared/SettingsSubsection"; function generalTabButton(content: string): JSX.Element { return ( diff --git a/src/components/views/settings/notifications/NotificationSettings2.tsx b/src/components/views/settings/notifications/NotificationSettings2.tsx index e7b92de7ce..5f91c3874c 100644 --- a/src/components/views/settings/notifications/NotificationSettings2.tsx +++ b/src/components/views/settings/notifications/NotificationSettings2.tsx @@ -31,7 +31,7 @@ import TagComposer from "../../elements/TagComposer"; import { StatelessNotificationBadge } from "../../rooms/NotificationBadge/StatelessNotificationBadge"; import { SettingsBanner } from "../shared/SettingsBanner"; import { SettingsSection } from "../shared/SettingsSection"; -import SettingsSubsection from "../shared/SettingsSubsection"; +import { SettingsSubsection } from "../shared/SettingsSubsection"; import { NotificationPusherSettings } from "./NotificationPusherSettings"; import SettingsFlag from "../../elements/SettingsFlag"; diff --git a/src/components/views/settings/shared/SettingsSubsection.tsx b/src/components/views/settings/shared/SettingsSubsection.tsx index a3b9c3c96c..3248a5eb90 100644 --- a/src/components/views/settings/shared/SettingsSubsection.tsx +++ b/src/components/views/settings/shared/SettingsSubsection.tsx @@ -65,5 +65,3 @@ export const SettingsSubsection: React.FC = ({ {!legacy && } ); - -export default SettingsSubsection; diff --git a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.tsx index 337cead3a3..5798771e67 100644 --- a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.tsx +++ b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.tsx @@ -20,7 +20,7 @@ import { ViewRoomPayload } from "../../../../../dispatcher/payloads/ViewRoomPayl import SettingsStore from "../../../../../settings/SettingsStore"; import SettingsTab from "../SettingsTab"; import { SettingsSection } from "../../shared/SettingsSection"; -import SettingsSubsection from "../../shared/SettingsSubsection"; +import { SettingsSubsection } from "../../shared/SettingsSubsection"; interface IProps { room: Room; diff --git a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx index 5f9d894012..066dc45366 100644 --- a/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx +++ b/src/components/views/settings/tabs/room/GeneralRoomSettingsTab.tsx @@ -19,7 +19,7 @@ import { UIFeature } from "../../../../../settings/UIFeature"; import UrlPreviewSettings from "../../../room_settings/UrlPreviewSettings"; import AliasSettings from "../../../room_settings/AliasSettings"; import PosthogTrackers from "../../../../../PosthogTrackers"; -import SettingsSubsection from "../../shared/SettingsSubsection"; +import { SettingsSubsection } from "../../shared/SettingsSubsection"; import SettingsTab from "../SettingsTab"; import { SettingsSection } from "../../shared/SettingsSection"; diff --git a/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx b/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx index a2f38ca0fc..f668b1ff07 100644 --- a/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx +++ b/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx @@ -25,7 +25,7 @@ import { UserTab } from "../../../dialogs/UserTab"; import { chromeFileInputFix } from "../../../../../utils/BrowserWorkarounds"; import SettingsTab from "../SettingsTab"; import { SettingsSection } from "../../shared/SettingsSection"; -import SettingsSubsection from "../../shared/SettingsSubsection"; +import { SettingsSubsection } from "../../shared/SettingsSubsection"; interface IProps { roomId: string; diff --git a/src/components/views/settings/tabs/room/VoipRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/VoipRoomSettingsTab.tsx index 1521ff1bb4..783ea1bce3 100644 --- a/src/components/views/settings/tabs/room/VoipRoomSettingsTab.tsx +++ b/src/components/views/settings/tabs/room/VoipRoomSettingsTab.tsx @@ -11,7 +11,7 @@ import { JoinRule, EventType, RoomState, Room } from "matrix-js-sdk/src/matrix"; import { _t } from "../../../../../languageHandler"; import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch"; -import SettingsSubsection from "../../shared/SettingsSubsection"; +import { SettingsSubsection } from "../../shared/SettingsSubsection"; import SettingsTab from "../SettingsTab"; import { ElementCall } from "../../../../../models/Call"; import { useRoomState } from "../../../../../hooks/useRoomState"; diff --git a/src/components/views/settings/tabs/user/AccountUserSettingsTab.tsx b/src/components/views/settings/tabs/user/AccountUserSettingsTab.tsx index 97f0e2e59e..cd52b2a76b 100644 --- a/src/components/views/settings/tabs/user/AccountUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/AccountUserSettingsTab.tsx @@ -22,9 +22,9 @@ import ErrorDialog, { extractErrorMessageFromError } from "../../../dialogs/Erro import ChangePassword from "../../ChangePassword"; import SettingsTab from "../SettingsTab"; import { SettingsSection } from "../../shared/SettingsSection"; -import SettingsSubsection, { SettingsSubsectionText } from "../../shared/SettingsSubsection"; +import { SettingsSubsection, SettingsSubsectionText } from "../../shared/SettingsSubsection"; import { SDKContext } from "../../../../../contexts/SDKContext"; -import UserPersonalInfoSettings from "../../UserPersonalInfoSettings"; +import { UserPersonalInfoSettings } from "../../UserPersonalInfoSettings"; import { useMatrixClientContext } from "../../../../../contexts/MatrixClientContext"; interface IProps { diff --git a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx index 90d54f1049..f220803f72 100644 --- a/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx @@ -23,7 +23,7 @@ import { ThemeChoicePanel } from "../../ThemeChoicePanel"; import ImageSizePanel from "../../ImageSizePanel"; import SettingsTab from "../SettingsTab"; import { SettingsSection } from "../../shared/SettingsSection"; -import SettingsSubsection from "../../shared/SettingsSubsection"; +import { SettingsSubsection } from "../../shared/SettingsSubsection"; interface IProps {} diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx index ec0e20fb32..7866131a01 100644 --- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx @@ -19,7 +19,7 @@ import BugReportDialog from "../../../dialogs/BugReportDialog"; import CopyableText from "../../../elements/CopyableText"; import SettingsTab from "../SettingsTab"; import { SettingsSection } from "../../shared/SettingsSection"; -import SettingsSubsection, { SettingsSubsectionText } from "../../shared/SettingsSubsection"; +import { SettingsSubsection, SettingsSubsectionText } from "../../shared/SettingsSubsection"; import ExternalLink from "../../../elements/ExternalLink"; import MatrixClientContext from "../../../../../contexts/MatrixClientContext"; diff --git a/src/components/views/settings/tabs/user/KeyboardUserSettingsTab.tsx b/src/components/views/settings/tabs/user/KeyboardUserSettingsTab.tsx index c973fa4b90..f4dd3de0ff 100644 --- a/src/components/views/settings/tabs/user/KeyboardUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/KeyboardUserSettingsTab.tsx @@ -18,7 +18,7 @@ import { import { KeyboardShortcut } from "../../KeyboardShortcut"; import SettingsTab from "../SettingsTab"; import { SettingsSection } from "../../shared/SettingsSection"; -import SettingsSubsection from "../../shared/SettingsSubsection"; +import { SettingsSubsection } from "../../shared/SettingsSubsection"; import { showLabsFlags } from "./LabsUserSettingsTab"; interface IKeyboardShortcutRowProps { diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.tsx b/src/components/views/settings/tabs/user/LabsUserSettingsTab.tsx index 3be630fd2c..54995415e2 100644 --- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.tsx @@ -17,7 +17,7 @@ import SettingsFlag from "../../../elements/SettingsFlag"; import { LabGroup, labGroupNames } from "../../../../../settings/Settings"; import { EnhancedMap } from "../../../../../utils/maps"; import { SettingsSection } from "../../shared/SettingsSection"; -import SettingsSubsection, { SettingsSubsectionText } from "../../shared/SettingsSubsection"; +import { SettingsSubsection, SettingsSubsectionText } from "../../shared/SettingsSubsection"; import SettingsTab from "../SettingsTab"; export const showLabsFlags = (): boolean => { diff --git a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.tsx b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.tsx index 338f5ee910..9ad7df31e9 100644 --- a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.tsx @@ -22,7 +22,7 @@ import AccessibleButton from "../../../elements/AccessibleButton"; import Field from "../../../elements/Field"; import SettingsTab from "../SettingsTab"; import { SettingsSection } from "../../shared/SettingsSection"; -import SettingsSubsection, { SettingsSubsectionText } from "../../shared/SettingsSubsection"; +import { SettingsSubsection, SettingsSubsectionText } from "../../shared/SettingsSubsection"; interface IState { busy: boolean; diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx index d95b0894d9..8cb662a9f0 100644 --- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx @@ -24,7 +24,7 @@ import { OpenToTabPayload } from "../../../../../dispatcher/payloads/OpenToTabPa import { Action } from "../../../../../dispatcher/actions"; import SdkConfig from "../../../../../SdkConfig"; import { showUserOnboardingPage } from "../../../user-onboarding/UserOnboardingPage"; -import SettingsSubsection from "../../shared/SettingsSubsection"; +import { SettingsSubsection } from "../../shared/SettingsSubsection"; import SettingsTab from "../SettingsTab"; import { SettingsSection } from "../../shared/SettingsSection"; import LanguageDropdown from "../../../elements/LanguageDropdown"; diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx index ba4b5eb54b..7d5e27580c 100644 --- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx @@ -32,9 +32,9 @@ import { privateShouldBeEncrypted } from "../../../../../utils/rooms"; import type { IServerVersions } from "matrix-js-sdk/src/matrix"; import SettingsTab from "../SettingsTab"; import { SettingsSection } from "../../shared/SettingsSection"; -import SettingsSubsection, { SettingsSubsectionText } from "../../shared/SettingsSubsection"; +import { SettingsSubsection, SettingsSubsectionText } from "../../shared/SettingsSubsection"; import { useOwnDevices } from "../../devices/useOwnDevices"; -import DiscoverySettings from "../../discovery/DiscoverySettings"; +import { DiscoverySettings } from "../../discovery/DiscoverySettings"; import SetIntegrationManager from "../../SetIntegrationManager"; interface IIgnoredUserProps { diff --git a/src/components/views/settings/tabs/user/SessionManagerTab.tsx b/src/components/views/settings/tabs/user/SessionManagerTab.tsx index 3e74f04e76..ec04acf751 100644 --- a/src/components/views/settings/tabs/user/SessionManagerTab.tsx +++ b/src/components/views/settings/tabs/user/SessionManagerTab.tsx @@ -12,7 +12,7 @@ import { logger } from "matrix-js-sdk/src/logger"; import { _t } from "../../../../../languageHandler"; import Modal from "../../../../../Modal"; -import SettingsSubsection from "../../shared/SettingsSubsection"; +import { SettingsSubsection } from "../../shared/SettingsSubsection"; import SetupEncryptionDialog from "../../../dialogs/security/SetupEncryptionDialog"; import VerificationRequestDialog from "../../../dialogs/VerificationRequestDialog"; import LogoutDialog from "../../../dialogs/LogoutDialog"; diff --git a/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx b/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx index b6a85d08bd..aae418d55d 100644 --- a/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx @@ -22,7 +22,7 @@ import { MetaSpace } from "../../../../../stores/spaces"; import PosthogTrackers from "../../../../../PosthogTrackers"; import SettingsTab from "../SettingsTab"; import { SettingsSection } from "../../shared/SettingsSection"; -import SettingsSubsection, { SettingsSubsectionText } from "../../shared/SettingsSubsection"; +import { SettingsSubsection, SettingsSubsectionText } from "../../shared/SettingsSubsection"; import SdkConfig from "../../../../../SdkConfig"; type InteractionName = "WebSettingsSidebarTabSpacesCheckbox" | "WebQuickSettingsPinToSidebarCheckbox"; diff --git a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.tsx b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.tsx index 4abe6615d1..36d336faa3 100644 --- a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.tsx @@ -21,7 +21,7 @@ import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch"; import { requestMediaPermissions } from "../../../../../utils/media/requestMediaPermissions"; import SettingsTab from "../SettingsTab"; import { SettingsSection } from "../../shared/SettingsSection"; -import SettingsSubsection from "../../shared/SettingsSubsection"; +import { SettingsSubsection } from "../../shared/SettingsSubsection"; import MatrixClientContext from "../../../../../contexts/MatrixClientContext"; interface IState { diff --git a/src/components/views/spaces/SpaceSettingsGeneralTab.tsx b/src/components/views/spaces/SpaceSettingsGeneralTab.tsx index d210378290..8d80f85c58 100644 --- a/src/components/views/spaces/SpaceSettingsGeneralTab.tsx +++ b/src/components/views/spaces/SpaceSettingsGeneralTab.tsx @@ -19,7 +19,7 @@ import { leaveSpace } from "../../../utils/leave-behaviour"; import { getTopic } from "../../../hooks/room/useTopic"; import SettingsTab from "../settings/tabs/SettingsTab"; import { SettingsSection } from "../settings/shared/SettingsSection"; -import SettingsSubsection from "../settings/shared/SettingsSubsection"; +import { SettingsSubsection } from "../settings/shared/SettingsSubsection"; interface IProps { matrixClient: MatrixClient; diff --git a/src/dispatcher/dispatcher.ts b/src/dispatcher/dispatcher.ts index 0c28de0e2b..f50e2bfe00 100644 --- a/src/dispatcher/dispatcher.ts +++ b/src/dispatcher/dispatcher.ts @@ -178,7 +178,7 @@ export class MatrixDispatcher { } } -export const defaultDispatcher = new MatrixDispatcher(); +const defaultDispatcher = new MatrixDispatcher(); if (!window.mxDispatcher) { window.mxDispatcher = defaultDispatcher; diff --git a/test/unit-tests/components/views/settings/discovery/DiscoverySettings-test.tsx b/test/unit-tests/components/views/settings/discovery/DiscoverySettings-test.tsx index c5e3efc122..4cd55f6fc4 100644 --- a/test/unit-tests/components/views/settings/discovery/DiscoverySettings-test.tsx +++ b/test/unit-tests/components/views/settings/discovery/DiscoverySettings-test.tsx @@ -12,7 +12,7 @@ import { MatrixClient } from "matrix-js-sdk/src/matrix"; import { mocked } from "jest-mock"; import userEvent from "@testing-library/user-event"; -import DiscoverySettings from "../../../../../../src/components/views/settings/discovery/DiscoverySettings"; +import { DiscoverySettings } from "../../../../../../src/components/views/settings/discovery/DiscoverySettings"; import { stubClient } from "../../../../../test-utils"; import MatrixClientContext from "../../../../../../src/contexts/MatrixClientContext"; import { UIFeature } from "../../../../../../src/settings/UIFeature"; diff --git a/test/unit-tests/components/views/settings/shared/SettingsSubsection-test.tsx b/test/unit-tests/components/views/settings/shared/SettingsSubsection-test.tsx index 1ad1b5d35d..428954e78c 100644 --- a/test/unit-tests/components/views/settings/shared/SettingsSubsection-test.tsx +++ b/test/unit-tests/components/views/settings/shared/SettingsSubsection-test.tsx @@ -9,7 +9,7 @@ Please see LICENSE files in the repository root for full details. import React from "react"; import { render } from "jest-matrix-react"; -import SettingsSubsection from "../../../../../../src/components/views/settings/shared/SettingsSubsection"; +import { SettingsSubsection } from "../../../../../../src/components/views/settings/shared/SettingsSubsection"; describe("", () => { const defaultProps = { diff --git a/test/unit-tests/stores/BreadcrumbsStore-test.ts b/test/unit-tests/stores/BreadcrumbsStore-test.ts index 0b6b302ac4..6419d00302 100644 --- a/test/unit-tests/stores/BreadcrumbsStore-test.ts +++ b/test/unit-tests/stores/BreadcrumbsStore-test.ts @@ -13,7 +13,7 @@ import { createTestClient, flushPromises, setupAsyncStoreWithClient } from "../. import SettingsStore from "../../../src/settings/SettingsStore"; import { BreadcrumbsStore } from "../../../src/stores/BreadcrumbsStore"; import { Action } from "../../../src/dispatcher/actions"; -import { defaultDispatcher } from "../../../src/dispatcher/dispatcher"; +import defaultDispatcher from "../../../src/dispatcher/dispatcher"; describe("BreadcrumbsStore", () => { let store: BreadcrumbsStore;