From c7e467bd4bbefd49169ca51a460c29528090027a Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Thu, 7 Dec 2023 11:39:09 +0100
Subject: [PATCH 1/3] chore(eslint): enable import/order rule again

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 .eslintrc.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index cdfeb5e8c60..9a921a5ee8d 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -15,7 +15,7 @@ module.exports = {
 		'import/newline-after-import': 'warn',
 		'import/no-named-as-default-member': 'off',
 		'import/order': [
-			'off', // TODO disabled with #10622 as it breaks tests and changes many components
+			'warn',
 			{
 				groups: ['builtin', 'external', 'internal', ['parent', 'sibling', 'index'], 'unknown'],
 				pathGroups: [
@@ -48,8 +48,8 @@ module.exports = {
 						// group project components
 						pattern: '*.vue',
 						patternOptions: { matchBase: true },
-						group: 'external',
-						position: 'after',
+						group: 'parent',
+						position: 'before',
 					},
 				],
 				pathGroupsExcludedImportTypes: ['@nextcloud', 'vue-material-design-icons'],

From 2d1080aa2f8ae5e9ddfd9893910c4c67a3c369d8 Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Thu, 7 Dec 2023 12:00:52 +0100
Subject: [PATCH 2/3] chore(eslint): run eslint

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 src/PublicShareAuthRequestPasswordButton.vue       |  1 +
 src/components/AdminSettings/RecordingServers.vue  |  3 ++-
 .../BreakoutRoomsParticipantsEditor.vue            |  2 +-
 src/components/CallView/CallView.vue               |  5 +++--
 src/components/CallView/shared/LocalVideo.vue      |  4 ++--
 src/components/CallView/shared/Screen.vue          |  2 +-
 src/components/CallView/shared/VideoVue.vue        |  4 ++--
 .../CallView/shared/ViewerOverlayCallView.vue      |  4 ++--
 .../RecordingConsentSettings.vue                   |  2 +-
 src/components/DialpadPanel.vue                    |  7 +++----
 .../ConversationsList/Conversation.spec.js         |  2 +-
 .../LeftSidebar/ConversationsList/Conversation.vue |  2 +-
 .../LeftSidebar/ConversationsListVirtual.vue       |  2 +-
 src/components/LeftSidebar/LeftSidebar.vue         | 12 ++++++------
 .../NewGroupConversation/NewGroupConversation.vue  |  6 +++---
 .../SetContacts/SetContacts.vue                    |  2 +-
 src/components/MediaSettings/MediaSettings.vue     |  2 +-
 .../MessagesGroup/Message/Message.spec.js          |  2 +-
 .../MessagesList/MessagesGroup/Message/Message.vue |  4 ++--
 .../MessagesGroup/Message/MessagePart/Poll.vue     |  2 +-
 .../MessagesList/MessagesGroup/MessagesGroup.vue   |  2 +-
 src/components/MessagesList/MessagesList.vue       |  2 +-
 src/components/NewMessage/NewMessage.vue           |  2 +-
 .../NewMessage/NewMessageUploadEditor.vue          |  2 +-
 .../BreakoutRooms/BreakoutRoomsTab.vue             |  3 +--
 .../Participant/Participant.spec.js                |  2 +-
 .../ParticipantsList/Participant/Participant.vue   |  6 +++---
 .../ParticipantPermissionsEditor.spec.js           |  2 +-
 .../ParticipantsList/ParticipantsList.vue          |  2 +-
 .../ParticipantsList/ParticipantsListVirtual.vue   |  2 +-
 .../RightSidebar/Participants/ParticipantsTab.vue  |  8 ++++----
 src/components/RightSidebar/RightSidebar.vue       |  4 ++--
 .../SharedItems/SharedItemsBrowser.vue             |  2 +-
 .../RightSidebar/SharedItems/SharedItemsTab.vue    |  4 ++--
 src/components/TopBar/CallButton.vue               |  3 +--
 src/components/TopBar/TopBar.vue                   |  4 ++--
 src/composables/useActiveSession.js                |  4 ++--
 src/composables/useIsInCall.js                     |  2 +-
 src/composables/useSortParticipants.js             |  2 +-
 src/main.js                                        |  2 +-
 src/mainFilesSidebar.js                            |  2 +-
 src/mainPublicShareAuthSidebar.js                  |  2 +-
 src/mainPublicShareSidebar.js                      |  2 +-
 src/mainRecording.js                               |  3 +--
 src/mixins/getParticipants.js                      |  2 +-
 src/services/callsService.js                       |  2 +-
 src/services/conversationsService.spec.js          |  2 +-
 src/services/messagesService.spec.js               |  2 +-
 src/store/actorStore.spec.js                       |  2 +-
 src/store/callViewStore.spec.js                    |  2 +-
 src/store/conversationsStore.spec.js               |  2 +-
 src/store/fileUploadStore.spec.js                  |  2 +-
 src/store/messagesStore.spec.js                    |  4 ++--
 src/store/participantsStore.spec.js                |  4 ++--
 src/stores/guestName.js                            |  3 ++-
 src/stores/settings.js                             |  2 +-
 src/utils/SignalingTypingHandler.spec.js           |  2 +-
 .../JitsiStreamBackgroundEffect.js                 |  2 +-
 src/utils/media/pipeline/MediaDevicesSource.js     |  2 +-
 .../media/pipeline/MediaDevicesSource.spec.js      |  2 +-
 src/utils/media/pipeline/SpeakingMonitor.js        |  2 +-
 src/utils/media/pipeline/TrackSinkSource.js        |  2 +-
 src/utils/media/pipeline/TrackSource.js            |  2 +-
 src/utils/media/pipeline/TrackToStream.js          |  2 +-
 src/utils/media/pipeline/VirtualBackground.js      |  2 +-
 src/utils/signaling.js                             |  2 +-
 src/utils/webrtc/analyzers/CallAnalyzer.js         |  2 +-
 src/utils/webrtc/analyzers/ParticipantAnalyzer.js  |  2 +-
 .../webrtc/analyzers/PeerConnectionAnalyzer.js     |  2 +-
 src/utils/webrtc/index.js                          | 14 +++++++-------
 .../webrtc/models/CallParticipantCollection.js     |  2 +-
 .../webrtc/models/LocalCallParticipantModel.js     |  2 +-
 src/utils/webrtc/simplewebrtc/localmedia.js        |  2 +-
 src/utils/webrtc/simplewebrtc/peer.js              |  1 +
 src/utils/webrtc/webrtc.js                         |  2 +-
 src/views/NotFoundView.vue                         |  3 ++-
 src/views/SessionConflictView.vue                  |  3 ++-
 src/views/WelcomeView.vue                          |  2 ++
 78 files changed, 115 insertions(+), 110 deletions(-)

diff --git a/src/PublicShareAuthRequestPasswordButton.vue b/src/PublicShareAuthRequestPasswordButton.vue
index abf278b3c2b..53e0004e95d 100644
--- a/src/PublicShareAuthRequestPasswordButton.vue
+++ b/src/PublicShareAuthRequestPasswordButton.vue
@@ -40,6 +40,7 @@
 
 <script>
 import { Fragment } from 'vue-frag'
+
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 
 import { getPublicShareAuthConversationToken } from './services/publicShareAuthService.js'
diff --git a/src/components/AdminSettings/RecordingServers.vue b/src/components/AdminSettings/RecordingServers.vue
index 6c994b1c0d3..543350d90a1 100644
--- a/src/components/AdminSettings/RecordingServers.vue
+++ b/src/components/AdminSettings/RecordingServers.vue
@@ -104,9 +104,10 @@ import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
 import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
 
 import RecordingServer from '../../components/AdminSettings/RecordingServer.vue'
-import { CALL } from '../../constants.js'
 import TransitionWrapper from '../TransitionWrapper.vue'
 
+import { CALL } from '../../constants.js'
+
 const recordingConsentCapability = getCapabilities()?.spreed?.features?.includes('recording-consent')
 const recordingConsentOptions = [
 	{ value: CALL.RECORDING_CONSENT.OFF, label: t('spreed', 'Disabled for all calls') },
diff --git a/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue b/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue
index 264e064fd39..a7531038b22 100644
--- a/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue
+++ b/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue
@@ -115,8 +115,8 @@ import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcDialog from '@nextcloud/vue/dist/Components/NcDialog.js'
 
-import BreakoutRoomItem from '../RightSidebar/BreakoutRooms/BreakoutRoomItem.vue'
 import SelectableParticipant from './SelectableParticipant.vue'
+import BreakoutRoomItem from '../RightSidebar/BreakoutRooms/BreakoutRoomItem.vue'
 
 import { ATTENDEE, CONVERSATION, PARTICIPANT } from '../../constants.js'
 
diff --git a/src/components/CallView/CallView.vue b/src/components/CallView/CallView.vue
index 1c666237a86..1916865f241 100644
--- a/src/components/CallView/CallView.vue
+++ b/src/components/CallView/CallView.vue
@@ -176,12 +176,14 @@
 <script>
 import debounce from 'debounce'
 
+import AccountBox from 'vue-material-design-icons/AccountBoxOutline.vue'
+
 import { getCapabilities } from '@nextcloud/capabilities'
 import { showMessage } from '@nextcloud/dialogs'
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { loadState } from '@nextcloud/initial-state'
 
-import AccountBox from 'vue-material-design-icons/AccountBoxOutline.vue'
+import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 
 import Grid from './Grid/Grid.vue'
 import EmptyCallView from './shared/EmptyCallView.vue'
@@ -197,7 +199,6 @@ import BrowserStorage from '../../services/BrowserStorage.js'
 import { fetchPeers } from '../../services/callsService.js'
 import { EventBus } from '../../services/EventBus.js'
 import { localMediaModel, localCallParticipantModel, callParticipantCollection } from '../../utils/webrtc/index.js'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import RemoteVideoBlocker from '../../utils/webrtc/RemoteVideoBlocker.js'
 
 export default {
diff --git a/src/components/CallView/shared/LocalVideo.vue b/src/components/CallView/shared/LocalVideo.vue
index 414b62a5823..3521015eeaa 100644
--- a/src/components/CallView/shared/LocalVideo.vue
+++ b/src/components/CallView/shared/LocalVideo.vue
@@ -71,13 +71,13 @@ import { showError, showInfo, TOAST_PERMANENT_TIMEOUT } from '@nextcloud/dialogs
 
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 
-import AvatarWrapper from '../../AvatarWrapper/AvatarWrapper.vue'
 import VideoBackground from './VideoBackground.vue'
+import AvatarWrapper from '../../AvatarWrapper/AvatarWrapper.vue'
 
 import { AVATAR } from '../../../constants.js'
 import video from '../../../mixins/video.js'
-import attachMediaStream from '../../../utils/attachmediastream.js'
 import { useGuestNameStore } from '../../../stores/guestName.js'
+import attachMediaStream from '../../../utils/attachmediastream.js'
 import { ConnectionState } from '../../../utils/webrtc/models/CallParticipantModel.js'
 
 export default {
diff --git a/src/components/CallView/shared/Screen.vue b/src/components/CallView/shared/Screen.vue
index 63d25e9bbef..9ba20f91a26 100644
--- a/src/components/CallView/shared/Screen.vue
+++ b/src/components/CallView/shared/Screen.vue
@@ -40,8 +40,8 @@ import SHA1 from 'crypto-js/sha1.js'
 
 import VideoBottomBar from './VideoBottomBar.vue'
 
-import attachMediaStream from '../../../utils/attachmediastream.js'
 import { useGuestNameStore } from '../../../stores/guestName.js'
+import attachMediaStream from '../../../utils/attachmediastream.js'
 
 export default {
 
diff --git a/src/components/CallView/shared/VideoVue.vue b/src/components/CallView/shared/VideoVue.vue
index 097ddf6fc83..5c4aed4d42b 100644
--- a/src/components/CallView/shared/VideoVue.vue
+++ b/src/components/CallView/shared/VideoVue.vue
@@ -92,11 +92,11 @@ import SHA1 from 'crypto-js/sha1.js'
 import AccountCircle from 'vue-material-design-icons/AccountCircle.vue'
 import AccountOff from 'vue-material-design-icons/AccountOff.vue'
 
-import AvatarWrapper from '../../AvatarWrapper/AvatarWrapper.vue'
-import TransitionWrapper from '../../TransitionWrapper.vue'
 import Screen from './Screen.vue'
 import VideoBackground from './VideoBackground.vue'
 import VideoBottomBar from './VideoBottomBar.vue'
+import AvatarWrapper from '../../AvatarWrapper/AvatarWrapper.vue'
+import TransitionWrapper from '../../TransitionWrapper.vue'
 
 import { ATTENDEE, AVATAR } from '../../../constants.js'
 import video from '../../../mixins/video.js'
diff --git a/src/components/CallView/shared/ViewerOverlayCallView.vue b/src/components/CallView/shared/ViewerOverlayCallView.vue
index 56b3957977e..2ea63b04564 100644
--- a/src/components/CallView/shared/ViewerOverlayCallView.vue
+++ b/src/components/CallView/shared/ViewerOverlayCallView.vue
@@ -131,13 +131,13 @@ import ChevronUp from 'vue-material-design-icons/ChevronUp.vue'
 
 import { NcButton, Tooltip } from '@nextcloud/vue'
 
-import TransitionWrapper from '../../TransitionWrapper.vue'
 import EmptyCallView from './EmptyCallView.vue'
 import LocalAudioControlButton from './LocalAudioControlButton.vue'
 import LocalVideo from './LocalVideo.vue'
 import LocalVideoControlButton from './LocalVideoControlButton.vue'
-import VideoVue from './VideoVue.vue'
 import Screen from './Screen.vue'
+import VideoVue from './VideoVue.vue'
+import TransitionWrapper from '../../TransitionWrapper.vue'
 
 import { localCallParticipantModel, localMediaModel } from '../../../utils/webrtc/index.js'
 
diff --git a/src/components/ConversationSettings/RecordingConsentSettings.vue b/src/components/ConversationSettings/RecordingConsentSettings.vue
index 75b80d0cb7b..e18752028e2 100644
--- a/src/components/ConversationSettings/RecordingConsentSettings.vue
+++ b/src/components/ConversationSettings/RecordingConsentSettings.vue
@@ -44,12 +44,12 @@
 </template>
 
 <script>
+import { getCapabilities } from '@nextcloud/capabilities'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 
 import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 
 import { CALL, CONVERSATION } from '../../constants.js'
-import { getCapabilities } from '@nextcloud/capabilities'
 
 const recordingConsent = getCapabilities()?.spreed?.config?.call?.['recording-consent']
 
diff --git a/src/components/DialpadPanel.vue b/src/components/DialpadPanel.vue
index a3e18ec65c2..a2bab0cc7a0 100644
--- a/src/components/DialpadPanel.vue
+++ b/src/components/DialpadPanel.vue
@@ -81,16 +81,15 @@
 </template>
 
 <script>
-import { getLocale } from '@nextcloud/l10n'
-
 import BackspaceOutline from 'vue-material-design-icons/BackspaceOutline.vue'
+import Dialpad from 'vue-material-design-icons/Dialpad.vue'
+
+import { getLocale } from '@nextcloud/l10n'
 
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcPopover from '@nextcloud/vue/dist/Components/NcPopover.js'
 import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
 
-import Dialpad from 'vue-material-design-icons/Dialpad.vue'
-
 import { regionCodes } from '../regionCodes.js'
 
 const allowedKeys = /^[0-9+\-()*#\s]+$/
diff --git a/src/components/LeftSidebar/ConversationsList/Conversation.spec.js b/src/components/LeftSidebar/ConversationsList/Conversation.spec.js
index e8208ce5e7e..773f42c8740 100644
--- a/src/components/LeftSidebar/ConversationsList/Conversation.spec.js
+++ b/src/components/LeftSidebar/ConversationsList/Conversation.spec.js
@@ -7,9 +7,9 @@ import Vuex from 'vuex'
 import { showSuccess, showError } from '@nextcloud/dialogs'
 
 import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-import NcListItem from '@nextcloud/vue/dist/Components/NcListItem.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcDialog from '@nextcloud/vue/dist/Components/NcDialog.js'
+import NcListItem from '@nextcloud/vue/dist/Components/NcListItem.js'
 
 import Conversation from './Conversation.vue'
 
diff --git a/src/components/LeftSidebar/ConversationsList/Conversation.vue b/src/components/LeftSidebar/ConversationsList/Conversation.vue
index baff6d89b2e..ecb167abd20 100644
--- a/src/components/LeftSidebar/ConversationsList/Conversation.vue
+++ b/src/components/LeftSidebar/ConversationsList/Conversation.vue
@@ -147,9 +147,9 @@ import { showError } from '@nextcloud/dialogs'
 import { emit } from '@nextcloud/event-bus'
 
 import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcDialog from '@nextcloud/vue/dist/Components/NcDialog.js'
 import NcListItem from '@nextcloud/vue/dist/Components/NcListItem.js'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 
 import ConversationIcon from './../../ConversationIcon.vue'
 
diff --git a/src/components/LeftSidebar/ConversationsListVirtual.vue b/src/components/LeftSidebar/ConversationsListVirtual.vue
index 51893c99dbc..66acca2311e 100644
--- a/src/components/LeftSidebar/ConversationsListVirtual.vue
+++ b/src/components/LeftSidebar/ConversationsListVirtual.vue
@@ -37,8 +37,8 @@
 <script>
 import { RecycleScroller } from 'vue-virtual-scroller'
 
-import LoadingPlaceholder from '../LoadingPlaceholder.vue'
 import Conversation from './ConversationsList/Conversation.vue'
+import LoadingPlaceholder from '../LoadingPlaceholder.vue'
 
 import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
 
diff --git a/src/components/LeftSidebar/LeftSidebar.vue b/src/components/LeftSidebar/LeftSidebar.vue
index 68a8c12c65e..3bf15417b9f 100644
--- a/src/components/LeftSidebar/LeftSidebar.vue
+++ b/src/components/LeftSidebar/LeftSidebar.vue
@@ -276,10 +276,10 @@ import FilterIcon from 'vue-material-design-icons/Filter.vue'
 import FilterRemoveIcon from 'vue-material-design-icons/FilterRemove.vue'
 import List from 'vue-material-design-icons/FormatListBulleted.vue'
 import MessageBadge from 'vue-material-design-icons/MessageBadge.vue'
+import MessageOutline from 'vue-material-design-icons/MessageOutline.vue'
 import Note from 'vue-material-design-icons/NoteEditOutline.vue'
 import Phone from 'vue-material-design-icons/Phone.vue'
 import Plus from 'vue-material-design-icons/Plus.vue'
-import MessageOutline from 'vue-material-design-icons/MessageOutline.vue'
 
 import { getCapabilities } from '@nextcloud/capabilities'
 import { showError } from '@nextcloud/dialogs'
@@ -291,19 +291,19 @@ import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 import NcAppNavigation from '@nextcloud/vue/dist/Components/NcAppNavigation.js'
 import NcAppNavigationCaption from '@nextcloud/vue/dist/Components/NcAppNavigationCaption.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 import NcListItem from '@nextcloud/vue/dist/Components/NcListItem.js'
 import isMobile from '@nextcloud/vue/dist/Mixins/isMobile.js'
-import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 
-import ConversationIcon from '../ConversationIcon.vue'
-import Hint from '../Hint.vue'
-import TransitionWrapper from '../TransitionWrapper.vue'
 import CallPhoneDialog from './CallPhoneDialog/CallPhoneDialog.vue'
 import Conversation from './ConversationsList/Conversation.vue'
 import ConversationsListVirtual from './ConversationsListVirtual.vue'
 import NewGroupConversation from './NewGroupConversation/NewGroupConversation.vue'
 import OpenConversationsList from './OpenConversationsList/OpenConversationsList.vue'
 import SearchBox from './SearchBox/SearchBox.vue'
+import ConversationIcon from '../ConversationIcon.vue'
+import Hint from '../Hint.vue'
+import TransitionWrapper from '../TransitionWrapper.vue'
 
 import { useArrowNavigation } from '../../composables/useArrowNavigation.js'
 import { CONVERSATION } from '../../constants.js'
@@ -317,8 +317,8 @@ import {
 import { EventBus } from '../../services/EventBus.js'
 import { talkBroadcastChannel } from '../../services/talkBroadcastChannel.js'
 import CancelableRequest from '../../utils/cancelableRequest.js'
-import { requestTabLeadership } from '../../utils/requestTabLeadership.js'
 import { hasUnreadMentions, filterFunction } from '../../utils/conversation.js'
+import { requestTabLeadership } from '../../utils/requestTabLeadership.js'
 
 const canModerateSipDialOut = getCapabilities()?.spreed?.features?.includes('sip-support-dialout')
 	&& getCapabilities()?.spreed?.config.call['sip-enabled']
diff --git a/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue b/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue
index 780181993c3..c67f274fdff 100644
--- a/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue
+++ b/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue
@@ -162,11 +162,11 @@
 </template>
 
 <script>
+import AlertCircle from 'vue-material-design-icons/AlertCircle.vue'
+import Check from 'vue-material-design-icons/Check.vue'
 
 import { getCapabilities } from '@nextcloud/capabilities'
 import { showError } from '@nextcloud/dialogs'
-import Check from 'vue-material-design-icons/Check.vue'
-import AlertCircle from 'vue-material-design-icons/AlertCircle.vue'
 
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
@@ -175,10 +175,10 @@ import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 import NcPasswordField from '@nextcloud/vue/dist/Components/NcPasswordField.js'
 import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
 
+import SetContacts from './SetContacts/SetContacts.vue'
 import ConversationAvatarEditor from '../../ConversationSettings/ConversationAvatarEditor.vue'
 import ListableSettings from '../../ConversationSettings/ListableSettings.vue'
 import LoadingComponent from '../../LoadingComponent.vue'
-import SetContacts from './SetContacts/SetContacts.vue'
 
 import { useIsInCall } from '../../../composables/useIsInCall.js'
 import { CONVERSATION, PRIVACY } from '../../../constants.js'
diff --git a/src/components/LeftSidebar/NewGroupConversation/SetContacts/SetContacts.vue b/src/components/LeftSidebar/NewGroupConversation/SetContacts/SetContacts.vue
index 754e0e84898..07ab0e9ae5e 100644
--- a/src/components/LeftSidebar/NewGroupConversation/SetContacts/SetContacts.vue
+++ b/src/components/LeftSidebar/NewGroupConversation/SetContacts/SetContacts.vue
@@ -83,11 +83,11 @@ import { showError } from '@nextcloud/dialogs'
 
 import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
 
+import ContactSelectionBubble from './ContactSelectionBubble/ContactSelectionBubble.vue'
 import DialpadPanel from '../../../DialpadPanel.vue'
 import ParticipantSearchResults from '../../../RightSidebar/Participants/ParticipantsSearchResults/ParticipantsSearchResults.vue'
 import SelectPhoneNumber from '../../../SelectPhoneNumber.vue'
 import TransitionWrapper from '../../../TransitionWrapper.vue'
-import ContactSelectionBubble from './ContactSelectionBubble/ContactSelectionBubble.vue'
 
 import { useArrowNavigation } from '../../../../composables/useArrowNavigation.js'
 import { searchPossibleConversations } from '../../../../services/conversationsService.js'
diff --git a/src/components/MediaSettings/MediaSettings.vue b/src/components/MediaSettings/MediaSettings.vue
index f925f9a17f0..6a2f320db16 100644
--- a/src/components/MediaSettings/MediaSettings.vue
+++ b/src/components/MediaSettings/MediaSettings.vue
@@ -219,12 +219,12 @@ import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
 import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
 
+import VideoBackgroundEditor from './VideoBackgroundEditor.vue'
 import AvatarWrapper from '../AvatarWrapper/AvatarWrapper.vue'
 import VideoBackground from '../CallView/shared/VideoBackground.vue'
 import MediaDevicesSelector from '../MediaDevicesSelector.vue'
 import CallButton from '../TopBar/CallButton.vue'
 import VolumeIndicator from '../VolumeIndicator/VolumeIndicator.vue'
-import VideoBackgroundEditor from './VideoBackgroundEditor.vue'
 
 import { useIsInCall } from '../../composables/useIsInCall.js'
 import { AVATAR, CALL, PARTICIPANT, VIRTUAL_BACKGROUND } from '../../constants.js'
diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.spec.js b/src/components/MessagesList/MessagesGroup/Message/Message.spec.js
index 46bf01aa579..57d7e01eb3c 100644
--- a/src/components/MessagesList/MessagesGroup/Message/Message.spec.js
+++ b/src/components/MessagesList/MessagesGroup/Message/Message.spec.js
@@ -12,7 +12,6 @@ import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker.js'
 
-import Quote from '../../../Quote.vue'
 import Message from './Message.vue'
 import MessageButtonsBar from './MessageButtonsBar/MessageButtonsBar.vue'
 import DeckCard from './MessagePart/DeckCard.vue'
@@ -20,6 +19,7 @@ import DefaultParameter from './MessagePart/DefaultParameter.vue'
 import FilePreview from './MessagePart/FilePreview.vue'
 import Location from './MessagePart/Location.vue'
 import Mention from './MessagePart/Mention.vue'
+import Quote from '../../../Quote.vue'
 
 import * as useIsInCallModule from '../../../../composables/useIsInCall.js'
 import { CONVERSATION, ATTENDEE, PARTICIPANT } from '../../../../constants.js'
diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue
index 2b36b914b77..31cdcca4c2f 100644
--- a/src/components/MessagesList/MessagesGroup/Message/Message.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue
@@ -267,8 +267,6 @@ import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker.js'
 import NcPopover from '@nextcloud/vue/dist/Components/NcPopover.js'
 import NcRichText from '@nextcloud/vue/dist/Components/NcRichText.js'
 
-import Quote from '../../../Quote.vue'
-import CallButton from '../../../TopBar/CallButton.vue'
 import MessageButtonsBar from './MessageButtonsBar/MessageButtonsBar.vue'
 import MessageTranslateDialog from './MessageButtonsBar/MessageTranslateDialog.vue'
 import Contact from './MessagePart/Contact.vue'
@@ -278,6 +276,8 @@ import FilePreview from './MessagePart/FilePreview.vue'
 import Location from './MessagePart/Location.vue'
 import Mention from './MessagePart/Mention.vue'
 import Poll from './MessagePart/Poll.vue'
+import Quote from '../../../Quote.vue'
+import CallButton from '../../../TopBar/CallButton.vue'
 
 import { useIsInCall } from '../../../../composables/useIsInCall.js'
 import { ATTENDEE, CONVERSATION, PARTICIPANT } from '../../../../constants.js'
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/Poll.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/Poll.vue
index b5aeee253c3..d0494395604 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/Poll.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/Poll.vue
@@ -140,8 +140,8 @@
 import FileLock from 'vue-material-design-icons/FileLock.vue'
 import PollIcon from 'vue-material-design-icons/Poll.vue'
 
-import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
diff --git a/src/components/MessagesList/MessagesGroup/MessagesGroup.vue b/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
index 038aa18f081..0f4cd7422ad 100644
--- a/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
+++ b/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
@@ -47,8 +47,8 @@
 </template>
 
 <script>
-import AvatarWrapper from '../../AvatarWrapper/AvatarWrapper.vue'
 import Message from './Message/Message.vue'
+import AvatarWrapper from '../../AvatarWrapper/AvatarWrapper.vue'
 
 import { ATTENDEE, AVATAR } from '../../../constants.js'
 import { useGuestNameStore } from '../../../stores/guestName.js'
diff --git a/src/components/MessagesList/MessagesList.vue b/src/components/MessagesList/MessagesList.vue
index de4e585750d..e3d134be699 100644
--- a/src/components/MessagesList/MessagesList.vue
+++ b/src/components/MessagesList/MessagesList.vue
@@ -80,9 +80,9 @@ import moment from '@nextcloud/moment'
 
 import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 
-import LoadingPlaceholder from '../LoadingPlaceholder.vue'
 import MessagesGroup from './MessagesGroup/MessagesGroup.vue'
 import MessagesSystemGroup from './MessagesGroup/MessagesSystemGroup.vue'
+import LoadingPlaceholder from '../LoadingPlaceholder.vue'
 
 import { useIsInCall } from '../../composables/useIsInCall.js'
 import { ATTENDEE, CHAT } from '../../constants.js'
diff --git a/src/components/NewMessage/NewMessage.vue b/src/components/NewMessage/NewMessage.vue
index 629c31a193a..eeead3bcd09 100644
--- a/src/components/NewMessage/NewMessage.vue
+++ b/src/components/NewMessage/NewMessage.vue
@@ -170,13 +170,13 @@ import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker.js'
 import NcRichContenteditable from '@nextcloud/vue/dist/Components/NcRichContenteditable.js'
 
-import Quote from '../Quote.vue'
 import NewMessageAbsenceInfo from './NewMessageAbsenceInfo.vue'
 import NewMessageAttachments from './NewMessageAttachments.vue'
 import NewMessageAudioRecorder from './NewMessageAudioRecorder.vue'
 import NewMessageNewFileDialog from './NewMessageNewFileDialog.vue'
 import NewMessagePollEditor from './NewMessagePollEditor.vue'
 import NewMessageTypingIndicator from './NewMessageTypingIndicator.vue'
+import Quote from '../Quote.vue'
 
 import { CONVERSATION, PARTICIPANT, PRIVACY } from '../../constants.js'
 import { EventBus } from '../../services/EventBus.js'
diff --git a/src/components/NewMessage/NewMessageUploadEditor.vue b/src/components/NewMessage/NewMessageUploadEditor.vue
index e7e37102122..fa5d650b9a8 100644
--- a/src/components/NewMessage/NewMessageUploadEditor.vue
+++ b/src/components/NewMessage/NewMessageUploadEditor.vue
@@ -97,9 +97,9 @@ import { getCapabilities } from '@nextcloud/capabilities'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 
+import NewMessage from './NewMessage.vue'
 import AudioPlayer from '../MessagesList/MessagesGroup/Message/MessagePart/AudioPlayer.vue'
 import FilePreview from '../MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue'
-import NewMessage from './NewMessage.vue'
 import TransitionWrapper from '../TransitionWrapper.vue'
 
 const supportMediaCaption = getCapabilities()?.spreed?.features?.includes('media-caption')
diff --git a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsTab.vue b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsTab.vue
index 983f23ef22d..2dbd7e0ad7a 100644
--- a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsTab.vue
+++ b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsTab.vue
@@ -53,11 +53,10 @@ import DotsCircle from 'vue-material-design-icons/DotsCircle.vue'
 
 import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 
-import Participant from '../Participants/ParticipantsList/Participant/Participant.vue'
 import BreakoutRoomItem from './BreakoutRoomItem.vue'
 import BreakoutRoomsActions from './BreakoutRoomsActions.vue'
+import Participant from '../Participants/ParticipantsList/Participant/Participant.vue'
 
-// Constants
 import { CONVERSATION, PARTICIPANT } from '../../../constants.js'
 
 export default {
diff --git a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.spec.js b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.spec.js
index 7caf192758f..d7de75d7805 100644
--- a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.spec.js
+++ b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.spec.js
@@ -10,8 +10,8 @@ import VideoIcon from 'vue-material-design-icons/Video.vue'
 import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 import NcActionText from '@nextcloud/vue/dist/Components/NcActionText.js'
 
-import AvatarWrapper from '../../../../AvatarWrapper/AvatarWrapper.vue'
 import Participant from './Participant.vue'
+import AvatarWrapper from '../../../../AvatarWrapper/AvatarWrapper.vue'
 
 import { ATTENDEE, PARTICIPANT } from '../../../../../constants.js'
 import storeConfig from '../../../../../store/storeConfig.js'
diff --git a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
index 2686eba0386..b9633fdcd10 100644
--- a/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
+++ b/src/components/RightSidebar/Participants/ParticipantsList/Participant/Participant.vue
@@ -306,8 +306,8 @@ import Microphone from 'vue-material-design-icons/Microphone.vue'
 import MicrophoneOff from 'vue-material-design-icons/MicrophoneOff.vue'
 import Pencil from 'vue-material-design-icons/Pencil.vue'
 import Phone from 'vue-material-design-icons/Phone.vue'
-import PhoneInTalk from 'vue-material-design-icons/PhoneInTalk.vue'
 import PhoneHangup from 'vue-material-design-icons/PhoneHangup.vue'
+import PhoneInTalk from 'vue-material-design-icons/PhoneInTalk.vue'
 import PhonePaused from 'vue-material-design-icons/PhonePaused.vue'
 import Tune from 'vue-material-design-icons/Tune.vue'
 import VideoIcon from 'vue-material-design-icons/Video.vue'
@@ -322,9 +322,9 @@ import NcActionText from '@nextcloud/vue/dist/Components/NcActionText.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
 
+import ParticipantPermissionsEditor from './ParticipantPermissionsEditor/ParticipantPermissionsEditor.vue'
 import AvatarWrapper from '../../../../AvatarWrapper/AvatarWrapper.vue'
 import DialpadPanel from '../../../../DialpadPanel.vue'
-import ParticipantPermissionsEditor from './ParticipantPermissionsEditor/ParticipantPermissionsEditor.vue'
 
 import { useIsInCall } from '../../../../../composables/useIsInCall.js'
 import { CONVERSATION, PARTICIPANT, ATTENDEE } from '../../../../../constants.js'
@@ -336,8 +336,8 @@ import {
 	callSIPUnmutePhone,
 	callSIPSendDTMF,
 } from '../../../../../services/callsService.js'
-import { readableNumber } from '../../../../../utils/readableNumber.js'
 import { formattedTime } from '../../../../../utils/formattedTime.js'
+import { readableNumber } from '../../../../../utils/readableNumber.js'
 import { getStatusMessage } from '../../../../../utils/userStatus.js'
 
 export default {
diff --git a/src/components/RightSidebar/Participants/ParticipantsList/Participant/ParticipantPermissionsEditor/ParticipantPermissionsEditor.spec.js b/src/components/RightSidebar/Participants/ParticipantsList/Participant/ParticipantPermissionsEditor/ParticipantPermissionsEditor.spec.js
index fc673b91528..f04dd5406d9 100644
--- a/src/components/RightSidebar/Participants/ParticipantsList/Participant/ParticipantPermissionsEditor/ParticipantPermissionsEditor.spec.js
+++ b/src/components/RightSidebar/Participants/ParticipantsList/Participant/ParticipantPermissionsEditor/ParticipantPermissionsEditor.spec.js
@@ -2,8 +2,8 @@ import { createLocalVue, mount } from '@vue/test-utils'
 import { cloneDeep } from 'lodash'
 import Vuex from 'vuex'
 
-import PermissionsEditor from '../../../../../PermissionsEditor/PermissionsEditor.vue'
 import ParticipantPermissionsEditor from './ParticipantPermissionsEditor.vue'
+import PermissionsEditor from '../../../../../PermissionsEditor/PermissionsEditor.vue'
 
 import { PARTICIPANT, ATTENDEE } from '../../../../../../constants.js'
 import storeConfig from '../../../../../../store/storeConfig.js'
diff --git a/src/components/RightSidebar/Participants/ParticipantsList/ParticipantsList.vue b/src/components/RightSidebar/Participants/ParticipantsList/ParticipantsList.vue
index 310fc509426..0eb41034006 100644
--- a/src/components/RightSidebar/Participants/ParticipantsList/ParticipantsList.vue
+++ b/src/components/RightSidebar/Participants/ParticipantsList/ParticipantsList.vue
@@ -33,8 +33,8 @@
 
 <script>
 
-import LoadingPlaceholder from '../../../LoadingPlaceholder.vue'
 import Participant from './Participant/Participant.vue'
+import LoadingPlaceholder from '../../../LoadingPlaceholder.vue'
 
 export default {
 	name: 'ParticipantsList',
diff --git a/src/components/RightSidebar/Participants/ParticipantsList/ParticipantsListVirtual.vue b/src/components/RightSidebar/Participants/ParticipantsList/ParticipantsListVirtual.vue
index 771fb78f496..ecbb16e764f 100644
--- a/src/components/RightSidebar/Participants/ParticipantsList/ParticipantsListVirtual.vue
+++ b/src/components/RightSidebar/Participants/ParticipantsList/ParticipantsListVirtual.vue
@@ -38,8 +38,8 @@
 <script>
 import { RecycleScroller } from 'vue-virtual-scroller'
 
-import LoadingPlaceholder from '../../../LoadingPlaceholder.vue'
 import Participant from './Participant/Participant.vue'
+import LoadingPlaceholder from '../../../LoadingPlaceholder.vue'
 
 import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
 
diff --git a/src/components/RightSidebar/Participants/ParticipantsTab.vue b/src/components/RightSidebar/Participants/ParticipantsTab.vue
index b3a31eb52ae..55b9f3266fd 100644
--- a/src/components/RightSidebar/Participants/ParticipantsTab.vue
+++ b/src/components/RightSidebar/Participants/ParticipantsTab.vue
@@ -74,16 +74,16 @@ import { loadState } from '@nextcloud/initial-state'
 
 import NcAppNavigationCaption from '@nextcloud/vue/dist/Components/NcAppNavigationCaption.js'
 
+import ParticipantsList from './ParticipantsList/ParticipantsList.vue'
+import ParticipantsListVirtual from './ParticipantsList/ParticipantsListVirtual.vue'
+import ParticipantsSearchResults from './ParticipantsSearchResults/ParticipantsSearchResults.vue'
 import DialpadPanel from '../../DialpadPanel.vue'
 import Hint from '../../Hint.vue'
 import SearchBox from '../../LeftSidebar/SearchBox/SearchBox.vue'
 import SelectPhoneNumber from '../../SelectPhoneNumber.vue'
-import ParticipantsList from './ParticipantsList/ParticipantsList.vue'
-import ParticipantsListVirtual from './ParticipantsList/ParticipantsListVirtual.vue'
-import ParticipantsSearchResults from './ParticipantsSearchResults/ParticipantsSearchResults.vue'
 
-import { useSortParticipants } from '../../../composables/useSortParticipants.js'
 import { useIsInCall } from '../../../composables/useIsInCall.js'
+import { useSortParticipants } from '../../../composables/useSortParticipants.js'
 import getParticipants from '../../../mixins/getParticipants.js'
 import { searchPossibleConversations } from '../../../services/conversationsService.js'
 import { EventBus } from '../../../services/EventBus.js'
diff --git a/src/components/RightSidebar/RightSidebar.vue b/src/components/RightSidebar/RightSidebar.vue
index 8e2d8d90dba..f835a00b733 100644
--- a/src/components/RightSidebar/RightSidebar.vue
+++ b/src/components/RightSidebar/RightSidebar.vue
@@ -114,13 +114,13 @@ import NcAppSidebar from '@nextcloud/vue/dist/Components/NcAppSidebar.js'
 import NcAppSidebarTab from '@nextcloud/vue/dist/Components/NcAppSidebarTab.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 
-import ChatView from '../ChatView.vue'
-import SetGuestUsername from '../SetGuestUsername.vue'
 import BreakoutRoomsTab from './BreakoutRooms/BreakoutRoomsTab.vue'
 import LobbyStatus from './LobbyStatus.vue'
 import ParticipantsTab from './Participants/ParticipantsTab.vue'
 import SharedItemsTab from './SharedItems/SharedItemsTab.vue'
 import SipSettings from './SipSettings.vue'
+import ChatView from '../ChatView.vue'
+import SetGuestUsername from '../SetGuestUsername.vue'
 
 import { CONVERSATION, WEBINAR, PARTICIPANT } from '../../constants.js'
 import isInLobby from '../../mixins/isInLobby.js'
diff --git a/src/components/RightSidebar/SharedItems/SharedItemsBrowser.vue b/src/components/RightSidebar/SharedItems/SharedItemsBrowser.vue
index 57d4726f27e..b3dd468b624 100644
--- a/src/components/RightSidebar/SharedItems/SharedItemsBrowser.vue
+++ b/src/components/RightSidebar/SharedItems/SharedItemsBrowser.vue
@@ -51,8 +51,8 @@ import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 
 import SharedItems from './SharedItems.vue'
 
-import { useSharedItemsStore } from '../../../stores/sharedItems.js'
 import { sharedItemsOrder, sharedItemTitle } from './sharedItemsConstants.js'
+import { useSharedItemsStore } from '../../../stores/sharedItems.js'
 
 export default {
 	name: 'SharedItemsBrowser',
diff --git a/src/components/RightSidebar/SharedItems/SharedItemsTab.vue b/src/components/RightSidebar/SharedItems/SharedItemsTab.vue
index c10b74ae811..556473d51de 100644
--- a/src/components/RightSidebar/SharedItems/SharedItemsTab.vue
+++ b/src/components/RightSidebar/SharedItems/SharedItemsTab.vue
@@ -94,17 +94,17 @@ import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 import NcRelatedResourcesPanel from '@nextcloud/vue/dist/Components/NcRelatedResourcesPanel.js'
 
-import LoadingComponent from '../../LoadingComponent.vue'
 import SharedItems from './SharedItems.vue'
 import SharedItemsBrowser from './SharedItemsBrowser.vue'
+import LoadingComponent from '../../LoadingComponent.vue'
 
-import { useSharedItemsStore } from '../../../stores/sharedItems.js'
 import {
 	sharedItemButtonTitle,
 	sharedItemsOrder,
 	sharedItemsWithPreviewLimit,
 	sharedItemTitle,
 } from './sharedItemsConstants.js'
+import { useSharedItemsStore } from '../../../stores/sharedItems.js'
 
 export default {
 
diff --git a/src/components/TopBar/CallButton.vue b/src/components/TopBar/CallButton.vue
index a2037565761..dae344cf2ef 100644
--- a/src/components/TopBar/CallButton.vue
+++ b/src/components/TopBar/CallButton.vue
@@ -93,8 +93,6 @@
 </template>
 
 <script>
-import { showError } from '@nextcloud/dialogs'
-
 import ArrowLeft from 'vue-material-design-icons/ArrowLeft.vue'
 import PhoneIcon from 'vue-material-design-icons/Phone.vue'
 import PhoneHangup from 'vue-material-design-icons/PhoneHangup.vue'
@@ -102,6 +100,7 @@ import VideoIcon from 'vue-material-design-icons/Video.vue'
 import VideoBoxOff from 'vue-material-design-icons/VideoBoxOff.vue'
 import VideoOff from 'vue-material-design-icons/VideoOff.vue'
 
+import { showError } from '@nextcloud/dialogs'
 import { emit } from '@nextcloud/event-bus'
 import { loadState } from '@nextcloud/initial-state'
 
diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
index 2e819190531..04cf6938594 100644
--- a/src/components/TopBar/TopBar.vue
+++ b/src/components/TopBar/TopBar.vue
@@ -156,13 +156,13 @@ import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
 import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
 import richEditor from '@nextcloud/vue/dist/Mixins/richEditor.js'
 
-import BreakoutRoomsEditor from '../BreakoutRoomsEditor/BreakoutRoomsEditor.vue'
-import ConversationIcon from '../ConversationIcon.vue'
 import CallButton from './CallButton.vue'
 import CallTime from './CallTime.vue'
 import ReactionMenu from './ReactionMenu.vue'
 import TopBarMediaControls from './TopBarMediaControls.vue'
 import TopBarMenu from './TopBarMenu.vue'
+import BreakoutRoomsEditor from '../BreakoutRoomsEditor/BreakoutRoomsEditor.vue'
+import ConversationIcon from '../ConversationIcon.vue'
 
 import { CONVERSATION } from '../../constants.js'
 import getParticipants from '../../mixins/getParticipants.js'
diff --git a/src/composables/useActiveSession.js b/src/composables/useActiveSession.js
index ef94ea6c665..dbd688d53dd 100644
--- a/src/composables/useActiveSession.js
+++ b/src/composables/useActiveSession.js
@@ -22,10 +22,10 @@ import { computed, onBeforeMount, onBeforeUnmount, ref, watch } from 'vue'
 import { getCapabilities } from '@nextcloud/capabilities'
 import { showInfo } from '@nextcloud/dialogs'
 
-import { SESSION } from '../constants.js'
-import { setSessionState } from '../services/participantsService.js'
 import { useIsInCall } from './useIsInCall.js'
 import { useStore } from './useStore.js'
+import { SESSION } from '../constants.js'
+import { setSessionState } from '../services/participantsService.js'
 
 const supportSessionState = getCapabilities()?.spreed?.features?.includes('session-state')
 const INACTIVE_TIME_MS = 3 * 60 * 1000
diff --git a/src/composables/useIsInCall.js b/src/composables/useIsInCall.js
index 30d226b3e77..fb0f7cc7894 100644
--- a/src/composables/useIsInCall.js
+++ b/src/composables/useIsInCall.js
@@ -20,9 +20,9 @@
 
 import { computed, onBeforeMount, onBeforeUnmount, ref } from 'vue'
 
+import { useStore } from './useStore.js'
 import { EventBus } from '../services/EventBus.js'
 import SessionStorage from '../services/SessionStorage.js'
-import { useStore } from './useStore.js'
 
 /**
  * Check whether the user joined the call of the current token in this PHP session or not
diff --git a/src/composables/useSortParticipants.js b/src/composables/useSortParticipants.js
index 23a69217794..128e3f4db5e 100644
--- a/src/composables/useSortParticipants.js
+++ b/src/composables/useSortParticipants.js
@@ -20,9 +20,9 @@
 
 import { computed } from 'vue'
 
+import { useStore } from './useStore.js'
 import { ATTENDEE, PARTICIPANT } from '../constants.js'
 import { isDoNotDisturb } from '../utils/userStatus.js'
-import { useStore } from './useStore.js'
 
 const MODERATOR_TYPES = [PARTICIPANT.TYPE.OWNER, PARTICIPANT.TYPE.MODERATOR, PARTICIPANT.TYPE.GUEST_MODERATOR]
 
diff --git a/src/main.js b/src/main.js
index d6ce8547359..e1bb599008d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -46,8 +46,8 @@ import router from './router/router.js'
 import store from './store/index.js'
 
 // Leaflet icon patch
-import 'leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css' // Re-uses images from ~leaflet package
 import 'leaflet/dist/leaflet.css'
+import 'leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css' // Re-uses images from ~leaflet package
 
 // eslint-disable-next-line
 import 'leaflet-defaulticon-compatibility'
diff --git a/src/mainFilesSidebar.js b/src/mainFilesSidebar.js
index d54c714f84c..1b362769180 100644
--- a/src/mainFilesSidebar.js
+++ b/src/mainFilesSidebar.js
@@ -42,8 +42,8 @@ import './init.js'
 import store from './store/index.js'
 
 // Leaflet icon patch
-import 'leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css' // Re-uses images from ~leaflet package
 import 'leaflet/dist/leaflet.css'
+import 'leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css' // Re-uses images from ~leaflet package
 
 // eslint-disable-next-line
 import 'leaflet-defaulticon-compatibility'
diff --git a/src/mainPublicShareAuthSidebar.js b/src/mainPublicShareAuthSidebar.js
index fdd08bf8b70..a61bee541fe 100644
--- a/src/mainPublicShareAuthSidebar.js
+++ b/src/mainPublicShareAuthSidebar.js
@@ -36,8 +36,8 @@ import './init.js'
 import store from './store/index.js'
 
 // Leaflet icon patch
-import 'leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css' // Re-uses images from ~leaflet package
 import 'leaflet/dist/leaflet.css'
+import 'leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css' // Re-uses images from ~leaflet package
 
 // eslint-disable-next-line
 import 'leaflet-defaulticon-compatibility'
diff --git a/src/mainPublicShareSidebar.js b/src/mainPublicShareSidebar.js
index 22a957f1faa..a19901171d1 100644
--- a/src/mainPublicShareSidebar.js
+++ b/src/mainPublicShareSidebar.js
@@ -36,8 +36,8 @@ import './init.js'
 import store from './store/index.js'
 
 // Leaflet icon patch
-import 'leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css' // Re-uses images from ~leaflet package
 import 'leaflet/dist/leaflet.css'
+import 'leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css' // Re-uses images from ~leaflet package
 
 // eslint-disable-next-line
 import 'leaflet-defaulticon-compatibility'
diff --git a/src/mainRecording.js b/src/mainRecording.js
index 182c942d03f..0a92f63c596 100644
--- a/src/mainRecording.js
+++ b/src/mainRecording.js
@@ -50,10 +50,9 @@ import {
 } from './utils/webrtc/index.js'
 
 import '@nextcloud/dialogs/style.css'
-
 // Leaflet icon patch
-import 'leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css' // Re-uses images from ~leaflet package
 import 'leaflet/dist/leaflet.css'
+import 'leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css' // Re-uses images from ~leaflet package
 
 // eslint-disable-next-line
 import 'leaflet-defaulticon-compatibility'
diff --git a/src/mixins/getParticipants.js b/src/mixins/getParticipants.js
index b7bcf5377f0..e5ddb855f42 100644
--- a/src/mixins/getParticipants.js
+++ b/src/mixins/getParticipants.js
@@ -23,8 +23,8 @@ import debounce from 'debounce'
 
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 
-import { EventBus } from '../services/EventBus.js'
 import isInLobby from './isInLobby.js'
+import { EventBus } from '../services/EventBus.js'
 
 const getParticipants = {
 
diff --git a/src/services/callsService.js b/src/services/callsService.js
index 32af70a6c86..ffd77375124 100644
--- a/src/services/callsService.js
+++ b/src/services/callsService.js
@@ -23,12 +23,12 @@
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
 
+import { PARTICIPANT } from '../constants.js'
 import {
 	signalingJoinCall,
 	signalingLeaveCall,
 	signalingSendCallMessage,
 } from '../utils/webrtc/index.js'
-import { PARTICIPANT } from '../constants.js'
 
 /**
  * Join a call as participant
diff --git a/src/services/conversationsService.spec.js b/src/services/conversationsService.spec.js
index 2e106c07026..987b6b60dcc 100644
--- a/src/services/conversationsService.spec.js
+++ b/src/services/conversationsService.spec.js
@@ -2,8 +2,8 @@ import axios from '@nextcloud/axios'
 import { loadState } from '@nextcloud/initial-state'
 import { generateOcsUrl } from '@nextcloud/router'
 
-import { SHARE } from '../constants.js'
 import { searchPossibleConversations } from './conversationsService.js'
+import { SHARE } from '../constants.js'
 
 jest.mock('@nextcloud/axios', () => ({
 	get: jest.fn(),
diff --git a/src/services/messagesService.spec.js b/src/services/messagesService.spec.js
index 0db7274fbfc..c2b8cad777c 100644
--- a/src/services/messagesService.spec.js
+++ b/src/services/messagesService.spec.js
@@ -1,7 +1,6 @@
 import axios from '@nextcloud/axios'
 import { generateOcsUrl } from '@nextcloud/router'
 
-import { CHAT } from '../constants.js'
 import {
 	fetchMessages,
 	getMessageContext,
@@ -11,6 +10,7 @@ import {
 	postRichObjectToConversation,
 	updateLastReadMessage,
 } from './messagesService.js'
+import { CHAT } from '../constants.js'
 
 jest.mock('@nextcloud/axios', () => ({
 	get: jest.fn(),
diff --git a/src/store/actorStore.spec.js b/src/store/actorStore.spec.js
index 4b9915bf9e3..f158389e085 100644
--- a/src/store/actorStore.spec.js
+++ b/src/store/actorStore.spec.js
@@ -2,8 +2,8 @@ import { createLocalVue } from '@vue/test-utils'
 import { cloneDeep } from 'lodash'
 import Vuex from 'vuex'
 
-import { PARTICIPANT } from '../constants.js'
 import actorStore from './actorStore.js'
+import { PARTICIPANT } from '../constants.js'
 
 describe('actorStore', () => {
 	let localVue = null
diff --git a/src/store/callViewStore.spec.js b/src/store/callViewStore.spec.js
index 4d4276737c4..86e2c88c2f4 100644
--- a/src/store/callViewStore.spec.js
+++ b/src/store/callViewStore.spec.js
@@ -2,8 +2,8 @@ import { createLocalVue } from '@vue/test-utils'
 import { cloneDeep } from 'lodash'
 import Vuex from 'vuex'
 
-import { CONVERSATION } from '../constants.js'
 import storeConfig from './storeConfig.js'
+import { CONVERSATION } from '../constants.js'
 
 describe('callViewStore', () => {
 	let localVue = null
diff --git a/src/store/conversationsStore.spec.js b/src/store/conversationsStore.spec.js
index 91c2ee3294b..3aec85de249 100644
--- a/src/store/conversationsStore.spec.js
+++ b/src/store/conversationsStore.spec.js
@@ -5,6 +5,7 @@ import Vuex from 'vuex'
 
 import { emit } from '@nextcloud/event-bus'
 
+import storeConfig from './storeConfig.js'
 import {
 	CONVERSATION,
 	WEBINAR,
@@ -33,7 +34,6 @@ import {
 	setConversationUnread,
 } from '../services/conversationsService.js'
 import { generateOCSErrorResponse, generateOCSResponse } from '../test-helpers.js'
-import storeConfig from './storeConfig.js'
 
 jest.mock('../services/conversationsService', () => ({
 	makePublic: jest.fn(),
diff --git a/src/store/fileUploadStore.spec.js b/src/store/fileUploadStore.spec.js
index cb0faf76c0f..e07ddfcd716 100644
--- a/src/store/fileUploadStore.spec.js
+++ b/src/store/fileUploadStore.spec.js
@@ -5,11 +5,11 @@ import Vuex from 'vuex'
 
 import { showError } from '@nextcloud/dialogs'
 
+import fileUploadStore from './fileUploadStore.js'
 import { getDavClient } from '../services/DavClient.js'
 import { shareFile } from '../services/filesSharingServices.js'
 import { setAttachmentFolder } from '../services/settingsService.js'
 import { findUniquePath } from '../utils/fileUpload.js'
-import fileUploadStore from './fileUploadStore.js'
 
 jest.mock('../services/DavClient', () => ({
 	getDavClient: jest.fn(),
diff --git a/src/store/messagesStore.spec.js b/src/store/messagesStore.spec.js
index 5519670131f..30b5c70689e 100644
--- a/src/store/messagesStore.spec.js
+++ b/src/store/messagesStore.spec.js
@@ -7,6 +7,8 @@ import Vuex from 'vuex'
 
 import { showError } from '@nextcloud/dialogs'
 
+import messagesStore from './messagesStore.js'
+import storeConfig from './storeConfig.js'
 import {
 	ATTENDEE, CHAT,
 } from '../constants.js'
@@ -25,8 +27,6 @@ import {
 import { useGuestNameStore } from '../stores/guestName.js'
 import { generateOCSErrorResponse, generateOCSResponse } from '../test-helpers.js'
 import CancelableRequest from '../utils/cancelableRequest.js'
-import messagesStore from './messagesStore.js'
-import storeConfig from './storeConfig.js'
 
 jest.mock('../services/messagesService', () => ({
 	deleteMessage: jest.fn(),
diff --git a/src/store/participantsStore.spec.js b/src/store/participantsStore.spec.js
index f305f9cc66c..12a938e9a50 100644
--- a/src/store/participantsStore.spec.js
+++ b/src/store/participantsStore.spec.js
@@ -8,6 +8,8 @@ import Vuex from 'vuex'
 
 import { emit } from '@nextcloud/event-bus'
 
+import participantsStore from './participantsStore.js'
+import storeConfig from './storeConfig.js'
 import { PARTICIPANT } from '../constants.js'
 import {
 	joinCall,
@@ -29,8 +31,6 @@ import {
 } from '../services/participantsService.js'
 import { useGuestNameStore } from '../stores/guestName.js'
 import { generateOCSErrorResponse, generateOCSResponse } from '../test-helpers.js'
-import participantsStore from './participantsStore.js'
-import storeConfig from './storeConfig.js'
 
 jest.mock('../services/participantsService', () => ({
 	promoteToModerator: jest.fn(),
diff --git a/src/stores/guestName.js b/src/stores/guestName.js
index 053219b8e0f..a9ebe088681 100644
--- a/src/stores/guestName.js
+++ b/src/stores/guestName.js
@@ -23,9 +23,10 @@
 import { defineStore } from 'pinia'
 import Vue from 'vue'
 
+import { emit } from '@nextcloud/event-bus'
+
 import { setGuestUserName } from '../services/participantsService.js'
 import store from '../store/index.js'
-import { emit } from '@nextcloud/event-bus'
 
 export const useGuestNameStore = defineStore('guestName', {
 	state: () => ({
diff --git a/src/stores/settings.js b/src/stores/settings.js
index 286d7e885bc..9d9b74cc59c 100644
--- a/src/stores/settings.js
+++ b/src/stores/settings.js
@@ -20,8 +20,8 @@
  *
  */
 
-import Vue from 'vue'
 import { defineStore } from 'pinia'
+import Vue from 'vue'
 
 import { loadState } from '@nextcloud/initial-state'
 
diff --git a/src/utils/SignalingTypingHandler.spec.js b/src/utils/SignalingTypingHandler.spec.js
index 297fad9ad44..5863d61ade8 100644
--- a/src/utils/SignalingTypingHandler.spec.js
+++ b/src/utils/SignalingTypingHandler.spec.js
@@ -22,8 +22,8 @@
 import { cloneDeep } from 'lodash'
 import Vuex from 'vuex'
 
-import storeConfig from '../store/storeConfig.js'
 import SignalingTypingHandler from './SignalingTypingHandler.js'
+import storeConfig from '../store/storeConfig.js'
 
 describe('SignalingTypingHandler', () => {
 	let store
diff --git a/src/utils/media/effects/virtual-background/JitsiStreamBackgroundEffect.js b/src/utils/media/effects/virtual-background/JitsiStreamBackgroundEffect.js
index 25ceff8e1f8..844e1011e2b 100644
--- a/src/utils/media/effects/virtual-background/JitsiStreamBackgroundEffect.js
+++ b/src/utils/media/effects/virtual-background/JitsiStreamBackgroundEffect.js
@@ -1,6 +1,5 @@
 // @flow
 
-import { VIRTUAL_BACKGROUND } from '../../../../constants.js'
 import WebWorker from './JitsiStreamBackgroundEffect.worker.js'
 import {
 	CLEAR_TIMEOUT,
@@ -8,6 +7,7 @@ import {
 	SET_TIMEOUT,
 	timerWorkerScript,
 } from './TimerWorker.js'
+import { VIRTUAL_BACKGROUND } from '../../../../constants.js'
 
 /**
  * Represents a modified MediaStream that adds effects to video background.
diff --git a/src/utils/media/pipeline/MediaDevicesSource.js b/src/utils/media/pipeline/MediaDevicesSource.js
index af044d7257d..e3160f44c99 100644
--- a/src/utils/media/pipeline/MediaDevicesSource.js
+++ b/src/utils/media/pipeline/MediaDevicesSource.js
@@ -21,8 +21,8 @@
 
 import UAParser from 'ua-parser-js'
 
-import { mediaDevicesManager } from '../../webrtc/index.js'
 import TrackSource from './TrackSource.js'
+import { mediaDevicesManager } from '../../webrtc/index.js'
 
 /**
  * Source node to get audio and video tracks from MediaDevicesManager.
diff --git a/src/utils/media/pipeline/MediaDevicesSource.spec.js b/src/utils/media/pipeline/MediaDevicesSource.spec.js
index ec3fdf1d808..b3901e50c7a 100644
--- a/src/utils/media/pipeline/MediaDevicesSource.spec.js
+++ b/src/utils/media/pipeline/MediaDevicesSource.spec.js
@@ -19,8 +19,8 @@
  *
  */
 
-import { mediaDevicesManager } from '../../webrtc/index.js'
 import MediaDevicesSource from './MediaDevicesSource.js'
+import { mediaDevicesManager } from '../../webrtc/index.js'
 
 /**
  * Helper function to create MediaStreamTrack mocks with just the attributes and
diff --git a/src/utils/media/pipeline/SpeakingMonitor.js b/src/utils/media/pipeline/SpeakingMonitor.js
index 381e9859f8d..e5b07a6adac 100644
--- a/src/utils/media/pipeline/SpeakingMonitor.js
+++ b/src/utils/media/pipeline/SpeakingMonitor.js
@@ -21,8 +21,8 @@
 
 import hark from 'hark'
 
-import EmitterMixin from '../../EmitterMixin.js'
 import TrackSink from './TrackSink.js'
+import EmitterMixin from '../../EmitterMixin.js'
 
 /**
  * Sink node to detect sound in its input track and emit "speaking" events.
diff --git a/src/utils/media/pipeline/TrackSinkSource.js b/src/utils/media/pipeline/TrackSinkSource.js
index fa9c9d84a35..5aaecc2bafe 100644
--- a/src/utils/media/pipeline/TrackSinkSource.js
+++ b/src/utils/media/pipeline/TrackSinkSource.js
@@ -19,9 +19,9 @@
  *
  */
 
-import EmitterMixin from '../../EmitterMixin.js'
 import TrackSinkMixin from './TrackSinkMixin.js'
 import TrackSourceMixin from './TrackSourceMixin.js'
+import EmitterMixin from '../../EmitterMixin.js'
 
 /**
  * Base class for nodes that act both as a sink and as a source (a processing
diff --git a/src/utils/media/pipeline/TrackSource.js b/src/utils/media/pipeline/TrackSource.js
index a61d3736580..174f86382f1 100644
--- a/src/utils/media/pipeline/TrackSource.js
+++ b/src/utils/media/pipeline/TrackSource.js
@@ -19,8 +19,8 @@
  *
  */
 
-import EmitterMixin from '../../EmitterMixin.js'
 import TrackSourceMixin from './TrackSourceMixin.js'
+import EmitterMixin from '../../EmitterMixin.js'
 
 /**
  * Base class for source nodes of tracks.
diff --git a/src/utils/media/pipeline/TrackToStream.js b/src/utils/media/pipeline/TrackToStream.js
index ef8c06b1771..4b2b6fa780c 100644
--- a/src/utils/media/pipeline/TrackToStream.js
+++ b/src/utils/media/pipeline/TrackToStream.js
@@ -19,8 +19,8 @@
  *
  */
 
-import EmitterMixin from '../../EmitterMixin.js'
 import TrackSink from './TrackSink.js'
+import EmitterMixin from '../../EmitterMixin.js'
 
 /**
  * Sink node to add one or more tracks to a single stream.
diff --git a/src/utils/media/pipeline/VirtualBackground.js b/src/utils/media/pipeline/VirtualBackground.js
index 01a1a7bad7b..80cd63dc973 100644
--- a/src/utils/media/pipeline/VirtualBackground.js
+++ b/src/utils/media/pipeline/VirtualBackground.js
@@ -23,9 +23,9 @@
 
 import * as wasmCheck from 'wasm-check'
 
+import TrackSinkSource from './TrackSinkSource.js'
 import { VIRTUAL_BACKGROUND } from '../../../constants.js'
 import JitsiStreamBackgroundEffect from '../effects/virtual-background/JitsiStreamBackgroundEffect.js'
-import TrackSinkSource from './TrackSinkSource.js'
 
 /**
  * Processor node to set a virtual background on a video track.
diff --git a/src/utils/signaling.js b/src/utils/signaling.js
index 4f9df044063..5af2af5dd9b 100644
--- a/src/utils/signaling.js
+++ b/src/utils/signaling.js
@@ -43,12 +43,12 @@ import {
 	generateUrl,
 } from '@nextcloud/router'
 
+import CancelableRequest from './cancelableRequest.js'
 import { PARTICIPANT } from '../constants.js'
 import { EventBus } from '../services/EventBus.js'
 import { rejoinConversation } from '../services/participantsService.js'
 import { pullSignalingMessages } from '../services/signalingService.js'
 import store from '../store/index.js'
-import CancelableRequest from './cancelableRequest.js'
 
 const Signaling = {
 	Base: {},
diff --git a/src/utils/webrtc/analyzers/CallAnalyzer.js b/src/utils/webrtc/analyzers/CallAnalyzer.js
index 65a7db6b190..cf63d18bb11 100644
--- a/src/utils/webrtc/analyzers/CallAnalyzer.js
+++ b/src/utils/webrtc/analyzers/CallAnalyzer.js
@@ -19,8 +19,8 @@
  *
  */
 
-import EmitterMixin from '../../EmitterMixin.js'
 import { ParticipantAnalyzer } from './ParticipantAnalyzer.js'
+import EmitterMixin from '../../EmitterMixin.js'
 
 /**
  * Analyzer for the quality of the connections of a call.
diff --git a/src/utils/webrtc/analyzers/ParticipantAnalyzer.js b/src/utils/webrtc/analyzers/ParticipantAnalyzer.js
index 82a5652bbb9..1c93a2ae193 100644
--- a/src/utils/webrtc/analyzers/ParticipantAnalyzer.js
+++ b/src/utils/webrtc/analyzers/ParticipantAnalyzer.js
@@ -19,8 +19,8 @@
  *
  */
 
-import EmitterMixin from '../../EmitterMixin.js'
 import { PEER_DIRECTION, PeerConnectionAnalyzer } from './PeerConnectionAnalyzer.js'
+import EmitterMixin from '../../EmitterMixin.js'
 
 /**
  * Analyzer for the quality of the connections of a Participant.
diff --git a/src/utils/webrtc/analyzers/PeerConnectionAnalyzer.js b/src/utils/webrtc/analyzers/PeerConnectionAnalyzer.js
index 4a3a5ddf356..847faa099c0 100644
--- a/src/utils/webrtc/analyzers/PeerConnectionAnalyzer.js
+++ b/src/utils/webrtc/analyzers/PeerConnectionAnalyzer.js
@@ -19,8 +19,8 @@
  *
  */
 
-import EmitterMixin from '../../EmitterMixin.js'
 import { STAT_VALUE_TYPE, AverageStatValue } from './AverageStatValue.js'
+import EmitterMixin from '../../EmitterMixin.js'
 
 const CONNECTION_QUALITY = {
 	UNKNOWN: 0,
diff --git a/src/utils/webrtc/index.js b/src/utils/webrtc/index.js
index c5bbdec8002..e68a0cf6a5e 100644
--- a/src/utils/webrtc/index.js
+++ b/src/utils/webrtc/index.js
@@ -22,13 +22,6 @@
 import Axios from '@nextcloud/axios'
 import { getCapabilities } from '@nextcloud/capabilities'
 
-import { PARTICIPANT, PRIVACY, VIRTUAL_BACKGROUND } from '../../constants.js'
-import BrowserStorage from '../../services/BrowserStorage.js'
-import { fetchSignalingSettings } from '../../services/signalingService.js'
-import store from '../../store/index.js'
-import CancelableRequest from '../cancelableRequest.js'
-import Signaling from '../signaling.js'
-import SignalingTypingHandler from '../SignalingTypingHandler.js'
 import CallAnalyzer from './analyzers/CallAnalyzer.js'
 import MediaDevicesManager from './MediaDevicesManager.js'
 import CallParticipantCollection from './models/CallParticipantCollection.js'
@@ -39,6 +32,13 @@ import './shims/MediaStream.js'
 import './shims/MediaStreamTrack.js'
 import SpeakingStatusHandler from './SpeakingStatusHandler.js'
 import initWebRtc from './webrtc.js'
+import { PARTICIPANT, PRIVACY, VIRTUAL_BACKGROUND } from '../../constants.js'
+import BrowserStorage from '../../services/BrowserStorage.js'
+import { fetchSignalingSettings } from '../../services/signalingService.js'
+import store from '../../store/index.js'
+import CancelableRequest from '../cancelableRequest.js'
+import Signaling from '../signaling.js'
+import SignalingTypingHandler from '../SignalingTypingHandler.js'
 
 let webRtc = null
 const callParticipantCollection = new CallParticipantCollection()
diff --git a/src/utils/webrtc/models/CallParticipantCollection.js b/src/utils/webrtc/models/CallParticipantCollection.js
index dd8c67d8b23..c2779806ef9 100644
--- a/src/utils/webrtc/models/CallParticipantCollection.js
+++ b/src/utils/webrtc/models/CallParticipantCollection.js
@@ -19,8 +19,8 @@
  *
  */
 
-import EmitterMixin from '../../EmitterMixin.js'
 import CallParticipantModel from './CallParticipantModel.js'
+import EmitterMixin from '../../EmitterMixin.js'
 
 /**
  *
diff --git a/src/utils/webrtc/models/LocalCallParticipantModel.js b/src/utils/webrtc/models/LocalCallParticipantModel.js
index ab3a0859374..9ad233d80ac 100644
--- a/src/utils/webrtc/models/LocalCallParticipantModel.js
+++ b/src/utils/webrtc/models/LocalCallParticipantModel.js
@@ -19,9 +19,9 @@
  *
  */
 
+import { ConnectionState } from './CallParticipantModel.js'
 import store from '../../../store/index.js'
 import EmitterMixin from '../../EmitterMixin.js'
-import { ConnectionState } from './CallParticipantModel.js'
 
 /**
  *
diff --git a/src/utils/webrtc/simplewebrtc/localmedia.js b/src/utils/webrtc/simplewebrtc/localmedia.js
index 55897623655..c9b8962be7a 100644
--- a/src/utils/webrtc/simplewebrtc/localmedia.js
+++ b/src/utils/webrtc/simplewebrtc/localmedia.js
@@ -5,6 +5,7 @@ import WildEmitter from 'wildemitter'
 
 // Only mediaDevicesManager is used, but it can not be assigned here due to not
 // being initialized yet.
+import getScreenMedia from './getscreenmedia.js'
 import BlackVideoEnforcer from '../../media/pipeline/BlackVideoEnforcer.js'
 import MediaDevicesSource from '../../media/pipeline/MediaDevicesSource.js'
 import SpeakingMonitor from '../../media/pipeline/SpeakingMonitor.js'
@@ -13,7 +14,6 @@ import TrackEnabler from '../../media/pipeline/TrackEnabler.js'
 import TrackToStream from '../../media/pipeline/TrackToStream.js'
 import VirtualBackground from '../../media/pipeline/VirtualBackground.js'
 import { mediaDevicesManager } from '../index.js'
-import getScreenMedia from './getscreenmedia.js'
 
 /**
  * @param {object} opts the options object.
diff --git a/src/utils/webrtc/simplewebrtc/peer.js b/src/utils/webrtc/simplewebrtc/peer.js
index 046cde2317b..a9884c56438 100644
--- a/src/utils/webrtc/simplewebrtc/peer.js
+++ b/src/utils/webrtc/simplewebrtc/peer.js
@@ -3,6 +3,7 @@ import util from 'util'
 import adapter from 'webrtc-adapter'
 import webrtcSupport from 'webrtcsupport'
 import WildEmitter from 'wildemitter'
+
 import { isSafari } from '../../../utils/browserCheck.js'
 
 /**
diff --git a/src/utils/webrtc/webrtc.js b/src/utils/webrtc/webrtc.js
index 71f062bbfe3..887eb58a297 100644
--- a/src/utils/webrtc/webrtc.js
+++ b/src/utils/webrtc/webrtc.js
@@ -38,10 +38,10 @@ import {
 	TOAST_DEFAULT_TIMEOUT,
 } from '@nextcloud/dialogs'
 
+import SimpleWebRTC from './simplewebrtc/simplewebrtc.js'
 import { PARTICIPANT } from '../../constants.js'
 import store from '../../store/index.js'
 import { Sounds } from '../sounds.js'
-import SimpleWebRTC from './simplewebrtc/simplewebrtc.js'
 
 let webrtc
 const spreedPeerConnectionTable = []
diff --git a/src/views/NotFoundView.vue b/src/views/NotFoundView.vue
index d2377c29be8..ed82e3f169a 100644
--- a/src/views/NotFoundView.vue
+++ b/src/views/NotFoundView.vue
@@ -8,9 +8,10 @@
 </template>
 
 <script>
-import EmptyView from '../components/EmptyView.vue'
 import IconMagnify from 'vue-material-design-icons/Magnify.vue'
 
+import EmptyView from '../components/EmptyView.vue'
+
 export default {
 	name: 'NotFoundView',
 
diff --git a/src/views/SessionConflictView.vue b/src/views/SessionConflictView.vue
index 08d723aec57..31b864b0f12 100644
--- a/src/views/SessionConflictView.vue
+++ b/src/views/SessionConflictView.vue
@@ -9,9 +9,10 @@
 </template>
 
 <script>
-import EmptyView from '../components/EmptyView.vue'
 import IconInformationOutline from 'vue-material-design-icons/InformationOutline.vue'
 
+import EmptyView from '../components/EmptyView.vue'
+
 export default {
 	name: 'SessionConflictView',
 
diff --git a/src/views/WelcomeView.vue b/src/views/WelcomeView.vue
index a4a03fb431f..c3958694708 100644
--- a/src/views/WelcomeView.vue
+++ b/src/views/WelcomeView.vue
@@ -9,7 +9,9 @@
 
 <script>
 import NcIconSvgWrapper from '@nextcloud/vue/dist/Components/NcIconSvgWrapper.js'
+
 import EmptyView from '../components/EmptyView.vue'
+
 import IconTalk from '../../img/app-dark.svg?raw'
 
 export default {

From 0a657dd81a6d29b03ba7ff7c86fd52b197b2731d Mon Sep 17 00:00:00 2001
From: Maksim Sukharev <antreesy.web@gmail.com>
Date: Thu, 7 Dec 2023 12:24:07 +0100
Subject: [PATCH 3/3] fix(eslint): revert rule for testing - storeConfig import
 messagesStore as well, so there might be a loop while initializing

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
---
 src/store/messagesStore.spec.js     | 3 ++-
 src/store/participantsStore.spec.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/store/messagesStore.spec.js b/src/store/messagesStore.spec.js
index 30b5c70689e..ad2cedf29f1 100644
--- a/src/store/messagesStore.spec.js
+++ b/src/store/messagesStore.spec.js
@@ -7,8 +7,9 @@ import Vuex from 'vuex'
 
 import { showError } from '@nextcloud/dialogs'
 
-import messagesStore from './messagesStore.js'
 import storeConfig from './storeConfig.js'
+// eslint-disable-next-line import/order -- required for testing
+import messagesStore from './messagesStore.js'
 import {
 	ATTENDEE, CHAT,
 } from '../constants.js'
diff --git a/src/store/participantsStore.spec.js b/src/store/participantsStore.spec.js
index 12a938e9a50..670123d4d4e 100644
--- a/src/store/participantsStore.spec.js
+++ b/src/store/participantsStore.spec.js
@@ -8,8 +8,9 @@ import Vuex from 'vuex'
 
 import { emit } from '@nextcloud/event-bus'
 
-import participantsStore from './participantsStore.js'
 import storeConfig from './storeConfig.js'
+// eslint-disable-next-line import/order -- required for testing
+import participantsStore from './participantsStore.js'
 import { PARTICIPANT } from '../constants.js'
 import {
 	joinCall,