ref(TS) Remove unnecessary ts-ignores (#12412)

Remove ts-ignores that are no longer needed because of tsconfig.web.json
Change ts-ignore to ts-expect-error for files outside react/features

react/features/analytics/functions.ts

@@ -1,7 +1,5 @@
-/* eslint-disable lines-around-comment */
+// @ts-expect-error
-// @ts-ignore
 import { API_ID } from '../../../modules/API/constants';
-// @ts-ignore
 import { getName as getAppName } from '../app/functions';
 import { IStore } from '../app/types';
 import { getAnalyticsRoomName } from '../base/conference/functions';
@@ -14,10 +12,9 @@ import JitsiMeetJS, {
     browser
 } from '../base/lib-jitsi-meet';
 import { isAnalyticsEnabled } from '../base/lib-jitsi-meet/functions.any';
-// @ts-ignore
-import { loadScript } from '../base/util';
 import { getJitsiMeetGlobalNS } from '../base/util/helpers';
 import { inIframe } from '../base/util/iframeUtils';
+import { loadScript } from '../base/util/loadScript';
 import { parseURIString } from '../base/util/uri';
 
 import AmplitudeHandler from './handlers/AmplitudeHandler';
@@ -258,7 +255,7 @@ function _loadHandlers(scriptURLs: any[] = [], handlerConstructorOptions: Object
 
     return Promise.all(promises).then(values => {
         for (const el of values) {
-            if (el.type === 'error') {
+            if (el.type === 'error') { // @ts-ignore
                 logger.warn(`Failed to load ${el.url}: ${el.error}`);
             }
         }

react/features/analytics/handlers/AmplitudeHandler.ts

@@ -1,10 +1,7 @@
-/* eslint-disable lines-around-comment */
 import logger from '../logger';
 
 import AbstractHandler, { IEvent } from './AbstractHandler';
-// @ts-ignore
 import { fixDeviceID } from './amplitude/fixDeviceID';
-// @ts-ignore
 import amplitude from './amplitude/lib';
 
 /**
@@ -13,6 +10,7 @@ import amplitude from './amplitude/lib';
 export default class AmplitudeHandler extends AbstractHandler {
     _deviceId: string;
     _userId: Object;
+
     /**
      * Creates new instance of the Amplitude analytics handler.
      *
@@ -36,6 +34,7 @@ export default class AmplitudeHandler extends AbstractHandler {
             amplitude.getInstance().init(amplitudeAPPKey); // @ts-ignore
             fixDeviceID(amplitude.getInstance()).then(() => {
                 amplitude.getInstance().getDeviceId()
+
                 // @ts-ignore
                     .then((deviceId: string) => {
                         this._deviceId = deviceId;

react/features/authentication/components/web/LoginDialog.tsx

@@ -1,8 +1,7 @@
-/* eslint-disable lines-around-comment */
 import React, { Component } from 'react';
 import { WithTranslation } from 'react-i18next';
 
-// @ts-ignore
+// @ts-expect-error
 import { connect } from '../../../../../connection';
 import { IState, IStore } from '../../../app/types';
 import { IJitsiConference } from '../../../base/conference/reducer';

react/features/authentication/components/web/WaitForOwnerDialog.tsx

@@ -5,8 +5,6 @@ import { IStore } from '../../../app/types';
 import { translate } from '../../../base/i18n/functions';
 import { connect } from '../../../base/redux/functions';
 import Dialog from '../../../base/ui/components/web/Dialog';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
 import { cancelWaitForOwner } from '../../actions.web';
 
 /**

react/features/base/audio-only/actions.ts

@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-expect-error
 import UIEvents from '../../../../service/UI/UIEvents';
 import { createAudioOnlyChangedEvent } from '../../analytics/AnalyticsEvents';
 import { sendAnalytics } from '../../analytics/functions';

react/features/base/conference/actions.ts

@@ -1,13 +1,10 @@
 /* eslint-disable lines-around-comment */
 import { createStartMutedConfigurationEvent } from '../../analytics/AnalyticsEvents';
 import { sendAnalytics } from '../../analytics/functions';
-// @ts-ignore
 import { appNavigate } from '../../app/actions';
 import { IState, IStore } from '../../app/types';
 import { endpointMessageReceived } from '../../subtitles/actions.any';
-// @ts-ignore
 import { getReplaceParticipant } from '../config/functions';
-// @ts-ignore
 import { disconnect } from '../connection/actions';
 import { JITSI_CONNECTION_CONFERENCE_KEY } from '../connection/constants';
 import { JitsiConferenceEvents, JitsiE2ePingEvents } from '../lib-jitsi-meet';

react/features/base/conference/functions.ts

@@ -1,7 +1,6 @@
 import { sha512_256 as sha512 } from 'js-sha512';
 import _ from 'lodash';
 
-// @ts-ignore
 import { getName } from '../../app/functions';
 import { IState, IStore } from '../../app/types';
 import { determineTranscriptionLanguage } from '../../transcribing/functions';

react/features/base/config/reducer.ts

@@ -12,8 +12,6 @@ import {
     UPDATE_CONFIG
 } from './actionTypes';
 import { IConfig } from './configType';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
 import { _cleanupConfig } from './functions';
 
 declare let interfaceConfig: any;

react/features/base/devices/middleware.ts

@@ -1,6 +1,6 @@
 import { AnyAction } from 'redux';
 
-// @ts-ignore
+// @ts-expect-error
 import UIEvents from '../../../../service/UI/UIEvents';
 import { IStore } from '../../app/types';
 import { processExternalDeviceRequest } from '../../device-selection/functions';

react/features/base/environment/utils.ts

@@ -1,4 +1,3 @@
-// @ts-ignore
 import Platform from '../react/Platform';
 
 /**

react/features/base/i18n/i18next.ts

@@ -10,8 +10,6 @@ import MAIN_RESOURCES from '../../../../lang/main.json';
 import TRANSLATION_LANGUAGES_RESOURCES from '../../../../lang/translation-languages.json';
 
 import { I18NEXT_INITIALIZED, LANGUAGE_CHANGED } from './actionTypes';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
 import languageDetector from './languageDetector';
 
 /**

react/features/base/known-domains/middleware.ts

@@ -1,4 +1,3 @@
-// @ts-ignore
 import { getDefaultURL } from '../../app/functions';
 import { IStore } from '../../app/types';
 import { APP_WILL_MOUNT } from '../app/actionTypes';

react/features/base/logging/LogTransport.web.ts

@@ -0,0 +1 @@
+export default {};

react/features/base/logging/functions.ts

@@ -2,7 +2,6 @@
 import Logger, { getLogger as _getLogger } from '@jitsi/logger';
 import _ from 'lodash';
 
-// @ts-ignore
 import LogTransport from './LogTransport';
 
 /**

react/features/base/participants/middleware.ts

@@ -1,7 +1,7 @@
 import i18n from 'i18next';
 import { batch } from 'react-redux';
 
-// @ts-ignore
+// @ts-expect-error
 import UIEvents from '../../../../service/UI/UIEvents';
 import { IStore } from '../../app/types';
 import { approveParticipant } from '../../av-moderation/actions';

react/features/base/settings/middleware.ts

@@ -16,7 +16,6 @@ import { parseURLParams } from '../util/parseURLParams';
 
 import { SETTINGS_UPDATED } from './actionTypes';
 import { updateSettings } from './actions';
-// @ts-ignore
 import { handleCallIntegrationChange, handleCrashReportingChange } from './functions';
 import { ISettingsState } from './reducer';
 

react/features/base/sounds/actions.ts

@@ -1,5 +1,5 @@
-/* eslint-disable lines-around-comment */
 import { Sounds } from '../config/configType';
+// eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import type { AudioElement } from '../media';
 
@@ -11,7 +11,6 @@ import {
     _ADD_AUDIO_ELEMENT,
     _REMOVE_AUDIO_ELEMENT
 } from './actionTypes';
-// @ts-ignore
 import { getSoundsPath } from './functions';
 import { getDisabledSounds } from './functions.any';
 

react/features/base/tracks/actions.any.ts

@@ -7,9 +7,7 @@ import { getCurrentConference } from '../conference/functions';
 import { IJitsiConference } from '../conference/reducer';
 import { getMultipleVideoSendingSupportFeatureFlag, getMultipleVideoSupportFeatureFlag } from '../config/functions.any';
 import { JitsiTrackErrors, JitsiTrackEvents } from '../lib-jitsi-meet';
-// eslint-disable-next-line lines-around-comment
+import { createLocalTrack } from '../lib-jitsi-meet/functions.any';
-// @ts-ignore
-import { createLocalTrack } from '../lib-jitsi-meet/functions';
 import { setAudioMuted, setScreenshareMuted, setVideoMuted } from '../media/actions';
 import {
     CAMERA_FACING_MODE,

react/features/base/tracks/actions.web.ts

@@ -1,5 +1,5 @@
 /* eslint-disable lines-around-comment */
-// @ts-ignore
+// @ts-expect-error
 import { AUDIO_ONLY_SCREEN_SHARE_NO_TRACK } from '../../../../modules/UI/UIErrors';
 import { IState, IStore } from '../../app/types';
 import { showModeratedNotification } from '../../av-moderation/actions';

react/features/base/tracks/middleware.ts

@@ -42,8 +42,6 @@ import {
     trackMuteUnmuteFailed,
     trackNoDataFromSourceNotificationInfoChanged,
     trackRemoved
-
-    // @ts-ignore
 } from './actions';
 import {
     getLocalTrack,

react/features/base/util/uri.ts

@@ -1,6 +1,4 @@
 import { parseURLParams } from './parseURLParams';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
 import { normalizeNFKC } from './strings';
 
 /**

react/features/breakout-rooms/actions.ts

@@ -1,4 +1,3 @@
-/* eslint-disable lines-around-comment */
 import i18next from 'i18next';
 import _ from 'lodash';
 
@@ -15,14 +14,12 @@ import { getCurrentConference } from '../base/conference/functions';
 import { setAudioMuted, setVideoMuted } from '../base/media/actions';
 import { MEDIA_TYPE } from '../base/media/constants';
 import { getRemoteParticipants } from '../base/participants/functions';
+import { createDesiredLocalTracks } from '../base/tracks/actions';
 import {
     getLocalTracks,
     isLocalCameraTrackMuted,
     isLocalTrackMuted
-    // @ts-ignore
+} from '../base/tracks/functions';
-} from '../base/tracks';
-// @ts-ignore
-import { createDesiredLocalTracks } from '../base/tracks/actions';
 import { clearNotifications, showNotification } from '../notifications/actions';
 import { NOTIFICATION_TIMEOUT_TYPE } from '../notifications/constants';
 
@@ -186,6 +183,7 @@ export function moveToRoom(roomId?: string) {
 
             // eslint-disable-next-line no-new-wrappers
             _roomId = new String(id);
+
             // @ts-ignore
             _roomId.domain = domainParts.join('@');
         }

react/features/chat/actions.web.ts

@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-expect-error
 import VideoLayout from '../../../modules/UI/videolayout/VideoLayout';
 import { IStore } from '../app/types';
 import { getParticipantById } from '../base/participants/functions';

react/features/chat/components/AbstractChatPrivacyDialog.tsx

@@ -4,8 +4,6 @@ import { WithTranslation } from 'react-i18next';
 import { IState, IStore } from '../../app/types';
 import { getParticipantById } from '../../base/participants/functions';
 import { Participant } from '../../base/participants/types';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
 import { sendMessage, setPrivateMessageRecipient } from '../actions';
 
 interface Props extends WithTranslation {

react/features/conference/components/web/RaisedHandsCountLabel.tsx

@@ -1,5 +1,3 @@
-/* eslint-disable lines-around-comment */
-
 import { Theme } from '@mui/material';
 import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -9,9 +7,9 @@ import { makeStyles } from 'tss-react/mui';
 import { IState } from '../../../app/types';
 import { IconRaisedHand } from '../../../base/icons/svg';
 import Label from '../../../base/label/components/web/Label';
+// eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import { Tooltip } from '../../../base/tooltip';
-// @ts-ignore
 import { open as openParticipantsPane } from '../../../participants-pane/actions';
 
 const useStyles = makeStyles()((theme: Theme) => {

react/features/feedback/actions.ts

@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-expect-error
 import { FEEDBACK_REQUEST_IN_PROGRESS } from '../../../modules/UI/UIErrors';
 import { IStore } from '../app/types';
 import { IJitsiConference } from '../base/conference/reducer';

react/features/filmstrip/components/web/Filmstrip.tsx

@@ -51,7 +51,6 @@ import {
 
 // @ts-ignore
 import AudioTracksContainer from './AudioTracksContainer';
-// @ts-ignore
 import Thumbnail from './Thumbnail';
 // @ts-ignore
 import ThumbnailWrapper from './ThumbnailWrapper';

react/features/filmstrip/components/web/Thumbnail.tsx

@@ -32,7 +32,6 @@ import {
 import { Participant } from '../../../base/participants/types';
 import { ASPECT_RATIO_NARROW } from '../../../base/responsive-ui/constants';
 import { isTestModeEnabled } from '../../../base/testing/functions';
-// @ts-ignore
 import { trackStreamingStatusChanged, updateLastTrackVideoMediaEvent } from '../../../base/tracks/actions';
 import {
     getLocalAudioTrack,

react/features/filmstrip/components/web/ThumbnailBottomIndicators.tsx

@@ -11,7 +11,6 @@ import {
     isNameReadOnly
 } from '../../../base/config/functions.any';
 import { isScreenShareParticipantById } from '../../../base/participants/functions';
-// @ts-ignore
 import DisplayName from '../../../display-name/components/web/DisplayName';
 import { THUMBNAIL_TYPE } from '../../constants';
 

react/features/filmstrip/components/web/ThumbnailTopIndicators.tsx

@@ -8,15 +8,12 @@ import { IState } from '../../../app/types';
 import { getMultipleVideoSupportFeatureFlag } from '../../../base/config/functions.any';
 import { isMobileBrowser } from '../../../base/environment/utils';
 import { isScreenShareParticipantById } from '../../../base/participants/functions';
-// @ts-ignore
 import ConnectionIndicator from '../../../connection-indicator/components/web/ConnectionIndicator';
 import { STATS_POPOVER_POSITION, THUMBNAIL_TYPE } from '../../constants';
 // @ts-ignore
 import { getIndicatorsTooltipPosition } from '../../functions.web';
 
-// @ts-ignore
 import PinnedIndicator from './PinnedIndicator';
-// @ts-ignore
 import RaisedHandIndicator from './RaisedHandIndicator';
 // @ts-ignore
 import StatusIndicators from './StatusIndicators';

react/features/participants-pane/components/web/LobbyParticipantItem.tsx

@@ -1,5 +1,3 @@
-/* eslint-disable lines-around-comment */
-
 import { Theme } from '@mui/material';
 import React, { useCallback, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -13,10 +11,10 @@ import Button from '../../../base/ui/components/web/Button';
 import ContextMenu from '../../../base/ui/components/web/ContextMenu';
 import ContextMenuItemGroup from '../../../base/ui/components/web/ContextMenuItemGroup';
 import { BUTTON_TYPES } from '../../../base/ui/constants';
+// eslint-disable-next-line lines-around-comment
 // @ts-ignore
 import { showLobbyChatButton } from '../../../lobby/functions';
 import { ACTION_TRIGGER, MEDIA_STATE } from '../../constants';
-// @ts-ignore
 import { useLobbyActions } from '../../hooks';
 
 import ParticipantItem from './ParticipantItem';

react/features/participants-pane/components/web/LobbyParticipants.tsx

@@ -17,7 +17,6 @@ import { getKnockingParticipants, getLobbyEnabled } from '../../../lobby/functio
 // @ts-ignore
 import { Drawer, JitsiPortal } from '../../../toolbox/components/web';
 import { showOverflowDrawer } from '../../../toolbox/functions.web';
-// @ts-ignore
 import { useLobbyActions, useParticipantDrawer } from '../../hooks';
 
 // @ts-ignore

react/features/participants-pane/components/web/MeetingParticipants.tsx

@@ -22,7 +22,6 @@ import { showOverflowDrawer } from '../../../toolbox/functions.web';
 // @ts-ignore
 import { muteRemote } from '../../../video-menu/actions.any';
 import { getSortedParticipantIds, shouldRenderInviteButton } from '../../functions';
-// @ts-ignore
 import { useParticipantDrawer } from '../../hooks';
 
 import { InviteButton } from './InviteButton';

react/features/participants-pane/components/web/ParticipantsPane.tsx

@@ -17,7 +17,6 @@ import { BUTTON_TYPES } from '../../../base/ui/constants';
 import { isAddBreakoutRoomButtonVisible } from '../../../breakout-rooms/functions';
 // @ts-ignore
 import { MuteEveryoneDialog } from '../../../video-menu/components/';
-// @ts-ignore
 import { close } from '../../actions';
 import {
     findAncestorByClass,

react/features/participants-pane/functions.ts

@@ -19,8 +19,6 @@ import {
 } from '../base/participants/functions';
 import { Participant } from '../base/participants/types';
 import { toState } from '../base/redux/functions';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
 import { normalizeAccents } from '../base/util/strings';
 import { isInBreakoutRoom } from '../breakout-rooms/functions';
 

react/features/power-monitor/reducer.ts

@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-expect-error
 import { Transport } from '../../../modules/transport';
 import ReducerRegistry from '../base/redux/ReducerRegistry';
 import { set } from '../base/redux/functions';

react/features/prejoin/actions.ts

@@ -3,25 +3,20 @@ import { v4 as uuidv4 } from 'uuid';
 
 import { IStore } from '../app/types';
 import { updateConfig } from '../base/config/actions';
-// @ts-ignore
 import { getDialOutStatusUrl, getDialOutUrl } from '../base/config/functions';
 import { browser } from '../base/lib-jitsi-meet';
-// @ts-ignore
 import { createLocalTrack } from '../base/lib-jitsi-meet/functions';
 import { MEDIA_TYPE } from '../base/media/constants';
 import { isVideoMutedByUser } from '../base/media/functions';
 import { updateSettings } from '../base/settings/actions';
+import { replaceLocalTrack, trackAdded } from '../base/tracks/actions';
 import {
     createLocalTracksF,
     getLocalAudioTrack,
     getLocalTracks,
-    getLocalVideoTrack,
+    getLocalVideoTrack
-    replaceLocalTrack,
+} from '../base/tracks/functions';
-    trackAdded
+import { openURLInBrowser } from '../base/util/openURLInBrowser';
-    // @ts-ignore
-} from '../base/tracks';
-// @ts-ignore
-import { openURLInBrowser } from '../base/util';
 // @ts-ignore
 import { executeDialOutRequest, executeDialOutStatusRequest, getDialInfoPageURL } from '../invite/functions';
 import { showErrorNotification } from '../notifications/actions';
@@ -386,7 +381,7 @@ export function replaceAudioTrackById(deviceId: string) {
  * @param {string} deviceId - The deviceId of the camera.
  * @returns {Function}
  */
-export function replaceVideoTrackById(deviceId: Object) {
+export function replaceVideoTrackById(deviceId: string) {
     return async (dispatch: IStore['dispatch'], getState: IStore['getState']) => {
         try {
             const tracks = getState()['features/base/tracks'];

react/features/reactions/middleware.ts

@@ -5,8 +5,6 @@ import { sendAnalytics } from '../analytics/functions';
 import { IStore } from '../app/types';
 import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from '../base/app/actionTypes';
 import { CONFERENCE_JOIN_IN_PROGRESS, SET_START_REACTIONS_MUTED } from '../base/conference/actionTypes';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
 import { setStartReactionsMuted } from '../base/conference/actions';
 import {
     getParticipantById,

react/features/screen-share/components/ShareAudioDialog.tsx

@@ -6,8 +6,6 @@ import { translate } from '../../base/i18n/functions';
 import { connect } from '../../base/redux/functions';
 import { updateSettings } from '../../base/settings/actions';
 import { shouldHideShareAudioHelper } from '../../base/settings/functions.any';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
 import { toggleScreensharing } from '../../base/tracks/actions';
 import Checkbox from '../../base/ui/components/web/Checkbox';
 import Dialog from '../../base/ui/components/web/Dialog';

react/features/screen-share/components/ShareScreenWarningDialog.tsx

@@ -4,8 +4,6 @@ import { WithTranslation } from 'react-i18next';
 import { IStore } from '../../app/types';
 import { translate } from '../../base/i18n/functions';
 import { connect } from '../../base/redux/functions';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
 import { toggleScreensharing } from '../../base/tracks/actions';
 import Dialog from '../../base/ui/components/web/Dialog';
 

react/features/security/components/security-dialog/web/SecurityDialog.tsx

@@ -2,8 +2,7 @@
 import React, { useEffect, useState } from 'react';
 
 import { IState } from '../../../../app/types';
-// @ts-ignore
+import { setPassword as setPass } from '../../../../base/conference/actions';
-import { setPassword as setPass } from '../../../../base/conference';
 import { isLocalParticipantModerator } from '../../../../base/participants/functions';
 import { connect } from '../../../../base/redux/functions';
 import Dialog from '../../../../base/ui/components/web/Dialog';

react/features/settings/components/web/MoreTab.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { WithTranslation } from 'react-i18next';
 
-// @ts-ignore
+// @ts-expect-error
 import keyboardShortcut from '../../../../../modules/keyboardshortcut/keyboardshortcut';
 import AbstractDialogTab, {
     Props as AbstractDialogTabProps

react/features/settings/components/web/ProfileTab.tsx

@@ -2,7 +2,7 @@
 import React from 'react';
 import { WithTranslation } from 'react-i18next';
 
-// @ts-ignore
+// @ts-expect-error
 import UIEvents from '../../../../../service/UI/UIEvents';
 import { createProfilePanelButtonEvent } from '../../../analytics/AnalyticsEvents';
 import { sendAnalytics } from '../../../analytics/functions';

react/features/settings/components/web/SettingsDialog.tsx

@@ -6,7 +6,8 @@ import React, { Component } from 'react';
 import { IState } from '../../../app/types';
 import { getAvailableDevices } from '../../../base/devices/actions';
 // @ts-ignore
-import { DialogWithTabs, hideDialog } from '../../../base/dialog';
+import { DialogWithTabs } from '../../../base/dialog';
+import { hideDialog } from '../../../base/dialog/actions';
 import { connect } from '../../../base/redux/functions';
 import { withPixelLineHeight } from '../../../base/styles/functions.web';
 // @ts-ignore

react/features/speaker-stats/components/web/SpeakerStatsSearch.tsx

@@ -7,8 +7,7 @@ import { makeStyles } from 'tss-react/mui';
 
 import Icon from '../../../base/icons/components/Icon';
 import { IconSearch } from '../../../base/icons/svg';
-// @ts-ignore
+import { getFieldValue } from '../../../base/react/functions';
-import { getFieldValue } from '../../../base/react';
 import { withPixelLineHeight } from '../../../base/styles/functions.web';
 import { MOBILE_BREAKPOINT } from '../../constants';
 // @ts-ignore

react/features/subtitles/components/LanguageSelectorDialog.web.tsx

@@ -14,7 +14,6 @@ import { connect } from '../../base/redux/functions';
 import Dialog from '../../base/ui/components/web/Dialog';
 // @ts-ignore
 import { openSettingsDialog } from '../../settings/actions';
-// @ts-ignore
 import { SETTINGS_TABS } from '../../settings/constants';
 // @ts-ignore
 import { setRequestingSubtitles, toggleLanguageSelectorDialog, updateTranslationLanguage } from '../actions';

react/features/toolbox/components/web/EndConferenceButton.tsx

@@ -2,8 +2,7 @@ import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
 
-// @ts-ignore
+import { endConference } from '../../../base/conference/actions';
-import { endConference } from '../../../base/conference';
 import { isLocalParticipantModerator } from '../../../base/participants/functions';
 import Button from '../../../base/ui/components/web/Button';
 import { BUTTON_TYPES } from '../../../base/ui/constants';

react/features/toolbox/components/web/LeaveConferenceButton.tsx

@@ -4,8 +4,6 @@ import { useDispatch } from 'react-redux';
 
 import { createToolbarEvent } from '../../../analytics/AnalyticsEvents';
 import { sendAnalytics } from '../../../analytics/functions';
-// eslint-disable-next-line lines-around-comment
-// @ts-ignore
 import { leaveConference } from '../../../base/conference/actions';
 import Button from '../../../base/ui/components/web/Button';
 import { BUTTON_TYPES } from '../../../base/ui/constants';

react/features/toolbox/components/web/Toolbox.tsx

@@ -4,7 +4,7 @@ import React, { Component } from 'react';
 import { WithTranslation } from 'react-i18next';
 import { batch } from 'react-redux';
 
-// @ts-ignore
+// @ts-expect-error
 import keyboardShortcut from '../../../../../modules/keyboardshortcut/keyboardshortcut';
 // @ts-ignore
 import { isSpeakerStatsDisabled } from '../../../../features/speaker-stats/functions';
@@ -51,7 +51,6 @@ import { NoiseSuppressionButton } from '../../../noise-suppression/components';
 import {
     close as closeParticipantsPane,
     open as openParticipantsPane
-    // @ts-ignore
 } from '../../../participants-pane/actions';
 // @ts-ignore
 import { ParticipantsPaneButton } from '../../../participants-pane/components/web';
@@ -109,7 +108,6 @@ import {
     // @ts-ignore
 } from '../../actions';
 import { NOTIFY_CLICK_MODE, NOT_APPLICABLE, THRESHOLDS } from '../../constants';
-// @ts-ignore
 import { isDesktopShareButtonDisabled, isToolboxVisible } from '../../functions';
 import { getJwtDisabledButtons } from '../../functions.any';
 // @ts-ignore

react/features/welcome/constants.tsx

@@ -2,7 +2,6 @@
 import React from 'react';
 
 import { IconEventNote, IconRestore, IconSettings } from '../base/icons/svg';
-// @ts-ignore
 import BaseTheme from '../base/ui/components/BaseTheme';
 
 // @ts-ignore

react/features/whiteboard/components/web/Whiteboard.tsx

@@ -4,13 +4,12 @@ import clsx from 'clsx';
 import React, { useCallback, useEffect, useRef } from 'react';
 import { useSelector } from 'react-redux';
 
-// @ts-ignore
+// @ts-expect-error
 import Filmstrip from '../../../../../modules/UI/videolayout/Filmstrip';
 import { IState } from '../../../app/types';
 import { getLocalParticipant } from '../../../base/participants/functions';
 // @ts-ignore
 import { getVerticalViewMaxWidth } from '../../../filmstrip/functions.web';
-// @ts-ignore
 import { getToolboxHeight } from '../../../toolbox/functions.web';
 // @ts-ignore
 import { shouldDisplayTileView } from '../../../video-layout/functions.any';