From 48db099134d416a09c7aba1efde5b0ea50e0b657 Mon Sep 17 00:00:00 2001 From: Bogdan Duduman Date: Tue, 27 Sep 2022 10:10:28 +0300 Subject: [PATCH] feat: include sort members eslint changes --- conference.js | 26 +++++++++---------- connection.js | 2 +- modules/API/API.js | 26 +++++++++---------- modules/UI/UI.js | 4 +-- modules/UI/authentication/AuthHandler.js | 4 +-- modules/UI/videolayout/LargeVideoManager.js | 4 +-- modules/UI/videolayout/VideoContainer.js | 2 +- modules/UI/videolayout/VideoLayout.js | 4 +-- package-lock.json | 14 +++++----- package.json | 2 +- react/features/app/actions.web.js | 2 +- react/features/authentication/actions.web.js | 2 +- .../components/native/WaitForOwnerDialog.js | 2 +- react/features/av-moderation/actions.ts | 10 +++---- react/features/av-moderation/functions.ts | 2 +- react/features/av-moderation/middleware.ts | 6 ++--- react/features/base/conference/actions.js | 6 ++--- .../base/conference/middleware.any.js | 8 +++--- .../base/conference/middleware.web.js | 12 ++++----- react/features/base/config/actions.ts | 4 +-- react/features/base/config/functions.any.ts | 2 +- react/features/base/config/middleware.ts | 2 +- react/features/base/config/reducer.ts | 4 +-- .../dialog/components/native/BottomSheet.js | 2 +- .../dialog/components/web/ModalHeader.tsx | 4 +-- .../dialog/components/web/ThemedDialog.js | 8 +++--- .../base/label/components/native/Label.js | 2 +- react/features/base/logging/actions.ts | 2 +- react/features/base/logging/reducer.ts | 2 +- react/features/base/media/actions.ts | 2 +- react/features/base/media/middleware.any.js | 6 ++--- react/features/base/participants/actions.ts | 8 +++--- .../components/ParticipantView.native.js | 2 +- .../base/popover/components/Popover.web.js | 2 +- .../react/components/native/SectionList.js | 4 +-- .../react/components/native/SlidingView.js | 2 +- .../features/base/redux/MiddlewareRegistry.ts | 2 +- react/features/base/sounds/actions.ts | 6 ++--- react/features/base/sounds/reducer.ts | 6 ++--- react/features/base/tracks/actions.ts | 6 ++--- react/features/base/tracks/functions.ts | 2 +- react/features/base/tracks/middleware.ts | 16 ++++++------ react/features/base/tracks/reducer.ts | 2 +- .../base/ui/components/BaseTheme.native.ts | 2 +- .../base/ui/components/BaseTheme.web.ts | 2 +- .../ui/components/JitsiThemeProvider.web.tsx | 2 +- react/features/base/ui/functions.web.ts | 2 +- react/features/breakout-rooms/reducer.ts | 4 +-- .../components/CalendarList.web.js | 2 +- .../components/CalendarListContent.native.js | 2 +- react/features/calendar-sync/middleware.js | 2 +- react/features/calendar-sync/reducer.tsx | 2 +- react/features/chat/actions.any.ts | 6 ++--- react/features/chat/components/native/Chat.js | 4 +-- .../components/native/MessageRecipient.js | 2 +- react/features/chat/components/web/Chat.js | 4 +-- .../chat/components/web/MessageRecipient.js | 4 +-- .../components/web/PrivateMessageButton.js | 2 +- react/features/chat/middleware.js | 2 +- react/features/chat/reducer.ts | 6 ++--- .../components/native/AlwaysOnLabels.js | 4 +-- .../components/native/Conference.js | 6 ++--- .../native/InsecureRoomNameExpandedLabel.js | 2 +- .../conference/components/native/Labels.js | 2 +- .../native/LonelyMeetingExperience.js | 2 +- .../native/RaisedHandsCountExpandedLabel.js | 2 +- .../conference/components/native/TitleBar.js | 2 +- .../native/carmode/MicrophoneButton.tsx | 8 +++--- .../components/native/carmode/TitleBar.tsx | 2 +- .../conference/components/web/Conference.js | 2 +- .../components/web/ConnectionIndicator.tsx | 12 +++++---- .../web/ConnectionIndicatorContent.js | 4 +-- .../components/DeepLinkingDesktopPage.web.js | 4 +-- .../components/web/DisplayName.tsx | 4 +-- .../dynamic-branding/functions.web.ts | 4 +-- react/features/e2ee/components/E2EELabel.js | 2 +- react/features/e2ee/middleware.js | 10 +++---- react/features/external-api/middleware.js | 6 ++--- .../face-landmarks/FaceLandmarksDetector.ts | 8 +++--- .../face-landmarks/FaceLandmarksHelper.ts | 2 +- react/features/face-landmarks/actions.ts | 2 +- react/features/face-landmarks/middleware.ts | 2 +- react/features/filmstrip/actions.web.js | 16 ++++++------ .../filmstrip/components/native/Thumbnail.js | 8 +++--- .../filmstrip/components/web/Filmstrip.tsx | 8 +++--- .../filmstrip/components/web/MainFilmstrip.js | 2 +- .../components/web/ScreenshareFilmstrip.js | 2 +- .../components/web/StageFilmstrip.js | 2 +- .../components/web/StatusIndicators.js | 2 +- .../filmstrip/components/web/Thumbnail.tsx | 6 ++--- .../components/web/ThumbnailWrapper.js | 6 ++--- .../web/VirtualScreenshareParticipant.js | 2 +- react/features/filmstrip/functions.native.js | 2 +- react/features/filmstrip/functions.web.js | 6 ++--- react/features/filmstrip/middleware.web.js | 16 ++++++------ react/features/filmstrip/reducer.ts | 16 ++++++------ react/features/filmstrip/subscriber.web.js | 4 +-- react/features/follow-me/middleware.js | 2 +- react/features/invite/actions.native.js | 2 +- .../add-people-dialog/native/InviteButton.js | 2 +- .../add-people-dialog/web/AddPeopleDialog.js | 4 +-- react/features/invite/middleware.any.js | 8 +++--- react/features/jaas/middleware.any.js | 4 +-- react/features/large-video/actions.web.js | 2 +- react/features/large-video/middleware.js | 4 +-- react/features/large-video/reducer.ts | 4 +-- react/features/lobby/actions.any.js | 8 +++--- .../lobby/components/AbstractLobbyScreen.js | 4 +-- .../native/KnockingParticipantList.js | 4 +-- .../lobby/components/native/LobbyScreen.js | 2 +- .../lobby/components/web/LobbyScreen.js | 4 +-- react/features/lobby/middleware.js | 4 +-- .../components/AudioRoutePickerDialog.js | 2 +- .../features/mobile/audio-mode/middleware.js | 4 +-- react/features/mobile/background/actions.js | 2 +- react/features/mobile/background/reducer.ts | 4 +-- .../mobile/call-integration/CallKit.js | 2 +- .../mobile/external-api/middleware.js | 8 +++--- .../navigation/components/ConnectingPage.js | 2 +- react/features/mobile/navigation/functions.js | 4 +-- react/features/mobile/polyfills/webrtc.js | 2 +- .../components/NoiseSuppressionButton.tsx | 4 +-- react/features/notifications/actions.ts | 2 +- react/features/notifications/middleware.ts | 4 +-- .../components/native/PageReloadOverlay.js | 4 +-- .../components/web/PageReloadOverlay.js | 4 +-- .../breakout-rooms/components/web/RoomList.js | 6 ++--- .../components/native/ClearableInput.js | 2 +- .../components/native/ContextMenuMore.js | 6 ++--- .../components/native/ParticipantItem.js | 2 +- .../components/web/LobbyParticipantItem.tsx | 2 +- .../components/web/LobbyParticipants.tsx | 4 +-- .../components/web/MeetingParticipantItem.js | 2 +- .../components/web/ParticipantItem.tsx | 6 ++--- react/features/participants-pane/functions.ts | 12 ++++----- react/features/polls/actions.js | 2 +- .../polls/components/AbstractPollCreate.js | 2 +- .../polls/components/AbstractPollResults.js | 2 +- .../polls/components/native/PollCreate.js | 2 +- .../polls/components/native/PollResults.js | 2 +- .../polls/components/native/PollsPane.js | 2 +- react/features/polls/reducer.ts | 6 ++--- react/features/prejoin/actions.js | 16 ++++++------ .../components/preview/DeviceStatus.tsx | 4 +-- react/features/reactions/constants.ts | 6 ++--- react/features/reactions/functions.any.ts | 4 +-- react/features/reactions/middleware.ts | 8 +++--- react/features/reactions/reducer.ts | 6 ++--- react/features/recent-list/actions.js | 4 +-- react/features/recent-list/middleware.js | 4 +-- react/features/recent-list/reducer.ts | 4 +-- .../LiveStream/native/GoogleSigninForm.js | 2 +- .../native/StartLiveStreamDialog.js | 2 +- .../LiveStream/web/LiveStreamButton.js | 4 +-- .../LiveStream/web/StartLiveStreamDialog.js | 4 +-- .../Recording/AbstractHighlightButton.js | 2 +- .../Recording/AbstractStartRecordingDialog.js | 2 +- .../Recording/LocalRecordingManager.web.ts | 2 +- .../Recording/native/HighlightButton.js | 4 +-- .../Recording/native/HighlightDialog.js | 2 +- .../Recording/web/HighlightButton.tsx | 4 +-- .../components/Recording/web/RecordButton.js | 4 +-- .../native/RecordingExpandedLabel.js | 4 +-- react/features/recording/middleware.js | 4 +-- react/features/remote-control/actions.js | 6 ++--- .../RemoteControlAuthorizationDialog.js | 2 +- react/features/remote-control/functions.js | 2 +- react/features/remote-control/subscriber.js | 2 +- react/features/room-lock/actions.js | 2 +- react/features/rtcstats/functions.ts | 4 +-- react/features/rtcstats/middleware.ts | 7 +++-- react/features/salesforce/actions.js | 2 +- .../components/native/RecordItem.js | 2 +- .../components/native/SalesforceLinkDialog.js | 2 +- .../salesforce/useSalesforceLinkDialog.js | 2 +- react/features/screen-share/actions.js | 4 +-- .../components/ShareAudioDialog.tsx | 4 +-- react/features/screen-share/reducer.ts | 4 +-- .../AbstractSecurityDialogButton.js | 4 +-- .../security-dialog/native/SecurityDialog.js | 2 +- .../native/SecurityDialogButton.js | 4 +-- .../security-dialog/web/SecurityDialog.tsx | 2 +- .../web/SecurityDialogButton.js | 4 +-- .../components/native/SettingsView.tsx | 2 +- .../settings/components/web/CalendarTab.js | 2 +- react/features/settings/functions.js | 2 +- react/features/settings/middleware.web.js | 2 +- .../components/native/SharedVideoButton.js | 2 +- .../components/native/VideoManager.js | 4 +-- .../components/native/YoutubeVideoManager.js | 4 +-- .../components/web/AbstractVideoManager.js | 2 +- .../components/web/VideoManager.js | 4 +-- react/features/shared-video/middleware.any.js | 8 +++--- react/features/shared-video/reducer.ts | 2 +- react/features/speaker-stats/actions.any.js | 6 ++--- .../components/native/SpeakerStats.js | 2 +- .../components/native/SpeakerStatsButton.js | 2 +- .../components/native/SpeakerStatsItem.js | 2 +- .../components/native/SpeakerStatsSearch.js | 2 +- .../components/web/SpeakerStats.tsx | 4 +-- react/features/speaker-stats/functions.js | 4 +-- react/features/speaker-stats/middleware.js | 2 +- react/features/speaker-stats/reducer.ts | 6 ++--- .../JitsiStreamBackgroundEffect.js | 2 +- react/features/subtitles/actions.any.js | 2 +- .../subtitles/components/Captions.native.js | 4 +-- .../subtitles/components/Captions.web.js | 4 +-- .../components/ClosedCaptionButton.native.js | 2 +- .../components/LanguageSelectorDialog.web.tsx | 6 ++--- react/features/subtitles/middleware.js | 4 +-- react/features/toolbox/actions.any.js | 4 +-- .../toolbox/components/AudioMuteButton.js | 2 +- .../features/toolbox/components/HelpButton.js | 2 +- .../toolbox/components/VideoMuteButton.js | 2 +- .../toolbox/components/native/HangupMenu.tsx | 2 +- .../components/native/OverflowMenuButton.js | 2 +- .../native/ScreenSharingAndroidButton.js | 2 +- .../native/ScreenSharingIosButton.js | 4 +-- .../toolbox/components/native/Toolbox.js | 2 +- .../components/web/OverflowMenuButton.tsx | 2 +- .../toolbox/components/web/ProfileButton.js | 2 +- .../toolbox/components/web/Toolbox.tsx | 6 ++--- .../components/web/VideoSettingsButton.js | 2 +- react/features/toolbox/functions.native.js | 2 +- react/features/toolbox/middleware.js | 4 +-- react/features/transcribing/actions.js | 4 +-- .../TranscribingExpandedLabel.native.js | 2 +- .../components/TranscribingLabel.native.js | 2 +- .../components/TranscribingLabel.web.js | 2 +- react/features/transcribing/reducer.ts | 6 ++--- react/features/video-layout/functions.any.js | 4 +-- react/features/video-layout/functions.web.js | 2 +- react/features/video-layout/middleware.any.js | 4 +-- .../video-layout/middleware.native.js | 2 +- react/features/video-layout/middleware.web.js | 4 +-- react/features/video-menu/actions.any.js | 8 +++--- .../AbstractGrantModeratorButton.js | 4 +-- .../components/native/MuteEveryoneDialog.js | 4 +-- .../native/MuteEveryonesVideoDialog.js | 4 +-- .../components/web/GrantModeratorButton.js | 4 +-- .../video-menu/components/web/MuteButton.js | 4 +-- .../components/web/MuteEveryoneDialog.tsx | 2 +- .../web/MuteEveryonesVideoDialog.tsx | 2 +- .../components/web/MuteVideoButton.js | 4 +-- .../components/web/ParticipantContextMenu.tsx | 2 +- .../web/PrivateMessageMenuButton.js | 4 +-- .../VideoQualityExpandedLabel.native.js | 2 +- .../components/VideoQualityLabel.native.js | 6 ++--- .../components/VideoQualityLabel.web.js | 4 +-- .../components/VideoQualitySlider.web.tsx | 2 +- react/features/video-quality/subscriber.js | 2 +- .../components/UploadImageButton.tsx | 2 +- .../components/VirtualBackgroundDialog.tsx | 6 ++--- .../welcome/components/WelcomePage.native.js | 4 +-- .../welcome/components/WelcomePage.web.js | 2 +- 255 files changed, 516 insertions(+), 515 deletions(-) diff --git a/conference.js b/conference.js index cbd537d210..45ddb99c2b 100644 --- a/conference.js +++ b/conference.js @@ -15,8 +15,8 @@ import Recorder from './modules/recorder/Recorder'; import { createTaskQueue } from './modules/util/helpers'; import { createDeviceChangedEvent, - createStartSilentEvent, createScreenSharingEvent, + createStartSilentEvent, createTrackMutedEvent, sendAnalytics } from './react/features/analytics'; @@ -30,14 +30,15 @@ import { shouldShowModeratedNotification } from './react/features/av-moderation/ import { setAudioOnly } from './react/features/base/audio-only'; import { AVATAR_URL_COMMAND, + CONFERENCE_LEAVE_REASONS, EMAIL_COMMAND, _conferenceWillJoin, authStatusChanged, commonUserJoinedHandling, commonUserLeftHandling, conferenceFailed, - conferenceJoined, conferenceJoinInProgress, + conferenceJoined, conferenceLeft, conferenceSubjectChanged, conferenceTimestampChanged, @@ -49,15 +50,14 @@ import { getConferenceOptions, kickedOut, lockStateChanged, + nonParticipantMessageReceived, onStartMutedPolicyChanged, p2pStatusChanged, - sendLocalParticipant, - nonParticipantMessageReceived, - CONFERENCE_LEAVE_REASONS + sendLocalParticipant } from './react/features/base/conference'; import { - getReplaceParticipant, - getMultipleVideoSendingSupportFeatureFlag + getMultipleVideoSendingSupportFeatureFlag, + getReplaceParticipant } from './react/features/base/config/functions'; import { checkAndNotifyForNewDevice, @@ -69,7 +69,6 @@ import { updateDeviceList } from './react/features/base/devices'; import { - browser, JitsiConferenceErrors, JitsiConferenceEvents, JitsiConnectionErrors, @@ -78,14 +77,15 @@ import { JitsiMediaDevicesEvents, JitsiParticipantConnectionStatus, JitsiTrackErrors, - JitsiTrackEvents + JitsiTrackEvents, + browser } from './react/features/base/lib-jitsi-meet'; import { isFatalJitsiConnectionError } from './react/features/base/lib-jitsi-meet/functions'; import { + MEDIA_TYPE, getStartWithAudioMuted, getStartWithVideoMuted, isVideoMutedByUser, - MEDIA_TYPE, setAudioAvailable, setAudioMuted, setAudioUnmutePermissions, @@ -140,9 +140,9 @@ import { import { maybeSetLobbyChatMessageListener } from './react/features/lobby/actions.any'; import { setNoiseSuppressionEnabled } from './react/features/noise-suppression/actions'; import { + NOTIFICATION_TIMEOUT_TYPE, isModerationNotificationDisplayed, - showNotification, - NOTIFICATION_TIMEOUT_TYPE + showNotification } from './react/features/notifications'; import { mediaPermissionPromptVisibilityChanged, toggleSlowGUMOverlay } from './react/features/overlay'; import { suspendDetected } from './react/features/power-monitor'; @@ -153,7 +153,7 @@ import { setJoiningInProgress } from './react/features/prejoin'; import { disableReceiver, stopReceiver } from './react/features/remote-control'; -import { setScreenAudioShareState, isScreenAudioShared } from './react/features/screen-share/'; +import { isScreenAudioShared, setScreenAudioShareState } from './react/features/screen-share/'; import { toggleScreenshotCaptureSummary } from './react/features/screenshot-capture'; import { isScreenshotCaptureEnabled } from './react/features/screenshot-capture/functions'; import { AudioMixerEffect } from './react/features/stream-effects/audio-mixer/AudioMixerEffect'; diff --git a/connection.js b/connection.js index 939415b9df..10d164cb7d 100644 --- a/connection.js +++ b/connection.js @@ -19,7 +19,7 @@ import { } from './react/features/base/lib-jitsi-meet'; import { isFatalJitsiConnectionError } from './react/features/base/lib-jitsi-meet/functions'; import { getCustomerDetails } from './react/features/jaas/actions.any'; -import { isVpaasMeeting, getJaasJWT } from './react/features/jaas/functions'; +import { getJaasJWT, isVpaasMeeting } from './react/features/jaas/functions'; import { setPrejoinDisplayNameRequired } from './react/features/prejoin/actions'; diff --git a/modules/API/API.js b/modules/API/API.js index 5a38eccd68..899cb6ccf5 100644 --- a/modules/API/API.js +++ b/modules/API/API.js @@ -25,24 +25,24 @@ import { setPassword, setSubject } from '../../react/features/base/conference'; -import { overwriteConfig, getWhitelistedJSON } from '../../react/features/base/config'; +import { getWhitelistedJSON, overwriteConfig } from '../../react/features/base/config'; import { toggleDialog } from '../../react/features/base/dialog/actions'; import { isSupportedBrowser } from '../../react/features/base/environment'; import { parseJWTFromURLParams } from '../../react/features/base/jwt'; import JitsiMeetJS, { JitsiRecordingConstants } from '../../react/features/base/lib-jitsi-meet'; import { MEDIA_TYPE } from '../../react/features/base/media'; import { + LOCAL_PARTICIPANT_DEFAULT_ID, getLocalParticipant, getParticipantById, - pinParticipant, - kickParticipant, - raiseHand, - isParticipantModerator, - isLocalParticipantModerator, - hasRaisedHand, grantModerator, + hasRaisedHand, + isLocalParticipantModerator, + isParticipantModerator, + kickParticipant, overwriteParticipantsNames, - LOCAL_PARTICIPANT_DEFAULT_ID + pinParticipant, + raiseHand } from '../../react/features/base/participants'; import { updateSettings } from '../../react/features/base/settings'; import { getDisplayName } from '../../react/features/base/settings/functions.web'; @@ -78,12 +78,12 @@ import { captureLargeVideoScreenshot, resizeLargeVideo } from '../../react/features/large-video/actions.web'; -import { toggleLobbyMode, answerKnockingParticipant } from '../../react/features/lobby/actions'; +import { answerKnockingParticipant, toggleLobbyMode } from '../../react/features/lobby/actions'; import { setNoiseSuppressionEnabled } from '../../react/features/noise-suppression/actions'; import { - hideNotification, NOTIFICATION_TIMEOUT_TYPE, NOTIFICATION_TYPE, + hideNotification, showNotification } from '../../react/features/notifications'; import { @@ -95,14 +95,14 @@ import { startLocalVideoRecording, stopLocalVideoRecording } from '../../react/f import { RECORDING_TYPES } from '../../react/features/recording/constants'; import { getActiveSession, supportsLocalRecording } from '../../react/features/recording/functions'; import { isScreenAudioSupported } from '../../react/features/screen-share'; -import { startScreenShareFlow, startAudioScreenShareFlow } from '../../react/features/screen-share/actions'; +import { startAudioScreenShareFlow, startScreenShareFlow } from '../../react/features/screen-share/actions'; import { toggleScreenshotCaptureSummary } from '../../react/features/screenshot-capture'; import { isScreenshotCaptureEnabled } from '../../react/features/screenshot-capture/functions'; import { playSharedVideo, stopSharedVideo } from '../../react/features/shared-video/actions.any'; import { extractYoutubeIdOrURL } from '../../react/features/shared-video/functions'; -import { toggleRequestingSubtitles, setRequestingSubtitles } from '../../react/features/subtitles/actions'; +import { setRequestingSubtitles, toggleRequestingSubtitles } from '../../react/features/subtitles/actions'; import { isAudioMuteButtonDisabled } from '../../react/features/toolbox/functions'; -import { toggleTileView, setTileView } from '../../react/features/video-layout'; +import { setTileView, toggleTileView } from '../../react/features/video-layout'; import { muteAllParticipants } from '../../react/features/video-menu/actions'; import { setVideoQuality } from '../../react/features/video-quality'; import VirtualBackgroundDialog from '../../react/features/virtual-background/components/VirtualBackgroundDialog'; diff --git a/modules/UI/UI.js b/modules/UI/UI.js index ff0eb8c698..006fca20de 100644 --- a/modules/UI/UI.js +++ b/modules/UI/UI.js @@ -12,10 +12,10 @@ import { setColorAlpha } from '../../react/features/base/util'; import { setDocumentUrl } from '../../react/features/etherpad'; import { setFilmstripVisible } from '../../react/features/filmstrip'; import { + NOTIFICATION_TIMEOUT_TYPE, joinLeaveNotificationsDisabled, setNotificationsEnabled, - showNotification, - NOTIFICATION_TIMEOUT_TYPE + showNotification } from '../../react/features/notifications'; import { dockToolbox, diff --git a/modules/UI/authentication/AuthHandler.js b/modules/UI/authentication/AuthHandler.js index eb79ecb69c..053e9ea8f3 100644 --- a/modules/UI/authentication/AuthHandler.js +++ b/modules/UI/authentication/AuthHandler.js @@ -11,8 +11,8 @@ import { WaitForOwnerDialog } from '../../../react/features/authentication/components'; import { - isTokenAuthEnabled, - getTokenAuthUrl + getTokenAuthUrl, + isTokenAuthEnabled } from '../../../react/features/authentication/functions'; import { getReplaceParticipant } from '../../../react/features/base/config/functions'; import { isDialogOpen } from '../../../react/features/base/dialog'; diff --git a/modules/UI/videolayout/LargeVideoManager.js b/modules/UI/videolayout/LargeVideoManager.js index 7fc18e9194..410dc3a2b0 100644 --- a/modules/UI/videolayout/LargeVideoManager.js +++ b/modules/UI/videolayout/LargeVideoManager.js @@ -34,7 +34,7 @@ import { isTrackStreamingStatusInactive, isTrackStreamingStatusInterrupted } from '../../../react/features/connection-indicator/functions'; -import { FILMSTRIP_BREAKPOINT, isFilmstripResizable, getVerticalViewMaxWidth } from '../../../react/features/filmstrip'; +import { FILMSTRIP_BREAKPOINT, getVerticalViewMaxWidth, isFilmstripResizable } from '../../../react/features/filmstrip'; import { updateKnownLargeVideoResolution } from '../../../react/features/large-video/actions'; @@ -45,7 +45,7 @@ import { shouldDisplayTileView } from '../../../react/features/video-layout'; import { createDeferred } from '../../util/helpers'; import AudioLevels from '../audio_levels/AudioLevels'; -import { VideoContainer, VIDEO_CONTAINER_TYPE } from './VideoContainer'; +import { VIDEO_CONTAINER_TYPE, VideoContainer } from './VideoContainer'; const logger = Logger.getLogger(__filename); diff --git a/modules/UI/videolayout/VideoContainer.js b/modules/UI/videolayout/VideoContainer.js index 676a81823a..6b79dfee85 100644 --- a/modules/UI/videolayout/VideoContainer.js +++ b/modules/UI/videolayout/VideoContainer.js @@ -8,7 +8,7 @@ import ReactDOM from 'react-dom'; import { browser } from '../../../react/features/base/lib-jitsi-meet'; import { isTestModeEnabled } from '../../../react/features/base/testing'; import { FILMSTRIP_BREAKPOINT } from '../../../react/features/filmstrip'; -import { ORIENTATION, LargeVideoBackground, updateLastLargeVideoMediaEvent } from '../../../react/features/large-video'; +import { LargeVideoBackground, ORIENTATION, updateLastLargeVideoMediaEvent } from '../../../react/features/large-video'; import { setLargeVideoDimensions } from '../../../react/features/large-video/actions.any'; import { LAYOUTS, getCurrentLayout } from '../../../react/features/video-layout'; /* eslint-enable no-unused-vars */ diff --git a/modules/UI/videolayout/VideoLayout.js b/modules/UI/videolayout/VideoLayout.js index 9e3e6af3d2..749d48b1d4 100644 --- a/modules/UI/videolayout/VideoLayout.js +++ b/modules/UI/videolayout/VideoLayout.js @@ -5,8 +5,8 @@ import Logger from '@jitsi/logger'; import { getMultipleVideoSupportFeatureFlag } from '../../../react/features/base/config'; import { MEDIA_TYPE, VIDEO_TYPE } from '../../../react/features/base/media'; import { - getPinnedParticipant, - getParticipantById + getParticipantById, + getPinnedParticipant } from '../../../react/features/base/participants'; import { getTrackByMediaTypeAndParticipant, diff --git a/package-lock.json b/package-lock.json index 07289f329f..daf3c8ec3e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -142,7 +142,7 @@ "@babel/preset-flow": "7.16.0", "@babel/preset-react": "7.16.0", "@babel/runtime": "7.16.0", - "@jitsi/eslint-config": "4.1.2", + "@jitsi/eslint-config": "4.1.3", "@types/js-md5": "0.4.3", "@types/lodash": "4.14.182", "@types/react": "17.0.14", @@ -3723,9 +3723,9 @@ } }, "node_modules/@jitsi/eslint-config": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/@jitsi/eslint-config/-/eslint-config-4.1.2.tgz", - "integrity": "sha512-kAkCLEKSWdwqj8L026T/5+FttvPLmNkPPETfgzG4SxWdkIVsW8wqFN/RypUZp2H7NmL5AgVL+QkXQXoEoQgW8A==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@jitsi/eslint-config/-/eslint-config-4.1.3.tgz", + "integrity": "sha512-Fl3bvasAOREemcCdKXpBJDayuNl2CFIHkvNjUCqCs8uorHAMdagjbqBvg4ow7GnMamQdCrcdpIpZfeOmf+FTJQ==", "dev": true, "peerDependencies": { "@babel/eslint-parser": ">= 7", @@ -23210,9 +23210,9 @@ } }, "@jitsi/eslint-config": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/@jitsi/eslint-config/-/eslint-config-4.1.2.tgz", - "integrity": "sha512-kAkCLEKSWdwqj8L026T/5+FttvPLmNkPPETfgzG4SxWdkIVsW8wqFN/RypUZp2H7NmL5AgVL+QkXQXoEoQgW8A==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/@jitsi/eslint-config/-/eslint-config-4.1.3.tgz", + "integrity": "sha512-Fl3bvasAOREemcCdKXpBJDayuNl2CFIHkvNjUCqCs8uorHAMdagjbqBvg4ow7GnMamQdCrcdpIpZfeOmf+FTJQ==", "dev": true }, "@jitsi/js-utils": { diff --git a/package.json b/package.json index 3329b170ca..ae497f2808 100644 --- a/package.json +++ b/package.json @@ -147,7 +147,7 @@ "@babel/preset-flow": "7.16.0", "@babel/preset-react": "7.16.0", "@babel/runtime": "7.16.0", - "@jitsi/eslint-config": "4.1.2", + "@jitsi/eslint-config": "4.1.3", "@types/js-md5": "0.4.3", "@types/lodash": "4.14.182", "@types/react": "17.0.14", diff --git a/react/features/app/actions.web.js b/react/features/app/actions.web.js index 2fd75cc03b..b427b6a8d7 100644 --- a/react/features/app/actions.web.js +++ b/react/features/app/actions.web.js @@ -22,8 +22,8 @@ import { } from '../base/util'; import { isVpaasMeeting } from '../jaas/functions'; import { - clearNotifications, NOTIFICATION_TIMEOUT_TYPE, + clearNotifications, showNotification } from '../notifications'; import { setFatalError } from '../overlay'; diff --git a/react/features/authentication/actions.web.js b/react/features/authentication/actions.web.js index 13a8f906e9..1ac8e72242 100644 --- a/react/features/authentication/actions.web.js +++ b/react/features/authentication/actions.web.js @@ -6,7 +6,7 @@ import { hideDialog, openDialog } from '../base/dialog/actions'; import { CANCEL_LOGIN } from './actionTypes'; -import { WaitForOwnerDialog, LoginDialog } from './components'; +import { LoginDialog, WaitForOwnerDialog } from './components'; export * from './actions.any'; diff --git a/react/features/authentication/components/native/WaitForOwnerDialog.js b/react/features/authentication/components/native/WaitForOwnerDialog.js index 7c2e90a0b3..7a90ee1aee 100644 --- a/react/features/authentication/components/native/WaitForOwnerDialog.js +++ b/react/features/authentication/components/native/WaitForOwnerDialog.js @@ -4,7 +4,7 @@ import type { Dispatch } from 'redux'; import { ConfirmDialog } from '../../../base/dialog'; import { translate } from '../../../base/i18n'; import { connect } from '../../../base/redux'; -import { openLoginDialog, cancelWaitForOwner } from '../../actions.native'; +import { cancelWaitForOwner, openLoginDialog } from '../../actions.native'; /** * The type of the React {@code Component} props of {@link WaitForOwnerDialog}. diff --git a/react/features/av-moderation/actions.ts b/react/features/av-moderation/actions.ts index a034ce2d05..f92cbc3133 100644 --- a/react/features/av-moderation/actions.ts +++ b/react/features/av-moderation/actions.ts @@ -8,19 +8,19 @@ import { Participant } from '../base/participants/types'; import { isForceMuted } from '../participants-pane/functions'; import { - DISMISS_PENDING_PARTICIPANT, DISABLE_MODERATION, + DISMISS_PENDING_PARTICIPANT, ENABLE_MODERATION, LOCAL_PARTICIPANT_APPROVED, LOCAL_PARTICIPANT_MODERATION_NOTIFICATION, + LOCAL_PARTICIPANT_REJECTED, PARTICIPANT_APPROVED, PARTICIPANT_PENDING_AUDIO, + PARTICIPANT_REJECTED, REQUEST_DISABLE_AUDIO_MODERATION, - REQUEST_ENABLE_AUDIO_MODERATION, REQUEST_DISABLE_VIDEO_MODERATION, - REQUEST_ENABLE_VIDEO_MODERATION, - LOCAL_PARTICIPANT_REJECTED, - PARTICIPANT_REJECTED + REQUEST_ENABLE_AUDIO_MODERATION, + REQUEST_ENABLE_VIDEO_MODERATION } from './actionTypes'; import { isEnabledFromState } from './functions'; diff --git a/react/features/av-moderation/functions.ts b/react/features/av-moderation/functions.ts index 0d8d2ca105..867a8df758 100644 --- a/react/features/av-moderation/functions.ts +++ b/react/features/av-moderation/functions.ts @@ -4,7 +4,7 @@ import { isLocalParticipantModerator } from '../base/participants/functions'; import { Participant } from '../base/participants/types'; import { isInBreakoutRoom } from '../breakout-rooms/functions'; -import { MEDIA_TYPE_TO_WHITELIST_STORE_KEY, MEDIA_TYPE_TO_PENDING_STORE_KEY } from './constants'; +import { MEDIA_TYPE_TO_PENDING_STORE_KEY, MEDIA_TYPE_TO_WHITELIST_STORE_KEY } from './constants'; /** * Returns this feature's root state. diff --git a/react/features/av-moderation/middleware.ts b/react/features/av-moderation/middleware.ts index 9a626cd240..5317c0e69c 100644 --- a/react/features/av-moderation/middleware.ts +++ b/react/features/av-moderation/middleware.ts @@ -5,7 +5,7 @@ import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from '../base/app/actionTypes'; // @ts-ignore import { getConferenceState } from '../base/conference'; import { JitsiConferenceEvents } from '../base/lib-jitsi-meet'; -import { MediaType, MEDIA_TYPE } from '../base/media/constants'; +import { MEDIA_TYPE, MediaType } from '../base/media/constants'; import { PARTICIPANT_UPDATED } from '../base/participants/actionTypes'; import { raiseHand } from '../base/participants/actions'; import { @@ -40,13 +40,13 @@ import { } from './actionTypes'; import { disableModeration, - dismissPendingParticipant, dismissPendingAudioParticipant, + dismissPendingParticipant, enableModeration, localParticipantApproved, + localParticipantRejected, participantApproved, participantPendingAudio, - localParticipantRejected, participantRejected } from './actions'; import { diff --git a/react/features/base/conference/actions.js b/react/features/base/conference/actions.js index 5bd79ae29d..87b1a6e58c 100644 --- a/react/features/base/conference/actions.js +++ b/react/features/base/conference/actions.js @@ -41,8 +41,8 @@ import { getBackendSafeRoomName } from '../util'; import { AUTH_STATUS_CHANGED, CONFERENCE_FAILED, - CONFERENCE_JOIN_IN_PROGRESS, CONFERENCE_JOINED, + CONFERENCE_JOIN_IN_PROGRESS, CONFERENCE_LEFT, CONFERENCE_LOCAL_SUBJECT_CHANGED, CONFERENCE_SUBJECT_CHANGED, @@ -61,8 +61,8 @@ import { SET_OBFUSCATED_ROOM, SET_PASSWORD, SET_PASSWORD_FAILED, - SET_ROOM, SET_PENDING_SUBJECT_CHANGE, + SET_ROOM, SET_START_MUTED_POLICY, SET_START_REACTIONS_MUTED } from './actionTypes'; @@ -76,8 +76,8 @@ import { commonUserJoinedHandling, commonUserLeftHandling, getConferenceOptions, - getCurrentConference, getConferenceState, + getCurrentConference, sendLocalParticipant } from './functions'; import logger from './logger'; diff --git a/react/features/base/conference/middleware.any.js b/react/features/base/conference/middleware.any.js index c081c2945e..8d6af979e8 100644 --- a/react/features/base/conference/middleware.any.js +++ b/react/features/base/conference/middleware.any.js @@ -17,12 +17,12 @@ import { validateJwt } from '../jwt'; import { JitsiConferenceErrors } from '../lib-jitsi-meet'; import { MEDIA_TYPE } from '../media'; import { - getLocalParticipant, - getParticipantById, - getPinnedParticipant, PARTICIPANT_ROLE, PARTICIPANT_UPDATED, - PIN_PARTICIPANT + PIN_PARTICIPANT, + getLocalParticipant, + getParticipantById, + getPinnedParticipant } from '../participants'; import { MiddlewareRegistry } from '../redux'; import { TRACK_ADDED, TRACK_REMOVED } from '../tracks'; diff --git a/react/features/base/conference/middleware.web.js b/react/features/base/conference/middleware.web.js index b08d791f29..9b9da3caa7 100644 --- a/react/features/base/conference/middleware.web.js +++ b/react/features/base/conference/middleware.web.js @@ -6,9 +6,9 @@ import { showModeratedNotification } from '../../av-moderation/actions'; import { shouldShowModeratedNotification } from '../../av-moderation/functions'; import { setNoiseSuppressionEnabled } from '../../noise-suppression/actions'; import { - showNotification, NOTIFICATION_TIMEOUT_TYPE, - isModerationNotificationDisplayed + isModerationNotificationDisplayed, + showNotification } from '../../notifications'; import { setPrejoinPageVisibility, @@ -25,19 +25,19 @@ import { AudioMixerEffect } from '../../stream-effects/audio-mixer/AudioMixerEff import { setAudioOnly } from '../audio-only'; import { getMultipleVideoSendingSupportFeatureFlag } from '../config/functions.any'; import { JitsiConferenceErrors, JitsiTrackErrors, JitsiTrackEvents } from '../lib-jitsi-meet'; -import { MEDIA_TYPE, setScreenshareMuted, VIDEO_TYPE } from '../media'; +import { MEDIA_TYPE, VIDEO_TYPE, setScreenshareMuted } from '../media'; import { MiddlewareRegistry } from '../redux'; import { + TOGGLE_SCREENSHARING, addLocalTrack, createLocalTracksF, getLocalDesktopTrack, getLocalJitsiAudioTrack, replaceLocalTrack, - toggleScreensharing, - TOGGLE_SCREENSHARING + toggleScreensharing } from '../tracks'; -import { CONFERENCE_FAILED, CONFERENCE_JOIN_IN_PROGRESS, CONFERENCE_JOINED } from './actionTypes'; +import { CONFERENCE_FAILED, CONFERENCE_JOINED, CONFERENCE_JOIN_IN_PROGRESS } from './actionTypes'; import { getCurrentConference } from './functions'; import './middleware.any'; diff --git a/react/features/base/config/actions.ts b/react/features/base/config/actions.ts index 5b7957b97e..043b8e337f 100644 --- a/react/features/base/config/actions.ts +++ b/react/features/base/config/actions.ts @@ -8,9 +8,9 @@ import { parseURIString } from '../util/uri'; import { CONFIG_WILL_LOAD, LOAD_CONFIG_ERROR, + OVERWRITE_CONFIG, SET_CONFIG, - UPDATE_CONFIG, - OVERWRITE_CONFIG + UPDATE_CONFIG } from './actionTypes'; import { IConfig } from './configType'; import { _CONFIG_STORE_PREFIX } from './constants'; diff --git a/react/features/base/config/functions.any.ts b/react/features/base/config/functions.any.ts index ec49999646..f412dda8f5 100644 --- a/react/features/base/config/functions.any.ts +++ b/react/features/base/config/functions.any.ts @@ -11,7 +11,7 @@ import { parseURLParams } from '../util/parseURLParams'; import { IConfig } from './configType'; import CONFIG_WHITELIST from './configWhitelist'; -import { _CONFIG_STORE_PREFIX, FEATURE_FLAGS } from './constants'; +import { FEATURE_FLAGS, _CONFIG_STORE_PREFIX } from './constants'; import INTERFACE_CONFIG_WHITELIST from './interfaceConfigWhitelist'; import logger from './logger'; diff --git a/react/features/base/config/middleware.ts b/react/features/base/config/middleware.ts index 21c86abd25..c0f5c49fe3 100644 --- a/react/features/base/config/middleware.ts +++ b/react/features/base/config/middleware.ts @@ -5,7 +5,7 @@ import { getFeatureFlag } from '../flags/functions'; import MiddlewareRegistry from '../redux/MiddlewareRegistry'; import { updateSettings } from '../settings/actions'; -import { SET_CONFIG, OVERWRITE_CONFIG } from './actionTypes'; +import { OVERWRITE_CONFIG, SET_CONFIG } from './actionTypes'; import { updateConfig } from './actions'; import { IConfig } from './configType'; diff --git a/react/features/base/config/reducer.ts b/react/features/base/config/reducer.ts index b04b2df4f8..ed31f6d0ae 100644 --- a/react/features/base/config/reducer.ts +++ b/react/features/base/config/reducer.ts @@ -5,11 +5,11 @@ import ReducerRegistry from '../redux/ReducerRegistry'; import { equals } from '../redux/functions'; import { - UPDATE_CONFIG, CONFIG_WILL_LOAD, LOAD_CONFIG_ERROR, + OVERWRITE_CONFIG, SET_CONFIG, - OVERWRITE_CONFIG + UPDATE_CONFIG } from './actionTypes'; import { IConfig } from './configType'; // eslint-disable-next-line lines-around-comment diff --git a/react/features/base/dialog/components/native/BottomSheet.js b/react/features/base/dialog/components/native/BottomSheet.js index 5dfa1e5a8c..7456013677 100644 --- a/react/features/base/dialog/components/native/BottomSheet.js +++ b/react/features/base/dialog/components/native/BottomSheet.js @@ -1,4 +1,4 @@ -import React, { PureComponent, type Node } from 'react'; +import React, { type Node, PureComponent } from 'react'; import { SafeAreaView, ScrollView, View } from 'react-native'; import { SlidingView } from '../../../react'; diff --git a/react/features/base/dialog/components/web/ModalHeader.tsx b/react/features/base/dialog/components/web/ModalHeader.tsx index 824b077bb5..0e09fed8ad 100644 --- a/react/features/base/dialog/components/web/ModalHeader.tsx +++ b/react/features/base/dialog/components/web/ModalHeader.tsx @@ -5,8 +5,8 @@ import WarningIcon from '@atlaskit/icon/glyph/warning'; import { Header, Title, - titleIconWrapperStyles, - TitleText + TitleText, + titleIconWrapperStyles // @ts-ignore } from '@atlaskit/modal-dialog/dist/es2019/styled/Content'; import { Theme } from '@mui/material'; diff --git a/react/features/base/dialog/components/web/ThemedDialog.js b/react/features/base/dialog/components/web/ThemedDialog.js index dff8849224..0d82214380 100644 --- a/react/features/base/dialog/components/web/ThemedDialog.js +++ b/react/features/base/dialog/components/web/ThemedDialog.js @@ -3,12 +3,12 @@ import { Dialog, FillScreen, - dialogWidth, - dialogHeight, PositionerAbsolute, - PositionerRelative + PositionerRelative, + dialogHeight, + dialogWidth } from '@atlaskit/modal-dialog/dist/es2019/styled/Modal.js'; -import { N0, DN50 } from '@atlaskit/theme/colors'; +import { DN50, N0 } from '@atlaskit/theme/colors'; import { themed } from '@atlaskit/theme/components'; import React from 'react'; diff --git a/react/features/base/label/components/native/Label.js b/react/features/base/label/components/native/Label.js index 8a89161652..8aeeb0155e 100644 --- a/react/features/base/label/components/native/Label.js +++ b/react/features/base/label/components/native/Label.js @@ -3,7 +3,7 @@ import React from 'react'; import { Animated, Text } from 'react-native'; import Icon from '../../../icons/components/Icon'; -import { combineStyles, type StyleType } from '../../../styles'; +import { type StyleType, combineStyles } from '../../../styles'; import AbstractLabel, { type Props as AbstractProps } from '../AbstractLabel'; diff --git a/react/features/base/logging/actions.ts b/react/features/base/logging/actions.ts index 16dd75e29f..5cb32ee9be 100644 --- a/react/features/base/logging/actions.ts +++ b/react/features/base/logging/actions.ts @@ -1,4 +1,4 @@ -import { SET_LOG_COLLECTOR, SET_LOGGING_CONFIG } from './actionTypes'; +import { SET_LOGGING_CONFIG, SET_LOG_COLLECTOR } from './actionTypes'; /** * Stores a {@code Logger.LogCollector} instance which will be uploading logs diff --git a/react/features/base/logging/reducer.ts b/react/features/base/logging/reducer.ts index 32b7a2f218..c6942ca1ca 100644 --- a/react/features/base/logging/reducer.ts +++ b/react/features/base/logging/reducer.ts @@ -3,7 +3,7 @@ import _ from 'lodash'; import ReducerRegistry from '../redux/ReducerRegistry'; import { equals, set } from '../redux/functions'; -import { SET_LOG_COLLECTOR, SET_LOGGING_CONFIG } from './actionTypes'; +import { SET_LOGGING_CONFIG, SET_LOG_COLLECTOR } from './actionTypes'; const DEFAULT_LOGGING_CONFIG = { // default log level for the app and lib-jitsi-meet diff --git a/react/features/base/media/actions.ts b/react/features/base/media/actions.ts index 76dfc38fc1..18a08f640a 100644 --- a/react/features/base/media/actions.ts +++ b/react/features/base/media/actions.ts @@ -5,8 +5,8 @@ import { shouldShowModeratedNotification } from '../../av-moderation/functions'; import { isModerationNotificationDisplayed } from '../../notifications/functions'; import { - SET_AUDIO_MUTED, SET_AUDIO_AVAILABLE, + SET_AUDIO_MUTED, SET_AUDIO_UNMUTE_PERMISSIONS, SET_CAMERA_FACING_MODE, SET_SCREENSHARE_MUTED, diff --git a/react/features/base/media/middleware.any.js b/react/features/base/media/middleware.any.js index 42348c542a..48c61c7193 100644 --- a/react/features/base/media/middleware.any.js +++ b/react/features/base/media/middleware.any.js @@ -15,17 +15,17 @@ import { import { isForceMuted } from '../../participants-pane/functions'; import { isScreenMediaShared } from '../../screen-share/functions'; import { SET_AUDIO_ONLY, setAudioOnly } from '../audio-only'; -import { isRoomValid, SET_ROOM } from '../conference'; +import { SET_ROOM, isRoomValid } from '../conference'; import { getMultipleVideoSendingSupportFeatureFlag } from '../config'; import { getLocalParticipant } from '../participants'; import { MiddlewareRegistry } from '../redux'; import { getPropertyValue } from '../settings'; import { + TRACK_ADDED, destroyLocalTracks, isLocalTrackMuted, isLocalVideoTrackDesktop, - setTrackMuted, - TRACK_ADDED + setTrackMuted } from '../tracks'; import { diff --git a/react/features/base/participants/actions.ts b/react/features/base/participants/actions.ts index 8357734e72..f2975fdff9 100644 --- a/react/features/base/participants/actions.ts +++ b/react/features/base/participants/actions.ts @@ -5,15 +5,15 @@ import { set } from '../redux/functions'; import { DOMINANT_SPEAKER_CHANGED, + GRANT_MODERATOR, HIDDEN_PARTICIPANT_JOINED, HIDDEN_PARTICIPANT_LEFT, - GRANT_MODERATOR, KICK_PARTICIPANT, LOCAL_PARTICIPANT_AUDIO_LEVEL_CHANGED, LOCAL_PARTICIPANT_RAISE_HAND, MUTE_REMOTE_PARTICIPANT, - OVERWRITE_PARTICIPANT_NAME, OVERWRITE_PARTICIPANTS_NAMES, + OVERWRITE_PARTICIPANT_NAME, PARTICIPANT_ID_CHANGED, PARTICIPANT_JOINED, PARTICIPANT_KICKED, @@ -30,10 +30,10 @@ import { } from './constants'; import { getLocalParticipant, - getVirtualScreenshareParticipantOwnerId, getNormalizedDisplayName, + getParticipantById, getParticipantDisplayName, - getParticipantById + getVirtualScreenshareParticipantOwnerId } from './functions'; import logger from './logger'; import { Participant } from './types'; diff --git a/react/features/base/participants/components/ParticipantView.native.js b/react/features/base/participants/components/ParticipantView.native.js index b4731e5cb9..4989e80e92 100644 --- a/react/features/base/participants/components/ParticipantView.native.js +++ b/react/features/base/participants/components/ParticipantView.native.js @@ -12,7 +12,7 @@ import { Container, TintedView } from '../../react'; import { connect } from '../../redux'; import { TestHint } from '../../testing/components'; import { getVideoTrackByParticipant } from '../../tracks'; -import { shouldRenderParticipantVideo, getParticipantById } from '../functions'; +import { getParticipantById, shouldRenderParticipantVideo } from '../functions'; import styles from './styles'; diff --git a/react/features/base/popover/components/Popover.web.js b/react/features/base/popover/components/Popover.web.js index 333ceed21d..2990c268d2 100644 --- a/react/features/base/popover/components/Popover.web.js +++ b/react/features/base/popover/components/Popover.web.js @@ -1,7 +1,7 @@ /* @flow */ import React, { Component } from 'react'; -import { Drawer, JitsiPortal, DialogPortal } from '../../../toolbox/components/web'; +import { DialogPortal, Drawer, JitsiPortal } from '../../../toolbox/components/web'; import { isMobileBrowser } from '../../environment/utils'; import { connect } from '../../redux'; import { getContextMenuStyle } from '../functions.web'; diff --git a/react/features/base/react/components/native/SectionList.js b/react/features/base/react/components/native/SectionList.js index 6305cba06b..d3ad2c054d 100644 --- a/react/features/base/react/components/native/SectionList.js +++ b/react/features/base/react/components/native/SectionList.js @@ -2,8 +2,8 @@ import React, { Component } from 'react'; import { - SafeAreaView, - SectionList as ReactNativeSectionList + SectionList as ReactNativeSectionList, + SafeAreaView } from 'react-native'; import type { Section } from '../../Types'; diff --git a/react/features/base/react/components/native/SlidingView.js b/react/features/base/react/components/native/SlidingView.js index c2aae951da..a4e1a33030 100644 --- a/react/features/base/react/components/native/SlidingView.js +++ b/react/features/base/react/components/native/SlidingView.js @@ -1,6 +1,6 @@ // @flow -import React, { PureComponent, type Node } from 'react'; +import React, { type Node, PureComponent } from 'react'; import { Animated, BackHandler, diff --git a/react/features/base/redux/MiddlewareRegistry.ts b/react/features/base/redux/MiddlewareRegistry.ts index cb107e0fdf..a67df7af67 100644 --- a/react/features/base/redux/MiddlewareRegistry.ts +++ b/react/features/base/redux/MiddlewareRegistry.ts @@ -1,4 +1,4 @@ -import { applyMiddleware, Middleware } from 'redux'; +import { Middleware, applyMiddleware } from 'redux'; import { IState, IStore } from '../../app/types'; diff --git a/react/features/base/sounds/actions.ts b/react/features/base/sounds/actions.ts index 47e73a5e54..7967fbc386 100644 --- a/react/features/base/sounds/actions.ts +++ b/react/features/base/sounds/actions.ts @@ -4,12 +4,12 @@ import { Sounds } from '../config/configType'; import type { AudioElement } from '../media'; import { - _ADD_AUDIO_ELEMENT, - _REMOVE_AUDIO_ELEMENT, PLAY_SOUND, REGISTER_SOUND, STOP_SOUND, - UNREGISTER_SOUND + UNREGISTER_SOUND, + _ADD_AUDIO_ELEMENT, + _REMOVE_AUDIO_ELEMENT } from './actionTypes'; // @ts-ignore import { getSoundsPath } from './functions'; diff --git a/react/features/base/sounds/reducer.ts b/react/features/base/sounds/reducer.ts index 3e57a5b425..16c59d96b8 100644 --- a/react/features/base/sounds/reducer.ts +++ b/react/features/base/sounds/reducer.ts @@ -5,10 +5,10 @@ import ReducerRegistry from '../redux/ReducerRegistry'; import { assign } from '../redux/functions'; import { - _ADD_AUDIO_ELEMENT, - _REMOVE_AUDIO_ELEMENT, REGISTER_SOUND, - UNREGISTER_SOUND + UNREGISTER_SOUND, + _ADD_AUDIO_ELEMENT, + _REMOVE_AUDIO_ELEMENT } from './actionTypes'; // @ts-ignore import logger from './logger'; diff --git a/react/features/base/tracks/actions.ts b/react/features/base/tracks/actions.ts index 534ade0ad8..9c038fbf8e 100644 --- a/react/features/base/tracks/actions.ts +++ b/react/features/base/tracks/actions.ts @@ -13,11 +13,11 @@ import { createLocalTrack } from '../lib-jitsi-meet/functions'; import { setAudioMuted, setScreenshareMuted, setVideoMuted } from '../media/actions'; import { CAMERA_FACING_MODE, - MediaType, MEDIA_TYPE, - VideoType, + MediaType, VIDEO_MUTISM_AUTHORITY, - VIDEO_TYPE + VIDEO_TYPE, + VideoType } from '../media/constants'; import { getLocalParticipant } from '../participants/functions'; import { updateSettings } from '../settings/actions'; diff --git a/react/features/base/tracks/functions.ts b/react/features/base/tracks/functions.ts index b24b141342..734bbfa3db 100644 --- a/react/features/base/tracks/functions.ts +++ b/react/features/base/tracks/functions.ts @@ -7,7 +7,7 @@ import { import { isMobileBrowser } from '../environment/utils'; import JitsiMeetJS, { JitsiTrackErrors, browser } from '../lib-jitsi-meet'; import { setAudioMuted } from '../media/actions'; -import { MediaType, MEDIA_TYPE, VIDEO_TYPE } from '../media/constants'; +import { MEDIA_TYPE, MediaType, VIDEO_TYPE } from '../media/constants'; import { getParticipantByIdOrUndefined, getVirtualScreenshareParticipantOwnerId } from '../participants/functions'; import { Participant } from '../participants/types'; import { toState } from '../redux/functions'; diff --git a/react/features/base/tracks/middleware.ts b/react/features/base/tracks/middleware.ts index 1113c2afe8..07d288482f 100644 --- a/react/features/base/tracks/middleware.ts +++ b/react/features/base/tracks/middleware.ts @@ -10,18 +10,18 @@ import { getAvailableDevices } from '../devices/actions'; import { SET_AUDIO_MUTED, SET_CAMERA_FACING_MODE, + SET_SCREENSHARE_MUTED, SET_VIDEO_MUTED, - TOGGLE_CAMERA_FACING_MODE, - SET_SCREENSHARE_MUTED + TOGGLE_CAMERA_FACING_MODE } from '../media/actionTypes'; -import { toggleCameraFacingMode, setScreenshareMuted } from '../media/actions'; +import { setScreenshareMuted, toggleCameraFacingMode } from '../media/actions'; import { CAMERA_FACING_MODE, MEDIA_TYPE, - VIDEO_MUTISM_AUTHORITY, - VIDEO_TYPE, + MediaType, SCREENSHARE_MUTISM_AUTHORITY, - MediaType + VIDEO_MUTISM_AUTHORITY, + VIDEO_TYPE } from '../media/constants'; import MiddlewareRegistry from '../redux/MiddlewareRegistry'; import StateListenerRegistry from '../redux/StateListenerRegistry'; @@ -40,8 +40,8 @@ import { showNoDataFromSourceVideoError, toggleScreensharing, trackMuteUnmuteFailed, - trackRemoved, - trackNoDataFromSourceNotificationInfoChanged + trackNoDataFromSourceNotificationInfoChanged, + trackRemoved } from './actions'; import { getLocalTrack, diff --git a/react/features/base/tracks/reducer.ts b/react/features/base/tracks/reducer.ts index 1bcdb53895..6f5c9533c4 100644 --- a/react/features/base/tracks/reducer.ts +++ b/react/features/base/tracks/reducer.ts @@ -10,8 +10,8 @@ import { TRACK_CREATE_ERROR, TRACK_NO_DATA_FROM_SOURCE, TRACK_REMOVED, - TRACK_UPDATE_LAST_VIDEO_MEDIA_EVENT, TRACK_UPDATED, + TRACK_UPDATE_LAST_VIDEO_MEDIA_EVENT, TRACK_WILL_CREATE } from './actionTypes'; diff --git a/react/features/base/ui/components/BaseTheme.native.ts b/react/features/base/ui/components/BaseTheme.native.ts index 0975553100..702c221328 100644 --- a/react/features/base/ui/components/BaseTheme.native.ts +++ b/react/features/base/ui/components/BaseTheme.native.ts @@ -1,4 +1,4 @@ -import { font, colors, colorMap, spacing, shape, typography } from '../Tokens'; +import { colorMap, colors, font, shape, spacing, typography } from '../Tokens'; import { createNativeTheme } from '../functions.native'; import updateTheme from './updateTheme.native'; diff --git a/react/features/base/ui/components/BaseTheme.web.ts b/react/features/base/ui/components/BaseTheme.web.ts index 69cfaa0f14..b83b77d593 100644 --- a/react/features/base/ui/components/BaseTheme.web.ts +++ b/react/features/base/ui/components/BaseTheme.web.ts @@ -1,4 +1,4 @@ -import { font, colors, colorMap, spacing, shape, typography, breakpoints } from '../Tokens'; +import { breakpoints, colorMap, colors, font, shape, spacing, typography } from '../Tokens'; import { createWebTheme } from '../functions.web'; export default createWebTheme({ diff --git a/react/features/base/ui/components/JitsiThemeProvider.web.tsx b/react/features/base/ui/components/JitsiThemeProvider.web.tsx index 405ba41aa7..553e7d0f91 100644 --- a/react/features/base/ui/components/JitsiThemeProvider.web.tsx +++ b/react/features/base/ui/components/JitsiThemeProvider.web.tsx @@ -1,4 +1,4 @@ -import { ThemeProvider, StyledEngineProvider } from '@mui/material/styles'; +import { StyledEngineProvider, ThemeProvider } from '@mui/material/styles'; import * as React from 'react'; import { connect } from 'react-redux'; diff --git a/react/features/base/ui/functions.web.ts b/react/features/base/ui/functions.web.ts index 17907c4a69..40b1fcf9ba 100644 --- a/react/features/base/ui/functions.web.ts +++ b/react/features/base/ui/functions.web.ts @@ -1,4 +1,4 @@ -import { createTheme, adaptV4Theme } from '@mui/material/styles'; +import { adaptV4Theme, createTheme } from '@mui/material/styles'; import { Palette as Palette1, Typography } from '../ui/types'; diff --git a/react/features/breakout-rooms/reducer.ts b/react/features/breakout-rooms/reducer.ts index 0078ddded3..5412c28b79 100644 --- a/react/features/breakout-rooms/reducer.ts +++ b/react/features/breakout-rooms/reducer.ts @@ -1,9 +1,9 @@ import ReducerRegistry from '../base/redux/ReducerRegistry'; import { + UPDATE_BREAKOUT_ROOMS, _RESET_BREAKOUT_ROOMS, - _UPDATE_ROOM_COUNTER, - UPDATE_BREAKOUT_ROOMS + _UPDATE_ROOM_COUNTER } from './actionTypes'; import { FEATURE_KEY } from './constants'; import { IRooms } from './types'; diff --git a/react/features/calendar-sync/components/CalendarList.web.js b/react/features/calendar-sync/components/CalendarList.web.js index 54a7f3d2d7..094ed610a4 100644 --- a/react/features/calendar-sync/components/CalendarList.web.js +++ b/react/features/calendar-sync/components/CalendarList.web.js @@ -11,7 +11,7 @@ import { translate } from '../../base/i18n'; import { Icon, IconPlusCalendar } from '../../base/icons'; import { AbstractPage } from '../../base/react'; import { connect } from '../../base/redux'; -import { openSettingsDialog, SETTINGS_TABS } from '../../settings'; +import { SETTINGS_TABS, openSettingsDialog } from '../../settings'; import { refreshCalendar } from '../actions'; import { ERRORS } from '../constants'; diff --git a/react/features/calendar-sync/components/CalendarListContent.native.js b/react/features/calendar-sync/components/CalendarListContent.native.js index 1f6f696471..9be588e43f 100644 --- a/react/features/calendar-sync/components/CalendarListContent.native.js +++ b/react/features/calendar-sync/components/CalendarListContent.native.js @@ -11,7 +11,7 @@ import { appNavigate } from '../../app/actions'; import { getLocalizedDateFormatter, translate } from '../../base/i18n'; import { NavigateSectionList } from '../../base/react'; import { connect } from '../../base/redux'; -import { refreshCalendar, openUpdateCalendarEventDialog } from '../actions'; +import { openUpdateCalendarEventDialog, refreshCalendar } from '../actions'; /** diff --git a/react/features/calendar-sync/middleware.js b/react/features/calendar-sync/middleware.js index 5804269bb0..0eb64fefbc 100644 --- a/react/features/calendar-sync/middleware.js +++ b/react/features/calendar-sync/middleware.js @@ -2,7 +2,7 @@ import { SET_CONFIG } from '../base/config'; import { ADD_KNOWN_DOMAINS } from '../base/known-domains'; -import { equals, MiddlewareRegistry } from '../base/redux'; +import { MiddlewareRegistry, equals } from '../base/redux'; import { APP_STATE_CHANGED } from '../mobile/background/actionTypes'; import { REFRESH_CALENDAR } from './actionTypes'; diff --git a/react/features/calendar-sync/reducer.tsx b/react/features/calendar-sync/reducer.tsx index 73ed217ad7..483eae7597 100644 --- a/react/features/calendar-sync/reducer.tsx +++ b/react/features/calendar-sync/reducer.tsx @@ -4,8 +4,8 @@ import { set } from '../base/redux/functions'; import { CLEAR_CALENDAR_INTEGRATION, - SET_CALENDAR_AUTH_STATE, SET_CALENDAR_AUTHORIZATION, + SET_CALENDAR_AUTH_STATE, SET_CALENDAR_ERROR, SET_CALENDAR_EVENTS, SET_CALENDAR_INTEGRATION, diff --git a/react/features/chat/actions.any.ts b/react/features/chat/actions.any.ts index 15d3485d0a..042c068170 100644 --- a/react/features/chat/actions.any.ts +++ b/react/features/chat/actions.any.ts @@ -9,12 +9,12 @@ import { CLEAR_MESSAGES, CLOSE_CHAT, EDIT_MESSAGE, + REMOVE_LOBBY_CHAT_PARTICIPANT, SEND_MESSAGE, - SET_PRIVATE_MESSAGE_RECIPIENT, SET_IS_POLL_TAB_FOCUSED, + SET_LOBBY_CHAT_ACTIVE_STATE, SET_LOBBY_CHAT_RECIPIENT, - REMOVE_LOBBY_CHAT_PARTICIPANT, - SET_LOBBY_CHAT_ACTIVE_STATE + SET_PRIVATE_MESSAGE_RECIPIENT } from './actionTypes'; /** diff --git a/react/features/chat/components/native/Chat.js b/react/features/chat/components/native/Chat.js index 6746346f04..68297702ed 100644 --- a/react/features/chat/components/native/Chat.js +++ b/react/features/chat/components/native/Chat.js @@ -8,8 +8,8 @@ import JitsiScreen from '../../../base/modal/components/JitsiScreen'; import { connect } from '../../../base/redux'; import { closeChat } from '../../actions.any'; import AbstractChat, { - _mapStateToProps, - type Props as AbstractProps + type Props as AbstractProps, + _mapStateToProps } from '../AbstractChat'; import ChatInputBar from './ChatInputBar'; diff --git a/react/features/chat/components/native/MessageRecipient.js b/react/features/chat/components/native/MessageRecipient.js index ccf74a1a6a..fb1e9fd1e9 100644 --- a/react/features/chat/components/native/MessageRecipient.js +++ b/react/features/chat/components/native/MessageRecipient.js @@ -11,7 +11,7 @@ import { type StyleType } from '../../../base/styles'; import { setParams } from '../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef'; -import { setPrivateMessageRecipient, setLobbyChatActiveState } from '../../actions.any'; +import { setLobbyChatActiveState, setPrivateMessageRecipient } from '../../actions.any'; import AbstractMessageRecipient, { type Props as AbstractProps } from '../AbstractMessageRecipient'; diff --git a/react/features/chat/components/web/Chat.js b/react/features/chat/components/web/Chat.js index 3646a27600..8f61220c8e 100644 --- a/react/features/chat/components/web/Chat.js +++ b/react/features/chat/components/web/Chat.js @@ -10,8 +10,8 @@ import { PollsPane } from '../../../polls/components'; import { toggleChat } from '../../actions.web'; import { CHAT_TABS } from '../../constants'; import AbstractChat, { - _mapStateToProps, - type Props + type Props, + _mapStateToProps } from '../AbstractChat'; import ChatHeader from './ChatHeader'; diff --git a/react/features/chat/components/web/MessageRecipient.js b/react/features/chat/components/web/MessageRecipient.js index d5ae104747..391cde4ce1 100644 --- a/react/features/chat/components/web/MessageRecipient.js +++ b/react/features/chat/components/web/MessageRecipient.js @@ -6,9 +6,9 @@ import { translate } from '../../../base/i18n'; import { Icon, IconCancelSelection } from '../../../base/icons'; import { connect } from '../../../base/redux'; import AbstractMessageRecipient, { + type Props, _mapDispatchToProps, - _mapStateToProps, - type Props + _mapStateToProps } from '../AbstractMessageRecipient'; /** diff --git a/react/features/chat/components/web/PrivateMessageButton.js b/react/features/chat/components/web/PrivateMessageButton.js index 73ef2609d8..b529b07d63 100644 --- a/react/features/chat/components/web/PrivateMessageButton.js +++ b/react/features/chat/components/web/PrivateMessageButton.js @@ -6,7 +6,7 @@ import { IconMessage, IconReply } from '../../../base/icons'; import { getParticipantById } from '../../../base/participants'; import { connect } from '../../../base/redux'; import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components'; -import { openChat, handleLobbyChatInitialized } from '../../actions'; +import { handleLobbyChatInitialized, openChat } from '../../actions'; export type Props = AbstractButtonProps & { diff --git a/react/features/chat/middleware.js b/react/features/chat/middleware.js index ddf81b30e5..c4df0d58e9 100644 --- a/react/features/chat/middleware.js +++ b/react/features/chat/middleware.js @@ -33,7 +33,7 @@ import { } from '../toolbox/actions'; -import { ADD_MESSAGE, SEND_MESSAGE, OPEN_CHAT, CLOSE_CHAT, SET_IS_POLL_TAB_FOCUSED } from './actionTypes'; +import { ADD_MESSAGE, CLOSE_CHAT, OPEN_CHAT, SEND_MESSAGE, SET_IS_POLL_TAB_FOCUSED } from './actionTypes'; import { addMessage, clearMessages } from './actions'; import { closeChat } from './actions.any'; import { ChatPrivacyDialog } from './components'; diff --git a/react/features/chat/reducer.ts b/react/features/chat/reducer.ts index f0e5511e0c..9c5bc5bac4 100644 --- a/react/features/chat/reducer.ts +++ b/react/features/chat/reducer.ts @@ -9,11 +9,11 @@ import { CLOSE_CHAT, EDIT_MESSAGE, OPEN_CHAT, - SET_PRIVATE_MESSAGE_RECIPIENT, + REMOVE_LOBBY_CHAT_PARTICIPANT, SET_IS_POLL_TAB_FOCUSED, - SET_LOBBY_CHAT_RECIPIENT, SET_LOBBY_CHAT_ACTIVE_STATE, - REMOVE_LOBBY_CHAT_PARTICIPANT + SET_LOBBY_CHAT_RECIPIENT, + SET_PRIVATE_MESSAGE_RECIPIENT } from './actionTypes'; const DEFAULT_STATE = { diff --git a/react/features/conference/components/native/AlwaysOnLabels.js b/react/features/conference/components/native/AlwaysOnLabels.js index 9df9574b31..a040c8bf6b 100644 --- a/react/features/conference/components/native/AlwaysOnLabels.js +++ b/react/features/conference/components/native/AlwaysOnLabels.js @@ -11,10 +11,10 @@ import HighlightButton from '../../../recording/components/Recording/native/High import RaisedHandsCountLabel from './RaisedHandsCountLabel'; import { - LabelHitSlop, LABEL_ID_RAISED_HANDS_COUNT, LABEL_ID_RECORDING, - LABEL_ID_STREAMING + LABEL_ID_STREAMING, + LabelHitSlop } from './constants'; type Props = { diff --git a/react/features/conference/components/native/Conference.js b/react/features/conference/components/native/Conference.js index f999e5993b..4ed84fdf9d 100644 --- a/react/features/conference/components/native/Conference.js +++ b/react/features/conference/components/native/Conference.js @@ -6,7 +6,7 @@ import { BackHandler, NativeModules, SafeAreaView, StatusBar, View } from 'react import { withSafeAreaInsets } from 'react-native-safe-area-context'; import { appNavigate } from '../../../app/actions'; -import { PIP_ENABLED, FULLSCREEN_ENABLED, getFeatureFlag } from '../../../base/flags'; +import { FULLSCREEN_ENABLED, PIP_ENABLED, getFeatureFlag } from '../../../base/flags'; import { getParticipantCount } from '../../../base/participants'; import { Container, LoadingIndicator, TintedView } from '../../../base/react'; import { connect } from '../../../base/redux'; @@ -18,8 +18,8 @@ import { BrandingImageBackground } from '../../../dynamic-branding'; import { FILMSTRIP_SIZE, Filmstrip, - isFilmstripVisible, - TileView + TileView, + isFilmstripVisible } from '../../../filmstrip'; import { CalleeInfoContainer } from '../../../invite'; import { LargeVideo } from '../../../large-video'; diff --git a/react/features/conference/components/native/InsecureRoomNameExpandedLabel.js b/react/features/conference/components/native/InsecureRoomNameExpandedLabel.js index 0c9f63c16e..b6433cf496 100644 --- a/react/features/conference/components/native/InsecureRoomNameExpandedLabel.js +++ b/react/features/conference/components/native/InsecureRoomNameExpandedLabel.js @@ -1,7 +1,7 @@ // @flow import { translate } from '../../../base/i18n'; -import { ExpandedLabel, type Props as AbstractProps } from '../../../base/label'; +import { type Props as AbstractProps, ExpandedLabel } from '../../../base/label'; import { INSECURE_ROOM_NAME_LABEL_COLOR } from './styles'; diff --git a/react/features/conference/components/native/Labels.js b/react/features/conference/components/native/Labels.js index b598f328f6..408cd0e450 100644 --- a/react/features/conference/components/native/Labels.js +++ b/react/features/conference/components/native/Labels.js @@ -6,7 +6,7 @@ import { TouchableOpacity, View } from 'react-native'; import { TranscribingLabel } from '../../../transcribing'; import { VideoQualityLabel } from '../../../video-quality'; -import { LabelHitSlop, LABEL_ID_INSECURE_ROOM_NAME, LABEL_ID_QUALITY, LABEL_ID_TRANSCRIBING } from './constants'; +import { LABEL_ID_INSECURE_ROOM_NAME, LABEL_ID_QUALITY, LABEL_ID_TRANSCRIBING, LabelHitSlop } from './constants'; import styles from './styles'; import { InsecureRoomNameLabel } from './'; diff --git a/react/features/conference/components/native/LonelyMeetingExperience.js b/react/features/conference/components/native/LonelyMeetingExperience.js index b2f1a2d07d..64722ec79b 100644 --- a/react/features/conference/components/native/LonelyMeetingExperience.js +++ b/react/features/conference/components/native/LonelyMeetingExperience.js @@ -1,7 +1,7 @@ import React, { PureComponent } from 'react'; import { Text, View } from 'react-native'; -import { getFeatureFlag, INVITE_ENABLED } from '../../../base/flags'; +import { INVITE_ENABLED, getFeatureFlag } from '../../../base/flags'; import { translate } from '../../../base/i18n'; import { Icon, IconAddPeople } from '../../../base/icons'; import { getParticipantCountWithFake } from '../../../base/participants'; diff --git a/react/features/conference/components/native/RaisedHandsCountExpandedLabel.js b/react/features/conference/components/native/RaisedHandsCountExpandedLabel.js index 7d1ef68b69..c22a4f150a 100644 --- a/react/features/conference/components/native/RaisedHandsCountExpandedLabel.js +++ b/react/features/conference/components/native/RaisedHandsCountExpandedLabel.js @@ -1,7 +1,7 @@ // @flow import { translate } from '../../../base/i18n'; -import { ExpandedLabel, type Props as AbstractProps } from '../../../base/label'; +import { type Props as AbstractProps, ExpandedLabel } from '../../../base/label'; type Props = AbstractProps & { t: Function diff --git a/react/features/conference/components/native/TitleBar.js b/react/features/conference/components/native/TitleBar.js index 9230424916..a64c0b63ba 100644 --- a/react/features/conference/components/native/TitleBar.js +++ b/react/features/conference/components/native/TitleBar.js @@ -4,7 +4,7 @@ import React from 'react'; import { Text, View } from 'react-native'; import { getConferenceName, getConferenceTimestamp } from '../../../base/conference/functions'; -import { getFeatureFlag, CONFERENCE_TIMER_ENABLED, MEETING_NAME_ENABLED } from '../../../base/flags'; +import { CONFERENCE_TIMER_ENABLED, MEETING_NAME_ENABLED, getFeatureFlag } from '../../../base/flags'; import { connect } from '../../../base/redux'; import InviteButton from '../../../invite/components/add-people-dialog/native/InviteButton'; import AudioDeviceToggleButton from '../../../mobile/audio-mode/components/AudioDeviceToggleButton'; diff --git a/react/features/conference/components/native/carmode/MicrophoneButton.tsx b/react/features/conference/components/native/carmode/MicrophoneButton.tsx index 248f519bfc..d5644a67f1 100644 --- a/react/features/conference/components/native/carmode/MicrophoneButton.tsx +++ b/react/features/conference/components/native/carmode/MicrophoneButton.tsx @@ -1,17 +1,17 @@ /* eslint-disable lines-around-comment */ import React, { useCallback, useState } from 'react'; -import { View, TouchableOpacity } from 'react-native'; +import { TouchableOpacity, View } from 'react-native'; import { useDispatch, useSelector } from 'react-redux'; import { - createShortcutEvent, ACTION_SHORTCUT_PRESSED as PRESSED, - ACTION_SHORTCUT_RELEASED as RELEASED + ACTION_SHORTCUT_RELEASED as RELEASED, + createShortcutEvent } from '../../../../analytics/AnalyticsEvents'; import { sendAnalytics } from '../../../../analytics/functions'; import { IState } from '../../../../app/types'; // @ts-ignore -import { getFeatureFlag, AUDIO_MUTE_BUTTON_ENABLED } from '../../../../base/flags'; +import { AUDIO_MUTE_BUTTON_ENABLED, getFeatureFlag } from '../../../../base/flags'; import Icon from '../../../../base/icons/components/Icon'; import { IconMicrophone, IconMicrophoneEmptySlash } from '../../../../base/icons/svg'; import { MEDIA_TYPE } from '../../../../base/media/constants'; diff --git a/react/features/conference/components/native/carmode/TitleBar.tsx b/react/features/conference/components/native/carmode/TitleBar.tsx index 3970beaa65..ed38072adc 100644 --- a/react/features/conference/components/native/carmode/TitleBar.tsx +++ b/react/features/conference/components/native/carmode/TitleBar.tsx @@ -7,7 +7,7 @@ import { IState } from '../../../../app/types'; // @ts-ignore import { getConferenceName } from '../../../../base/conference/functions'; // @ts-ignore -import { getFeatureFlag, MEETING_NAME_ENABLED } from '../../../../base/flags'; +import { MEETING_NAME_ENABLED, getFeatureFlag } from '../../../../base/flags'; // @ts-ignore import { JitsiRecordingConstants } from '../../../../base/lib-jitsi-meet'; import { getLocalParticipant } from '../../../../base/participants/functions'; diff --git a/react/features/conference/components/web/Conference.js b/react/features/conference/components/web/Conference.js index 450856447d..07c5b591da 100644 --- a/react/features/conference/components/web/Conference.js +++ b/react/features/conference/components/web/Conference.js @@ -11,7 +11,7 @@ import { translate } from '../../../base/i18n'; import { connect as reactReduxConnect } from '../../../base/redux'; import { setColorAlpha } from '../../../base/util'; import { Chat } from '../../../chat'; -import { MainFilmstrip, StageFilmstrip, ScreenshareFilmstrip } from '../../../filmstrip'; +import { MainFilmstrip, ScreenshareFilmstrip, StageFilmstrip } from '../../../filmstrip'; import { CalleeInfoContainer } from '../../../invite'; import { LargeVideo } from '../../../large-video'; import { LobbyScreen } from '../../../lobby'; diff --git a/react/features/connection-indicator/components/web/ConnectionIndicator.tsx b/react/features/connection-indicator/components/web/ConnectionIndicator.tsx index c8dfd63717..4f121b150e 100644 --- a/react/features/connection-indicator/components/web/ConnectionIndicator.tsx +++ b/react/features/connection-indicator/components/web/ConnectionIndicator.tsx @@ -17,9 +17,11 @@ import { getLocalParticipant, getParticipantById } from '../../../base/participa // @ts-ignore import { Popover } from '../../../base/popover'; import { - getVirtualScreenshareParticipantTrack, - getSourceNameByParticipantId, // @ts-ignore - getTrackByMediaTypeAndParticipant } from '../../../base/tracks'; + getSourceNameByParticipantId, + getTrackByMediaTypeAndParticipant, + getVirtualScreenshareParticipantTrack + // @ts-ignore +} from '../../../base/tracks'; import { isParticipantConnectionStatusInactive, isParticipantConnectionStatusInterrupted, @@ -27,9 +29,9 @@ import { isTrackStreamingStatusInterrupted } from '../../functions'; import AbstractConnectionIndicator, { - INDICATOR_DISPLAY_THRESHOLD, type Props as AbstractProps, - type State as AbstractState + type State as AbstractState, + INDICATOR_DISPLAY_THRESHOLD // @ts-ignore } from '../AbstractConnectionIndicator'; diff --git a/react/features/connection-indicator/components/web/ConnectionIndicatorContent.js b/react/features/connection-indicator/components/web/ConnectionIndicatorContent.js index eb125af42a..2cd4fae709 100644 --- a/react/features/connection-indicator/components/web/ConnectionIndicatorContent.js +++ b/react/features/connection-indicator/components/web/ConnectionIndicatorContent.js @@ -18,9 +18,9 @@ import { isTrackStreamingStatusInterrupted } from '../../functions'; import AbstractConnectionIndicator, { - INDICATOR_DISPLAY_THRESHOLD, type Props as AbstractProps, - type State as AbstractState + type State as AbstractState, + INDICATOR_DISPLAY_THRESHOLD } from '../AbstractConnectionIndicator'; /** diff --git a/react/features/deep-linking/components/DeepLinkingDesktopPage.web.js b/react/features/deep-linking/components/DeepLinkingDesktopPage.web.js index 87e8e98c98..17c05371a1 100644 --- a/react/features/deep-linking/components/DeepLinkingDesktopPage.web.js +++ b/react/features/deep-linking/components/DeepLinkingDesktopPage.web.js @@ -11,8 +11,8 @@ import { connect } from '../../base/redux'; import { Button } from '../../base/ui/components/web'; import { BUTTON_TYPES } from '../../base/ui/constants'; import { - openWebApp, - openDesktopApp + openDesktopApp, + openWebApp } from '../actions'; import { _TNS } from '../constants'; diff --git a/react/features/display-name/components/web/DisplayName.tsx b/react/features/display-name/components/web/DisplayName.tsx index dfaa9df396..a5844e8f17 100644 --- a/react/features/display-name/components/web/DisplayName.tsx +++ b/react/features/display-name/components/web/DisplayName.tsx @@ -9,8 +9,8 @@ import type { Dispatch } from 'redux'; import { IState } from '../../../app/types'; import { translate } from '../../../base/i18n/functions'; import { - getParticipantDisplayName, - getParticipantById + getParticipantById, + getParticipantDisplayName } from '../../../base/participants/functions'; // @ts-ignore import { updateSettings } from '../../../base/settings'; diff --git a/react/features/dynamic-branding/functions.web.ts b/react/features/dynamic-branding/functions.web.ts index 173e050d39..0701d09121 100644 --- a/react/features/dynamic-branding/functions.web.ts +++ b/react/features/dynamic-branding/functions.web.ts @@ -1,7 +1,7 @@ import { Theme } from '@mui/material'; -import { createTheme, adaptV4Theme } from '@mui/material/styles'; +import { adaptV4Theme, createTheme } from '@mui/material/styles'; -import { font, colors, colorMap, spacing, shape, typography, breakpoints } from '../base/ui/Tokens'; +import { breakpoints, colorMap, colors, font, shape, spacing, typography } from '../base/ui/Tokens'; import { createColorTokens } from '../base/ui/utils'; /** diff --git a/react/features/e2ee/components/E2EELabel.js b/react/features/e2ee/components/E2EELabel.js index 744f1e00ad..f3c80e7eef 100644 --- a/react/features/e2ee/components/E2EELabel.js +++ b/react/features/e2ee/components/E2EELabel.js @@ -9,7 +9,7 @@ import { COLORS } from '../../base/label/constants'; import { connect } from '../../base/redux'; import { Tooltip } from '../../base/tooltip'; -import { _mapStateToProps, type Props } from './AbstractE2EELabel'; +import { type Props, _mapStateToProps } from './AbstractE2EELabel'; /** diff --git a/react/features/e2ee/middleware.js b/react/features/e2ee/middleware.js index 21e7dd78b1..60ca6cef30 100644 --- a/react/features/e2ee/middleware.js +++ b/react/features/e2ee/middleware.js @@ -5,14 +5,14 @@ import { batch } from 'react-redux'; import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from '../base/app'; import { CONFERENCE_JOINED, getCurrentConference } from '../base/conference'; import { - getLocalParticipant, - getParticipantById, - getParticipantCount, PARTICIPANT_JOINED, PARTICIPANT_LEFT, PARTICIPANT_UPDATED, - participantUpdated, - getRemoteParticipants + getLocalParticipant, + getParticipantById, + getParticipantCount, + getRemoteParticipants, + participantUpdated } from '../base/participants'; import { MiddlewareRegistry, StateListenerRegistry } from '../base/redux'; import { playSound, registerSound, unregisterSound } from '../base/sounds'; diff --git a/react/features/external-api/middleware.js b/react/features/external-api/middleware.js index b099cc924e..db61335eb1 100644 --- a/react/features/external-api/middleware.js +++ b/react/features/external-api/middleware.js @@ -12,14 +12,14 @@ import { NOTIFY_CAMERA_ERROR, NOTIFY_MIC_ERROR } from '../base/devices'; import { JitsiConferenceErrors } from '../base/lib-jitsi-meet'; import { DOMINANT_SPEAKER_CHANGED, + PARTICIPANT_JOINED, PARTICIPANT_KICKED, PARTICIPANT_LEFT, - PARTICIPANT_JOINED, PARTICIPANT_ROLE_CHANGED, SET_LOADABLE_AVATAR_URL, + getDominantSpeakerParticipant, getLocalParticipant, - getParticipantById, - getDominantSpeakerParticipant + getParticipantById } from '../base/participants'; import { MiddlewareRegistry } from '../base/redux'; import { getBaseUrl } from '../base/util'; diff --git a/react/features/face-landmarks/FaceLandmarksDetector.ts b/react/features/face-landmarks/FaceLandmarksDetector.ts index f514111068..7e53544b1e 100644 --- a/react/features/face-landmarks/FaceLandmarksDetector.ts +++ b/react/features/face-landmarks/FaceLandmarksDetector.ts @@ -8,16 +8,16 @@ import { getBaseUrl } from '../base/util/helpers'; import { addFaceExpression, - faceLandmarkDetectionStopped, clearFaceExpressionBuffer, + faceLandmarkDetectionStopped, newFaceBox } from './actions'; import { DETECTION_TYPES, - INIT_WORKER, DETECT_FACE, - WEBHOOK_SEND_TIME_INTERVAL, - FACE_LANDMARK_DETECTION_ERROR_THRESHOLD + FACE_LANDMARK_DETECTION_ERROR_THRESHOLD, + INIT_WORKER, + WEBHOOK_SEND_TIME_INTERVAL } from './constants'; import { getDetectionInterval, diff --git a/react/features/face-landmarks/FaceLandmarksHelper.ts b/react/features/face-landmarks/FaceLandmarksHelper.ts index d34b85889a..8750a7ea8d 100644 --- a/react/features/face-landmarks/FaceLandmarksHelper.ts +++ b/react/features/face-landmarks/FaceLandmarksHelper.ts @@ -1,5 +1,5 @@ import { setWasmPaths } from '@tensorflow/tfjs-backend-wasm'; -import { Human, Config, FaceResult } from '@vladmandic/human'; +import { Config, FaceResult, Human } from '@vladmandic/human'; import { DETECTION_TYPES, FACE_DETECTION_SCORE_THRESHOLD, FACE_EXPRESSIONS_NAMING_MAPPING } from './constants'; import { DetectInput, DetectOutput, FaceBox, InitInput } from './types'; diff --git a/react/features/face-landmarks/actions.ts b/react/features/face-landmarks/actions.ts index b6d4fdf402..e353eac4f8 100644 --- a/react/features/face-landmarks/actions.ts +++ b/react/features/face-landmarks/actions.ts @@ -5,8 +5,8 @@ import { AnyAction } from 'redux'; import { ADD_FACE_EXPRESSION, ADD_TO_FACE_EXPRESSIONS_BUFFER, - FACE_LANDMARK_DETECTION_STOPPED, CLEAR_FACE_EXPRESSIONS_BUFFER, + FACE_LANDMARK_DETECTION_STOPPED, NEW_FACE_COORDINATES } from './actionTypes'; import { FaceBox } from './types'; diff --git a/react/features/face-landmarks/middleware.ts b/react/features/face-landmarks/middleware.ts index 186756b208..2fb9872b80 100644 --- a/react/features/face-landmarks/middleware.ts +++ b/react/features/face-landmarks/middleware.ts @@ -10,7 +10,7 @@ import { JitsiConferenceEvents } from '../base/lib-jitsi-meet'; import { getLocalParticipant, getParticipantCount } from '../base/participants/functions'; import { Participant } from '../base/participants/types'; import MiddlewareRegistry from '../base/redux/MiddlewareRegistry'; -import { TRACK_UPDATED, TRACK_ADDED, TRACK_REMOVED } from '../base/tracks/actionTypes'; +import { TRACK_ADDED, TRACK_REMOVED, TRACK_UPDATED } from '../base/tracks/actionTypes'; import FaceLandmarksDetector from './FaceLandmarksDetector'; import { ADD_FACE_EXPRESSION, NEW_FACE_COORDINATES, UPDATE_FACE_COORDINATES } from './actionTypes'; diff --git a/react/features/filmstrip/actions.web.js b/react/features/filmstrip/actions.web.js index 0d31d9a17a..29c2466dee 100644 --- a/react/features/filmstrip/actions.web.js +++ b/react/features/filmstrip/actions.web.js @@ -13,24 +13,24 @@ import { getMaxColumnCount } from '../video-layout'; import { ADD_STAGE_PARTICIPANT, + CLEAR_STAGE_PARTICIPANTS, REMOVE_STAGE_PARTICIPANT, RESIZE_FILMSTRIP, - SET_STAGE_PARTICIPANTS, + SET_FILMSTRIP_HEIGHT, SET_FILMSTRIP_WIDTH, SET_HORIZONTAL_VIEW_DIMENSIONS, + SET_SCREENSHARE_FILMSTRIP_PARTICIPANT, + SET_SCREENSHARING_TILE_DIMENSIONS, SET_STAGE_FILMSTRIP_DIMENSIONS, + SET_STAGE_PARTICIPANTS, SET_TILE_VIEW_DIMENSIONS, + SET_TOP_PANEL_VISIBILITY, + SET_USER_FILMSTRIP_HEIGHT, SET_USER_FILMSTRIP_WIDTH, SET_USER_IS_RESIZING, SET_VERTICAL_VIEW_DIMENSIONS, SET_VOLUME, - TOGGLE_PIN_STAGE_PARTICIPANT, - CLEAR_STAGE_PARTICIPANTS, - SET_SCREENSHARING_TILE_DIMENSIONS, - SET_USER_FILMSTRIP_HEIGHT, - SET_FILMSTRIP_HEIGHT, - SET_TOP_PANEL_VISIBILITY, - SET_SCREENSHARE_FILMSTRIP_PARTICIPANT + TOGGLE_PIN_STAGE_PARTICIPANT } from './actionTypes'; import { HORIZONTAL_FILMSTRIP_MARGIN, diff --git a/react/features/filmstrip/components/native/Thumbnail.js b/react/features/filmstrip/components/native/Thumbnail.js index f217b695b0..99b6063f04 100644 --- a/react/features/filmstrip/components/native/Thumbnail.js +++ b/react/features/filmstrip/components/native/Thumbnail.js @@ -10,12 +10,12 @@ import { MEDIA_TYPE, VIDEO_TYPE } from '../../../base/media'; import { PARTICIPANT_ROLE, ParticipantView, + getLocalParticipant, + getParticipantByIdOrUndefined, getParticipantCount, + hasRaisedHand, isEveryoneModerator, - pinParticipant, - getParticipantByIdOrUndefined, - getLocalParticipant, - hasRaisedHand + pinParticipant } from '../../../base/participants'; import { Container } from '../../../base/react'; import { connect } from '../../../base/redux'; diff --git a/react/features/filmstrip/components/web/Filmstrip.tsx b/react/features/filmstrip/components/web/Filmstrip.tsx index 04c0acead0..d25c4526fd 100644 --- a/react/features/filmstrip/components/web/Filmstrip.tsx +++ b/react/features/filmstrip/components/web/Filmstrip.tsx @@ -4,7 +4,7 @@ import clsx from 'clsx'; import _ from 'lodash'; import React, { PureComponent } from 'react'; import { WithTranslation } from 'react-i18next'; -import { FixedSizeList, FixedSizeGrid } from 'react-window'; +import { FixedSizeGrid, FixedSizeList } from 'react-window'; import type { Dispatch } from 'redux'; import { ACTION_SHORTCUT_TRIGGERED, createShortcutEvent, createToolbarEvent } from '../../../analytics/AnalyticsEvents'; @@ -29,10 +29,10 @@ import { getCurrentLayout } from '../../../video-layout'; import { LAYOUTS } from '../../../video-layout/constants'; import { setFilmstripVisible, + setTopPanelVisible, setUserFilmstripHeight, setUserFilmstripWidth, setUserIsResizing, - setTopPanelVisible, setVisibleRemoteParticipants // @ts-ignore } from '../../actions'; @@ -48,8 +48,8 @@ import { } from '../../constants'; import { getVerticalViewMaxWidth, - shouldRemoteVideosBeVisible, - isStageFilmstripTopPanel + isStageFilmstripTopPanel, + shouldRemoteVideosBeVisible // @ts-ignore } from '../../functions'; diff --git a/react/features/filmstrip/components/web/MainFilmstrip.js b/react/features/filmstrip/components/web/MainFilmstrip.js index 558ff347be..ac31a6683e 100644 --- a/react/features/filmstrip/components/web/MainFilmstrip.js +++ b/react/features/filmstrip/components/web/MainFilmstrip.js @@ -4,7 +4,7 @@ import React from 'react'; import { getToolbarButtons } from '../../../base/config'; import { isMobileBrowser } from '../../../base/environment/utils'; import { connect } from '../../../base/redux'; -import { getCurrentLayout, LAYOUTS } from '../../../video-layout'; +import { LAYOUTS, getCurrentLayout } from '../../../video-layout'; import { ASPECT_RATIO_BREAKPOINT, FILMSTRIP_BREAKPOINT, diff --git a/react/features/filmstrip/components/web/ScreenshareFilmstrip.js b/react/features/filmstrip/components/web/ScreenshareFilmstrip.js index 2089931ae6..9c29820b40 100644 --- a/react/features/filmstrip/components/web/ScreenshareFilmstrip.js +++ b/react/features/filmstrip/components/web/ScreenshareFilmstrip.js @@ -3,7 +3,7 @@ import React from 'react'; import { connect } from '../../../base/redux'; import { LAYOUT_CLASSNAMES } from '../../../conference/components/web/Conference'; -import { getCurrentLayout, LAYOUTS } from '../../../video-layout'; +import { LAYOUTS, getCurrentLayout } from '../../../video-layout'; import { FILMSTRIP_TYPE } from '../../constants'; diff --git a/react/features/filmstrip/components/web/StageFilmstrip.js b/react/features/filmstrip/components/web/StageFilmstrip.js index 89e47ed490..5d6daae96e 100644 --- a/react/features/filmstrip/components/web/StageFilmstrip.js +++ b/react/features/filmstrip/components/web/StageFilmstrip.js @@ -5,7 +5,7 @@ import { getToolbarButtons } from '../../../base/config'; import { isMobileBrowser } from '../../../base/environment/utils'; import { connect } from '../../../base/redux'; import { LAYOUT_CLASSNAMES } from '../../../conference/components/web/Conference'; -import { getCurrentLayout, LAYOUTS } from '../../../video-layout'; +import { LAYOUTS, getCurrentLayout } from '../../../video-layout'; import { ASPECT_RATIO_BREAKPOINT, FILMSTRIP_TYPE, diff --git a/react/features/filmstrip/components/web/StatusIndicators.js b/react/features/filmstrip/components/web/StatusIndicators.js index ed1380a3e4..251a536757 100644 --- a/react/features/filmstrip/components/web/StatusIndicators.js +++ b/react/features/filmstrip/components/web/StatusIndicators.js @@ -3,7 +3,7 @@ import React, { Component } from 'react'; import { MEDIA_TYPE } from '../../../base/media'; -import { getParticipantByIdOrUndefined, PARTICIPANT_ROLE } from '../../../base/participants'; +import { PARTICIPANT_ROLE, getParticipantByIdOrUndefined } from '../../../base/participants'; import { connect } from '../../../base/redux'; import { getVideoTrackByParticipant, diff --git a/react/features/filmstrip/components/web/Thumbnail.tsx b/react/features/filmstrip/components/web/Thumbnail.tsx index 8c669cd85a..4f00fda2a9 100644 --- a/react/features/filmstrip/components/web/Thumbnail.tsx +++ b/react/features/filmstrip/components/web/Thumbnail.tsx @@ -33,8 +33,8 @@ import { getLocalVideoTrack, getTrackByMediaTypeAndParticipant, getVirtualScreenshareParticipantTrack, - updateLastTrackVideoMediaEvent, - trackStreamingStatusChanged + trackStreamingStatusChanged, + updateLastTrackVideoMediaEvent // @ts-ignore } from '../../../base/tracks'; import { getVideoObjectPosition } from '../../../face-landmarks/functions'; @@ -62,8 +62,8 @@ import { getActiveParticipantsIds, getDisplayModeInput, getThumbnailTypeFromLayout, - isVideoPlayable, isStageFilmstripAvailable, + isVideoPlayable, showGridInVerticalView // @ts-ignore } from '../../functions'; diff --git a/react/features/filmstrip/components/web/ThumbnailWrapper.js b/react/features/filmstrip/components/web/ThumbnailWrapper.js index 8157346ca4..48cc923696 100644 --- a/react/features/filmstrip/components/web/ThumbnailWrapper.js +++ b/react/features/filmstrip/components/web/ThumbnailWrapper.js @@ -6,9 +6,9 @@ import { getSourceNameSignalingFeatureFlag } from '../../../base/config'; import { getLocalParticipant } from '../../../base/participants'; import { connect } from '../../../base/redux'; import { shouldHideSelfView } from '../../../base/settings/functions.any'; -import { getCurrentLayout, LAYOUTS } from '../../../video-layout'; -import { TILE_ASPECT_RATIO, TILE_HORIZONTAL_MARGIN, FILMSTRIP_TYPE } from '../../constants'; -import { showGridInVerticalView, getActiveParticipantsIds } from '../../functions'; +import { LAYOUTS, getCurrentLayout } from '../../../video-layout'; +import { FILMSTRIP_TYPE, TILE_ASPECT_RATIO, TILE_HORIZONTAL_MARGIN } from '../../constants'; +import { getActiveParticipantsIds, showGridInVerticalView } from '../../functions'; import Thumbnail from './Thumbnail'; diff --git a/react/features/filmstrip/components/web/VirtualScreenshareParticipant.js b/react/features/filmstrip/components/web/VirtualScreenshareParticipant.js index a956e21297..c789cb17de 100644 --- a/react/features/filmstrip/components/web/VirtualScreenshareParticipant.js +++ b/react/features/filmstrip/components/web/VirtualScreenshareParticipant.js @@ -5,7 +5,7 @@ import React from 'react'; import { useSelector } from 'react-redux'; import { VideoTrack } from '../../../base/media'; -import { getCurrentLayout, LAYOUTS } from '../../../video-layout'; +import { LAYOUTS, getCurrentLayout } from '../../../video-layout'; import ThumbnailBottomIndicators from './ThumbnailBottomIndicators'; import ThumbnailTopIndicators from './ThumbnailTopIndicators'; diff --git a/react/features/filmstrip/functions.native.js b/react/features/filmstrip/functions.native.js index 3c9d6dabc3..d44f7f3208 100644 --- a/react/features/filmstrip/functions.native.js +++ b/react/features/filmstrip/functions.native.js @@ -1,6 +1,6 @@ // @flow -import { getFeatureFlag, FILMSTRIP_ENABLED } from '../base/flags'; +import { FILMSTRIP_ENABLED, getFeatureFlag } from '../base/flags'; import { getLocalParticipant, getParticipantCountWithFake, diff --git a/react/features/filmstrip/functions.web.js b/react/features/filmstrip/functions.web.js index 2d6cf44f14..5ff126b0b2 100644 --- a/react/features/filmstrip/functions.web.js +++ b/react/features/filmstrip/functions.web.js @@ -18,12 +18,12 @@ import { isLocalTrackMuted, isRemoteTrackMuted } from '../base/tracks/functions'; -import { isTrackStreamingStatusActive, isParticipantConnectionStatusActive } from '../connection-indicator/functions'; +import { isParticipantConnectionStatusActive, isTrackStreamingStatusActive } from '../connection-indicator/functions'; import { isSharingStatus } from '../shared-video/functions'; import { + LAYOUTS, getCurrentLayout, - getNotResponsiveTileViewGridDimensions, - LAYOUTS + getNotResponsiveTileViewGridDimensions } from '../video-layout'; import { diff --git a/react/features/filmstrip/middleware.web.js b/react/features/filmstrip/middleware.web.js index fd33244146..b5a869ecd9 100644 --- a/react/features/filmstrip/middleware.web.js +++ b/react/features/filmstrip/middleware.web.js @@ -5,18 +5,18 @@ import { batch } from 'react-redux'; import VideoLayout from '../../../modules/UI/videolayout/VideoLayout'; import { DOMINANT_SPEAKER_CHANGED, + PARTICIPANT_JOINED, + PARTICIPANT_LEFT, getDominantSpeakerParticipant, getLocalParticipant, - getLocalScreenShareParticipant, - PARTICIPANT_JOINED, - PARTICIPANT_LEFT + getLocalScreenShareParticipant } from '../base/participants'; import { MiddlewareRegistry } from '../base/redux'; import { CLIENT_RESIZED } from '../base/responsive-ui'; import { SETTINGS_UPDATED } from '../base/settings'; import { - getCurrentLayout, LAYOUTS, + getCurrentLayout, setTileView } from '../video-layout'; @@ -45,13 +45,13 @@ import { TOP_FILMSTRIP_HEIGHT } from './constants'; import { + getActiveParticipantsIds, + getPinnedActiveParticipants, isFilmstripResizable, isStageFilmstripAvailable, + isStageFilmstripTopPanel, updateRemoteParticipants, - updateRemoteParticipantsOnLeave, - getActiveParticipantsIds, - getPinnedActiveParticipants, - isStageFilmstripTopPanel + updateRemoteParticipantsOnLeave } from './functions.web'; import './subscriber'; diff --git a/react/features/filmstrip/reducer.ts b/react/features/filmstrip/reducer.ts index e18c580ea6..d2622336ff 100644 --- a/react/features/filmstrip/reducer.ts +++ b/react/features/filmstrip/reducer.ts @@ -2,26 +2,26 @@ import { PARTICIPANT_LEFT } from '../base/participants/actionTypes'; import ReducerRegistry from '../base/redux/ReducerRegistry'; import { + CLEAR_STAGE_PARTICIPANTS, REMOVE_STAGE_PARTICIPANT, - SET_STAGE_PARTICIPANTS, SET_FILMSTRIP_ENABLED, + SET_FILMSTRIP_HEIGHT, SET_FILMSTRIP_VISIBLE, SET_FILMSTRIP_WIDTH, SET_HORIZONTAL_VIEW_DIMENSIONS, SET_REMOTE_PARTICIPANTS, + SET_SCREENSHARE_FILMSTRIP_PARTICIPANT, + SET_SCREENSHARING_TILE_DIMENSIONS, SET_STAGE_FILMSTRIP_DIMENSIONS, + SET_STAGE_PARTICIPANTS, SET_TILE_VIEW_DIMENSIONS, + SET_TOP_PANEL_VISIBILITY, + SET_USER_FILMSTRIP_HEIGHT, SET_USER_FILMSTRIP_WIDTH, SET_USER_IS_RESIZING, SET_VERTICAL_VIEW_DIMENSIONS, SET_VISIBLE_REMOTE_PARTICIPANTS, - SET_VOLUME, - CLEAR_STAGE_PARTICIPANTS, - SET_SCREENSHARING_TILE_DIMENSIONS, - SET_USER_FILMSTRIP_HEIGHT, - SET_FILMSTRIP_HEIGHT, - SET_TOP_PANEL_VISIBILITY, - SET_SCREENSHARE_FILMSTRIP_PARTICIPANT + SET_VOLUME } from './actionTypes'; const DEFAULT_STATE = { diff --git a/react/features/filmstrip/subscriber.web.js b/react/features/filmstrip/subscriber.web.js index 591ed0566a..8223d7dc29 100644 --- a/react/features/filmstrip/subscriber.web.js +++ b/react/features/filmstrip/subscriber.web.js @@ -9,14 +9,14 @@ import { setFilmstripVisible } from '../filmstrip/actions'; import { selectParticipantInLargeVideo } from '../large-video/actions.any'; import { getParticipantsPaneOpen } from '../participants-pane/functions'; import { setOverflowDrawer } from '../toolbox/actions.web'; -import { getCurrentLayout, shouldDisplayTileView, LAYOUTS } from '../video-layout'; +import { LAYOUTS, getCurrentLayout, shouldDisplayTileView } from '../video-layout'; import { clearStageParticipants, setHorizontalViewDimensions, + setScreenshareFilmstripParticipant, setScreensharingTileDimensions, setStageFilmstripViewDimensions, - setScreenshareFilmstripParticipant, setTileViewDimensions, setVerticalViewDimensions } from './actions.web'; diff --git a/react/features/follow-me/middleware.js b/react/features/follow-me/middleware.js index 357dd338f9..778740cb6a 100644 --- a/react/features/follow-me/middleware.js +++ b/react/features/follow-me/middleware.js @@ -4,9 +4,9 @@ import _ from 'lodash'; import { CONFERENCE_JOIN_IN_PROGRESS } from '../base/conference/actionTypes'; import { + PARTICIPANT_LEFT, getParticipantById, getPinnedParticipant, - PARTICIPANT_LEFT, pinParticipant } from '../base/participants'; import { MiddlewareRegistry } from '../base/redux'; diff --git a/react/features/invite/actions.native.js b/react/features/invite/actions.native.js index 5bf5753ab9..8994987760 100644 --- a/react/features/invite/actions.native.js +++ b/react/features/invite/actions.native.js @@ -2,7 +2,7 @@ import type { Dispatch } from 'redux'; -import { getFeatureFlag, ADD_PEOPLE_ENABLED } from '../base/flags'; +import { ADD_PEOPLE_ENABLED, getFeatureFlag } from '../base/flags'; import { navigate } from '../mobile/navigation/components/conference/ConferenceNavigationContainerRef'; import { screen } from '../mobile/navigation/routes'; import { beginShareRoom } from '../share-room'; diff --git a/react/features/invite/components/add-people-dialog/native/InviteButton.js b/react/features/invite/components/add-people-dialog/native/InviteButton.js index 360d35aadb..c80c8cd8f6 100644 --- a/react/features/invite/components/add-people-dialog/native/InviteButton.js +++ b/react/features/invite/components/add-people-dialog/native/InviteButton.js @@ -2,7 +2,7 @@ import type { Dispatch } from 'redux'; -import { getFeatureFlag, INVITE_ENABLED } from '../../../../base/flags'; +import { INVITE_ENABLED, getFeatureFlag } from '../../../../base/flags'; import { translate } from '../../../../base/i18n'; import { IconInviteMore } from '../../../../base/icons'; import { connect } from '../../../../base/redux'; diff --git a/react/features/invite/components/add-people-dialog/web/AddPeopleDialog.js b/react/features/invite/components/add-people-dialog/web/AddPeopleDialog.js index 41cbccb46b..05ddbfedd6 100644 --- a/react/features/invite/components/add-people-dialog/web/AddPeopleDialog.js +++ b/react/features/invite/components/add-people-dialog/web/AddPeopleDialog.js @@ -19,8 +19,8 @@ import { getInviteTextiOS, isAddPeopleEnabled, isDialOutEnabled, - sharingFeatures, - isSharingEnabled + isSharingEnabled, + sharingFeatures } from '../../../functions'; import CopyMeetingLinkSection from './CopyMeetingLinkSection'; diff --git a/react/features/invite/middleware.any.js b/react/features/invite/middleware.any.js index 4485b52a28..be58f46827 100644 --- a/react/features/invite/middleware.any.js +++ b/react/features/invite/middleware.any.js @@ -5,14 +5,14 @@ import { CONFERENCE_JOINED } from '../base/conference'; import { - getLocalParticipant, - getParticipantCount, - getParticipantPresenceStatus, - getRemoteParticipants, PARTICIPANT_JOINED, PARTICIPANT_JOINED_SOUND_ID, PARTICIPANT_LEFT, PARTICIPANT_UPDATED, + getLocalParticipant, + getParticipantCount, + getParticipantPresenceStatus, + getRemoteParticipants, pinParticipant } from '../base/participants'; import { MiddlewareRegistry } from '../base/redux'; diff --git a/react/features/jaas/middleware.any.js b/react/features/jaas/middleware.any.js index d0263c66af..0069f6dc2a 100644 --- a/react/features/jaas/middleware.any.js +++ b/react/features/jaas/middleware.any.js @@ -1,8 +1,8 @@ -import { sendAnalytics, createVpaasConferenceJoinedEvent } from '../analytics'; +import { createVpaasConferenceJoinedEvent, sendAnalytics } from '../analytics'; import { CONFERENCE_JOINED } from '../base/conference/actionTypes'; import { MiddlewareRegistry } from '../base/redux'; -import { isVpaasMeeting, getVpaasTenant } from './functions'; +import { getVpaasTenant, isVpaasMeeting } from './functions'; /** * The redux middleware for billing counter. diff --git a/react/features/large-video/actions.web.js b/react/features/large-video/actions.web.js index 96fbca4d51..4e9743e21e 100644 --- a/react/features/large-video/actions.web.js +++ b/react/features/large-video/actions.web.js @@ -6,7 +6,7 @@ import VideoLayout from '../../../modules/UI/videolayout/VideoLayout'; import { MEDIA_TYPE } from '../base/media'; import { getTrackByMediaTypeAndParticipant } from '../base/tracks'; -import { UPDATE_LAST_LARGE_VIDEO_MEDIA_EVENT, SET_SEE_WHAT_IS_BEING_SHARED } from './actionTypes'; +import { SET_SEE_WHAT_IS_BEING_SHARED, UPDATE_LAST_LARGE_VIDEO_MEDIA_EVENT } from './actionTypes'; export * from './actions.any'; diff --git a/react/features/large-video/middleware.js b/react/features/large-video/middleware.js index d8e8a23317..6ab55f46bd 100644 --- a/react/features/large-video/middleware.js +++ b/react/features/large-video/middleware.js @@ -5,8 +5,8 @@ import { PARTICIPANT_JOINED, PARTICIPANT_LEFT, PIN_PARTICIPANT, - getLocalParticipant, - getDominantSpeakerParticipant + getDominantSpeakerParticipant, + getLocalParticipant } from '../base/participants'; import { MiddlewareRegistry } from '../base/redux'; import { isTestModeEnabled } from '../base/testing'; diff --git a/react/features/large-video/reducer.ts b/react/features/large-video/reducer.ts index c70635d820..8e83de1ad5 100644 --- a/react/features/large-video/reducer.ts +++ b/react/features/large-video/reducer.ts @@ -4,9 +4,9 @@ import ReducerRegistry from '../base/redux/ReducerRegistry'; import { SELECT_LARGE_VIDEO_PARTICIPANT, SET_LARGE_VIDEO_DIMENSIONS, + SET_SEE_WHAT_IS_BEING_SHARED, UPDATE_KNOWN_LARGE_VIDEO_RESOLUTION, - UPDATE_LAST_LARGE_VIDEO_MEDIA_EVENT, - SET_SEE_WHAT_IS_BEING_SHARED + UPDATE_LAST_LARGE_VIDEO_MEDIA_EVENT } from './actionTypes'; export interface ILargeVideoState { diff --git a/react/features/lobby/actions.any.js b/react/features/lobby/actions.any.js index 6c9c2f86e9..43488d241b 100644 --- a/react/features/lobby/actions.any.js +++ b/react/features/lobby/actions.any.js @@ -12,18 +12,18 @@ import { getLocalParticipant } from '../base/participants'; import { onLobbyChatInitialized, removeLobbyChatParticipant, sendMessage } from '../chat/actions.any'; import { LOBBY_CHAT_MESSAGE } from '../chat/constants'; import { handleLobbyMessageReceived } from '../chat/middleware'; -import { hideNotification, LOBBY_NOTIFICATION_ID } from '../notifications'; +import { LOBBY_NOTIFICATION_ID, hideNotification } from '../notifications'; import { showNotification } from '../notifications/actions'; import { KNOCKING_PARTICIPANT_ARRIVED_OR_UPDATED, KNOCKING_PARTICIPANT_LEFT, + REMOVE_LOBBY_CHAT_WITH_MODERATOR, SET_KNOCKING_STATE, SET_LOBBY_MODE_ENABLED, - SET_PASSWORD_JOIN_FAILED, - SET_LOBBY_VISIBILITY, SET_LOBBY_PARTICIPANT_CHAT_STATE, - REMOVE_LOBBY_CHAT_WITH_MODERATOR + SET_LOBBY_VISIBILITY, + SET_PASSWORD_JOIN_FAILED } from './actionTypes'; import { LOBBY_CHAT_INITIALIZED, MODERATOR_IN_CHAT_WITH_LEFT } from './constants'; import { getKnockingParticipants, getLobbyEnabled } from './functions'; diff --git a/react/features/lobby/components/AbstractLobbyScreen.js b/react/features/lobby/components/AbstractLobbyScreen.js index 7a68a771ba..0c858aff78 100644 --- a/react/features/lobby/components/AbstractLobbyScreen.js +++ b/react/features/lobby/components/AbstractLobbyScreen.js @@ -3,12 +3,12 @@ import React, { PureComponent } from 'react'; import { conferenceWillJoin, getConferenceName } from '../../base/conference'; -import { getFeatureFlag, INVITE_ENABLED } from '../../base/flags'; +import { INVITE_ENABLED, getFeatureFlag } from '../../base/flags'; import { getLocalParticipant } from '../../base/participants'; import { getFieldValue } from '../../base/react'; import { updateSettings } from '../../base/settings'; import { isDeviceStatusVisible } from '../../prejoin/functions'; -import { cancelKnocking, joinWithPassword, setPasswordJoinFailed, startKnocking, onSendMessage } from '../actions'; +import { cancelKnocking, joinWithPassword, onSendMessage, setPasswordJoinFailed, startKnocking } from '../actions'; export const SCREEN_STATES = { EDIT: 1, diff --git a/react/features/lobby/components/native/KnockingParticipantList.js b/react/features/lobby/components/native/KnockingParticipantList.js index dbc6ab8928..e8c9aadb88 100644 --- a/react/features/lobby/components/native/KnockingParticipantList.js +++ b/react/features/lobby/components/native/KnockingParticipantList.js @@ -1,7 +1,7 @@ // @flow import React, { PureComponent } from 'react'; -import { ScrollView, Text, View, TouchableOpacity } from 'react-native'; +import { ScrollView, Text, TouchableOpacity, View } from 'react-native'; import { Avatar } from '../../../base/avatar'; import { translate } from '../../../base/i18n'; @@ -12,7 +12,7 @@ import { navigate } from '../../../mobile/navigation/components/conference/Confe import { screen } from '../../../mobile/navigation/routes'; import { setKnockingParticipantApproval } from '../../actions'; import { HIDDEN_EMAILS } from '../../constants'; -import { showLobbyChatButton, getKnockingParticipants, getLobbyEnabled } from '../../functions'; +import { getKnockingParticipants, getLobbyEnabled, showLobbyChatButton } from '../../functions'; import styles from './styles'; diff --git a/react/features/lobby/components/native/LobbyScreen.js b/react/features/lobby/components/native/LobbyScreen.js index 8201170058..9889a23114 100644 --- a/react/features/lobby/components/native/LobbyScreen.js +++ b/react/features/lobby/components/native/LobbyScreen.js @@ -1,7 +1,7 @@ // @flow import React from 'react'; -import { Text, View, TextInput } from 'react-native'; +import { Text, TextInput, View } from 'react-native'; import { getConferenceName } from '../../../base/conference/functions'; import { translate } from '../../../base/i18n'; diff --git a/react/features/lobby/components/web/LobbyScreen.js b/react/features/lobby/components/web/LobbyScreen.js index 1b7356cad1..d59713ce2b 100644 --- a/react/features/lobby/components/web/LobbyScreen.js +++ b/react/features/lobby/components/web/LobbyScreen.js @@ -10,8 +10,8 @@ import { connect } from '../../../base/redux'; import ChatInput from '../../../chat/components/web/ChatInput'; import MessageContainer from '../../../chat/components/web/MessageContainer'; import AbstractLobbyScreen, { - _mapStateToProps, - type Props + type Props, + _mapStateToProps } from '../AbstractLobbyScreen'; /** diff --git a/react/features/lobby/middleware.js b/react/features/lobby/middleware.js index c49c183c68..184f8baa67 100644 --- a/react/features/lobby/middleware.js +++ b/react/features/lobby/middleware.js @@ -34,10 +34,10 @@ import { knockingParticipantLeft, openLobbyScreen, participantIsKnockingOrUpdated, + setLobbyMessageListener, setLobbyModeEnabled, - startKnocking, setPasswordJoinFailed, - setLobbyMessageListener + startKnocking } from './actions'; import { updateLobbyParticipantOnLeave } from './actions.any'; import { KNOCKING_PARTICIPANT_SOUND_ID } from './constants'; diff --git a/react/features/mobile/audio-mode/components/AudioRoutePickerDialog.js b/react/features/mobile/audio-mode/components/AudioRoutePickerDialog.js index ea8029c4ff..625b917434 100644 --- a/react/features/mobile/audio-mode/components/AudioRoutePickerDialog.js +++ b/react/features/mobile/audio-mode/components/AudioRoutePickerDialog.js @@ -2,7 +2,7 @@ import _ from 'lodash'; import React, { Component } from 'react'; import { NativeModules, Text, TouchableHighlight, View } from 'react-native'; -import { hideSheet, BottomSheet } from '../../../base/dialog'; +import { BottomSheet, hideSheet } from '../../../base/dialog'; import { bottomSheetStyles } from '../../../base/dialog/components/native/styles'; import { translate } from '../../../base/i18n'; import { diff --git a/react/features/mobile/audio-mode/middleware.js b/react/features/mobile/audio-mode/middleware.js index 51f45e1fb8..b67e619489 100644 --- a/react/features/mobile/audio-mode/middleware.js +++ b/react/features/mobile/audio-mode/middleware.js @@ -5,11 +5,11 @@ import { APP_WILL_MOUNT, APP_WILL_UNMOUNT } from '../../base/app'; import { SET_AUDIO_ONLY } from '../../base/audio-only'; import { CONFERENCE_FAILED, - CONFERENCE_LEFT, CONFERENCE_JOINED, + CONFERENCE_LEFT, getCurrentConference } from '../../base/conference'; -import { getFeatureFlag, AUDIO_FOCUS_DISABLED } from '../../base/flags'; +import { AUDIO_FOCUS_DISABLED, getFeatureFlag } from '../../base/flags'; import { MiddlewareRegistry } from '../../base/redux'; import { _SET_AUDIOMODE_DEVICES, _SET_AUDIOMODE_SUBSCRIPTIONS } from './actionTypes'; diff --git a/react/features/mobile/background/actions.js b/react/features/mobile/background/actions.js index 786b9bf8b1..821a32acb7 100644 --- a/react/features/mobile/background/actions.js +++ b/react/features/mobile/background/actions.js @@ -1,6 +1,6 @@ // @flow -import { _SET_APP_STATE_LISTENER, APP_STATE_CHANGED } from './actionTypes'; +import { APP_STATE_CHANGED, _SET_APP_STATE_LISTENER } from './actionTypes'; /** * Sets the listener to be used with React Native's AppState API. diff --git a/react/features/mobile/background/reducer.ts b/react/features/mobile/background/reducer.ts index 684de06476..572fdddf9a 100644 --- a/react/features/mobile/background/reducer.ts +++ b/react/features/mobile/background/reducer.ts @@ -1,8 +1,8 @@ import ReducerRegistry from '../../base/redux/ReducerRegistry'; import { - _SET_APP_STATE_LISTENER, - APP_STATE_CHANGED + APP_STATE_CHANGED, + _SET_APP_STATE_LISTENER } from './actionTypes'; export interface IBackgroundState { diff --git a/react/features/mobile/call-integration/CallKit.js b/react/features/mobile/call-integration/CallKit.js index ff4c24bb2e..3fd304bd7c 100644 --- a/react/features/mobile/call-integration/CallKit.js +++ b/react/features/mobile/call-integration/CallKit.js @@ -1,4 +1,4 @@ -import { NativeModules, NativeEventEmitter } from 'react-native'; +import { NativeEventEmitter, NativeModules } from 'react-native'; import { getName } from '../../app/functions'; diff --git a/react/features/mobile/external-api/middleware.js b/react/features/mobile/external-api/middleware.js index 2cdefc3aea..1e20b0f9d9 100644 --- a/react/features/mobile/external-api/middleware.js +++ b/react/features/mobile/external-api/middleware.js @@ -30,15 +30,15 @@ import { SET_AUDIO_MUTED, SET_VIDEO_MUTED } from '../../base/media/actionTypes'; import { PARTICIPANT_JOINED, PARTICIPANT_LEFT, + getLocalParticipant, getParticipantById, - getRemoteParticipants, - getLocalParticipant + getRemoteParticipants } from '../../base/participants'; import { MiddlewareRegistry, StateListenerRegistry } from '../../base/redux'; import { getLocalTracks, isLocalTrackMuted, toggleScreensharing } from '../../base/tracks'; -import { OPEN_CHAT, CLOSE_CHAT } from '../../chat'; +import { CLOSE_CHAT, OPEN_CHAT } from '../../chat'; import { openChat } from '../../chat/actions'; -import { sendMessage, setPrivateMessageRecipient, closeChat } from '../../chat/actions.any'; +import { closeChat, sendMessage, setPrivateMessageRecipient } from '../../chat/actions.any'; import { SET_PAGE_RELOAD_OVERLAY_CANCELED } from '../../overlay/actionTypes'; import { setRequestingSubtitles } from '../../subtitles'; import { muteLocal } from '../../video-menu/actions'; diff --git a/react/features/mobile/navigation/components/ConnectingPage.js b/react/features/mobile/navigation/components/ConnectingPage.js index 5602c90445..1b4059bd82 100644 --- a/react/features/mobile/navigation/components/ConnectingPage.js +++ b/react/features/mobile/navigation/components/ConnectingPage.js @@ -7,7 +7,7 @@ import { SafeAreaView, Text, View } from 'react-native'; import JitsiScreen from '../../../base/modal/components/JitsiScreen'; import { LoadingIndicator } from '../../../base/react'; -import { navigationStyles, TEXT_COLOR } from './styles'; +import { TEXT_COLOR, navigationStyles } from './styles'; const ConnectingPage = () => { const { t } = useTranslation(); diff --git a/react/features/mobile/navigation/functions.js b/react/features/mobile/navigation/functions.js index d7c21ed45a..e2972f45b7 100644 --- a/react/features/mobile/navigation/functions.js +++ b/react/features/mobile/navigation/functions.js @@ -6,8 +6,8 @@ import { useDispatch } from 'react-redux'; import { appNavigate } from '../../app/actions'; import { - getFeatureFlag, - PREJOIN_PAGE_ENABLED + PREJOIN_PAGE_ENABLED, + getFeatureFlag } from '../../base/flags'; import { IconClose } from '../../base/icons'; import { toState } from '../../base/redux'; diff --git a/react/features/mobile/polyfills/webrtc.js b/react/features/mobile/polyfills/webrtc.js index 705f048f4d..2186f03a7b 100644 --- a/react/features/mobile/polyfills/webrtc.js +++ b/react/features/mobile/polyfills/webrtc.js @@ -1,8 +1,8 @@ import { MediaStream, MediaStreamTrack, - RTCSessionDescription, RTCIceCandidate, + RTCSessionDescription, mediaDevices, permissions } from 'react-native-webrtc'; diff --git a/react/features/noise-suppression/components/NoiseSuppressionButton.tsx b/react/features/noise-suppression/components/NoiseSuppressionButton.tsx index df1516f339..5dc6fa8282 100644 --- a/react/features/noise-suppression/components/NoiseSuppressionButton.tsx +++ b/react/features/noise-suppression/components/NoiseSuppressionButton.tsx @@ -2,8 +2,8 @@ import { IState } from '../../app/types'; import { translate } from '../../base/i18n/functions'; import { - IconNoiseSuppressionOn, - IconNoiseSuppressionOff + IconNoiseSuppressionOff, + IconNoiseSuppressionOn } from '../../base/icons/svg'; import { connect } from '../../base/redux/functions'; import { diff --git a/react/features/notifications/actions.ts b/react/features/notifications/actions.ts index d3130e95c3..5405b24c38 100644 --- a/react/features/notifications/actions.ts +++ b/react/features/notifications/actions.ts @@ -13,8 +13,8 @@ import { } from './actionTypes'; import { NOTIFICATION_ICON, - NOTIFICATION_TIMEOUT_TYPE, NOTIFICATION_TIMEOUT, + NOTIFICATION_TIMEOUT_TYPE, NOTIFICATION_TYPE, SILENT_JOIN_THRESHOLD, SILENT_LEFT_THRESHOLD diff --git a/react/features/notifications/middleware.ts b/react/features/notifications/middleware.ts index 4a4e164e3c..dfa46e384a 100644 --- a/react/features/notifications/middleware.ts +++ b/react/features/notifications/middleware.ts @@ -7,9 +7,9 @@ import { } from '../base/participants/actionTypes'; import { PARTICIPANT_ROLE } from '../base/participants/constants'; import { + getLocalParticipant, getParticipantById, - getParticipantDisplayName, - getLocalParticipant + getParticipantDisplayName } from '../base/participants/functions'; import MiddlewareRegistry from '../base/redux/MiddlewareRegistry'; import StateListenerRegistry from '../base/redux/StateListenerRegistry'; diff --git a/react/features/overlay/components/native/PageReloadOverlay.js b/react/features/overlay/components/native/PageReloadOverlay.js index 53e48c3acb..657c33b86c 100644 --- a/react/features/overlay/components/native/PageReloadOverlay.js +++ b/react/features/overlay/components/native/PageReloadOverlay.js @@ -8,8 +8,8 @@ import { translate } from '../../../base/i18n'; import { connect } from '../../../base/redux'; import { setFatalError, setPageReloadOverlayCanceled } from '../../actions'; import AbstractPageReloadOverlay, { - abstractMapStateToProps, - type Props + type Props, + abstractMapStateToProps } from '../AbstractPageReloadOverlay'; import OverlayFrame from './OverlayFrame'; diff --git a/react/features/overlay/components/web/PageReloadOverlay.js b/react/features/overlay/components/web/PageReloadOverlay.js index 5fd42df343..03424966cd 100644 --- a/react/features/overlay/components/web/PageReloadOverlay.js +++ b/react/features/overlay/components/web/PageReloadOverlay.js @@ -5,8 +5,8 @@ import React from 'react'; import { translate } from '../../../base/i18n'; import { connect } from '../../../base/redux'; import AbstractPageReloadOverlay, { - abstractMapStateToProps, - type Props + type Props, + abstractMapStateToProps } from '../AbstractPageReloadOverlay'; import OverlayFrame from './OverlayFrame'; diff --git a/react/features/participants-pane/components/breakout-rooms/components/web/RoomList.js b/react/features/participants-pane/components/breakout-rooms/components/web/RoomList.js index 98de25a75a..446c9fd3e5 100644 --- a/react/features/participants-pane/components/breakout-rooms/components/web/RoomList.js +++ b/react/features/participants-pane/components/breakout-rooms/components/web/RoomList.js @@ -8,10 +8,10 @@ import { isLocalParticipantModerator } from '../../../../../base/participants'; import { equals } from '../../../../../base/redux'; import { getBreakoutRooms, - isInBreakoutRoom, - getCurrentRoomId, getBreakoutRoomsConfig, - isAutoAssignParticipantsVisible + getCurrentRoomId, + isAutoAssignParticipantsVisible, + isInBreakoutRoom } from '../../../../../breakout-rooms/functions'; import { showOverflowDrawer } from '../../../../../toolbox/functions'; diff --git a/react/features/participants-pane/components/native/ClearableInput.js b/react/features/participants-pane/components/native/ClearableInput.js index f4bb727d27..842ca67bd2 100644 --- a/react/features/participants-pane/components/native/ClearableInput.js +++ b/react/features/participants-pane/components/native/ClearableInput.js @@ -1,7 +1,7 @@ // @flow import React, { useCallback, useEffect, useState } from 'react'; -import { View, TextInput, TouchableOpacity } from 'react-native'; +import { TextInput, TouchableOpacity, View } from 'react-native'; import { withTheme } from 'react-native-paper'; import { Icon, IconCloseSolid } from '../../../base/icons'; diff --git a/react/features/participants-pane/components/native/ContextMenuMore.js b/react/features/participants-pane/components/native/ContextMenuMore.js index fa2070e41a..9f0731bad2 100644 --- a/react/features/participants-pane/components/native/ContextMenuMore.js +++ b/react/features/participants-pane/components/native/ContextMenuMore.js @@ -11,10 +11,10 @@ import { requestEnableVideoModeration } from '../../../av-moderation/actions'; import { - isSupported as isAvModerationSupported, - isEnabled as isAvModerationEnabled + isEnabled as isAvModerationEnabled, + isSupported as isAvModerationSupported } from '../../../av-moderation/functions'; -import { openDialog, hideSheet } from '../../../base/dialog/actions'; +import { hideSheet, openDialog } from '../../../base/dialog/actions'; import BottomSheet from '../../../base/dialog/components/native/BottomSheet'; import { Icon, diff --git a/react/features/participants-pane/components/native/ParticipantItem.js b/react/features/participants-pane/components/native/ParticipantItem.js index 62f14cae2b..e75fe81984 100644 --- a/react/features/participants-pane/components/native/ParticipantItem.js +++ b/react/features/participants-pane/components/native/ParticipantItem.js @@ -7,7 +7,7 @@ import { TouchableOpacity, View } from 'react-native'; import { Text } from 'react-native-paper'; import { Avatar } from '../../../base/avatar'; -import { MEDIA_STATE, type MediaState, AudioStateIcons, VideoStateIcons } from '../../constants'; +import { AudioStateIcons, MEDIA_STATE, type MediaState, VideoStateIcons } from '../../constants'; import { RaisedHandIndicator } from './RaisedHandIndicator'; import styles from './styles'; diff --git a/react/features/participants-pane/components/web/LobbyParticipantItem.tsx b/react/features/participants-pane/components/web/LobbyParticipantItem.tsx index ce11324170..1441c5b80a 100644 --- a/react/features/participants-pane/components/web/LobbyParticipantItem.tsx +++ b/react/features/participants-pane/components/web/LobbyParticipantItem.tsx @@ -1,7 +1,7 @@ /* eslint-disable lines-around-comment */ import { Theme } from '@mui/material'; -import React, { useCallback, useState, useRef } from 'react'; +import React, { useCallback, useRef, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useSelector } from 'react-redux'; import { makeStyles } from 'tss-react/mui'; diff --git a/react/features/participants-pane/components/web/LobbyParticipants.tsx b/react/features/participants-pane/components/web/LobbyParticipants.tsx index e6cd4e2a3d..808a3a9872 100644 --- a/react/features/participants-pane/components/web/LobbyParticipants.tsx +++ b/react/features/participants-pane/components/web/LobbyParticipants.tsx @@ -2,7 +2,7 @@ import { Theme } from '@mui/material'; import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; -import { useSelector, useDispatch } from 'react-redux'; +import { useDispatch, useSelector } from 'react-redux'; import { makeStyles } from 'tss-react/mui'; // @ts-ignore @@ -13,7 +13,7 @@ import { withPixelLineHeight } from '../../../base/styles/functions.web'; // @ts-ignore import { admitMultiple } from '../../../lobby/actions.web'; // @ts-ignore -import { getLobbyEnabled, getKnockingParticipants } from '../../../lobby/functions'; +import { getKnockingParticipants, getLobbyEnabled } from '../../../lobby/functions'; // @ts-ignore import { Drawer, JitsiPortal } from '../../../toolbox/components/web'; // @ts-ignore diff --git a/react/features/participants-pane/components/web/MeetingParticipantItem.js b/react/features/participants-pane/components/web/MeetingParticipantItem.js index 1c1ae37c8f..6fb9fc0e11 100644 --- a/react/features/participants-pane/components/web/MeetingParticipantItem.js +++ b/react/features/participants-pane/components/web/MeetingParticipantItem.js @@ -19,7 +19,7 @@ import { isParticipantAudioMuted, isParticipantVideoMuted } from '../../../base/tracks'; -import { ACTION_TRIGGER, type MediaState, MEDIA_STATE } from '../../constants'; +import { ACTION_TRIGGER, MEDIA_STATE, type MediaState } from '../../constants'; import { getParticipantAudioMediaState, getParticipantVideoMediaState, diff --git a/react/features/participants-pane/components/web/ParticipantItem.tsx b/react/features/participants-pane/components/web/ParticipantItem.tsx index 1586d09df0..9296230d50 100644 --- a/react/features/participants-pane/components/web/ParticipantItem.tsx +++ b/react/features/participants-pane/components/web/ParticipantItem.tsx @@ -12,11 +12,11 @@ import { translate } from '../../../base/i18n/functions'; import { withPixelLineHeight } from '../../../base/styles/functions.web'; import { ACTION_TRIGGER, + type ActionTrigger, AudioStateIcons, MEDIA_STATE, - type ActionTrigger, - VideoStateIcons, - MediaState + MediaState, + VideoStateIcons } from '../../constants'; import { RaisedHandIndicator } from './RaisedHandIndicator'; diff --git a/react/features/participants-pane/functions.ts b/react/features/participants-pane/functions.ts index 866319cb6b..35f7e32246 100644 --- a/react/features/participants-pane/functions.ts +++ b/react/features/participants-pane/functions.ts @@ -1,22 +1,22 @@ /* eslint-disable lines-around-comment */ import { IState } from '../app/types'; import { - isParticipantApproved, isEnabledFromState, isLocalParticipantApprovedFromState, + isParticipantApproved, isSupported } from '../av-moderation/functions'; import { IStateful } from '../base/app/types'; // @ts-ignore -import { getFeatureFlag, INVITE_ENABLED } from '../base/flags'; +import { INVITE_ENABLED, getFeatureFlag } from '../base/flags'; import { MEDIA_TYPE, type MediaType } from '../base/media/constants'; import { getDominantSpeakerParticipant, - isLocalParticipantModerator, - isParticipantModerator, getLocalParticipant, + getRaiseHandsQueue, getRemoteParticipantsSorted, - getRaiseHandsQueue + isLocalParticipantModerator, + isParticipantModerator } from '../base/participants/functions'; import { Participant } from '../base/participants/types'; import { toState } from '../base/redux/functions'; @@ -24,7 +24,7 @@ import { toState } from '../base/redux/functions'; import { normalizeAccents } from '../base/util/strings'; import { isInBreakoutRoom } from '../breakout-rooms/functions'; -import { QUICK_ACTION_BUTTON, REDUCER_KEY, MEDIA_STATE } from './constants'; +import { MEDIA_STATE, QUICK_ACTION_BUTTON, REDUCER_KEY } from './constants'; /** * Find the first styled ancestor component of an element. diff --git a/react/features/polls/actions.js b/react/features/polls/actions.js index 9fcbe234f7..011437bbc6 100644 --- a/react/features/polls/actions.js +++ b/react/features/polls/actions.js @@ -3,10 +3,10 @@ import { CHANGE_VOTE, CLEAR_POLLS, - RESET_NB_UNREAD_POLLS, RECEIVE_ANSWER, RECEIVE_POLL, REGISTER_VOTE, + RESET_NB_UNREAD_POLLS, RETRACT_VOTE } from './actionTypes'; import type { Answer, Poll } from './types'; diff --git a/react/features/polls/components/AbstractPollCreate.js b/react/features/polls/components/AbstractPollCreate.js index 8498956739..540effa765 100644 --- a/react/features/polls/components/AbstractPollCreate.js +++ b/react/features/polls/components/AbstractPollCreate.js @@ -5,7 +5,7 @@ import type { AbstractComponent } from 'react'; import { useTranslation } from 'react-i18next'; import { useSelector } from 'react-redux'; -import { sendAnalytics, createPollEvent } from '../../analytics'; +import { createPollEvent, sendAnalytics } from '../../analytics'; import { getParticipantDisplayName } from '../../base/participants'; import { COMMAND_NEW_POLL } from '../constants'; diff --git a/react/features/polls/components/AbstractPollResults.js b/react/features/polls/components/AbstractPollResults.js index f9b64e4214..26f3157148 100644 --- a/react/features/polls/components/AbstractPollResults.js +++ b/react/features/polls/components/AbstractPollResults.js @@ -5,7 +5,7 @@ import type { AbstractComponent } from 'react'; import { useTranslation } from 'react-i18next'; import { useDispatch, useSelector } from 'react-redux'; -import { sendAnalytics, createPollEvent } from '../../analytics'; +import { createPollEvent, sendAnalytics } from '../../analytics'; import { getParticipantById } from '../../base/participants/functions'; import { useBoundSelector } from '../../base/util/hooks'; import { setVoteChanging } from '../actions'; diff --git a/react/features/polls/components/native/PollCreate.js b/react/features/polls/components/native/PollCreate.js index 9a8fafdf7d..5e3dbbf4f6 100644 --- a/react/features/polls/components/native/PollCreate.js +++ b/react/features/polls/components/native/PollCreate.js @@ -1,7 +1,7 @@ // @flow import React, { useCallback, useEffect, useRef, useState } from 'react'; -import { View, Text, TextInput, FlatList, Platform } from 'react-native'; +import { FlatList, Platform, Text, TextInput, View } from 'react-native'; import { Divider, TouchableRipple } from 'react-native-paper'; import BaseTheme from '../../../base/ui/components/BaseTheme.native'; diff --git a/react/features/polls/components/native/PollResults.js b/react/features/polls/components/native/PollResults.js index 754b36e239..3e724a0dc9 100644 --- a/react/features/polls/components/native/PollResults.js +++ b/react/features/polls/components/native/PollResults.js @@ -1,7 +1,7 @@ // @flow import React, { useCallback } from 'react'; -import { View, Text, FlatList, TouchableOpacity } from 'react-native'; +import { FlatList, Text, TouchableOpacity, View } from 'react-native'; import { useSelector } from 'react-redux'; import { getLocalParticipant } from '../../../base/participants'; diff --git a/react/features/polls/components/native/PollsPane.js b/react/features/polls/components/native/PollsPane.js index 2a87e63e90..65a4944747 100644 --- a/react/features/polls/components/native/PollsPane.js +++ b/react/features/polls/components/native/PollsPane.js @@ -1,7 +1,7 @@ /* eslint-disable react-native/no-color-literals */ // @flow -import { useNavigation, useIsFocused } from '@react-navigation/native'; +import { useIsFocused, useNavigation } from '@react-navigation/native'; import React, { useEffect } from 'react'; import { useSelector } from 'react-redux'; diff --git a/react/features/polls/reducer.ts b/react/features/polls/reducer.ts index 68fdfef073..06681afdd9 100644 --- a/react/features/polls/reducer.ts +++ b/react/features/polls/reducer.ts @@ -3,11 +3,11 @@ import ReducerRegistry from '../base/redux/ReducerRegistry'; import { CHANGE_VOTE, CLEAR_POLLS, - RECEIVE_POLL, RECEIVE_ANSWER, + RECEIVE_POLL, REGISTER_VOTE, - RETRACT_VOTE, - RESET_NB_UNREAD_POLLS + RESET_NB_UNREAD_POLLS, + RETRACT_VOTE } from './actionTypes'; import { Answer, Poll } from './types'; diff --git a/react/features/prejoin/actions.js b/react/features/prejoin/actions.js index d965023914..f28094d18b 100644 --- a/react/features/prejoin/actions.js +++ b/react/features/prejoin/actions.js @@ -8,38 +8,38 @@ import { v4 as uuidv4 } from 'uuid'; import { getDialOutStatusUrl, getDialOutUrl, updateConfig } from '../base/config'; import { browser } from '../base/lib-jitsi-meet'; import { createLocalTrack } from '../base/lib-jitsi-meet/functions'; -import { isVideoMutedByUser, MEDIA_TYPE } from '../base/media'; +import { MEDIA_TYPE, isVideoMutedByUser } from '../base/media'; import { updateSettings } from '../base/settings'; import { createLocalTracksF, getLocalAudioTrack, getLocalTracks, getLocalVideoTrack, - trackAdded, - replaceLocalTrack + replaceLocalTrack, + trackAdded } from '../base/tracks'; import { openURLInBrowser } from '../base/util'; import { executeDialOutRequest, executeDialOutStatusRequest, getDialInfoPageURL } from '../invite/functions'; import { NOTIFICATION_TIMEOUT_TYPE, showErrorNotification } from '../notifications'; import { - PREJOIN_JOINING_IN_PROGRESS, PREJOIN_INITIALIZED, + PREJOIN_JOINING_IN_PROGRESS, + SET_DEVICE_STATUS, SET_DIALOUT_COUNTRY, SET_DIALOUT_NUMBER, SET_DIALOUT_STATUS, - SET_PREJOIN_DISPLAY_NAME_REQUIRED, - SET_SKIP_PREJOIN_RELOAD, SET_JOIN_BY_PHONE_DIALOG_VISIBLITY, SET_PRECALL_TEST_RESULTS, SET_PREJOIN_DEVICE_ERRORS, + SET_PREJOIN_DISPLAY_NAME_REQUIRED, SET_PREJOIN_PAGE_VISIBILITY, - SET_DEVICE_STATUS + SET_SKIP_PREJOIN_RELOAD } from './actionTypes'; import { - getFullDialOutNumber, getDialOutConferenceUrl, getDialOutCountry, + getFullDialOutNumber, isJoinByPhoneDialogVisible } from './functions'; import logger from './logger'; diff --git a/react/features/prejoin/components/preview/DeviceStatus.tsx b/react/features/prejoin/components/preview/DeviceStatus.tsx index 181b7bd6de..98c6380f89 100644 --- a/react/features/prejoin/components/preview/DeviceStatus.tsx +++ b/react/features/prejoin/components/preview/DeviceStatus.tsx @@ -9,8 +9,8 @@ import Icon from '../../../base/icons/components/Icon'; import { IconCheckSolid, IconExclamationTriangle } from '../../../base/icons/svg'; import { connect } from '../../../base/redux/functions'; import { - getDeviceStatusType, - getDeviceStatusText + getDeviceStatusText, + getDeviceStatusType // @ts-ignore } from '../../functions'; diff --git a/react/features/reactions/constants.ts b/react/features/reactions/constants.ts index 981b76e2e6..8b6c9d1458 100644 --- a/react/features/reactions/constants.ts +++ b/react/features/reactions/constants.ts @@ -1,10 +1,10 @@ import { + BOO_SOUND_FILES, CLAP_SOUND_FILES, LAUGH_SOUND_FILES, LIKE_SOUND_FILES, - BOO_SOUND_FILES, - SURPRISE_SOUND_FILES, - SILENCE_SOUND_FILES + SILENCE_SOUND_FILES, + SURPRISE_SOUND_FILES } from './sounds'; /** diff --git a/react/features/reactions/functions.any.ts b/react/features/reactions/functions.any.ts index ab6d1a9a34..a333d2a9b0 100644 --- a/react/features/reactions/functions.any.ts +++ b/react/features/reactions/functions.any.ts @@ -3,12 +3,12 @@ import { v4 as uuidv4 } from 'uuid'; import { IState } from '../app/types'; // @ts-ignore -import { getFeatureFlag, REACTIONS_ENABLED } from '../base/flags'; +import { REACTIONS_ENABLED, getFeatureFlag } from '../base/flags'; import { getLocalParticipant } from '../base/participants/functions'; // @ts-ignore import { extractFqnFromPath } from '../dynamic-branding/functions.any'; -import { ReactionEmojiProps, REACTIONS, ReactionThreshold, SOUNDS_THRESHOLDS } from './constants'; +import { REACTIONS, ReactionEmojiProps, ReactionThreshold, SOUNDS_THRESHOLDS } from './constants'; import logger from './logger'; /** diff --git a/react/features/reactions/middleware.ts b/react/features/reactions/middleware.ts index 927a5861fc..bcf74d7037 100644 --- a/react/features/reactions/middleware.ts +++ b/react/features/reactions/middleware.ts @@ -30,8 +30,8 @@ import { NOTIFICATION_TIMEOUT_TYPE, showNotification } from '../notifications'; import { ADD_REACTION_BUFFER, FLUSH_REACTION_BUFFER, - SEND_REACTIONS, PUSH_REACTIONS, + SEND_REACTIONS, SHOW_SOUNDS_NOTIFICATION } from './actionTypes'; import { @@ -44,12 +44,12 @@ import { import { displayReactionSoundsNotification } from './actions.web'; import { ENDPOINT_REACTION_NAME, + MUTE_REACTIONS_COMMAND, + MuteCommandAttributes, RAISE_HAND_SOUND_ID, REACTIONS, REACTION_SOUND, - SOUNDS_THRESHOLDS, - MUTE_REACTIONS_COMMAND, - MuteCommandAttributes + SOUNDS_THRESHOLDS } from './constants'; import { getReactionMessageFromBuffer, diff --git a/react/features/reactions/reducer.ts b/react/features/reactions/reducer.ts index b1e27cb7de..891ffc81d8 100644 --- a/react/features/reactions/reducer.ts +++ b/react/features/reactions/reducer.ts @@ -1,11 +1,11 @@ import ReducerRegistry from '../base/redux/ReducerRegistry'; import { - TOGGLE_REACTIONS_VISIBLE, - SET_REACTION_QUEUE, ADD_REACTION_BUFFER, FLUSH_REACTION_BUFFER, - SHOW_SOUNDS_NOTIFICATION + SET_REACTION_QUEUE, + SHOW_SOUNDS_NOTIFICATION, + TOGGLE_REACTIONS_VISIBLE } from './actionTypes'; import { ReactionEmojiProps } from './constants'; diff --git a/react/features/recent-list/actions.js b/react/features/recent-list/actions.js index d288fbce35..f1fc9b5926 100644 --- a/react/features/recent-list/actions.js +++ b/react/features/recent-list/actions.js @@ -1,9 +1,9 @@ // @flow import { + DELETE_RECENT_LIST_ENTRY, _STORE_CURRENT_CONFERENCE, - _UPDATE_CONFERENCE_DURATION, - DELETE_RECENT_LIST_ENTRY + _UPDATE_CONFERENCE_DURATION } from './actionTypes'; /** diff --git a/react/features/recent-list/middleware.js b/react/features/recent-list/middleware.js index aba036198a..39748fed88 100644 --- a/react/features/recent-list/middleware.js +++ b/react/features/recent-list/middleware.js @@ -3,8 +3,8 @@ import { APP_WILL_MOUNT } from '../base/app'; import { CONFERENCE_WILL_LEAVE, - SET_ROOM, - JITSI_CONFERENCE_URL_KEY + JITSI_CONFERENCE_URL_KEY, + SET_ROOM } from '../base/conference'; import { addKnownDomains } from '../base/known-domains'; import { MiddlewareRegistry } from '../base/redux'; diff --git a/react/features/recent-list/reducer.ts b/react/features/recent-list/reducer.ts index 380516e753..199b31761a 100644 --- a/react/features/recent-list/reducer.ts +++ b/react/features/recent-list/reducer.ts @@ -4,9 +4,9 @@ import PersistenceRegistry from '../base/redux/PersistenceRegistry'; import ReducerRegistry from '../base/redux/ReducerRegistry'; import { + DELETE_RECENT_LIST_ENTRY, _STORE_CURRENT_CONFERENCE, - _UPDATE_CONFERENCE_DURATION, - DELETE_RECENT_LIST_ENTRY + _UPDATE_CONFERENCE_DURATION } from './actionTypes'; // @ts-ignore import { isRecentListEnabled } from './functions'; diff --git a/react/features/recording/components/LiveStream/native/GoogleSigninForm.js b/react/features/recording/components/LiveStream/native/GoogleSigninForm.js index 31fb2c8131..a9aa63ee19 100644 --- a/react/features/recording/components/LiveStream/native/GoogleSigninForm.js +++ b/react/features/recording/components/LiveStream/native/GoogleSigninForm.js @@ -10,8 +10,8 @@ import { StyleType } from '../../../../base/styles'; import { GOOGLE_API_STATES, GOOGLE_SCOPE_YOUTUBE, - googleApi, GoogleSignInButton, + googleApi, setGoogleAPIState } from '../../../../google-api'; import logger from '../../../logger'; diff --git a/react/features/recording/components/LiveStream/native/StartLiveStreamDialog.js b/react/features/recording/components/LiveStream/native/StartLiveStreamDialog.js index 9cb228b37b..7c647d2a85 100644 --- a/react/features/recording/components/LiveStream/native/StartLiveStreamDialog.js +++ b/react/features/recording/components/LiveStream/native/StartLiveStreamDialog.js @@ -12,7 +12,7 @@ import { goBack } from '../../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef'; import { setLiveStreamKey } from '../../../actions'; import AbstractStartLiveStreamDialog, -{ _mapStateToProps, type Props } from '../AbstractStartLiveStreamDialog'; +{ type Props, _mapStateToProps } from '../AbstractStartLiveStreamDialog'; import GoogleSigninForm from './GoogleSigninForm'; import StreamKeyForm from './StreamKeyForm'; diff --git a/react/features/recording/components/LiveStream/web/LiveStreamButton.js b/react/features/recording/components/LiveStream/web/LiveStreamButton.js index b75824fbb2..2f4bb9fd59 100644 --- a/react/features/recording/components/LiveStream/web/LiveStreamButton.js +++ b/react/features/recording/components/LiveStream/web/LiveStreamButton.js @@ -5,8 +5,8 @@ import { openDialog } from '../../../../base/dialog'; import { translate } from '../../../../base/i18n'; import { connect } from '../../../../base/redux'; import AbstractLiveStreamButton, { - _mapStateToProps as _abstractMapStateToProps, - type Props + type Props, + _mapStateToProps as _abstractMapStateToProps } from '../AbstractLiveStreamButton'; import { diff --git a/react/features/recording/components/LiveStream/web/StartLiveStreamDialog.js b/react/features/recording/components/LiveStream/web/StartLiveStreamDialog.js index e9c27060b1..9284936135 100644 --- a/react/features/recording/components/LiveStream/web/StartLiveStreamDialog.js +++ b/react/features/recording/components/LiveStream/web/StartLiveStreamDialog.js @@ -17,8 +17,8 @@ import { updateProfile } from '../../../../google-api'; import AbstractStartLiveStreamDialog, { - _mapStateToProps as _abstractMapStateToProps, - type Props as AbstractProps + type Props as AbstractProps, + _mapStateToProps as _abstractMapStateToProps } from '../AbstractStartLiveStreamDialog'; import StreamKeyForm from './StreamKeyForm'; diff --git a/react/features/recording/components/Recording/AbstractHighlightButton.js b/react/features/recording/components/Recording/AbstractHighlightButton.js index c591542184..d94741ebf9 100644 --- a/react/features/recording/components/Recording/AbstractHighlightButton.js +++ b/react/features/recording/components/Recording/AbstractHighlightButton.js @@ -8,9 +8,9 @@ import { JitsiRecordingConstants } from '../../../base/lib-jitsi-meet'; import { maybeShowPremiumFeatureDialog } from '../../../jaas/actions'; import { FEATURES } from '../../../jaas/constants'; import { - hideNotification, NOTIFICATION_TIMEOUT_TYPE, NOTIFICATION_TYPE, + hideNotification, showNotification } from '../../../notifications'; import { highlightMeetingMoment } from '../../actions.any'; diff --git a/react/features/recording/components/Recording/AbstractStartRecordingDialog.js b/react/features/recording/components/Recording/AbstractStartRecordingDialog.js index c49974a145..d9764418b9 100644 --- a/react/features/recording/components/Recording/AbstractStartRecordingDialog.js +++ b/react/features/recording/components/Recording/AbstractStartRecordingDialog.js @@ -9,8 +9,8 @@ import { import { JitsiRecordingConstants } from '../../../base/lib-jitsi-meet'; import { getDropboxData, - isEnabled as isDropboxEnabled, getNewAccessToken, + isEnabled as isDropboxEnabled, updateDropboxToken } from '../../../dropbox'; import { NOTIFICATION_TIMEOUT_TYPE, showErrorNotification } from '../../../notifications'; diff --git a/react/features/recording/components/Recording/LocalRecordingManager.web.ts b/react/features/recording/components/Recording/LocalRecordingManager.web.ts index 2b3dc4db61..3d47d4b812 100644 --- a/react/features/recording/components/Recording/LocalRecordingManager.web.ts +++ b/react/features/recording/components/Recording/LocalRecordingManager.web.ts @@ -7,7 +7,7 @@ import { IStore } from '../../../app/types'; import { getRoomName } from '../../../base/conference'; import { MEDIA_TYPE } from '../../../base/media/constants'; // @ts-ignore -import { getTrackState, getLocalTrack } from '../../../base/tracks'; +import { getLocalTrack, getTrackState } from '../../../base/tracks'; import { inIframe } from '../../../base/util/iframeUtils'; // @ts-ignore import { stopLocalVideoRecording } from '../../actions.any'; diff --git a/react/features/recording/components/Recording/native/HighlightButton.js b/react/features/recording/components/Recording/native/HighlightButton.js index 8de6e24ece..d374b56fb4 100644 --- a/react/features/recording/components/Recording/native/HighlightButton.js +++ b/react/features/recording/components/Recording/native/HighlightButton.js @@ -9,8 +9,8 @@ import { Label } from '../../../../base/label'; import { connect } from '../../../../base/redux'; import BaseTheme from '../../../../base/ui/components/BaseTheme'; import AbstractHighlightButton, { - _abstractMapStateToProps, - type Props as AbstractProps + type Props as AbstractProps, + _abstractMapStateToProps } from '../AbstractHighlightButton'; import styles from '../styles.native'; diff --git a/react/features/recording/components/Recording/native/HighlightDialog.js b/react/features/recording/components/Recording/native/HighlightDialog.js index dcee3083d8..1b450442e2 100644 --- a/react/features/recording/components/Recording/native/HighlightDialog.js +++ b/react/features/recording/components/Recording/native/HighlightDialog.js @@ -1,7 +1,7 @@ import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { Text, View } from 'react-native'; -import { useDispatch, batch } from 'react-redux'; +import { batch, useDispatch } from 'react-redux'; import { BottomSheet, hideSheet } from '../../../../base/dialog'; import Button from '../../../../base/ui/components/native/Button'; diff --git a/react/features/recording/components/Recording/web/HighlightButton.tsx b/react/features/recording/components/Recording/web/HighlightButton.tsx index d96819f437..e079239ae2 100644 --- a/react/features/recording/components/Recording/web/HighlightButton.tsx +++ b/react/features/recording/components/Recording/web/HighlightButton.tsx @@ -18,8 +18,8 @@ import BaseTheme from '../../../../base/ui/components/BaseTheme.web'; import { maybeShowPremiumFeatureDialog } from '../../../../jaas/actions'; import { FEATURES } from '../../../../jaas/constants'; import AbstractHighlightButton, { - _abstractMapStateToProps, - type Props as AbstractProps + type Props as AbstractProps, + _abstractMapStateToProps // @ts-ignore } from '../AbstractHighlightButton'; diff --git a/react/features/recording/components/Recording/web/RecordButton.js b/react/features/recording/components/Recording/web/RecordButton.js index 116bbc8243..11ccb00806 100644 --- a/react/features/recording/components/Recording/web/RecordButton.js +++ b/react/features/recording/components/Recording/web/RecordButton.js @@ -5,8 +5,8 @@ import { openDialog } from '../../../../base/dialog'; import { translate } from '../../../../base/i18n'; import { connect } from '../../../../base/redux'; import AbstractRecordButton, { - _mapStateToProps as _abstractMapStateToProps, - type Props + type Props, + _mapStateToProps as _abstractMapStateToProps } from '../AbstractRecordButton'; import { StartRecordingDialog, StopRecordingDialog } from './index'; diff --git a/react/features/recording/components/native/RecordingExpandedLabel.js b/react/features/recording/components/native/RecordingExpandedLabel.js index 43038fe2c6..88c0013471 100644 --- a/react/features/recording/components/native/RecordingExpandedLabel.js +++ b/react/features/recording/components/native/RecordingExpandedLabel.js @@ -2,8 +2,8 @@ import { translate } from '../../../base/i18n'; import { - ExpandedLabel, - type Props as AbstractProps + type Props as AbstractProps, + ExpandedLabel } from '../../../base/label'; import { JitsiRecordingConstants } from '../../../base/lib-jitsi-meet'; import { connect } from '../../../base/redux'; diff --git a/react/features/recording/middleware.js b/react/features/recording/middleware.js index a5d690d827..982e663dac 100644 --- a/react/features/recording/middleware.js +++ b/react/features/recording/middleware.js @@ -43,8 +43,8 @@ import { RECORDING_ON_SOUND_ID } from './constants'; import { - getSessionById, - getResourceId + getResourceId, + getSessionById } from './functions'; import logger from './logger'; import { diff --git a/react/features/remote-control/actions.js b/react/features/remote-control/actions.js index a497ea9962..e335dc47be 100644 --- a/react/features/remote-control/actions.js +++ b/react/features/remote-control/actions.js @@ -12,18 +12,18 @@ import { NOTIFICATION_TIMEOUT_TYPE, showNotification } from '../notifications'; import { CAPTURE_EVENTS, REMOTE_CONTROL_ACTIVE, - SET_REQUESTED_PARTICIPANT, + SET_CONTROLLED_PARTICIPANT, SET_CONTROLLER, SET_RECEIVER_ENABLED, SET_RECEIVER_TRANSPORT, - SET_CONTROLLED_PARTICIPANT + SET_REQUESTED_PARTICIPANT } from './actionTypes'; import { RemoteControlAuthorizationDialog } from './components'; import { DISCO_REMOTE_CONTROL_FEATURE, EVENTS, - REMOTE_CONTROL_MESSAGE_NAME, PERMISSIONS_ACTIONS, + REMOTE_CONTROL_MESSAGE_NAME, REQUESTS } from './constants'; import { diff --git a/react/features/remote-control/components/RemoteControlAuthorizationDialog.js b/react/features/remote-control/components/RemoteControlAuthorizationDialog.js index 6cc6beb803..e7aaa2a32e 100644 --- a/react/features/remote-control/components/RemoteControlAuthorizationDialog.js +++ b/react/features/remote-control/components/RemoteControlAuthorizationDialog.js @@ -7,7 +7,7 @@ import { translate } from '../../base/i18n'; import { getParticipantById } from '../../base/participants'; import { connect } from '../../base/redux'; import { getLocalVideoTrack } from '../../base/tracks'; -import { grant, deny } from '../actions'; +import { deny, grant } from '../actions'; declare var APP: Object; diff --git a/react/features/remote-control/functions.js b/react/features/remote-control/functions.js index b9f2dbbe5b..46280ecd76 100644 --- a/react/features/remote-control/functions.js +++ b/react/features/remote-control/functions.js @@ -4,7 +4,7 @@ import VideoLayout from '../../../modules/UI/videolayout/VideoLayout'; import JitsiMeetJS from '../base/lib-jitsi-meet'; import { enableReceiver, stopReceiver } from './actions'; -import { REMOTE_CONTROL_MESSAGE_NAME, EVENTS } from './constants'; +import { EVENTS, REMOTE_CONTROL_MESSAGE_NAME } from './constants'; import { keyboardEventToKey } from './keycodes'; import logger from './logger'; diff --git a/react/features/remote-control/subscriber.js b/react/features/remote-control/subscriber.js index 3287ac462f..9ea739b182 100644 --- a/react/features/remote-control/subscriber.js +++ b/react/features/remote-control/subscriber.js @@ -7,7 +7,7 @@ import { } from '../base/participants'; import { StateListenerRegistry } from '../base/redux'; -import { resume, pause } from './actions'; +import { pause, resume } from './actions'; /** * Listens for large video participant ID changes. diff --git a/react/features/room-lock/actions.js b/react/features/room-lock/actions.js index a734d34d42..eeb8b5479c 100644 --- a/react/features/room-lock/actions.js +++ b/react/features/room-lock/actions.js @@ -7,8 +7,8 @@ import { maybeRedirectToWelcomePage } from '../app/actions'; import { - conferenceLeft, JITSI_CONFERENCE_URL_KEY, + conferenceLeft, setPassword } from '../base/conference'; import { hideDialog, openDialog } from '../base/dialog'; diff --git a/react/features/rtcstats/functions.ts b/react/features/rtcstats/functions.ts index 8d21dba8d1..061fde2193 100644 --- a/react/features/rtcstats/functions.ts +++ b/react/features/rtcstats/functions.ts @@ -4,8 +4,8 @@ import { jitsiLocalStorage } from '@jitsi/js-utils'; import { getAmplitudeIdentity } from '../analytics/functions'; import { - getConferenceOptions, - getAnalyticsRoomName + getAnalyticsRoomName, + getConferenceOptions // @ts-ignore } from '../base/conference'; diff --git a/react/features/rtcstats/middleware.ts b/react/features/rtcstats/middleware.ts index 61e0e5c741..3d46fb7e3e 100644 --- a/react/features/rtcstats/middleware.ts +++ b/react/features/rtcstats/middleware.ts @@ -3,19 +3,18 @@ import { AnyAction } from 'redux'; import { IStore } from '../app/types'; import { - E2E_RTT_CHANGED, CONFERENCE_JOINED, CONFERENCE_TIMESTAMP_CHANGED, CONFERENCE_UNIQUE_ID_SET, - CONFERENCE_WILL_LEAVE - + CONFERENCE_WILL_LEAVE, + E2E_RTT_CHANGED // @ts-ignore } from '../base/conference'; import { LIB_WILL_INIT } from '../base/lib-jitsi-meet/actionTypes'; import { DOMINANT_SPEAKER_CHANGED } from '../base/participants/actionTypes'; import MiddlewareRegistry from '../base/redux/MiddlewareRegistry'; import { TRACK_ADDED, TRACK_UPDATED } from '../base/tracks/actionTypes'; -import { isInBreakoutRoom, getCurrentRoomId } from '../breakout-rooms/functions'; +import { getCurrentRoomId, isInBreakoutRoom } from '../breakout-rooms/functions'; // @ts-ignore import { extractFqnFromPath } from '../dynamic-branding/functions.any'; import { ADD_FACE_EXPRESSION, FACE_LANDMARK_DETECTION_STOPPED } from '../face-landmarks/actionTypes'; diff --git a/react/features/salesforce/actions.js b/react/features/salesforce/actions.js index 562884695f..149c3a6312 100644 --- a/react/features/salesforce/actions.js +++ b/react/features/salesforce/actions.js @@ -2,10 +2,10 @@ import { openDialog } from '../base/dialog'; import { - hideNotification, NOTIFICATION_TIMEOUT_TYPE, NOTIFICATION_TYPE, SALESFORCE_LINK_NOTIFICATION_ID, + hideNotification, showNotification } from '../notifications'; diff --git a/react/features/salesforce/components/native/RecordItem.js b/react/features/salesforce/components/native/RecordItem.js index ddd72dcadf..7dad2494cd 100644 --- a/react/features/salesforce/components/native/RecordItem.js +++ b/react/features/salesforce/components/native/RecordItem.js @@ -2,7 +2,7 @@ import React from 'react'; import { useTranslation } from 'react-i18next'; -import { View, Text, TouchableHighlight } from 'react-native'; +import { Text, TouchableHighlight, View } from 'react-native'; import { Icon } from '../../../base/icons'; import { RECORD_TYPE } from '../../constants'; diff --git a/react/features/salesforce/components/native/SalesforceLinkDialog.js b/react/features/salesforce/components/native/SalesforceLinkDialog.js index 35f583b6f4..36138fa619 100644 --- a/react/features/salesforce/components/native/SalesforceLinkDialog.js +++ b/react/features/salesforce/components/native/SalesforceLinkDialog.js @@ -2,7 +2,7 @@ import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; -import { View, SafeAreaView, ScrollView, Text, TextInput, Platform } from 'react-native'; +import { Platform, SafeAreaView, ScrollView, Text, TextInput, View } from 'react-native'; import { Button, withTheme } from 'react-native-paper'; import { useSelector } from 'react-redux'; diff --git a/react/features/salesforce/useSalesforceLinkDialog.js b/react/features/salesforce/useSalesforceLinkDialog.js index 7695841cea..6401160768 100644 --- a/react/features/salesforce/useSalesforceLinkDialog.js +++ b/react/features/salesforce/useSalesforceLinkDialog.js @@ -4,10 +4,10 @@ import { useDispatch, useSelector } from 'react-redux'; import { getCurrentConference } from '../base/conference'; import { - hideNotification, NOTIFICATION_TIMEOUT_TYPE, NOTIFICATION_TYPE, SALESFORCE_LINK_NOTIFICATION_ID, + hideNotification, showNotification } from '../notifications'; diff --git a/react/features/screen-share/actions.js b/react/features/screen-share/actions.js index 1a16a82b11..52df7d52a7 100644 --- a/react/features/screen-share/actions.js +++ b/react/features/screen-share/actions.js @@ -6,9 +6,9 @@ import { shouldHideShareAudioHelper } from '../base/settings'; import { toggleScreensharing } from '../base/tracks'; import { - SET_SCREEN_AUDIO_SHARE_STATE, SET_SCREENSHARE_CAPTURE_FRAME_RATE, - SET_SCREENSHARE_TRACKS + SET_SCREENSHARE_TRACKS, + SET_SCREEN_AUDIO_SHARE_STATE } from './actionTypes'; import { ShareAudioDialog } from './components'; import ShareMediaWarningDialog from './components/ShareScreenWarningDialog'; diff --git a/react/features/screen-share/components/ShareAudioDialog.tsx b/react/features/screen-share/components/ShareAudioDialog.tsx index edbd2cbd25..d2a76dd4a8 100644 --- a/react/features/screen-share/components/ShareAudioDialog.tsx +++ b/react/features/screen-share/components/ShareAudioDialog.tsx @@ -8,8 +8,8 @@ import { Dialog } from '../../base/dialog'; import { translate } from '../../base/i18n/functions'; import { connect } from '../../base/redux/functions'; import { - updateSettings, - shouldHideShareAudioHelper + shouldHideShareAudioHelper, + updateSettings // @ts-ignore } from '../../base/settings'; // @ts-ignore diff --git a/react/features/screen-share/reducer.ts b/react/features/screen-share/reducer.ts index 5ab424d8cf..ebf4005db1 100644 --- a/react/features/screen-share/reducer.ts +++ b/react/features/screen-share/reducer.ts @@ -2,9 +2,9 @@ import ReducerRegistry from '../base/redux/ReducerRegistry'; import { - SET_SCREEN_AUDIO_SHARE_STATE, SET_SCREENSHARE_CAPTURE_FRAME_RATE, - SET_SCREENSHARE_TRACKS + SET_SCREENSHARE_TRACKS, + SET_SCREEN_AUDIO_SHARE_STATE } from './actionTypes'; export interface IScreenShareState { diff --git a/react/features/security/components/security-dialog/AbstractSecurityDialogButton.js b/react/features/security/components/security-dialog/AbstractSecurityDialogButton.js index 26ec695975..23ce03140c 100644 --- a/react/features/security/components/security-dialog/AbstractSecurityDialogButton.js +++ b/react/features/security/components/security-dialog/AbstractSecurityDialogButton.js @@ -4,10 +4,10 @@ import type { Dispatch } from 'redux'; import { createToolbarEvent, sendAnalytics } from '../../../analytics'; import { - getFeatureFlag, LOBBY_MODE_ENABLED, MEETING_PASSWORD_ENABLED, - SECURITY_OPTIONS_ENABLED + SECURITY_OPTIONS_ENABLED, + getFeatureFlag } from '../../../base/flags'; import { IconSecurityOff, IconSecurityOn } from '../../../base/icons'; import { isLocalParticipantModerator } from '../../../base/participants'; diff --git a/react/features/security/components/security-dialog/native/SecurityDialog.js b/react/features/security/components/security-dialog/native/SecurityDialog.js index 107738ed36..84619e2723 100644 --- a/react/features/security/components/security-dialog/native/SecurityDialog.js +++ b/react/features/security/components/security-dialog/native/SecurityDialog.js @@ -6,7 +6,7 @@ import { } from 'react-native'; import type { Dispatch } from 'redux'; -import { getFeatureFlag, MEETING_PASSWORD_ENABLED } from '../../../../base/flags'; +import { MEETING_PASSWORD_ENABLED, getFeatureFlag } from '../../../../base/flags'; import { translate } from '../../../../base/i18n'; import JitsiScreen from '../../../../base/modal/components/JitsiScreen'; import { isLocalParticipantModerator } from '../../../../base/participants'; diff --git a/react/features/security/components/security-dialog/native/SecurityDialogButton.js b/react/features/security/components/security-dialog/native/SecurityDialogButton.js index eee01220af..ba29c91368 100644 --- a/react/features/security/components/security-dialog/native/SecurityDialogButton.js +++ b/react/features/security/components/security-dialog/native/SecurityDialogButton.js @@ -5,8 +5,8 @@ import { connect } from '../../../../base/redux'; import { navigate } from '../../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef'; import { screen } from '../../../../mobile/navigation/routes'; import AbstractSecurityDialogButton, { - _mapStateToProps as _abstractMapStateToProps, - type Props as AbstractSecurityDialogButtonProps + type Props as AbstractSecurityDialogButtonProps, + _mapStateToProps as _abstractMapStateToProps } from '../AbstractSecurityDialogButton'; type Props = AbstractSecurityDialogButtonProps; diff --git a/react/features/security/components/security-dialog/web/SecurityDialog.tsx b/react/features/security/components/security-dialog/web/SecurityDialog.tsx index 6c98584c42..4215791bc7 100644 --- a/react/features/security/components/security-dialog/web/SecurityDialog.tsx +++ b/react/features/security/components/security-dialog/web/SecurityDialog.tsx @@ -1,5 +1,5 @@ /* eslint-disable lines-around-comment */ -import React, { useState, useEffect } from 'react'; +import React, { useEffect, useState } from 'react'; import { IState } from '../../../../app/types'; // @ts-ignore diff --git a/react/features/security/components/security-dialog/web/SecurityDialogButton.js b/react/features/security/components/security-dialog/web/SecurityDialogButton.js index 56cbf20a8d..17e7a40d22 100644 --- a/react/features/security/components/security-dialog/web/SecurityDialogButton.js +++ b/react/features/security/components/security-dialog/web/SecurityDialogButton.js @@ -4,8 +4,8 @@ import { translate } from '../../../../base/i18n'; import { connect } from '../../../../base/redux'; import { toggleSecurityDialog } from '../../../actions'; import AbstractSecurityDialogButton, { - _mapStateToProps as _abstractMapStateToProps, - type Props as AbstractSecurityDialogButtonProps + type Props as AbstractSecurityDialogButtonProps, + _mapStateToProps as _abstractMapStateToProps } from '../AbstractSecurityDialogButton'; type Props = AbstractSecurityDialogButtonProps; diff --git a/react/features/settings/components/native/SettingsView.tsx b/react/features/settings/components/native/SettingsView.tsx index 838b625a75..35f021ead6 100644 --- a/react/features/settings/components/native/SettingsView.tsx +++ b/react/features/settings/components/native/SettingsView.tsx @@ -36,7 +36,7 @@ import { screen } from '../../../mobile/navigation/routes'; // @ts-ignore import { AVATAR_SIZE } from '../../../welcome/components/styles'; // @ts-ignore -import { normalizeUserInputURL, isServerURLChangeEnabled } from '../../functions'; +import { isServerURLChangeEnabled, normalizeUserInputURL } from '../../functions'; // @ts-ignore import FormRow from './FormRow'; diff --git a/react/features/settings/components/web/CalendarTab.js b/react/features/settings/components/web/CalendarTab.js index 5a0dd3df55..19e6e523e4 100644 --- a/react/features/settings/components/web/CalendarTab.js +++ b/react/features/settings/components/web/CalendarTab.js @@ -9,8 +9,8 @@ import { Button } from '../../../base/ui/components/web'; import { CALENDAR_TYPE, MicrosoftSignInButton, - clearCalendarIntegration, bootstrapCalendarIntegration, + clearCalendarIntegration, isCalendarEnabled, signIn } from '../../../calendar-sync'; diff --git a/react/features/settings/functions.js b/react/features/settings/functions.js index b6eaac3243..f77bbf5e24 100644 --- a/react/features/settings/functions.js +++ b/react/features/settings/functions.js @@ -2,7 +2,7 @@ import { isNameReadOnly } from '../base/config'; import { SERVER_URL_CHANGE_ENABLED, getFeatureFlag } from '../base/flags'; -import { i18next, DEFAULT_LANGUAGE, LANGUAGES } from '../base/i18n'; +import { DEFAULT_LANGUAGE, LANGUAGES, i18next } from '../base/i18n'; import { createLocalTrack } from '../base/lib-jitsi-meet/functions'; import { getLocalParticipant, diff --git a/react/features/settings/middleware.web.js b/react/features/settings/middleware.web.js index dda8cbabd7..ce0f413539 100644 --- a/react/features/settings/middleware.web.js +++ b/react/features/settings/middleware.web.js @@ -1,5 +1,5 @@ import { MiddlewareRegistry } from '../base/redux'; -import { getHideSelfView, SETTINGS_UPDATED } from '../base/settings'; +import { SETTINGS_UPDATED, getHideSelfView } from '../base/settings'; import { NOTIFICATION_TIMEOUT_TYPE, showNotification } from '../notifications'; import { openSettingsDialog } from './actions'; diff --git a/react/features/shared-video/components/native/SharedVideoButton.js b/react/features/shared-video/components/native/SharedVideoButton.js index dc65d262f2..8efd574eb6 100644 --- a/react/features/shared-video/components/native/SharedVideoButton.js +++ b/react/features/shared-video/components/native/SharedVideoButton.js @@ -2,7 +2,7 @@ import type { Dispatch } from 'redux'; -import { getFeatureFlag, VIDEO_SHARE_BUTTON_ENABLED } from '../../../base/flags'; +import { VIDEO_SHARE_BUTTON_ENABLED, getFeatureFlag } from '../../../base/flags'; import { translate } from '../../../base/i18n'; import { IconShareVideo } from '../../../base/icons'; import { getLocalParticipant } from '../../../base/participants'; diff --git a/react/features/shared-video/components/native/VideoManager.js b/react/features/shared-video/components/native/VideoManager.js index bc2aa01def..1f18c1e6ef 100644 --- a/react/features/shared-video/components/native/VideoManager.js +++ b/react/features/shared-video/components/native/VideoManager.js @@ -6,8 +6,8 @@ import { connect } from '../../../base/redux'; import { PLAYBACK_STATUSES } from '../../constants'; import AbstractVideoManager, { - _mapStateToProps, - Props + Props, + _mapStateToProps } from './AbstractVideoManager'; const logger = Logger.getLogger(__filename); diff --git a/react/features/shared-video/components/native/YoutubeVideoManager.js b/react/features/shared-video/components/native/YoutubeVideoManager.js index 46584c5f6c..10cf17aa29 100644 --- a/react/features/shared-video/components/native/YoutubeVideoManager.js +++ b/react/features/shared-video/components/native/YoutubeVideoManager.js @@ -5,8 +5,8 @@ import { connect } from '../../../base/redux'; import { PLAYBACK_STATUSES } from '../../constants'; import AbstractVideoManager, { - _mapStateToProps, - Props + Props, + _mapStateToProps } from './AbstractVideoManager'; /** diff --git a/react/features/shared-video/components/web/AbstractVideoManager.js b/react/features/shared-video/components/web/AbstractVideoManager.js index bd4d7d5e6d..1ecc23fe11 100644 --- a/react/features/shared-video/components/web/AbstractVideoManager.js +++ b/react/features/shared-video/components/web/AbstractVideoManager.js @@ -4,7 +4,7 @@ import Logger from '@jitsi/logger'; import throttle from 'lodash/throttle'; import { PureComponent } from 'react'; -import { sendAnalytics, createSharedVideoEvent as createEvent } from '../../../analytics'; +import { createSharedVideoEvent as createEvent, sendAnalytics } from '../../../analytics'; import { getCurrentConference } from '../../../base/conference'; import { MEDIA_TYPE } from '../../../base/media'; import { getLocalParticipant } from '../../../base/participants'; diff --git a/react/features/shared-video/components/web/VideoManager.js b/react/features/shared-video/components/web/VideoManager.js index 0d3422af8f..468312e59c 100644 --- a/react/features/shared-video/components/web/VideoManager.js +++ b/react/features/shared-video/components/web/VideoManager.js @@ -4,9 +4,9 @@ import { connect } from '../../../base/redux'; import { PLAYBACK_STATUSES } from '../../constants'; import AbstractVideoManager, { + Props, _mapDispatchToProps, - _mapStateToProps, - Props + _mapStateToProps } from './AbstractVideoManager'; diff --git a/react/features/shared-video/middleware.any.js b/react/features/shared-video/middleware.any.js index aac256e404..7c5158192c 100644 --- a/react/features/shared-video/middleware.any.js +++ b/react/features/shared-video/middleware.any.js @@ -8,19 +8,19 @@ import { MEDIA_TYPE } from '../base/media'; import { PARTICIPANT_LEFT, getLocalParticipant, + getParticipantById, participantJoined, participantLeft, - pinParticipant, - getParticipantById + pinParticipant } from '../base/participants'; import { MiddlewareRegistry } from '../base/redux'; -import { SET_SHARED_VIDEO_STATUS, RESET_SHARED_VIDEO_STATUS } from './actionTypes'; +import { RESET_SHARED_VIDEO_STATUS, SET_SHARED_VIDEO_STATUS } from './actionTypes'; import { resetSharedVideoStatus, setSharedVideoStatus } from './actions.any'; -import { SHARED_VIDEO, VIDEO_PLAYER_PARTICIPANT_NAME, PLAYBACK_STATUSES } from './constants'; +import { PLAYBACK_STATUSES, SHARED_VIDEO, VIDEO_PLAYER_PARTICIPANT_NAME } from './constants'; import { isSharingStatus } from './functions'; import logger from './logger'; diff --git a/react/features/shared-video/reducer.ts b/react/features/shared-video/reducer.ts index 641e8a98bd..eb1ff1240a 100644 --- a/react/features/shared-video/reducer.ts +++ b/react/features/shared-video/reducer.ts @@ -1,6 +1,6 @@ import ReducerRegistry from '../base/redux/ReducerRegistry'; -import { RESET_SHARED_VIDEO_STATUS, SET_SHARED_VIDEO_STATUS, SET_DISABLE_BUTTON } from './actionTypes'; +import { RESET_SHARED_VIDEO_STATUS, SET_DISABLE_BUTTON, SET_SHARED_VIDEO_STATUS } from './actionTypes'; const initialState = {}; diff --git a/react/features/speaker-stats/actions.any.js b/react/features/speaker-stats/actions.any.js index 480fc71ac1..8ea7c28906 100644 --- a/react/features/speaker-stats/actions.any.js +++ b/react/features/speaker-stats/actions.any.js @@ -1,12 +1,12 @@ // @flow import { + INIT_REORDER_STATS, INIT_SEARCH, INIT_UPDATE_STATS, - UPDATE_STATS, - INIT_REORDER_STATS, RESET_SEARCH_CRITERIA, - TOGGLE_FACE_EXPRESSIONS + TOGGLE_FACE_EXPRESSIONS, + UPDATE_STATS } from './actionTypes'; /** diff --git a/react/features/speaker-stats/components/native/SpeakerStats.js b/react/features/speaker-stats/components/native/SpeakerStats.js index f3807ec61e..84fa47a41f 100644 --- a/react/features/speaker-stats/components/native/SpeakerStats.js +++ b/react/features/speaker-stats/components/native/SpeakerStats.js @@ -5,7 +5,7 @@ import { useDispatch } from 'react-redux'; import JitsiScreen from '../../../base/modal/components/JitsiScreen'; import { escapeRegexp } from '../../../base/util'; -import { resetSearchCriteria, initSearch } from '../../actions'; +import { initSearch, resetSearchCriteria } from '../../actions'; import SpeakerStatsList from './SpeakerStatsList'; diff --git a/react/features/speaker-stats/components/native/SpeakerStatsButton.js b/react/features/speaker-stats/components/native/SpeakerStatsButton.js index eb48455fce..cd2cffcdb2 100644 --- a/react/features/speaker-stats/components/native/SpeakerStatsButton.js +++ b/react/features/speaker-stats/components/native/SpeakerStatsButton.js @@ -1,7 +1,7 @@ // @flow import { createToolbarEvent, sendAnalytics } from '../../../analytics'; -import { getFeatureFlag, SPEAKERSTATS_ENABLED } from '../../../base/flags'; +import { SPEAKERSTATS_ENABLED, getFeatureFlag } from '../../../base/flags'; import { translate } from '../../../base/i18n'; import { connect } from '../../../base/redux'; import { navigate } from '../../../mobile/navigation/components/conference/ConferenceNavigationContainerRef'; diff --git a/react/features/speaker-stats/components/native/SpeakerStatsItem.js b/react/features/speaker-stats/components/native/SpeakerStatsItem.js index 3bcbfd2088..8c83820ee2 100644 --- a/react/features/speaker-stats/components/native/SpeakerStatsItem.js +++ b/react/features/speaker-stats/components/native/SpeakerStatsItem.js @@ -1,7 +1,7 @@ // @flow import React from 'react'; -import { View, Text } from 'react-native'; +import { Text, View } from 'react-native'; import { Avatar, StatelessAvatar } from '../../../base/avatar'; import { getInitials } from '../../../base/avatar/functions'; diff --git a/react/features/speaker-stats/components/native/SpeakerStatsSearch.js b/react/features/speaker-stats/components/native/SpeakerStatsSearch.js index 88a50c1b63..96469a24a7 100644 --- a/react/features/speaker-stats/components/native/SpeakerStatsSearch.js +++ b/react/features/speaker-stats/components/native/SpeakerStatsSearch.js @@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next'; import { withTheme } from 'react-native-paper'; import { useSelector } from 'react-redux'; -import { IconSearch, Icon } from '../../../base/icons'; +import { Icon, IconSearch } from '../../../base/icons'; import ClearableInput from '../../../participants-pane/components/native/ClearableInput'; import { isSpeakerStatsSearchDisabled } from '../../functions'; diff --git a/react/features/speaker-stats/components/web/SpeakerStats.tsx b/react/features/speaker-stats/components/web/SpeakerStats.tsx index 6b36ad8dcb..e82f054174 100644 --- a/react/features/speaker-stats/components/web/SpeakerStats.tsx +++ b/react/features/speaker-stats/components/web/SpeakerStats.tsx @@ -1,7 +1,7 @@ /* eslint-disable lines-around-comment */ import { Theme } from '@mui/material'; import React, { useCallback, useEffect } from 'react'; -import { useSelector, useDispatch } from 'react-redux'; +import { useDispatch, useSelector } from 'react-redux'; import { makeStyles } from 'tss-react/mui'; import { IState } from '../../../app/types'; @@ -9,7 +9,7 @@ import { IState } from '../../../app/types'; import { Dialog } from '../../../base/dialog'; import { escapeRegexp } from '../../../base/util/helpers'; // @ts-ignore -import { resetSearchCriteria, toggleFaceExpressions, initSearch } from '../../actions'; +import { initSearch, resetSearchCriteria, toggleFaceExpressions } from '../../actions'; import { DISPLAY_SWITCH_BREAKPOINT, MOBILE_BREAKPOINT, diff --git a/react/features/speaker-stats/functions.js b/react/features/speaker-stats/functions.js index 63a3c37ef7..69089baa08 100644 --- a/react/features/speaker-stats/functions.js +++ b/react/features/speaker-stats/functions.js @@ -3,8 +3,8 @@ import _ from 'lodash'; import { - getParticipantById, - PARTICIPANT_ROLE + PARTICIPANT_ROLE, + getParticipantById } from '../base/participants'; import { objectSort } from '../base/util'; diff --git a/react/features/speaker-stats/middleware.js b/react/features/speaker-stats/middleware.js index 78283dfc96..c580929541 100644 --- a/react/features/speaker-stats/middleware.js +++ b/react/features/speaker-stats/middleware.js @@ -14,7 +14,7 @@ import { RESET_SEARCH_CRITERIA } from './actionTypes'; import { initReorderStats, updateStats } from './actions'; -import { filterBySearchCriteria, getSortedSpeakerStats, getPendingReorder, resetHiddenStats } from './functions'; +import { filterBySearchCriteria, getPendingReorder, getSortedSpeakerStats, resetHiddenStats } from './functions'; MiddlewareRegistry.register(({ dispatch, getState }) => next => action => { const result = next(action); diff --git a/react/features/speaker-stats/reducer.ts b/react/features/speaker-stats/reducer.ts index 2d216e26ed..4d69b352a6 100644 --- a/react/features/speaker-stats/reducer.ts +++ b/react/features/speaker-stats/reducer.ts @@ -3,11 +3,11 @@ import _ from 'lodash'; import ReducerRegistry from '../base/redux/ReducerRegistry'; import { - INIT_SEARCH, - UPDATE_STATS, INIT_REORDER_STATS, + INIT_SEARCH, RESET_SEARCH_CRITERIA, - TOGGLE_FACE_EXPRESSIONS + TOGGLE_FACE_EXPRESSIONS, + UPDATE_STATS } from './actionTypes'; /** diff --git a/react/features/stream-effects/virtual-background/JitsiStreamBackgroundEffect.js b/react/features/stream-effects/virtual-background/JitsiStreamBackgroundEffect.js index 351544544d..ca1dc89c8e 100644 --- a/react/features/stream-effects/virtual-background/JitsiStreamBackgroundEffect.js +++ b/react/features/stream-effects/virtual-background/JitsiStreamBackgroundEffect.js @@ -4,8 +4,8 @@ import { VIRTUAL_BACKGROUND_TYPE } from '../../virtual-background/constants'; import { CLEAR_TIMEOUT, - TIMEOUT_TICK, SET_TIMEOUT, + TIMEOUT_TICK, timerWorkerScript } from './TimerWorker'; diff --git a/react/features/subtitles/actions.any.js b/react/features/subtitles/actions.any.js index 5aaaaa6c79..221de7ac4d 100644 --- a/react/features/subtitles/actions.any.js +++ b/react/features/subtitles/actions.any.js @@ -3,8 +3,8 @@ import { ENDPOINT_MESSAGE_RECEIVED, REMOVE_TRANSCRIPT_MESSAGE, - TOGGLE_REQUESTING_SUBTITLES, SET_REQUESTING_SUBTITLES, + TOGGLE_REQUESTING_SUBTITLES, UPDATE_TRANSCRIPT_MESSAGE, UPDATE_TRANSLATION_LANGUAGE } from './actionTypes'; diff --git a/react/features/subtitles/components/Captions.native.js b/react/features/subtitles/components/Captions.native.js index a34b690f66..f1fee6d431 100644 --- a/react/features/subtitles/components/Captions.native.js +++ b/react/features/subtitles/components/Captions.native.js @@ -6,9 +6,9 @@ import { Container, Text } from '../../base/react'; import { connect } from '../../base/redux'; import { - _abstractMapStateToProps, AbstractCaptions, - type AbstractCaptionsProps + type AbstractCaptionsProps, + _abstractMapStateToProps } from './AbstractCaptions'; import styles from './styles'; diff --git a/react/features/subtitles/components/Captions.web.js b/react/features/subtitles/components/Captions.web.js index 7352024a27..29149c89d6 100644 --- a/react/features/subtitles/components/Captions.web.js +++ b/react/features/subtitles/components/Captions.web.js @@ -8,9 +8,9 @@ import { getLargeVideoParticipant } from '../../large-video/functions'; import { isLayoutTileView } from '../../video-layout'; import { - _abstractMapStateToProps, AbstractCaptions, - type AbstractCaptionsProps + type AbstractCaptionsProps, + _abstractMapStateToProps } from './AbstractCaptions'; type Props = { diff --git a/react/features/subtitles/components/ClosedCaptionButton.native.js b/react/features/subtitles/components/ClosedCaptionButton.native.js index a612c2a124..c841131b9c 100644 --- a/react/features/subtitles/components/ClosedCaptionButton.native.js +++ b/react/features/subtitles/components/ClosedCaptionButton.native.js @@ -1,6 +1,6 @@ // @flow -import { getFeatureFlag, CLOSE_CAPTIONS_ENABLED } from '../../base/flags'; +import { CLOSE_CAPTIONS_ENABLED, getFeatureFlag } from '../../base/flags'; import { translate } from '../../base/i18n'; import { IconClosedCaption } from '../../base/icons'; import { connect } from '../../base/redux'; diff --git a/react/features/subtitles/components/LanguageSelectorDialog.web.tsx b/react/features/subtitles/components/LanguageSelectorDialog.web.tsx index 223e7d7edd..793f1bc3f2 100644 --- a/react/features/subtitles/components/LanguageSelectorDialog.web.tsx +++ b/react/features/subtitles/components/LanguageSelectorDialog.web.tsx @@ -1,15 +1,15 @@ /* eslint-disable lines-around-comment */ -import React, { useState, useEffect, useCallback } from 'react'; +import React, { useCallback, useEffect, useState } from 'react'; import { useDispatch } from 'react-redux'; import { IState } from '../../app/types'; // @ts-ignore import { Dialog } from '../../base/dialog'; // @ts-ignore -import { LANGUAGES, TRANSLATION_LANGUAGES_HEAD, TRANSLATION_LANGUAGES_EXCLUDE } from '../../base/i18n'; +import { LANGUAGES, TRANSLATION_LANGUAGES_EXCLUDE, TRANSLATION_LANGUAGES_HEAD } from '../../base/i18n'; import { connect } from '../../base/redux/functions'; // @ts-ignore -import { updateTranslationLanguage, setRequestingSubtitles, toggleLangugeSelectorDialog } from '../actions'; +import { setRequestingSubtitles, toggleLangugeSelectorDialog, updateTranslationLanguage } from '../actions'; import LanguageList from './LanguageList'; diff --git a/react/features/subtitles/middleware.js b/react/features/subtitles/middleware.js index 3c2eda9a14..d083fd1ac7 100644 --- a/react/features/subtitles/middleware.js +++ b/react/features/subtitles/middleware.js @@ -4,8 +4,8 @@ import { MiddlewareRegistry } from '../base/redux'; import { ENDPOINT_MESSAGE_RECEIVED, - TOGGLE_REQUESTING_SUBTITLES, - SET_REQUESTING_SUBTITLES + SET_REQUESTING_SUBTITLES, + TOGGLE_REQUESTING_SUBTITLES } from './actionTypes'; import { removeTranscriptMessage, diff --git a/react/features/toolbox/actions.any.js b/react/features/toolbox/actions.any.js index 2ac22964b8..4317101ed8 100644 --- a/react/features/toolbox/actions.any.js +++ b/react/features/toolbox/actions.any.js @@ -3,9 +3,9 @@ import type { Dispatch } from 'redux'; import UIEvents from '../../../service/UI/UIEvents'; -import { createToolbarEvent, sendAnalytics, VIDEO_MUTE } from '../analytics'; +import { VIDEO_MUTE, createToolbarEvent, sendAnalytics } from '../analytics'; import { setAudioOnly } from '../base/audio-only'; -import { setVideoMuted, VIDEO_MUTISM_AUTHORITY } from '../base/media'; +import { VIDEO_MUTISM_AUTHORITY, setVideoMuted } from '../base/media'; import { getLocalVideoType } from '../base/tracks'; import { diff --git a/react/features/toolbox/components/AudioMuteButton.js b/react/features/toolbox/components/AudioMuteButton.js index e673a3a0cc..34e1dd66dc 100644 --- a/react/features/toolbox/components/AudioMuteButton.js +++ b/react/features/toolbox/components/AudioMuteButton.js @@ -6,7 +6,7 @@ import { createShortcutEvent, sendAnalytics } from '../../analytics'; -import { getFeatureFlag, AUDIO_MUTE_BUTTON_ENABLED } from '../../base/flags'; +import { AUDIO_MUTE_BUTTON_ENABLED, getFeatureFlag } from '../../base/flags'; import { translate } from '../../base/i18n'; import { MEDIA_TYPE } from '../../base/media'; import { connect } from '../../base/redux'; diff --git a/react/features/toolbox/components/HelpButton.js b/react/features/toolbox/components/HelpButton.js index 62cecdcebe..390b4e3519 100644 --- a/react/features/toolbox/components/HelpButton.js +++ b/react/features/toolbox/components/HelpButton.js @@ -1,7 +1,7 @@ // @flow import { createToolbarEvent, sendAnalytics } from '../../analytics'; -import { getFeatureFlag, HELP_BUTTON_ENABLED } from '../../base/flags'; +import { HELP_BUTTON_ENABLED, getFeatureFlag } from '../../base/flags'; import { translate } from '../../base/i18n'; import { IconHelp } from '../../base/icons'; import { connect } from '../../base/redux'; diff --git a/react/features/toolbox/components/VideoMuteButton.js b/react/features/toolbox/components/VideoMuteButton.js index 90048b28cd..a3fff5f3bc 100644 --- a/react/features/toolbox/components/VideoMuteButton.js +++ b/react/features/toolbox/components/VideoMuteButton.js @@ -6,7 +6,7 @@ import { createShortcutEvent, sendAnalytics } from '../../analytics'; -import { getFeatureFlag, VIDEO_MUTE_BUTTON_ENABLED } from '../../base/flags'; +import { VIDEO_MUTE_BUTTON_ENABLED, getFeatureFlag } from '../../base/flags'; import { translate } from '../../base/i18n'; import { connect } from '../../base/redux'; import { AbstractButton, AbstractVideoMuteButton } from '../../base/toolbox/components'; diff --git a/react/features/toolbox/components/native/HangupMenu.tsx b/react/features/toolbox/components/native/HangupMenu.tsx index 43b096661b..ef2e8d9384 100644 --- a/react/features/toolbox/components/native/HangupMenu.tsx +++ b/react/features/toolbox/components/native/HangupMenu.tsx @@ -16,7 +16,7 @@ import { hideSheet } from '../../../base/dialog'; // @ts-ignore import BottomSheet from '../../../base/dialog/components/native/BottomSheet'; // @ts-ignore -import { getLocalParticipant, PARTICIPANT_ROLE } from '../../../base/participants'; +import { PARTICIPANT_ROLE, getLocalParticipant } from '../../../base/participants'; import Button from '../../../base/ui/components/native/Button'; import { BUTTON_TYPES } from '../../../base/ui/constants'; // @ts-ignore diff --git a/react/features/toolbox/components/native/OverflowMenuButton.js b/react/features/toolbox/components/native/OverflowMenuButton.js index b803556c43..946000511a 100644 --- a/react/features/toolbox/components/native/OverflowMenuButton.js +++ b/react/features/toolbox/components/native/OverflowMenuButton.js @@ -1,5 +1,5 @@ import { openSheet } from '../../../base/dialog'; -import { getFeatureFlag, OVERFLOW_MENU_ENABLED } from '../../../base/flags'; +import { OVERFLOW_MENU_ENABLED, getFeatureFlag } from '../../../base/flags'; import { translate } from '../../../base/i18n'; import { IconHorizontalPoints } from '../../../base/icons'; import { connect } from '../../../base/redux'; diff --git a/react/features/toolbox/components/native/ScreenSharingAndroidButton.js b/react/features/toolbox/components/native/ScreenSharingAndroidButton.js index 68e0ad7046..675bc938c4 100644 --- a/react/features/toolbox/components/native/ScreenSharingAndroidButton.js +++ b/react/features/toolbox/components/native/ScreenSharingAndroidButton.js @@ -8,7 +8,7 @@ import { translate } from '../../../base/i18n'; import { IconShareDesktop } from '../../../base/icons'; import { connect } from '../../../base/redux'; import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components'; -import { toggleScreensharing, isLocalVideoTrackDesktop } from '../../../base/tracks'; +import { isLocalVideoTrackDesktop, toggleScreensharing } from '../../../base/tracks'; /** * The type of the React {@code Component} props of {@link ScreenSharingAndroidButton}. diff --git a/react/features/toolbox/components/native/ScreenSharingIosButton.js b/react/features/toolbox/components/native/ScreenSharingIosButton.js index 366df63d49..7922238354 100644 --- a/react/features/toolbox/components/native/ScreenSharingIosButton.js +++ b/react/features/toolbox/components/native/ScreenSharingIosButton.js @@ -1,10 +1,10 @@ // @flow import React from 'react'; -import { findNodeHandle, NativeModules, Platform } from 'react-native'; +import { NativeModules, Platform, findNodeHandle } from 'react-native'; import { ScreenCapturePickerView } from 'react-native-webrtc'; -import { getFeatureFlag, IOS_SCREENSHARING_ENABLED } from '../../../base/flags'; +import { IOS_SCREENSHARING_ENABLED, getFeatureFlag } from '../../../base/flags'; import { translate } from '../../../base/i18n'; import { IconShareDesktop } from '../../../base/icons'; import { connect } from '../../../base/redux'; diff --git a/react/features/toolbox/components/native/Toolbox.js b/react/features/toolbox/components/native/Toolbox.js index 608934c109..e513ba426f 100644 --- a/react/features/toolbox/components/native/Toolbox.js +++ b/react/features/toolbox/components/native/Toolbox.js @@ -13,7 +13,7 @@ import { ParticipantsPaneButton } from '../../../participants-pane/components/na import { ReactionsMenuButton } from '../../../reactions/components'; import { isReactionsEnabled } from '../../../reactions/functions.any'; import { TileViewButton } from '../../../video-layout'; -import { isToolboxVisible, getMovableButtons } from '../../functions.native'; +import { getMovableButtons, isToolboxVisible } from '../../functions.native'; import AudioMuteButton from '../AudioMuteButton'; import HangupButton from '../HangupButton'; import VideoMuteButton from '../VideoMuteButton'; diff --git a/react/features/toolbox/components/web/OverflowMenuButton.tsx b/react/features/toolbox/components/web/OverflowMenuButton.tsx index 89f48db559..eaf6c23524 100644 --- a/react/features/toolbox/components/web/OverflowMenuButton.tsx +++ b/react/features/toolbox/components/web/OverflowMenuButton.tsx @@ -11,7 +11,7 @@ import { IState } from '../../../app/types'; import { translate } from '../../../base/i18n/functions'; // @ts-ignore import { ReactionEmoji, ReactionsMenu } from '../../../reactions/components'; -import { type ReactionEmojiProps, REACTIONS_MENU_HEIGHT } from '../../../reactions/constants'; +import { REACTIONS_MENU_HEIGHT, type ReactionEmojiProps } from '../../../reactions/constants'; import { getReactionsQueue } from '../../../reactions/functions.any'; import { DRAWER_MAX_HEIGHT } from '../../constants'; diff --git a/react/features/toolbox/components/web/ProfileButton.js b/react/features/toolbox/components/web/ProfileButton.js index de1370d038..d37b4aeab1 100644 --- a/react/features/toolbox/components/web/ProfileButton.js +++ b/react/features/toolbox/components/web/ProfileButton.js @@ -5,7 +5,7 @@ import { translate } from '../../../base/i18n'; import { getLocalParticipant } from '../../../base/participants'; import { connect } from '../../../base/redux'; import { AbstractButton, type AbstractButtonProps } from '../../../base/toolbox/components'; -import { openSettingsDialog, SETTINGS_TABS } from '../../../settings'; +import { SETTINGS_TABS, openSettingsDialog } from '../../../settings'; import ProfileButtonAvatar from './ProfileButtonAvatar'; diff --git a/react/features/toolbox/components/web/Toolbox.tsx b/react/features/toolbox/components/web/Toolbox.tsx index 99a18ec864..aab67a1377 100644 --- a/react/features/toolbox/components/web/Toolbox.tsx +++ b/react/features/toolbox/components/web/Toolbox.tsx @@ -73,9 +73,9 @@ import { // @ts-ignore import { isSalesforceEnabled } from '../../../salesforce/functions'; import { + ShareAudioButton, isScreenAudioSupported, isScreenVideoShared, - ShareAudioButton, startScreenShareFlow // @ts-ignore } from '../../../screen-share'; @@ -98,7 +98,7 @@ import { // @ts-ignore } from '../../../video-layout'; // @ts-ignore -import { VideoQualityDialog, VideoQualityButton } from '../../../video-quality/components'; +import { VideoQualityButton, VideoQualityDialog } from '../../../video-quality/components'; // @ts-ignore import { VideoBackgroundButton, toggleBackgroundEffect } from '../../../virtual-background'; import { VIRTUAL_BACKGROUND_TYPE } from '../../../virtual-background/constants'; @@ -110,7 +110,7 @@ import { showToolbox // @ts-ignore } from '../../actions'; -import { THRESHOLDS, NOT_APPLICABLE, NOTIFY_CLICK_MODE } from '../../constants'; +import { NOTIFY_CLICK_MODE, NOT_APPLICABLE, THRESHOLDS } from '../../constants'; // @ts-ignore import { isDesktopShareButtonDisabled, isToolboxVisible } from '../../functions'; // @ts-ignore diff --git a/react/features/toolbox/components/web/VideoSettingsButton.js b/react/features/toolbox/components/web/VideoSettingsButton.js index 40a91ee405..191f8934fc 100644 --- a/react/features/toolbox/components/web/VideoSettingsButton.js +++ b/react/features/toolbox/components/web/VideoSettingsButton.js @@ -8,7 +8,7 @@ import { IconArrowUp } from '../../../base/icons'; import { connect } from '../../../base/redux'; import { ToolboxButtonWithIcon } from '../../../base/toolbox/components'; import { getLocalJitsiVideoTrack } from '../../../base/tracks'; -import { toggleVideoSettings, VideoSettingsPopup } from '../../../settings'; +import { VideoSettingsPopup, toggleVideoSettings } from '../../../settings'; import { getVideoSettingsVisibility } from '../../../settings/functions'; import { isVideoSettingsButtonDisabled } from '../../functions'; import VideoMuteButton from '../VideoMuteButton'; diff --git a/react/features/toolbox/functions.native.js b/react/features/toolbox/functions.native.js index f67145ca80..69bc370f05 100644 --- a/react/features/toolbox/functions.native.js +++ b/react/features/toolbox/functions.native.js @@ -1,7 +1,7 @@ // @flow import { hasAvailableDevices } from '../base/devices'; -import { TOOLBOX_ALWAYS_VISIBLE, getFeatureFlag, TOOLBOX_ENABLED } from '../base/flags'; +import { TOOLBOX_ALWAYS_VISIBLE, TOOLBOX_ENABLED, getFeatureFlag } from '../base/flags'; import { getParticipantCountWithFake } from '../base/participants'; import { toState } from '../base/redux'; import { isLocalVideoTrackDesktop } from '../base/tracks'; diff --git a/react/features/toolbox/middleware.js b/react/features/toolbox/middleware.js index beda68e6e4..43d91774ca 100644 --- a/react/features/toolbox/middleware.js +++ b/react/features/toolbox/middleware.js @@ -4,8 +4,8 @@ import { MiddlewareRegistry } from '../base/redux'; import { CLEAR_TOOLBOX_TIMEOUT, - SET_TOOLBOX_TIMEOUT, - SET_FULL_SCREEN + SET_FULL_SCREEN, + SET_TOOLBOX_TIMEOUT } from './actionTypes'; import './subscriber'; diff --git a/react/features/transcribing/actions.js b/react/features/transcribing/actions.js index 1af4aca1fd..26db2acf9f 100644 --- a/react/features/transcribing/actions.js +++ b/react/features/transcribing/actions.js @@ -8,10 +8,10 @@ import { } from '../notifications'; import { + SET_PENDING_TRANSCRIBING_NOTIFICATION_UID, _POTENTIAL_TRANSCRIBER_JOINED, _TRANSCRIBER_JOINED, - _TRANSCRIBER_LEFT, - SET_PENDING_TRANSCRIBING_NOTIFICATION_UID + _TRANSCRIBER_LEFT } from './actionTypes'; /** diff --git a/react/features/transcribing/components/TranscribingExpandedLabel.native.js b/react/features/transcribing/components/TranscribingExpandedLabel.native.js index 0dbb0609fc..bfab6d9c0e 100644 --- a/react/features/transcribing/components/TranscribingExpandedLabel.native.js +++ b/react/features/transcribing/components/TranscribingExpandedLabel.native.js @@ -1,7 +1,7 @@ // @flow import { translate } from '../../base/i18n'; -import { ExpandedLabel, type Props as AbstractProps } from '../../base/label'; +import { type Props as AbstractProps, ExpandedLabel } from '../../base/label'; type Props = AbstractProps & { t: Function diff --git a/react/features/transcribing/components/TranscribingLabel.native.js b/react/features/transcribing/components/TranscribingLabel.native.js index 71bc61e159..02ab25ee21 100644 --- a/react/features/transcribing/components/TranscribingLabel.native.js +++ b/react/features/transcribing/components/TranscribingLabel.native.js @@ -6,7 +6,7 @@ import { translate } from '../../base/i18n'; import { Label } from '../../base/label'; import { connect } from '../../base/redux'; -import { _mapStateToProps, type Props } from './AbstractTranscribingLabel'; +import { type Props, _mapStateToProps } from './AbstractTranscribingLabel'; /** * React {@code Component} for displaying a label when a transcriber is in the diff --git a/react/features/transcribing/components/TranscribingLabel.web.js b/react/features/transcribing/components/TranscribingLabel.web.js index c07ec38bd7..c31b48c10d 100644 --- a/react/features/transcribing/components/TranscribingLabel.web.js +++ b/react/features/transcribing/components/TranscribingLabel.web.js @@ -7,7 +7,7 @@ import { Label } from '../../base/label'; import { connect } from '../../base/redux'; import { Tooltip } from '../../base/tooltip'; -import { _mapStateToProps, type Props } from './AbstractTranscribingLabel'; +import { type Props, _mapStateToProps } from './AbstractTranscribingLabel'; /** * React {@code Component} for displaying a label when a transcriber is in the diff --git a/react/features/transcribing/reducer.ts b/react/features/transcribing/reducer.ts index f3d110337f..08da1e021b 100644 --- a/react/features/transcribing/reducer.ts +++ b/react/features/transcribing/reducer.ts @@ -1,10 +1,10 @@ import ReducerRegistry from '../base/redux/ReducerRegistry'; import { - _TRANSCRIBER_JOINED, - _TRANSCRIBER_LEFT, + SET_PENDING_TRANSCRIBING_NOTIFICATION_UID, _POTENTIAL_TRANSCRIBER_JOINED, - SET_PENDING_TRANSCRIBING_NOTIFICATION_UID + _TRANSCRIBER_JOINED, + _TRANSCRIBER_LEFT } from './actionTypes'; /** diff --git a/react/features/video-layout/functions.any.js b/react/features/video-layout/functions.any.js index 56ad032238..b79de4740e 100644 --- a/react/features/video-layout/functions.any.js +++ b/react/features/video-layout/functions.any.js @@ -1,10 +1,10 @@ // @flow import type { Dispatch } from 'redux'; -import { getFeatureFlag, TILE_VIEW_ENABLED } from '../base/flags'; +import { TILE_VIEW_ENABLED, getFeatureFlag } from '../base/flags'; import { - getPinnedParticipant, getParticipantCount, + getPinnedParticipant, pinParticipant } from '../base/participants'; import { isStageFilmstripAvailable } from '../filmstrip/functions'; diff --git a/react/features/video-layout/functions.web.js b/react/features/video-layout/functions.web.js index e0eed8bf42..349814d07c 100644 --- a/react/features/video-layout/functions.web.js +++ b/react/features/video-layout/functions.web.js @@ -1,6 +1,6 @@ import { - DEFAULT_MAX_COLUMNS, ABSOLUTE_MAX_COLUMNS, + DEFAULT_MAX_COLUMNS, TILE_PORTRAIT_ASPECT_RATIO } from '../filmstrip/constants'; import { diff --git a/react/features/video-layout/middleware.any.js b/react/features/video-layout/middleware.any.js index c3ab646666..5f94d3281c 100644 --- a/react/features/video-layout/middleware.any.js +++ b/react/features/video-layout/middleware.any.js @@ -5,9 +5,9 @@ import { VIDEO_TYPE } from '../base/media'; import { PARTICIPANT_LEFT, PIN_PARTICIPANT, - pinParticipant, getParticipantById, - getPinnedParticipant + getPinnedParticipant, + pinParticipant } from '../base/participants'; import { MiddlewareRegistry, StateListenerRegistry } from '../base/redux'; import { TRACK_REMOVED } from '../base/tracks'; diff --git a/react/features/video-layout/middleware.native.js b/react/features/video-layout/middleware.native.js index f20dfe8277..ba2760493e 100644 --- a/react/features/video-layout/middleware.native.js +++ b/react/features/video-layout/middleware.native.js @@ -1,4 +1,4 @@ -import { MEDIA_TYPE, setVideoMuted, VIDEO_MUTISM_AUTHORITY } from '../base/media'; +import { MEDIA_TYPE, VIDEO_MUTISM_AUTHORITY, setVideoMuted } from '../base/media'; import { MiddlewareRegistry } from '../base/redux'; import { CLIENT_RESIZED } from '../base/responsive-ui'; import { setLargeVideoDimensions } from '../large-video/actions.any'; diff --git a/react/features/video-layout/middleware.web.js b/react/features/video-layout/middleware.web.js index 9179346675..7862ee3c85 100644 --- a/react/features/video-layout/middleware.web.js +++ b/react/features/video-layout/middleware.web.js @@ -4,9 +4,9 @@ import VideoLayout from '../../../modules/UI/videolayout/VideoLayout.js'; import { CONFERENCE_WILL_LEAVE } from '../base/conference'; import { MEDIA_TYPE } from '../base/media'; import { - getLocalParticipant, PARTICIPANT_JOINED, - PARTICIPANT_UPDATED + PARTICIPANT_UPDATED, + getLocalParticipant } from '../base/participants'; import { MiddlewareRegistry } from '../base/redux'; import { TRACK_ADDED, TRACK_REMOVED, TRACK_STOPPED } from '../base/tracks'; diff --git a/react/features/video-menu/actions.any.js b/react/features/video-menu/actions.any.js index 45e5959e6e..ffe7405c4c 100644 --- a/react/features/video-menu/actions.any.js +++ b/react/features/video-menu/actions.any.js @@ -5,18 +5,18 @@ import type { Dispatch } from 'redux'; import UIEvents from '../../../service/UI/UIEvents'; import { AUDIO_MUTE, + VIDEO_MUTE, createRemoteMuteConfirmedEvent, createToolbarEvent, - sendAnalytics, - VIDEO_MUTE + sendAnalytics } from '../analytics'; import { rejectParticipantAudio, rejectParticipantVideo, showModeratedNotification } from '../av-moderation/actions'; import { shouldShowModeratedNotification } from '../av-moderation/functions'; import { MEDIA_TYPE, + VIDEO_MUTISM_AUTHORITY, setAudioMuted, - setVideoMuted, - VIDEO_MUTISM_AUTHORITY + setVideoMuted } from '../base/media'; import { getLocalParticipant, diff --git a/react/features/video-menu/components/AbstractGrantModeratorButton.js b/react/features/video-menu/components/AbstractGrantModeratorButton.js index 1e419fc021..002f9a72ad 100644 --- a/react/features/video-menu/components/AbstractGrantModeratorButton.js +++ b/react/features/video-menu/components/AbstractGrantModeratorButton.js @@ -3,10 +3,10 @@ import { openDialog } from '../../base/dialog'; import { IconCrown } from '../../base/icons'; import { + PARTICIPANT_ROLE, getLocalParticipant, getParticipantById, - isParticipantModerator, - PARTICIPANT_ROLE + isParticipantModerator } from '../../base/participants'; import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components'; diff --git a/react/features/video-menu/components/native/MuteEveryoneDialog.js b/react/features/video-menu/components/native/MuteEveryoneDialog.js index b087b442b3..64fcf3979b 100644 --- a/react/features/video-menu/components/native/MuteEveryoneDialog.js +++ b/react/features/video-menu/components/native/MuteEveryoneDialog.js @@ -6,8 +6,8 @@ import { ConfirmDialog } from '../../../base/dialog'; import { translate } from '../../../base/i18n'; import { connect } from '../../../base/redux'; import AbstractMuteEveryoneDialog, { - abstractMapStateToProps as _mapStateToProps, - type Props } from '../AbstractMuteEveryoneDialog'; + type Props, + abstractMapStateToProps as _mapStateToProps } from '../AbstractMuteEveryoneDialog'; import styles from './styles'; diff --git a/react/features/video-menu/components/native/MuteEveryonesVideoDialog.js b/react/features/video-menu/components/native/MuteEveryonesVideoDialog.js index 805915c307..1d2e373898 100644 --- a/react/features/video-menu/components/native/MuteEveryonesVideoDialog.js +++ b/react/features/video-menu/components/native/MuteEveryonesVideoDialog.js @@ -6,8 +6,8 @@ import { ConfirmDialog } from '../../../base/dialog'; import { translate } from '../../../base/i18n'; import { connect } from '../../../base/redux'; import AbstractMuteEveryonesVideoDialog, { - abstractMapStateToProps as _mapStateToProps, - type Props } from '../AbstractMuteEveryonesVideoDialog'; + type Props, + abstractMapStateToProps as _mapStateToProps } from '../AbstractMuteEveryonesVideoDialog'; import styles from './styles'; diff --git a/react/features/video-menu/components/web/GrantModeratorButton.js b/react/features/video-menu/components/web/GrantModeratorButton.js index ae3da5220b..2a02ee35ca 100644 --- a/react/features/video-menu/components/web/GrantModeratorButton.js +++ b/react/features/video-menu/components/web/GrantModeratorButton.js @@ -7,8 +7,8 @@ import { translate } from '../../../base/i18n'; import { IconCrown } from '../../../base/icons'; import { connect } from '../../../base/redux'; import AbstractGrantModeratorButton, { - _mapStateToProps, - type Props + type Props, + _mapStateToProps } from '../AbstractGrantModeratorButton'; declare var interfaceConfig: Object; diff --git a/react/features/video-menu/components/web/MuteButton.js b/react/features/video-menu/components/web/MuteButton.js index 40b2e2b128..5430d7f48e 100644 --- a/react/features/video-menu/components/web/MuteButton.js +++ b/react/features/video-menu/components/web/MuteButton.js @@ -7,8 +7,8 @@ import { translate } from '../../../base/i18n'; import { IconMicrophoneEmptySlash } from '../../../base/icons'; import { connect } from '../../../base/redux'; import AbstractMuteButton, { - _mapStateToProps, - type Props + type Props, + _mapStateToProps } from '../AbstractMuteButton'; diff --git a/react/features/video-menu/components/web/MuteEveryoneDialog.tsx b/react/features/video-menu/components/web/MuteEveryoneDialog.tsx index e0b9fb9302..6a6448ef66 100644 --- a/react/features/video-menu/components/web/MuteEveryoneDialog.tsx +++ b/react/features/video-menu/components/web/MuteEveryoneDialog.tsx @@ -6,7 +6,7 @@ import { Dialog } from '../../../base/dialog'; import { translate } from '../../../base/i18n/functions'; import { connect } from '../../../base/redux/functions'; import Switch from '../../../base/ui/components/web/Switch'; -import AbstractMuteEveryoneDialog, { abstractMapStateToProps, type Props } +import AbstractMuteEveryoneDialog, { type Props, abstractMapStateToProps } // @ts-ignore from '../AbstractMuteEveryoneDialog'; diff --git a/react/features/video-menu/components/web/MuteEveryonesVideoDialog.tsx b/react/features/video-menu/components/web/MuteEveryonesVideoDialog.tsx index dd30e41713..2f194d5119 100644 --- a/react/features/video-menu/components/web/MuteEveryonesVideoDialog.tsx +++ b/react/features/video-menu/components/web/MuteEveryonesVideoDialog.tsx @@ -6,7 +6,7 @@ import { Dialog } from '../../../base/dialog'; import { translate } from '../../../base/i18n/functions'; import { connect } from '../../../base/redux/functions'; import Switch from '../../../base/ui/components/web/Switch'; -import AbstractMuteEveryonesVideoDialog, { abstractMapStateToProps, type Props } +import AbstractMuteEveryonesVideoDialog, { type Props, abstractMapStateToProps } // @ts-ignore from '../AbstractMuteEveryonesVideoDialog'; diff --git a/react/features/video-menu/components/web/MuteVideoButton.js b/react/features/video-menu/components/web/MuteVideoButton.js index 8649069646..ead6340254 100644 --- a/react/features/video-menu/components/web/MuteVideoButton.js +++ b/react/features/video-menu/components/web/MuteVideoButton.js @@ -7,8 +7,8 @@ import { translate } from '../../../base/i18n'; import { IconVideoOff } from '../../../base/icons'; import { connect } from '../../../base/redux'; import AbstractMuteVideoButton, { - _mapStateToProps, - type Props + type Props, + _mapStateToProps } from '../AbstractMuteVideoButton'; /** diff --git a/react/features/video-menu/components/web/ParticipantContextMenu.tsx b/react/features/video-menu/components/web/ParticipantContextMenu.tsx index 5bf989dc86..5c93c21086 100644 --- a/react/features/video-menu/components/web/ParticipantContextMenu.tsx +++ b/react/features/video-menu/components/web/ParticipantContextMenu.tsx @@ -44,11 +44,11 @@ import { AskToUnmuteButton, ConnectionStatusButton, GrantModeratorButton, + KickButton, MuteButton, MuteEveryoneElseButton, MuteEveryoneElsesVideoButton, MuteVideoButton, - KickButton, PrivateMessageMenuButton, RemoteControlButton, TogglePinToStageButton, diff --git a/react/features/video-menu/components/web/PrivateMessageMenuButton.js b/react/features/video-menu/components/web/PrivateMessageMenuButton.js index 3a58e0afe3..cc7c28df0e 100644 --- a/react/features/video-menu/components/web/PrivateMessageMenuButton.js +++ b/react/features/video-menu/components/web/PrivateMessageMenuButton.js @@ -8,8 +8,8 @@ import { IconMessage } from '../../../base/icons'; import { connect } from '../../../base/redux'; import { openChat } from '../../../chat/'; import { - _mapStateToProps as _abstractMapStateToProps, - type Props as AbstractProps + type Props as AbstractProps, + _mapStateToProps as _abstractMapStateToProps } from '../../../chat/components/web/PrivateMessageButton'; import { isButtonEnabled } from '../../../toolbox/functions.web'; diff --git a/react/features/video-quality/components/VideoQualityExpandedLabel.native.js b/react/features/video-quality/components/VideoQualityExpandedLabel.native.js index e3a070e7ce..4189740498 100644 --- a/react/features/video-quality/components/VideoQualityExpandedLabel.native.js +++ b/react/features/video-quality/components/VideoQualityExpandedLabel.native.js @@ -1,7 +1,7 @@ // @flow import { translate } from '../../base/i18n'; -import { ExpandedLabel, type Props as AbstractProps } from '../../base/label'; +import { type Props as AbstractProps, ExpandedLabel } from '../../base/label'; import { AUD_LABEL_COLOR } from './styles'; diff --git a/react/features/video-quality/components/VideoQualityLabel.native.js b/react/features/video-quality/components/VideoQualityLabel.native.js index 2bb4d2f314..415b2e8b96 100644 --- a/react/features/video-quality/components/VideoQualityLabel.native.js +++ b/react/features/video-quality/components/VideoQualityLabel.native.js @@ -5,11 +5,11 @@ import React from 'react'; import { translate } from '../../base/i18n'; import { Label } from '../../base/label'; import { connect } from '../../base/redux'; -import { combineStyles, type StyleType } from '../../base/styles'; +import { type StyleType, combineStyles } from '../../base/styles'; import AbstractVideoQualityLabel, { - _abstractMapStateToProps, - type Props as AbstractProps + type Props as AbstractProps, + _abstractMapStateToProps } from './AbstractVideoQualityLabel'; import styles from './styles'; diff --git a/react/features/video-quality/components/VideoQualityLabel.web.js b/react/features/video-quality/components/VideoQualityLabel.web.js index d23a3e607b..1bdcb19134 100644 --- a/react/features/video-quality/components/VideoQualityLabel.web.js +++ b/react/features/video-quality/components/VideoQualityLabel.web.js @@ -11,8 +11,8 @@ import { Tooltip } from '../../base/tooltip'; import { shouldDisplayTileView } from '../../video-layout'; import AbstractVideoQualityLabel, { - _abstractMapStateToProps, - type Props as AbstractProps + type Props as AbstractProps, + _abstractMapStateToProps } from './AbstractVideoQualityLabel'; import VideoQualityDialog from './VideoQualityDialog.web'; diff --git a/react/features/video-quality/components/VideoQualitySlider.web.tsx b/react/features/video-quality/components/VideoQualitySlider.web.tsx index 487869fa29..82a703bdf4 100644 --- a/react/features/video-quality/components/VideoQualitySlider.web.tsx +++ b/react/features/video-quality/components/VideoQualitySlider.web.tsx @@ -13,7 +13,7 @@ import { IState } from '../../app/types'; import { setAudioOnly } from '../../base/audio-only'; import { translate } from '../../base/i18n/functions'; // @ts-ignore -import { setLastN, getLastNForQualityLevel } from '../../base/lastn'; +import { getLastNForQualityLevel, setLastN } from '../../base/lastn'; import { connect } from '../../base/redux/functions'; import { withPixelLineHeight } from '../../base/styles/functions.web'; // @ts-ignore diff --git a/react/features/video-quality/subscriber.js b/react/features/video-quality/subscriber.js index b37023ee9e..2b70029fc6 100644 --- a/react/features/video-quality/subscriber.js +++ b/react/features/video-quality/subscriber.js @@ -15,10 +15,10 @@ import { isTopPanelEnabled } from '../filmstrip/functions'; import { + LAYOUTS, getVideoQualityForLargeVideo, getVideoQualityForResizableFilmstripThumbnails, getVideoQualityForStageThumbnails, - LAYOUTS, shouldDisplayTileView } from '../video-layout'; import { getCurrentLayout, getVideoQualityForScreenSharingFilmstrip } from '../video-layout/functions.any'; diff --git a/react/features/virtual-background/components/UploadImageButton.tsx b/react/features/virtual-background/components/UploadImageButton.tsx index a8e34eb62d..381f6937ea 100644 --- a/react/features/virtual-background/components/UploadImageButton.tsx +++ b/react/features/virtual-background/components/UploadImageButton.tsx @@ -9,7 +9,7 @@ import { v4 as uuidv4 } from 'uuid'; import { translate } from '../../base/i18n/functions'; import Icon from '../../base/icons/components/Icon'; import { IconPlusCircle } from '../../base/icons/svg'; -import { VIRTUAL_BACKGROUND_TYPE, type Image } from '../constants'; +import { type Image, VIRTUAL_BACKGROUND_TYPE } from '../constants'; // @ts-ignore import { resizeImage } from '../functions'; // @ts-ignore diff --git a/react/features/virtual-background/components/VirtualBackgroundDialog.tsx b/react/features/virtual-background/components/VirtualBackgroundDialog.tsx index 442d7e1fd6..42bfaf16f3 100644 --- a/react/features/virtual-background/components/VirtualBackgroundDialog.tsx +++ b/react/features/virtual-background/components/VirtualBackgroundDialog.tsx @@ -5,7 +5,7 @@ import Bourne from '@hapi/bourne'; // @ts-ignore import { jitsiLocalStorage } from '@jitsi/js-utils/jitsi-local-storage'; import { Theme } from '@mui/material'; -import React, { useState, useEffect, useCallback } from 'react'; +import React, { useCallback, useEffect, useState } from 'react'; import { WithTranslation } from 'react-i18next'; import { useSelector } from 'react-redux'; import { makeStyles } from 'tss-react/mui'; @@ -18,7 +18,7 @@ import { Dialog, hideDialog, openDialog } from '../../base/dialog'; import { translate } from '../../base/i18n/functions'; import Icon from '../../base/icons/components/Icon'; import { IconCloseSmall, IconShareDesktop } from '../../base/icons/svg'; -import { browser, JitsiTrackErrors } from '../../base/lib-jitsi-meet'; +import { JitsiTrackErrors, browser } from '../../base/lib-jitsi-meet'; // @ts-ignore import { createLocalTrack } from '../../base/lib-jitsi-meet/functions'; import { VIDEO_TYPE } from '../../base/media/constants'; @@ -34,7 +34,7 @@ import { showErrorNotification } from '../../notifications'; import { NOTIFICATION_TIMEOUT_TYPE } from '../../notifications/constants'; // @ts-ignore import { toggleBackgroundEffect, virtualBackgroundTrackChanged } from '../actions'; -import { IMAGES, BACKGROUNDS_LIMIT, VIRTUAL_BACKGROUND_TYPE, type Image } from '../constants'; +import { BACKGROUNDS_LIMIT, IMAGES, type Image, VIRTUAL_BACKGROUND_TYPE } from '../constants'; // @ts-ignore import { toDataURL } from '../functions'; // @ts-ignore diff --git a/react/features/welcome/components/WelcomePage.native.js b/react/features/welcome/components/WelcomePage.native.js index d8443748ba..6460fec5c9 100644 --- a/react/features/welcome/components/WelcomePage.native.js +++ b/react/features/welcome/components/WelcomePage.native.js @@ -21,9 +21,9 @@ import WelcomePageTabs from '../../mobile/navigation/components/welcome/components/WelcomePageTabs'; import { + type Props as AbstractProps, AbstractWelcomePage, - _mapStateToProps as _abstractMapStateToProps, - type Props as AbstractProps + _mapStateToProps as _abstractMapStateToProps } from './AbstractWelcomePage'; import styles, { PLACEHOLDER_TEXT_COLOR } from './styles'; diff --git a/react/features/welcome/components/WelcomePage.web.js b/react/features/welcome/components/WelcomePage.web.js index ca5b7d11d4..c3a8ae9ff0 100644 --- a/react/features/welcome/components/WelcomePage.web.js +++ b/react/features/welcome/components/WelcomePage.web.js @@ -9,7 +9,7 @@ import { Watermarks } from '../../base/react'; import { connect } from '../../base/redux'; import { CalendarList } from '../../calendar-sync'; import { RecentList } from '../../recent-list'; -import { SettingsButton, SETTINGS_TABS } from '../../settings'; +import { SETTINGS_TABS, SettingsButton } from '../../settings'; import { AbstractWelcomePage, _mapStateToProps } from './AbstractWelcomePage'; import Tabs from './Tabs';